Fix transfer summary

svn path=/trunk/; revision=20321

diff --git a/reactos/apps/utils/net/ftp/fake.c b/reactos/apps/utils/net/ftp/fake.c
index e1ca22e..f8d0c8c 100644 (file)
--- a/reactos/apps/utils/net/ftp/fake.c
+++ b/reactos/apps/utils/net/ftp/fake.c
@@ -317,8 +317,8 @@ int gettimeofday(struct timeval *tv, struct timezone *tz)
     if (tv)
     {
         GetSystemTimeAsFileTime(&ft);
     if (tv)
     {
         GetSystemTimeAsFileTime(&ft);

-        //li.LowPart  = ft.dwLowDateTime;
-        //li.HighPart = ft.dwHighDateTime;
+        li.LowPart  = ft.dwLowDateTime;
+        li.HighPart = ft.dwHighDateTime;

         t  = li.QuadPart;       /* In 100-nanosecond intervals */
         t -= EPOCHFILETIME;     /* Offset to the Epoch time */
         t /= 10;                /* In microseconds */
         t  = li.QuadPart;       /* In 100-nanosecond intervals */
         t -= EPOCHFILETIME;     /* Offset to the Epoch time */
         t /= 10;                /* In microseconds */

diff --git a/reactos/apps/utils/net/ftp/ftp.c b/reactos/apps/utils/net/ftp/ftp.c
index bbe6579..640e1af 100644 (file)
--- a/reactos/apps/utils/net/ftp/ftp.c
+++ b/reactos/apps/utils/net/ftp/ftp.c
@@ -1294,7 +1294,7 @@ void ptransfer(direction, bytes, t0, t1)
                s = td.tv_sec + (td.tv_usec / 1000000.);
 #define        nz(x)   ((x) == 0 ? 1 : (x))
                bs = bytes / nz(s);
                s = td.tv_sec + (td.tv_usec / 1000000.);
 #define        nz(x)   ((x) == 0 ? 1 : (x))
                bs = bytes / nz(s);

-               printf("%ld bytes %s in %.2g seconds (%.2g Kbytes/s)\n",
+               printf("%ld bytes %s in %.1f seconds (%.0f Kbytes/s)\n",

                    bytes, direction, s, bs / 1024.);
                (void) fflush(stdout);
        }
                    bytes, direction, s, bs / 1024.);
                (void) fflush(stdout);
        }