X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=src%2Futils.c;h=7d4834fba4e42bc93549d6fe2aec8e04f6a13ca1;hp=4060aa5079cfaf570add0ec71d58d5b27d75f2e0;hb=3382df979cd96e15fd77f7c0ba95c39610c93272;hpb=b9e9ad65ccf6c1fbf989852c5adbb0f840f9c58b diff --git a/src/utils.c b/src/utils.c index 4060aa50..7d4834fb 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, 2009 Free Software Foundation, Inc. + 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, + Inc. This file is part of GNU Wget. @@ -34,12 +35,7 @@ as that of the covered work. */ #include #include #include -#ifdef HAVE_SYS_TIME_H -# include -#endif -#ifdef HAVE_UNISTD_H -# include -#endif +#include #ifdef HAVE_MMAP # include #endif @@ -49,15 +45,14 @@ as that of the covered work. */ #ifdef HAVE_UTIME_H # include #endif -#ifdef HAVE_SYS_UTIME_H -# include -#endif #include #include #include #include #include +#include + /* For TIOCGWINSZ and friends: */ #ifdef HAVE_SYS_IOCTL_H # include @@ -90,7 +85,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 +133,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 +168,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 +267,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 +319,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 */ @@ -491,18 +487,25 @@ fork_to_background (void) void touch (const char *file, time_t tm) { -#ifdef HAVE_STRUCT_UTIMBUF - struct utimbuf times; -#else - struct { - time_t actime; - time_t modtime; - } times; -#endif - times.modtime = tm; - times.actime = time (NULL); - if (utime (file, ×) == -1) - logprintf (LOG_NOTQUIET, "utime(%s): %s\n", file, strerror (errno)); + struct timespec timespecs[2]; + int fd; + + fd = open (file, O_WRONLY); + if (fd < 0) + { + logprintf (LOG_NOTQUIET, "open(%s): %s\n", file, strerror (errno)); + return; + } + + timespecs[0].tv_sec = time (NULL); + timespecs[0].tv_nsec = 0L; + timespecs[1].tv_sec = tm; + timespecs[1].tv_nsec = 0L; + + if (futimens (fd, timespecs) == -1) + logprintf (LOG_NOTQUIET, "futimens(%s): %s\n", file, strerror (errno)); + + close (fd); } /* Checks if FILE is a symbolic link, and removes it if it is. Does @@ -696,9 +699,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 @@ -872,6 +875,9 @@ acceptable (const char *s) { int l = strlen (s); + if (opt.output_document && strcmp (s, opt.output_document) == 0) + return true; + while (l && s[l] != '/') --l; if (s[l] == '/') @@ -890,7 +896,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 +909,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 +938,7 @@ dir_matches_p (char **dirlist, const char *dir) break; } } - + return *x ? true : false; } @@ -1069,7 +1075,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 +1154,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 +1275,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) @@ -1924,9 +1930,10 @@ abort_run_with_timeout (int sig) /* We don't have siglongjmp to preserve the set of blocked signals; if we longjumped out of the handler at this point, SIGALRM would remain blocked. We must unblock it manually. */ - int mask = siggetmask (); - mask &= ~sigmask (SIGALRM); - sigsetmask (mask); + sigset_t set; + sigemptyset (&set); + sigaddset (&set, SIGALRM); + sigprocmask (SIG_BLOCK, &set, NULL); /* Now it's safe to longjump. */ longjmp (run_with_timeout_env, -1); @@ -2368,12 +2375,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 +2412,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); }