mass change: update copyright years.

[wget] / src / netrc.c

diff --git a/src/netrc.c b/src/netrc.c
index e6c0d12c0363cb86d924862224b5c50f7d67e195..193d4f3767633433ea2f07ad93997477a91a0d30 100644 (file)
--- a/src/netrc.c
+++ b/src/netrc.c
@@ -1,5 +1,6 @@
 /* Read and parse the .netrc file to get hosts, accounts, and passwords.
-   Copyright (C) 1996, 2007, 2008 Free Software Foundation, Inc.
+   Copyright (C) 1996, 2007, 2008, 2009, 2010, 2011 Free Software
+   Foundation, Inc.
 
 This file is part of GNU Wget.
 
@@ -253,7 +254,7 @@ static void
 shift_left(char *string)
 {
   char *p;
-  
+
   for (p=string; *p; ++p)
     *p = *(p+1);
 }
@@ -266,7 +267,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
@@ -295,7 +296,7 @@ parse_netrc (const char *path)
 
       /* Parse the line.  */
       p = line;
-      quote = 0;
+      qmark = 0;
 
       /* Skip leading whitespace.  */
       while (*p && c_isspace (*p))
@@ -321,25 +322,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.  */
@@ -388,8 +389,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;
             }