a few more minor changes

svn path=/trunk/; revision=12992

diff --git a/reactos/apps/utils/net/tracert/makefile b/reactos/apps/utils/net/tracert/makefile
index 549a96a..09c6c49 100644 (file)
--- a/reactos/apps/utils/net/tracert/makefile
+++ b/reactos/apps/utils/net/tracert/makefile
@@ -4,7 +4,7 @@ TARGET_TYPE = program
 
 TARGET_APPTYPE = console
 
 
 TARGET_APPTYPE = console
 

-TARGET_NAME = traceroute
+TARGET_NAME = tracert

 
 TARGET_INSTALLDIR = system32
 
 
 TARGET_INSTALLDIR = system32
 

diff --git a/reactos/apps/utils/net/tracert/port.c b/reactos/apps/utils/net/tracert/port.c
deleted file mode 100644 (file)
index dbaf0ef..0000000
--- a/reactos/apps/utils/net/tracert/port.c
+++ /dev/null
@@ -1,47 +0,0 @@
-#include <stdio.h>
-#include <time.h>
-#include <winsock.h>
-
-#ifndef __GNUC__
-#define EPOCHFILETIME (116444736000000000i64)
-#else
-#define EPOCHFILETIME (116444736000000000LL)
-#endif
-
-struct timezone {
-    int tz_minuteswest; /* minutes W of Greenwich */
-    int tz_dsttime;     /* type of dst correction */
-};
-
-__inline int gettimeofday(struct timeval *tv, struct timezone *tz)
-{
-    FILETIME        ft;
-    LARGE_INTEGER   li;
-    __int64         t;
-    static int      tzflag;
-
-    if (tv)
-    {
-        GetSystemTimeAsFileTime(&ft);
-        //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 */
-        tv->tv_sec  = (long)(t / 1000000);
-        tv->tv_usec = (long)(t % 1000000);
-    }
-
-    if (tz)
-    {
-        if (!tzflag)
-        {
-            _tzset();
-            tzflag++;
-        }
-        tz->tz_minuteswest = _timezone / 60;
-        tz->tz_dsttime = _daylight;
-    }
-
-    return 0;
-}

diff --git a/reactos/apps/utils/net/tracert/traceroute.rc b/reactos/apps/utils/net/tracert/traceroute.rc
index 505a9fe..f1351ca 100644 (file)
--- a/reactos/apps/utils/net/tracert/traceroute.rc
+++ b/reactos/apps/utils/net/tracert/traceroute.rc
@@ -1,6 +1,6 @@
 /* $Id: route.rc 11816 2004-11-26 06:51:47Z arty $ */
 
 /* $Id: route.rc 11816 2004-11-26 06:51:47Z arty $ */
 

-#define REACTOS_STR_FILE_DESCRIPTION   "ReactOS TCP/IPv4 FTP Client\0"
-#define REACTOS_STR_INTERNAL_NAME      "ftp\0"
-#define REACTOS_STR_ORIGINAL_FILENAME  "ftp.exe\0"
+#define REACTOS_STR_FILE_DESCRIPTION   "ReactOS TCP/IPv4 Traceroute\0"
+#define REACTOS_STR_INTERNAL_NAME      "tracert\0"
+#define REACTOS_STR_ORIGINAL_FILENAME  "tracert.exe\0"

 #include <reactos/version.rc>
 #include <reactos/version.rc>