moparisthebest/wget
1
0
Fork 0
mirror of https://github.com/moparisthebest/wget synced 2024-07-03 16:38:41 -04:00
Code Issues Releases Wiki Activity

Avoid name conflict with quote function.

Browse Source
This commit is contained in:
Micah Cowan 2009-07-05 21:26:40 -07:00
parent 4f8d504903
commit e941befd40
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ChangeLog
View File

@ -1,3 +1,8 @@
2009-07-05 Micah Cowan <micah@cowan.name>
* netrc.c (parse_netrc): Rename local-scope variable "quote" to
"qmark", to avoid conflict with the function name.
2009-07-05 Petr Pisar <petr.pisar@atlas.cz> 2009-07-05 Petr Pisar <petr.pisar@atlas.cz>
* main.c (print_version): Mark initial line for translation, along * main.c (print_version): Mark initial line for translation, along

14
src/netrc.c
View File

@ -266,7 +266,7 @@ parse_netrc (const char *path)
char *line, *p, *tok; char *line, *p, *tok;
const char *premature_token; const char *premature_token;
acc_t *current, *retval; acc_t *current, *retval;
int ln, quote; int ln, qmark;
/* The latest token we've seen in the file. */ /* The latest token we've seen in the file. */
enum enum
@ -295,7 +295,7 @@ parse_netrc (const char *path)
/* Parse the line. */ /* Parse the line. */
p = line; p = line;
quote = 0; qmark = 0;
/* Skip leading whitespace. */ /* Skip leading whitespace. */
while (*p && c_isspace (*p)) while (*p && c_isspace (*p))
@ -321,25 +321,25 @@ parse_netrc (const char *path)
/* If the token starts with quotation mark, note this fact, /* If the token starts with quotation mark, note this fact,
and squash the quotation character */ and squash the quotation character */
if (*p == '"'){ if (*p == '"'){
quote = 1; qmark = 1;
shift_left (p); shift_left (p);
} }
tok = p; tok = p;
/* Find the end of the token, handling quotes and escapes. */ /* 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 == '\\') if (*p == '\\')
shift_left (p); shift_left (p);
p ++; p ++;
} }
/* If field was quoted, squash the trailing quotation mark /* If field was quoted, squash the trailing quotation mark
and reset quote flag. */ and reset qmark flag. */
if (quote) if (qmark)
{ {
shift_left (p); shift_left (p);
quote = 0; qmark = 0;
} }
/* Null-terminate the token, if it isn't already. */ /* Null-terminate the token, if it isn't already. */