X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=src%2Fnetrc.c;h=eb99ff44e0bef23eb42618a2a6ae8a87b20e197c;hp=e6c0d12c0363cb86d924862224b5c50f7d67e195;hb=e941befd40c22c4d66bf6587ffbdff745d6ab97c;hpb=d5e283b1a75c5f8249300b465b4e7b55130bec49 diff --git a/src/netrc.c b/src/netrc.c index e6c0d12c..eb99ff44 100644 --- a/src/netrc.c +++ b/src/netrc.c @@ -266,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 @@ -295,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)) @@ -321,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. */ @@ -388,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; }