X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=src%2Futils.c;h=01cc422ee1d33898920ab1882985be861a9d047a;hp=a8e30b9fa5d61dde680623715baf4b1c32a2a82e;hb=d5be8ecca466601bda9b81c28a79077fbda6ccde;hpb=45eea7387f05fa8c2d55694663d77f4a5a3dec3b diff --git a/src/utils.c b/src/utils.c index a8e30b9f..01cc422e 100644 --- a/src/utils.c +++ b/src/utils.c @@ -1,20 +1,21 @@ /* Various functions of utilitarian nature. - Copyright (C) 1995, 1996, 1997, 1998, 2000 Free Software Foundation, Inc. + Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001 + Free Software Foundation, Inc. -This file is part of Wget. +This file is part of GNU Wget. -This program is free software; you can redistribute it and/or modify +GNU Wget is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. -This program is distributed in the hope that it will be useful, +GNU Wget is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software +along with Wget; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include @@ -403,59 +404,11 @@ datetime_str (time_t *tm) ptm->tm_hour, ptm->tm_min, ptm->tm_sec); return output; } - -/* Returns an error message for ERRNUM. #### This requires more work. - This function, as well as the whole error system, is very - ill-conceived. */ -const char * -uerrmsg (uerr_t errnum) -{ - switch (errnum) - { - case URLUNKNOWN: - return _("Unknown/unsupported protocol"); - break; - case URLBADPORT: - return _("Invalid port specification"); - break; - case URLBADHOST: - return _("Invalid host name"); - break; - default: - abort (); - /* $@#@#$ compiler. */ - return NULL; - } -} /* The Windows versions of the following two functions are defined in mswindows.c. */ -/* A cuserid() immitation using getpwuid(), to avoid hassling with - utmp. Besides, not all systems have cuesrid(). Under Windows, it - is defined in mswindows.c. - - If WHERE is non-NULL, the username will be stored there. - Otherwise, it will be returned as a static buffer (as returned by - getpwuid()). In the latter case, the buffer should be copied - before calling getpwuid() or pwd_cuserid() again. */ #ifndef WINDOWS -char * -pwd_cuserid (char *where) -{ - struct passwd *pwd; - - if (!(pwd = getpwuid (getuid ())) || !pwd->pw_name) - return NULL; - if (where) - { - strcpy (where, pwd->pw_name); - return where; - } - else - return pwd->pw_name; -} - void fork_to_background (void) { @@ -487,6 +440,14 @@ fork_to_background (void) } #endif /* not WINDOWS */ +char * +ps (char *orig) +{ + char *r = xstrdup (orig); + path_simplify (r); + return r; +} + /* Canonicalize PATH, and return a new path. The new path differs from PATH in that: Multple `/'s are collapsed to a single `/'. @@ -502,7 +463,8 @@ fork_to_background (void) Always use '/' as stub_char. Don't check for local things using canon_stat. Change the original string instead of strdup-ing. - React correctly when beginning with `./' and `../'. */ + React correctly when beginning with `./' and `../'. + Don't zip out trailing slashes. */ void path_simplify (char *path) { @@ -568,20 +530,15 @@ path_simplify (char *path) i = start + 1; } - /* Check for trailing `/'. */ - if (start && !path[i]) - { - zero_last: - path[--i] = '\0'; - break; - } - /* Check for `../', `./' or trailing `.' by itself. */ if (path[i] == '.') { /* Handle trailing `.' by itself. */ if (!path[i + 1]) - goto zero_last; + { + path[--i] = '\0'; + break; + } /* Handle `./'. */ if (path[i + 1] == '/') @@ -602,12 +559,6 @@ path_simplify (char *path) } } /* path == '.' */ } /* while */ - - if (!*path) - { - *path = stub_char; - path[1] = '\0'; - } } /* "Touch" FILE, i.e. make its atime and mtime equal to the time @@ -751,6 +702,30 @@ make_directory (const char *directory) } return 0; } + +/* Merge BASE with FILE. BASE can be a directory or a file name, FILE + should be a file name. For example, file_merge("/foo/bar", "baz") + will return "/foo/baz". file_merge("/foo/bar/", "baz") will return + "foo/bar/baz". + + In other words, it's a simpler and gentler version of uri_merge_1. */ + +char * +file_merge (const char *base, const char *file) +{ + char *result; + const char *cut = (const char *)strrchr (base, '/'); + + if (!cut) + cut = base + strlen (base); + + result = (char *)xmalloc (cut - base + 1 + strlen (file) + 1); + memcpy (result, base, cut - base); + result[cut - base] = '/'; + strcpy (result + (cut - base) + 1, file); + + return result; +} static int in_acclist PARAMS ((const char *const *, const char *, int)); @@ -1230,7 +1205,7 @@ string_set_add (struct hash_table *ht, const char *s) /* First check whether the set element already exists. If it does, do nothing so that we don't have to free() the old element and then strdup() a new one. */ - if (hash_table_exists (ht, s)) + if (hash_table_contains (ht, s)) return; /* We use "1" as value. It provides us a useful and clear arbitrary @@ -1240,12 +1215,12 @@ string_set_add (struct hash_table *ht, const char *s) hash_table_put (ht, xstrdup (s), "1"); } -/* Synonym for hash_table_exists... */ +/* Synonym for hash_table_contains... */ int -string_set_exists (struct hash_table *ht, const char *s) +string_set_contains (struct hash_table *ht, const char *s) { - return hash_table_exists (ht, s); + return hash_table_contains (ht, s); } static int @@ -1340,7 +1315,7 @@ legible (long l) bytes are sufficient. Using more might be a good idea. This function does not go through the hoops that long_to_string - goes to because it doesn't need to be fast. (It's called perhaps + goes to because it doesn't aspire to be fast. (It's called perhaps once in a Wget run.) */ static void @@ -1383,73 +1358,40 @@ numdigit (long a) { int res = 1; if (a < 0) - a = -a; + { + a = -a; + ++res; + } while ((a /= 10) != 0) ++res; return res; } #define ONE_DIGIT(figure) *p++ = n / (figure) + '0' - -#define DIGITS_1(figure) \ - ONE_DIGIT (figure) -#define DIGITS_2(figure) \ - (ONE_DIGIT (figure), n %= (figure)); \ - DIGITS_1 ((figure) / 10) -#define DIGITS_3(figure) \ - (ONE_DIGIT (figure), n %= (figure)); \ - DIGITS_2 ((figure) / 10) -#define DIGITS_4(figure) \ - (ONE_DIGIT (figure), n %= (figure)); \ - DIGITS_3 ((figure) / 10) -#define DIGITS_5(figure) \ - (ONE_DIGIT (figure), n %= (figure)); \ - DIGITS_4 ((figure) / 10) -#define DIGITS_6(figure) \ - (ONE_DIGIT (figure), n %= (figure)); \ - DIGITS_5 ((figure) / 10) -#define DIGITS_7(figure) \ - (ONE_DIGIT (figure), n %= (figure)); \ - DIGITS_6 ((figure) / 10) -#define DIGITS_8(figure) \ - (ONE_DIGIT (figure), n %= (figure)); \ - DIGITS_7 ((figure) / 10) -#define DIGITS_9(figure) \ - (ONE_DIGIT (figure), n %= (figure)); \ - DIGITS_8 ((figure) / 10) -#define DIGITS_10(figure) \ - (ONE_DIGIT (figure), n %= (figure)); \ - DIGITS_9 ((figure) / 10) - -/* DIGITS_<11-20> are only used on 64-bit machines. */ - -#define DIGITS_11(figure) \ - (ONE_DIGIT (figure), n %= (figure)); \ - DIGITS_10 ((figure) / 10) -#define DIGITS_12(figure) \ - (ONE_DIGIT (figure), n %= (figure)); \ - DIGITS_11 ((figure) / 10) -#define DIGITS_13(figure) \ - (ONE_DIGIT (figure), n %= (figure)); \ - DIGITS_12 ((figure) / 10) -#define DIGITS_14(figure) \ - (ONE_DIGIT (figure), n %= (figure)); \ - DIGITS_13 ((figure) / 10) -#define DIGITS_15(figure) \ - (ONE_DIGIT (figure), n %= (figure)); \ - DIGITS_14 ((figure) / 10) -#define DIGITS_16(figure) \ - (ONE_DIGIT (figure), n %= (figure)); \ - DIGITS_15 ((figure) / 10) -#define DIGITS_17(figure) \ - (ONE_DIGIT (figure), n %= (figure)); \ - DIGITS_16 ((figure) / 10) -#define DIGITS_18(figure) \ - (ONE_DIGIT (figure), n %= (figure)); \ - DIGITS_17 ((figure) / 10) -#define DIGITS_19(figure) \ - (ONE_DIGIT (figure), n %= (figure)); \ - DIGITS_18 ((figure) / 10) +#define ONE_DIGIT_ADVANCE(figure) (ONE_DIGIT (figure), n %= (figure)) + +#define DIGITS_1(figure) ONE_DIGIT (figure) +#define DIGITS_2(figure) ONE_DIGIT_ADVANCE (figure); DIGITS_1 ((figure) / 10) +#define DIGITS_3(figure) ONE_DIGIT_ADVANCE (figure); DIGITS_2 ((figure) / 10) +#define DIGITS_4(figure) ONE_DIGIT_ADVANCE (figure); DIGITS_3 ((figure) / 10) +#define DIGITS_5(figure) ONE_DIGIT_ADVANCE (figure); DIGITS_4 ((figure) / 10) +#define DIGITS_6(figure) ONE_DIGIT_ADVANCE (figure); DIGITS_5 ((figure) / 10) +#define DIGITS_7(figure) ONE_DIGIT_ADVANCE (figure); DIGITS_6 ((figure) / 10) +#define DIGITS_8(figure) ONE_DIGIT_ADVANCE (figure); DIGITS_7 ((figure) / 10) +#define DIGITS_9(figure) ONE_DIGIT_ADVANCE (figure); DIGITS_8 ((figure) / 10) +#define DIGITS_10(figure) ONE_DIGIT_ADVANCE (figure); DIGITS_9 ((figure) / 10) + +/* DIGITS_<11-20> are only used on machines with 64-bit longs. */ + +#define DIGITS_11(figure) ONE_DIGIT_ADVANCE (figure); DIGITS_10 ((figure) / 10) +#define DIGITS_12(figure) ONE_DIGIT_ADVANCE (figure); DIGITS_11 ((figure) / 10) +#define DIGITS_13(figure) ONE_DIGIT_ADVANCE (figure); DIGITS_12 ((figure) / 10) +#define DIGITS_14(figure) ONE_DIGIT_ADVANCE (figure); DIGITS_13 ((figure) / 10) +#define DIGITS_15(figure) ONE_DIGIT_ADVANCE (figure); DIGITS_14 ((figure) / 10) +#define DIGITS_16(figure) ONE_DIGIT_ADVANCE (figure); DIGITS_15 ((figure) / 10) +#define DIGITS_17(figure) ONE_DIGIT_ADVANCE (figure); DIGITS_16 ((figure) / 10) +#define DIGITS_18(figure) ONE_DIGIT_ADVANCE (figure); DIGITS_17 ((figure) / 10) +#define DIGITS_19(figure) ONE_DIGIT_ADVANCE (figure); DIGITS_18 ((figure) / 10) /* Print NUMBER to BUFFER in base 10. This is completely equivalent to `sprintf(buffer, "%ld", number)', only much faster. @@ -1460,9 +1402,9 @@ numdigit (long a) slow compared to this function. BUFFER should accept as many bytes as you expect the number to take - up. On 64-bit machines, the maximum needed size is 24 bytes. That - includes all the digits, as well as the `-' sign for negative - numbers and the trailing \0. */ + up. On machines with 64-bit longs the maximum needed size is 24 + bytes. That includes the worst-case digits, the optional `-' sign, + and the trailing \0. */ void long_to_string (char *buffer, long number) @@ -1512,6 +1454,8 @@ long_to_string (char *buffer, long number) } #undef ONE_DIGIT +#undef ONE_DIGIT_ADVANCE + #undef DIGITS_1 #undef DIGITS_2 #undef DIGITS_3 @@ -1574,7 +1518,7 @@ struct wget_timer { }; /* Allocate a timer. It is not legal to do anything with a freshly - allocated timer, except call wtimer_reset(). */ + allocated timer, except call wtimer_reset() or wtimer_delete(). */ struct wget_timer * wtimer_allocate (void)