Updated config.guess, config.sub, install.sh.

[wget] / src / netrc.c

diff --git a/src/netrc.c b/src/netrc.c
index 35163a61e9070b5d2cd879fb05a4ea11a465545c..eb99ff44e0bef23eb42618a2a6ae8a87b20e197c 100644 (file)
--- a/src/netrc.c
+++ b/src/netrc.c
@@ -30,8 +30,6 @@ as that of the covered work.  */
 /* This file used to be kept in synch with the code in Fetchmail, but
    the latter has diverged since.  */
 
-#define USE_GNULIB_ALLOC
-
 #include "wget.h"
 
 #include <stdio.h>
@@ -67,6 +65,21 @@ search_netrc (const char *host, const char **acc, const char **passwd,
   /* Find ~/.netrc.  */
   if (!processed_netrc)
     {
+#ifdef __VMS
+
+      int err;
+      struct_stat buf;
+      char *path = "SYS$LOGIN:.netrc";
+
+      netrc_list = NULL;
+      processed_netrc = 1;
+
+      err = stat (path, &buf);
+      if (err == 0)
+        netrc_list = parse_netrc (path);
+
+#else /* def __VMS */
+
       char *home = home_dir ();
 
       netrc_list = NULL;
@@ -83,6 +96,8 @@ search_netrc (const char *host, const char **acc, const char **passwd,
           if (err == 0)
             netrc_list = parse_netrc (path);
         }
+
+#endif /* def __VMS [else] */
     }
   /* If nothing to do...  */
   if (!netrc_list)
@@ -251,7 +266,7 @@ parse_netrc (const char *path)
   char *line, *p, *tok;
   const char *premature_token;
   acc_t *current, *retval;
-  int ln, quote;
+  int ln, qmark;
 
   /* The latest token we've seen in the file.  */
   enum
@@ -280,7 +295,7 @@ parse_netrc (const char *path)
 
       /* Parse the line.  */
       p = line;
-      quote = 0;
+      qmark = 0;
 
       /* Skip leading whitespace.  */
       while (*p && c_isspace (*p))
@@ -306,25 +321,25 @@ parse_netrc (const char *path)
           /* If the token starts with quotation mark, note this fact,
              and squash the quotation character */
           if (*p == '"'){
-            quote = 1;
+            qmark = 1;
             shift_left (p);
           }
 
           tok = p;
 
           /* Find the end of the token, handling quotes and escapes.  */
-          while (*p && (quote ? *p != '"' : !c_isspace (*p))){
+          while (*p && (qmark ? *p != '"' : !c_isspace (*p))){
             if (*p == '\\')
               shift_left (p);
             p ++;
           }
 
           /* If field was quoted, squash the trailing quotation mark
-             and reset quote flag.  */
-          if (quote)
+             and reset qmark flag.  */
+          if (qmark)
             {
               shift_left (p);
-              quote = 0;
+              qmark = 0;
             }
 
           /* Null-terminate the token, if it isn't already.  */
@@ -373,8 +388,8 @@ parse_netrc (const char *path)
           if (premature_token)
             {
               fprintf (stderr, _("\
-%s: %s:%d: warning: \"%s\" token appears before any machine name\n"),
-                       exec_name, path, ln, premature_token);
+%s: %s:%d: warning: %s token appears before any machine name\n"),
+                       exec_name, path, ln, quote (premature_token));
               premature_token = NULL;
             }