X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=src%2Futils.c;h=86f4e12292c1bf47a0d485e6224638b16d3d8ebe;hp=7a93376a46d36a0bd246f4ae0ef057b3151c7300;hb=2f6aa1d7417df1dfc58597777686fbd77179b9fd;hpb=d5e283b1a75c5f8249300b465b4e7b55130bec49 diff --git a/src/utils.c b/src/utils.c index 7a93376a..86f4e122 100644 --- a/src/utils.c +++ b/src/utils.c @@ -1,6 +1,7 @@ /* Various utility functions. - Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, - 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, + Inc. This file is part of GNU Wget. @@ -37,9 +38,7 @@ as that of the covered work. */ #ifdef HAVE_SYS_TIME_H # include #endif -#ifdef HAVE_UNISTD_H -# include -#endif +#include #ifdef HAVE_MMAP # include #endif @@ -90,7 +89,7 @@ as that of the covered work. */ #ifdef TESTING #include "test.h" -#endif +#endif static void memfatal (const char *context, long attempted_size) @@ -138,7 +137,8 @@ memfatal (const char *context, long attempted_size) Vertical bar (|) Characters escaped by "^": - SP ! # % & ' ( ) + , . ; = @ [ ] ^ ` { } ~ + SP ! " # % & ' ( ) + , . : ; = + @ [ \ ] ^ ` { | } ~ Either "^_" or "^ " is accepted as a space. Period (.) is a special case. Note that un-escaped < and > can also confuse a directory @@ -172,22 +172,22 @@ unsigned char char_prop[ 256] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* SP ! " # $ % & ' ( ) * + , - . / */ - 2, 1, 0, 1, 16, 1, 1, 1, 1, 1, 0, 1, 1, 16, 4, 0, + 2, 1, 1, 1, 16, 1, 1, 1, 1, 1, 0, 1, 1, 16, 4, 0, /* 0 1 2 3 4 5 6 7 8 9 : ; < = > ? */ - 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 0, 1, 1, 1, 1, 1, + 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 1, 1, 1, 1, 1, 1, /* @ A B C D E F G H I J K L M N O */ 1, 80, 80, 80, 80, 80, 80, 16, 16, 16, 16, 16, 16, 16, 16, 16, /* P Q R S T U V W X Y Z [ \ ] ^ _ */ - 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 1, 0, 1, 1, 16, + 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 1, 1, 1, 1, 16, /* ` a b c d e f g h i j k l m n o */ 1, 96, 96, 96, 96, 96, 96, 32, 32, 32, 32, 32, 32, 32, 32, 32, /* p q r s t u v w x y z { | } ~ DEL */ - 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 1, 0, 1, 17, 8, + 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 1, 1, 1, 17, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, @@ -271,7 +271,7 @@ sepstring (const char *s) fallback implementation of vsnprintf, this should be portable. */ /* Constant is using for limits memory allocation for text buffer. - Applicable in situation when: vasprintf is not available in the system + Applicable in situation when: vasprintf is not available in the system and vsnprintf return -1 when long line is truncated (in old versions of glibc and in other system where C99 doesn`t support) */ @@ -323,7 +323,7 @@ aprintf (const char *fmt, ...) else if (size >= FMT_MAX_LENGTH) /* We have a huge buffer, */ { /* maybe we have some wrong format string? */ - logprintf (LOG_ALWAYS, + logprintf (LOG_ALWAYS, _("%s: aprintf: text buffer is too big (%ld bytes), " "aborting.\n"), exec_name, size); /* printout a log message */ @@ -696,9 +696,9 @@ unique_create (const char *name, bool binary, char **opened_name) If opening the file fails for any reason, including the file having previously existed, this function returns NULL and sets errno appropriately. */ - + FILE * -fopen_excl (const char *fname, bool binary) +fopen_excl (const char *fname, int binary) { int fd; #ifdef O_EXCL @@ -890,7 +890,7 @@ acceptable (const char *s) } /* Check if D2 is a subdirectory of D1. E.g. if D1 is `/something', subdir_p() - will return true if and only if D2 begins with `/something/' or is exactly + will return true if and only if D2 begins with `/something/' or is exactly '/something'. */ bool subdir_p (const char *d1, const char *d2) @@ -903,7 +903,7 @@ subdir_p (const char *d1, const char *d2) else for (; *d1 && *d2 && (c_tolower (*d1) == c_tolower (*d2)); ++d1, ++d2) ; - + return *d1 == '\0' && (*d2 == '\0' || *d2 == '/'); } @@ -932,7 +932,7 @@ dir_matches_p (char **dirlist, const char *dir) break; } } - + return *x ? true : false; } @@ -1069,7 +1069,7 @@ has_wildcards_p (const char *s) /* Return true if FNAME ends with a typical HTML suffix. The following (case-insensitive) suffixes are presumed to be HTML files: - + html htm ?html (`?' matches one character) @@ -1148,18 +1148,18 @@ read_whole_line (FILE *fp) zero-terminated, and you should *not* read or write beyond the [0, length) range of characters. - After you are done with the file contents, call read_file_free to + After you are done with the file contents, call wget_read_file_free to release the memory. Depending on the operating system and the type of file that is - being read, read_file() either mmap's the file into memory, or + being read, wget_read_file() either mmap's the file into memory, or reads the file into the core using read(). If file is named "-", fileno(stdin) is used for reading instead. If you want to read from a real file named "-", use "./-" instead. */ struct file_memory * -read_file (const char *file) +wget_read_file (const char *file) { int fd; struct file_memory *fm; @@ -1269,7 +1269,7 @@ read_file (const char *file) memory needed to hold the FM structure itself. */ void -read_file_free (struct file_memory *fm) +wget_read_file_free (struct file_memory *fm) { #ifdef HAVE_MMAP if (fm->mmap_p) @@ -2368,12 +2368,12 @@ test_subdir_p() { "/somedir", "/somedir/d2", true }, { "/somedir/d1", "/somedir", false }, }; - - for (i = 0; i < countof(test_array); ++i) + + for (i = 0; i < countof(test_array); ++i) { bool res = subdir_p (test_array[i].d1, test_array[i].d2); - mu_assert ("test_subdir_p: wrong result", + mu_assert ("test_subdir_p: wrong result", res == test_array[i].result); } @@ -2405,12 +2405,12 @@ test_dir_matches_p() { { "/Tmp/has", NULL, NULL }, "/Tmp/has space", false }, { { "/Tmp/has", NULL, NULL }, "/Tmp/has,comma", false }, }; - - for (i = 0; i < countof(test_array); ++i) + + for (i = 0; i < countof(test_array); ++i) { bool res = dir_matches_p (test_array[i].dirlist, test_array[i].dir); - - mu_assert ("test_dir_matches_p: wrong result", + + mu_assert ("test_dir_matches_p: wrong result", res == test_array[i].result); }