Follow RFC 2616 and httpbis specifications when handling redirects

[wget] / src / init.c

diff --git a/src/init.c b/src/init.c
index b4336502057a425143a60d318cb49fff52b26cb6..54a291987755fa04228ab062df376d1db63fef6e 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -574,7 +574,8 @@ bool
 run_wgetrc (const char *file)
 {
   FILE *fp;
-  char *line;
+  char *line = NULL;
+  size_t bufsize = 0;
   int ln;
   int errcnt = 0;
 
@@ -586,7 +587,7 @@ run_wgetrc (const char *file)
       return true;                      /* not a fatal error */
     }
   ln = 1;
-  while ((line = read_whole_line (fp)) != NULL)
+  while (getline (&line, &bufsize, fp) > 0)
     {
       char *com = NULL, *val = NULL;
       int comind;
@@ -620,9 +621,9 @@ run_wgetrc (const char *file)
         }
       xfree_null (com);
       xfree_null (val);
-      xfree (line);
       ++ln;
     }
+  xfree (line);
   fclose (fp);
 
   return errcnt == 0;
@@ -970,8 +971,8 @@ cmd_string_uppercase (const char *com, const char *val, void *place)
   if (!ret || q == NULL)
     return false;
 
-  while (*q)
-    *q++ = c_toupper (*q);
+  for ( ;*q; *q++)
+    *q = c_toupper (*q);
 
   return true;
 }