X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=src%2Fcookies.c;h=854139046c65f009ed7d1928ac2291f110b59b8c;hp=d3b64a9f031db79defb948bd39b4ce176e45ea54;hb=d763f8bf6d6e13ce006ffab616cc8a77e747a633;hpb=6633b74930870ffb148c46129c738af78082d934
diff --git a/src/cookies.c b/src/cookies.c
index d3b64a9f..85413904 100644
--- a/src/cookies.c
+++ b/src/cookies.c
@@ -1,6 +1,6 @@
/* Support for cookies.
- Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free
- Software Foundation, Inc.
+ Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+ 2008 Free Software Foundation, Inc.
This file is part of GNU Wget.
@@ -17,15 +17,16 @@ 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. */
/* Written by Hrvoje Niksic. Parts are loosely inspired by the
cookie patch submitted by Tomasz Wegrzanowski.
@@ -42,7 +43,7 @@ so, delete this exception statement from your version. */
sites that do send Set-Cookie2 also emit Set-Cookie for
compatibility. */
-#include
+#include "wget.h"
#include
#include
@@ -50,8 +51,6 @@ so, delete this exception statement from your version. */
#include
#include
#include
-
-#include "wget.h"
#include "utils.h"
#include "hash.h"
#include "cookies.h"
@@ -442,7 +441,8 @@ parse_set_cookie (const char *set_cookie, bool silent)
if (!silent)
logprintf (LOG_NOTQUIET,
_("Syntax error in Set-Cookie: %s at position %d.\n"),
- escnonprint (set_cookie), (int) (ptr - set_cookie));
+ quotearg_style (escape_quoting_style, set_cookie),
+ (int) (ptr - set_cookie));
delete_cookie (cookie);
return NULL;
}
@@ -456,9 +456,9 @@ parse_set_cookie (const char *set_cookie, bool silent)
#define REQUIRE_DIGITS(p) do { \
- if (!ISDIGIT (*p)) \
+ if (!c_isdigit (*p)) \
return false; \
- for (++p; ISDIGIT (*p); p++) \
+ for (++p; c_isdigit (*p); p++) \
; \
} while (0)
@@ -587,7 +587,7 @@ check_domain_match (const char *cookie_domain, const char *host)
if (dccount == 2)
{
- int i;
+ size_t i;
int known_toplevel = false;
static const char *known_toplevel_domains[] = {
".com", ".edu", ".net", ".org", ".gov", ".mil", ".int"
@@ -684,7 +684,8 @@ cookie_handle_set_cookie (struct cookie_jar *jar,
{
logprintf (LOG_NOTQUIET,
_("Cookie coming from %s attempted to set domain to %s\n"),
- escnonprint (host), escnonprint (cookie->domain));
+ quotearg_style (escape_quoting_style, host),
+ quotearg_style (escape_quoting_style, cookie->domain));
xfree (cookie->domain);
goto copy_domain;
}
@@ -1102,7 +1103,7 @@ domain_port (const char *domain_b, const char *domain_e,
const char *colon = memchr (domain_b, ':', domain_e - domain_b);
if (!colon)
return 0;
- for (p = colon + 1; p < domain_e && ISDIGIT (*p); p++)
+ for (p = colon + 1; p < domain_e && c_isdigit (*p); p++)
port = 10 * port + (*p - '0');
if (p < domain_e)
/* Garbage following port number. */
@@ -1130,8 +1131,8 @@ cookie_jar_load (struct cookie_jar *jar, const char *file)
FILE *fp = fopen (file, "r");
if (!fp)
{
- logprintf (LOG_NOTQUIET, _("Cannot open cookies file `%s': %s\n"),
- file, strerror (errno));
+ logprintf (LOG_NOTQUIET, _("Cannot open cookies file %s: %s\n"),
+ quote (file), strerror (errno));
return;
}
cookies_now = time (NULL);
@@ -1153,7 +1154,7 @@ cookie_jar_load (struct cookie_jar *jar, const char *file)
char *value_b = NULL, *value_e = NULL;
/* Skip leading white-space. */
- while (*p && ISSPACE (*p))
+ while (*p && c_isspace (*p))
++p;
/* Ignore empty lines. */
if (!*p || *p == '#')
@@ -1248,8 +1249,8 @@ cookie_jar_save (struct cookie_jar *jar, const char *file)
fp = fopen (file, "w");
if (!fp)
{
- logprintf (LOG_NOTQUIET, _("Cannot open cookies file `%s': %s\n"),
- file, strerror (errno));
+ logprintf (LOG_NOTQUIET, _("Cannot open cookies file %s: %s\n"),
+ quote (file), strerror (errno));
return;
}
@@ -1285,11 +1286,11 @@ cookie_jar_save (struct cookie_jar *jar, const char *file)
}
out:
if (ferror (fp))
- logprintf (LOG_NOTQUIET, _("Error writing to `%s': %s\n"),
- file, strerror (errno));
+ logprintf (LOG_NOTQUIET, _("Error writing to %s: %s\n"),
+ quote (file), strerror (errno));
if (fclose (fp) < 0)
- logprintf (LOG_NOTQUIET, _("Error closing `%s': %s\n"),
- file, strerror (errno));
+ logprintf (LOG_NOTQUIET, _("Error closing %s: %s\n"),
+ quote (file), strerror (errno));
DEBUGP (("Done saving cookies.\n"));
}