X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=src%2Fnetrc.c;fp=src%2Fnetrc.c;h=bf5f551605d58f772887096fcf1900650810449e;hp=ba9fc3099d7d9d93564bcc0bab4937e954f4ef50;hb=7d2066b2213bd8ee5705dfdf6ed4297e91d694d7;hpb=2fe72be505d2d91fc0bbbd22cc19f3d288813671 diff --git a/src/netrc.c b/src/netrc.c index ba9fc309..bf5f5516 100644 --- a/src/netrc.c +++ b/src/netrc.c @@ -57,7 +57,7 @@ static acc_t *parse_netrc (const char *); You will typically turn it off for HTTP. */ void search_netrc (const char *host, const char **acc, const char **passwd, - int slack_default) + int slack_default) { acc_t *l; static int processed_netrc; @@ -72,17 +72,17 @@ search_netrc (const char *host, const char **acc, const char **passwd, netrc_list = NULL; processed_netrc = 1; if (home) - { - int err; - struct_stat buf; - char *path = (char *)alloca (strlen (home) + 1 - + strlen (NETRC_FILE_NAME) + 1); - sprintf (path, "%s/%s", home, NETRC_FILE_NAME); - xfree (home); - err = stat (path, &buf); - if (err == 0) - netrc_list = parse_netrc (path); - } + { + int err; + struct_stat buf; + char *path = (char *)alloca (strlen (home) + 1 + + strlen (NETRC_FILE_NAME) + 1); + sprintf (path, "%s/%s", home, NETRC_FILE_NAME); + xfree (home); + err = stat (path, &buf); + if (err == 0) + netrc_list = parse_netrc (path); + } } /* If nothing to do... */ if (!netrc_list) @@ -94,44 +94,44 @@ search_netrc (const char *host, const char **acc, const char **passwd, for (l = netrc_list; l; l = l->next) { if (!l->host) - continue; + continue; else if (!strcasecmp (l->host, host)) - break; + break; } if (l) { if (*acc) - { - /* Looking for password in .netrc. */ - if (!strcmp (l->acc, *acc)) - *passwd = l->passwd; /* usernames match; password OK */ - else - *passwd = NULL; /* usernames don't match */ - } - else /* NOT *acc */ - { - /* If password was given, use it. The account is l->acc. */ - *acc = l->acc; - if (l->passwd) - *passwd = l->passwd; - } + { + /* Looking for password in .netrc. */ + if (!strcmp (l->acc, *acc)) + *passwd = l->passwd; /* usernames match; password OK */ + else + *passwd = NULL; /* usernames don't match */ + } + else /* NOT *acc */ + { + /* If password was given, use it. The account is l->acc. */ + *acc = l->acc; + if (l->passwd) + *passwd = l->passwd; + } return; } else { if (!slack_default) - return; + return; if (*acc) - return; + return; /* Try looking for the default account. */ for (l = netrc_list; l; l = l->next) - if (!l->host) - break; + if (!l->host) + break; if (!l) - return; + return; *acc = l->acc; if (!*passwd) - *passwd = l->passwd; + *passwd = l->passwd; return; } } @@ -170,7 +170,7 @@ read_whole_line (FILE *fp) length += strlen (line + length); assert (length > 0); if (line[length - 1] == '\n') - break; + break; /* fgets() guarantees to read the whole line, or to use up the space we've given it. We can double the buffer unconditionally. */ @@ -212,11 +212,11 @@ maybe_add_to_list (acc_t **newentry, acc_t **list) else { if (a) - { - /* Add the current machine into our list. */ - a->next = l; - l = a; - } + { + /* Add the current machine into our list. */ + a->next = l; + l = a; + } /* Allocate a new acc_t structure. */ a = xmalloc (sizeof (acc_t)); @@ -265,7 +265,7 @@ parse_netrc (const char *path) if (!fp) { fprintf (stderr, _("%s: Cannot read %s (%s).\n"), exec_name, - path, strerror (errno)); + path, strerror (errno)); return retval; } @@ -284,129 +284,129 @@ parse_netrc (const char *path) /* Skip leading whitespace. */ while (*p && ISSPACE (*p)) - p ++; + p ++; /* If the line is empty, then end any macro definition. */ if (last_token == tok_macdef && !*p) - /* End of macro if the line is empty. */ - last_token = tok_nothing; + /* End of macro if the line is empty. */ + last_token = tok_nothing; /* If we are defining macros, then skip parsing the line. */ while (*p && last_token != tok_macdef) - { - /* Skip any whitespace. */ - while (*p && ISSPACE (*p)) - p ++; - - /* Discard end-of-line comments; also, stop processing if - the above `while' merely skipped trailing whitespace. */ - if (*p == '#' || !*p) - break; - - /* If the token starts with quotation mark, note this fact, - and squash the quotation character */ - if (*p == '"'){ - quote = 1; - shift_left (p); - } - - tok = p; - - /* Find the end of the token, handling quotes and escapes. */ - while (*p && (quote ? *p != '"' : !ISSPACE (*p))){ - if (*p == '\\') - shift_left (p); - p ++; - } - - /* If field was quoted, squash the trailing quotation mark - and reset quote flag. */ - if (quote) - { - shift_left (p); - quote = 0; - } - - /* Null-terminate the token, if it isn't already. */ - if (*p) - *p ++ = '\0'; - - switch (last_token) - { - case tok_login: - if (current) - current->acc = xstrdup (tok); - else - premature_token = "login"; - break; - - case tok_machine: - /* Start a new machine entry. */ - maybe_add_to_list (¤t, &retval); - current->host = xstrdup (tok); - break; - - case tok_password: - if (current) - current->passwd = xstrdup (tok); - else - premature_token = "password"; - break; - - /* We handle most of tok_macdef above. */ - case tok_macdef: - if (!current) - premature_token = "macdef"; - break; - - /* We don't handle the account keyword at all. */ - case tok_account: - if (!current) - premature_token = "account"; - break; - - /* We handle tok_nothing below this switch. */ - case tok_nothing: - break; - } - - if (premature_token) - { - fprintf (stderr, _("\ + { + /* Skip any whitespace. */ + while (*p && ISSPACE (*p)) + p ++; + + /* Discard end-of-line comments; also, stop processing if + the above `while' merely skipped trailing whitespace. */ + if (*p == '#' || !*p) + break; + + /* If the token starts with quotation mark, note this fact, + and squash the quotation character */ + if (*p == '"'){ + quote = 1; + shift_left (p); + } + + tok = p; + + /* Find the end of the token, handling quotes and escapes. */ + while (*p && (quote ? *p != '"' : !ISSPACE (*p))){ + if (*p == '\\') + shift_left (p); + p ++; + } + + /* If field was quoted, squash the trailing quotation mark + and reset quote flag. */ + if (quote) + { + shift_left (p); + quote = 0; + } + + /* Null-terminate the token, if it isn't already. */ + if (*p) + *p ++ = '\0'; + + switch (last_token) + { + case tok_login: + if (current) + current->acc = xstrdup (tok); + else + premature_token = "login"; + break; + + case tok_machine: + /* Start a new machine entry. */ + maybe_add_to_list (¤t, &retval); + current->host = xstrdup (tok); + break; + + case tok_password: + if (current) + current->passwd = xstrdup (tok); + else + premature_token = "password"; + break; + + /* We handle most of tok_macdef above. */ + case tok_macdef: + if (!current) + premature_token = "macdef"; + break; + + /* We don't handle the account keyword at all. */ + case tok_account: + if (!current) + premature_token = "account"; + break; + + /* We handle tok_nothing below this switch. */ + case tok_nothing: + break; + } + + if (premature_token) + { + fprintf (stderr, _("\ %s: %s:%d: warning: \"%s\" token appears before any machine name\n"), - exec_name, path, ln, premature_token); - premature_token = NULL; - } - - if (last_token != tok_nothing) - /* We got a value, so reset the token state. */ - last_token = tok_nothing; - else - { - /* Fetch the next token. */ - if (!strcmp (tok, "account")) - last_token = tok_account; - else if (!strcmp (tok, "default")) - { - maybe_add_to_list (¤t, &retval); - } - else if (!strcmp (tok, "login")) - last_token = tok_login; - - else if (!strcmp (tok, "macdef")) - last_token = tok_macdef; - - else if (!strcmp (tok, "machine")) - last_token = tok_machine; - - else if (!strcmp (tok, "password")) - last_token = tok_password; - - else - fprintf (stderr, _("%s: %s:%d: unknown token \"%s\"\n"), - exec_name, path, ln, tok); - } - } + exec_name, path, ln, premature_token); + premature_token = NULL; + } + + if (last_token != tok_nothing) + /* We got a value, so reset the token state. */ + last_token = tok_nothing; + else + { + /* Fetch the next token. */ + if (!strcmp (tok, "account")) + last_token = tok_account; + else if (!strcmp (tok, "default")) + { + maybe_add_to_list (¤t, &retval); + } + else if (!strcmp (tok, "login")) + last_token = tok_login; + + else if (!strcmp (tok, "macdef")) + last_token = tok_macdef; + + else if (!strcmp (tok, "machine")) + last_token = tok_machine; + + else if (!strcmp (tok, "password")) + last_token = tok_password; + + else + fprintf (stderr, _("%s: %s:%d: unknown token \"%s\"\n"), + exec_name, path, ln, tok); + } + } xfree (line); } @@ -478,7 +478,7 @@ main (int argc, char **argv) if (stat (file, &sb)) { fprintf (stderr, _("%s: cannot stat %s: %s\n"), argv[0], file, - strerror (errno)); + strerror (errno)); exit (1); } @@ -488,37 +488,37 @@ main (int argc, char **argv) { /* Skip if we have a target and this isn't it. */ if (target && a->host && strcmp (target, a->host)) - { - a = a->next; - continue; - } + { + a = a->next; + continue; + } if (!target) - { - /* Print the host name if we have no target. */ - if (a->host) - fputs (a->host, stdout); - else - fputs ("DEFAULT", stdout); + { + /* Print the host name if we have no target. */ + if (a->host) + fputs (a->host, stdout); + else + fputs ("DEFAULT", stdout); - fputc (' ', stdout); - } + fputc (' ', stdout); + } /* Print the account name. */ fputs (a->acc, stdout); if (a->passwd) - { - /* Print the password, if there is any. */ - fputc (' ', stdout); - fputs (a->passwd, stdout); - } + { + /* Print the password, if there is any. */ + fputc (' ', stdout); + fputs (a->passwd, stdout); + } fputc ('\n', stdout); /* Exit if we found the target. */ if (target) - exit (0); + exit (0); a = a->next; }