[svn] Small cleanup of mswindows.c by Paul Bludov.

Published in <wget-patches@sunsite.auc.dk>.

diff --git a/src/ChangeLog b/src/ChangeLog
index 0d471023a7bd1a8d88f0b5bfd1e88401f3cc4b41..83a5838037308cb49fcb32045735f0ab26d941d4 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2001-04-03  Paul Bludov  <paul@ozero.net>
+
+       * mswindows.c (sleep): Use SleepEx() instead of Sleep().
+       (ws_changetitle): Use alloca() instead of malloc() to avoid memory
+       leak.
+       (ws_mypath): Use GetModuleFileName instead of argv[0].
+       (ws_startup): Use data.wVersion for comparison.
+
 2001-04-02  Hrvoje Niksic  <hniksic@arsdigita.com>
 
        * http.c (http_loop): Ditto.

diff --git a/src/mswindows.c b/src/mswindows.c
index e68d852204db74d197a6a7efcd9c054210f7c1b8..a938cab62f68f702603ce9d595bfb8ce20e405ca 100644 (file)
--- a/src/mswindows.c
+++ b/src/mswindows.c
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
-/* #### Someone document these functions!  */
+/* #### Someone please document what these functions do!  */
 
 #include <config.h>
 
@@ -35,8 +35,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 extern int errno;
 #endif
 
-char *argv0;
-
 /* Defined in log.c.  */
 void redirect_output (const char *);
 
@@ -47,11 +45,7 @@ static int windows_nt_p;
 unsigned int
 sleep (unsigned seconds)
 {
-  Sleep (1000 * seconds);
-  /* Unix sleep() is interruptible.  To make it semi-usable, it
-     returns a value that says how much it "really" slept, or some
-     junk like that.  Ignore it.  */
-  return 0U;
+  return SleepEx (1000 * seconds, TRUE) ? 0U : 1000 * seconds;
 }
 
 static char *
@@ -100,8 +94,6 @@ windows_main_junk (int *argc, char **argv, char **exec_name)
 {
   char *p;
 
-  argv0 = argv[0];
-
   /* Remove .EXE from filename if it has one.  */
   *exec_name = xstrdup (*exec_name);
   p = strrchr (*exec_name, '.');
@@ -176,10 +168,8 @@ ws_changetitle (char *url, int nurl)
   if (!nurl)
     return;
 
-  title_buf = (char *)xmalloc (strlen (url) + 20);
+  title_buf = (char *)alloca (strlen (url) + 20);
   sprintf (title_buf, "Wget %s%s", url, nurl == 1 ? "" : " ...");
-  /* #### What are the semantics of SetConsoleTitle?  Will it free the
-     given memory later?  */
   SetConsoleTitle (title_buf);
 }
 
@@ -187,34 +177,26 @@ char *
 ws_mypath (void)
 {
   static char *wspathsave;
-  char *buffer;
-  int rrr;
+  char buffer[MAX_PATH];
   char *ptr;
 
   if (wspathsave)
     {
       return wspathsave;
     }
-  ptr = strrchr (argv0, '\\');
+
+  GetModuleFileName (NULL, buffer, MAX_PATH);
+
+  ptr = strrchr (buffer, '\\');
   if (ptr)
     {
       *(ptr + 1) = '\0';
-      wspathsave = (char*) xmalloc (strlen(argv0)+1);
-      strcpy (wspathsave, argv0);
-      return wspathsave;
-    }
-  buffer = (char*) xmalloc (256);
-  rrr = SearchPath (NULL, argv0, strchr (argv0, '.') ? NULL : ".EXE",
-                   256, buffer, &ptr);
-  if (rrr && rrr <= 256)
-    {
-      *ptr = '\0';
-      wspathsave = (char*) xmalloc (strlen(buffer)+1);
+      wspathsave = (char*) xmalloc (strlen (buffer) + 1);
       strcpy (wspathsave, buffer);
-      return wspathsave;
     }
-  xfree (buffer);
-  return NULL;
+  else
+    wspathsave = NULL;
+  return wspathsave;
 }
 
 void
@@ -261,8 +243,7 @@ ws_startup (void)
       exit (1);
     }
 
-  if (LOBYTE (requested) < 1 || (LOBYTE (requested) == 1 &&
-                               HIBYTE (requested) < 1))
+  if (data.wVersion < requested)
     {
       fprintf (stderr, _("%s: Couldn't find usable socket driver.\n"),
               exec_name);