X-Git-Url: http://sjero.net/git/?a=blobdiff_plain;f=src%2Fcmpt.c;h=8ca3b038962d853b3bf23fca179da641cfe50e3d;hb=b1838bdfd197ec970d834ce5042995df92516841;hp=1977e8ea45be7e9a612c26afba34fbcb19c8cc3d;hpb=53d0aff795316dc1a4b785632f0d4d93c861e9cb;p=wget
diff --git a/src/cmpt.c b/src/cmpt.c
index 1977e8ea..8ca3b038 100644
--- a/src/cmpt.c
+++ b/src/cmpt.c
@@ -1,6 +1,7 @@
/* Replacements for routines missing on some systems.
Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
- 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+ 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+ Foundation, Inc.
This file is part of GNU Wget.
@@ -17,31 +18,28 @@ 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
-#include
+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. */
+
+#include "wget.h"
#include
#include
#include
#include
-#ifdef HAVE_UNISTD_H
-# include
-#endif
+#include
#include
-#include "wget.h"
-
/* Some systems lack certain functions normally taken for granted.
For example, Windows doesn't have strptime, and some systems don't
have a usable fnmatch. This file should contain fallback
@@ -73,8 +71,8 @@ strcasecmp (const char *s1, const char *s2)
do
{
- c1 = TOLOWER (*p1++);
- c2 = TOLOWER (*p2++);
+ c1 = c_tolower (*p1++);
+ c2 = c_tolower (*p2++);
if (c1 == '\0')
break;
}
@@ -102,8 +100,8 @@ strncasecmp (const char *s1, const char *s2, size_t n)
do
{
- c1 = TOLOWER (*p1++);
- c2 = TOLOWER (*p2++);
+ c1 = c_tolower (*p1++);
+ c2 = c_tolower (*p2++);
if (c1 == '\0' || c1 != c2)
return c1 - c2;
} while (--n > 0);
@@ -432,9 +430,9 @@ strptime_internal (rp, fmt, tm, decided)
{
/* A white space in the format string matches 0 more or white
space in the input string. */
- if (ISSPACE (*fmt))
+ if (c_isspace (*fmt))
{
- while (ISSPACE (*rp))
+ while (c_isspace (*rp))
++rp;
++fmt;
continue;
@@ -654,7 +652,7 @@ strptime_internal (rp, fmt, tm, decided)
case 'n':
case 't':
/* Match any white space. */
- while (ISSPACE (*rp))
+ while (c_isspace (*rp))
++rp;
break;
case 'p':
@@ -1367,7 +1365,7 @@ strtoll (const char *nptr, char **endptr, int base)
nptr += 2;
/* "0x" must be followed by at least one hex char. If not,
return 0 and place ENDPTR on 'x'. */
- if (!ISXDIGIT (*nptr))
+ if (!c_isxdigit (*nptr))
{
--nptr;
goto out;