X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=src%2Fnetrc.c;h=193d4f3767633433ea2f07ad93997477a91a0d30;hp=73de0d0786f9263c98f5848536f708c56ef9de06;hb=2f6aa1d7417df1dfc58597777686fbd77179b9fd;hpb=2524076dd238f47d3d45368a6b2722931cea577e

diff --git a/src/netrc.c b/src/netrc.c
index 73de0d07..193d4f37 100644
--- 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.  */