X-Git-Url: http://sjero.net/git/?a=blobdiff_plain;f=src%2Fnetrc.c;h=fea440d33eb60f7b1ac2a729d5136f3f9a72fbee;hb=766df9d4e9392045a4e5c730ed81e599b509557a;hp=bf5f551605d58f772887096fcf1900650810449e;hpb=7d2066b2213bd8ee5705dfdf6ed4297e91d694d7;p=wget
diff --git a/src/netrc.c b/src/netrc.c
index bf5f5516..fea440d3 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, 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"
@@ -283,7 +281,7 @@ parse_netrc (const char *path)
quote = 0;
/* Skip leading whitespace. */
- while (*p && ISSPACE (*p))
+ while (*p && c_isspace (*p))
p ++;
/* If the line is empty, then end any macro definition. */
@@ -295,7 +293,7 @@ parse_netrc (const char *path)
while (*p && last_token != tok_macdef)
{
/* Skip any whitespace. */
- while (*p && ISSPACE (*p))
+ while (*p && c_isspace (*p))
p ++;
/* Discard end-of-line comments; also, stop processing if
@@ -313,7 +311,7 @@ parse_netrc (const char *path)
tok = p;
/* Find the end of the token, handling quotes and escapes. */
- while (*p && (quote ? *p != '"' : !ISSPACE (*p))){
+ while (*p && (quote ? *p != '"' : !c_isspace (*p))){
if (*p == '\\')
shift_left (p);
p ++;