X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=src%2Fnetrc.c;h=eb99ff44e0bef23eb42618a2a6ae8a87b20e197c;hp=485e0757cf28130d1d33b3178493336c74c6cf78;hb=d763f8bf6d6e13ce006ffab616cc8a77e747a633;hpb=da99855784988c6bf125799f47c57d888bbc25f1
diff --git a/src/netrc.c b/src/netrc.c
index 485e0757..eb99ff44 100644
--- a/src/netrc.c
+++ b/src/netrc.c
@@ -1,5 +1,5 @@
/* Read and parse the .netrc file to get hosts, accounts, and passwords.
- Copyright (C) 1996, 2007 Free Software Foundation, Inc.
+ Copyright (C) 1996, 2007, 2008 Free Software Foundation, Inc.
This file is part of GNU Wget.
@@ -16,29 +16,27 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Wget. If not, see .
-In addition, as a special exception, the Free Software Foundation
-gives permission to link the code of its release of Wget with the
-OpenSSL project's "OpenSSL" library (or with modified versions of it
-that use the same license as the "OpenSSL" library), and distribute
-the linked executables. You must obey the GNU General Public License
-in all respects for all of the code used other than "OpenSSL". If you
-modify this file, you may extend this exception to your version of the
-file, but you are not obligated to do so. If you do not wish to do
-so, delete this exception statement from your version. */
+Additional permission under GNU GPL version 3 section 7
+
+If you modify this program, or any covered work, by linking or
+combining it with the OpenSSL project's OpenSSL library (or a
+modified version of that library), containing parts covered by the
+terms of the OpenSSL or SSLeay licenses, the Free Software Foundation
+grants you additional permission to convey the resulting work.
+Corresponding Source for a non-source form of such a combination
+shall include the source code for the parts of OpenSSL used as well
+as that of the covered work. */
/* This file used to be kept in synch with the code in Fetchmail, but
the latter has diverged since. */
-#ifdef HAVE_CONFIG_H
-# include
-#endif
+#include "wget.h"
#include
#include
#include
#include
-#include "wget.h"
#include "utils.h"
#include "netrc.h"
#include "init.h"
@@ -67,6 +65,21 @@ search_netrc (const char *host, const char **acc, const char **passwd,
/* Find ~/.netrc. */
if (!processed_netrc)
{
+#ifdef __VMS
+
+ int err;
+ struct_stat buf;
+ char *path = "SYS$LOGIN:.netrc";
+
+ netrc_list = NULL;
+ processed_netrc = 1;
+
+ err = stat (path, &buf);
+ if (err == 0)
+ netrc_list = parse_netrc (path);
+
+#else /* def __VMS */
+
char *home = home_dir ();
netrc_list = NULL;
@@ -83,6 +96,8 @@ search_netrc (const char *host, const char **acc, const char **passwd,
if (err == 0)
netrc_list = parse_netrc (path);
}
+
+#endif /* def __VMS [else] */
}
/* If nothing to do... */
if (!netrc_list)
@@ -251,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
@@ -280,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))
@@ -306,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. */
@@ -373,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;
}