X-Git-Url: http://sjero.net/git/?a=blobdiff_plain;f=src%2Fwget.h;h=86fa953d99f69807d797bb6d87ea4979de5f6c2f;hb=07f60f19a4ee99ddc343bb51568b0c474e9b853d;hp=d42cb5aeb1d7b71350d5efac0cb0c5ada54fce6e;hpb=6b4a85888e351e8ad6c55770fff98e0eddf22cd2;p=wget diff --git a/src/wget.h b/src/wget.h index d42cb5ae..86fa953d 100644 --- a/src/wget.h +++ b/src/wget.h @@ -71,7 +71,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ /* Print X if debugging is enabled; a no-op otherwise. */ #ifdef DEBUG -# define DEBUGP(x) do { debug_logprintf x; } while (0) +# define DEBUGP(x) do { if (opt.debug) { debug_logprintf x; } } while (0) #else /* not DEBUG */ # define DEBUGP(x) DO_NOTHING #endif /* not DEBUG */ @@ -87,15 +87,41 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ them here. */ enum log_options { LOG_VERBOSE, LOG_NOTQUIET, LOG_NONVERBOSE, LOG_ALWAYS }; +#ifdef HAVE_STDARG_H void logprintf PARAMS ((enum log_options, const char *, ...)) GCC_FORMAT_ATTR (2, 3); void debug_logprintf PARAMS ((const char *, ...)) GCC_FORMAT_ATTR (1, 2); +#else /* not HAVE_STDARG_H */ +void logprintf (); +void debug_logprintf (); +#endif /* not HAVE_STDARG_H */ void logputs PARAMS ((enum log_options, const char *)); /* Defined in `utils.c', but used literally everywhere. */ -void *xmalloc PARAMS ((size_t)); -void *xrealloc PARAMS ((void *, size_t)); -char *xstrdup PARAMS ((const char *)); +#ifndef DEBUG_MALLOC + +#define xmalloc xmalloc_real +#define xrealloc xrealloc_real +#define xstrdup xstrdup_real +#define xfree free + +void *xmalloc_real PARAMS ((size_t)); +void *xrealloc_real PARAMS ((void *, size_t)); +char *xstrdup_real PARAMS ((const char *)); + +#else /* DEBUG_MALLOC */ + +#define xmalloc(s) xmalloc_debug (s, __FILE__, __LINE__) +#define xfree(p) xfree_debug (p, __FILE__, __LINE__) +#define xrealloc(p, s) xrealloc_debug (p, s, __FILE__, __LINE__) +#define xstrdup(p) xstrdup_debug (p, __FILE__, __LINE__) + +void *xmalloc_debug PARAMS ((size_t, const char *, int)); +void xfree_debug PARAMS ((void *, const char *, int)); +void *xrealloc_debug PARAMS ((void *, size_t, const char *, int)); +char *xstrdup_debug PARAMS ((const char *, const char *, int)); + +#endif /* DEBUG_MALLOC */ /* #### Find a better place for this. */ /* The log file to which Wget writes to after HUP. */ @@ -168,63 +194,71 @@ char *xstrdup PARAMS ((const char *)); DO_REALLOC. */ #define DO_REALLOC_FROM_ALLOCA(basevar, sizevar, needed_size, allocap, type) do \ { \ - /* Avoid side-effectualness. */ \ - long do_realloc_needed_size = (needed_size); \ - long do_realloc_newsize = 0; \ - while ((sizevar) < (do_realloc_needed_size)) { \ - do_realloc_newsize = 2*(sizevar); \ - if (do_realloc_newsize < 16) \ - do_realloc_newsize = 16; \ - (sizevar) = do_realloc_newsize; \ - } \ - if (do_realloc_newsize) \ - if (!allocap) \ - XREALLOC_ARRAY (basevar, type, do_realloc_newsize); \ - else \ - { \ - void *drfa_new_basevar = xmalloc (do_realloc_newsize); \ - memcpy (drfa_new_basevar, basevar, sizevar); \ - (basevar) = drfa_new_basevar; \ - allocap = 0; \ - } \ + /* Avoid side-effectualness. */ \ + long do_realloc_needed_size = (needed_size); \ + long do_realloc_newsize = 0; \ + while ((sizevar) < (do_realloc_needed_size)) { \ + do_realloc_newsize = 2*(sizevar); \ + if (do_realloc_newsize < 16) \ + do_realloc_newsize = 16; \ + (sizevar) = do_realloc_newsize; \ + } \ + if (do_realloc_newsize) \ + { \ + if (!allocap) \ + XREALLOC_ARRAY (basevar, type, do_realloc_newsize); \ + else \ + { \ + void *drfa_new_basevar = xmalloc (do_realloc_newsize); \ + memcpy (drfa_new_basevar, basevar, sizevar); \ + (basevar) = drfa_new_basevar; \ + allocap = 0; \ + } \ + } \ } while (0) /* Free FOO if it is non-NULL. */ -#define FREE_MAYBE(foo) do { if (foo) free (foo); } while (0) +#define FREE_MAYBE(foo) do { if (foo) xfree (foo); } while (0) /* #### Hack: OPTIONS_DEFINED_HERE is defined in main.c. */ +/* [Is this weird hack really necessary on any compilers? No ANSI C compiler + should complain about "extern const char *exec_name;" followed by + "const char *exec_name;". Are we doing this for K&R compilers, or...?? + -- Dan Harkless ] */ #ifndef OPTIONS_DEFINED_HERE extern const char *exec_name; #endif -/* Document-type flags */ +/* Document type ("dt") flags */ enum { - TEXTHTML = 0x0001, /* document is of type text/html */ - RETROKF = 0x0002, /* retrieval was OK */ - HEAD_ONLY = 0x0004, /* only send the HEAD request */ - SEND_NOCACHE = 0x0008, /* send Pragma: no-cache directive */ - ACCEPTRANGES = 0x0010 /* Accept-ranges header was found */ + TEXTHTML = 0x0001, /* document is of type text/html */ + RETROKF = 0x0002, /* retrieval was OK */ + HEAD_ONLY = 0x0004, /* only send the HEAD request */ + SEND_NOCACHE = 0x0008, /* send Pragma: no-cache directive */ + ACCEPTRANGES = 0x0010, /* Accept-ranges header was found */ + ADDED_HTML_EXTENSION = 0x0020 /* added ".html" extension due to -E */ }; /* Universal error type -- used almost everywhere. This is, of course, utter crock. */ typedef enum { - NOCONERROR, HOSTERR, CONSOCKERR, CONERROR, + NOCONERROR, HOSTERR, CONSOCKERR, CONERROR, CONSSLERR, CONREFUSED, NEWLOCATION, NOTENOUGHMEM, CONPORTERR, BINDERR, BINDOK, LISTENERR, ACCEPTERR, ACCEPTOK, CONCLOSED, FTPOK, FTPLOGINC, FTPLOGREFUSED, FTPPORTERR, FTPNSFOD, FTPRETROK, FTPUNKNOWNTYPE, FTPRERR, - FTPREXC, FTPSRVERR, FTPRETRINT, FTPRESTFAIL, + FTPREXC, FTPSRVERR, FTPRETRINT, FTPRESTFAIL, URLHTTPS, URLOK, URLHTTP, URLFTP, URLFILE, URLUNKNOWN, URLBADPORT, URLBADHOST, FOPENERR, FWRITEERR, HOK, HLEXC, HEOF, HERR, RETROK, RECLEVELEXC, FTPACCDENIED, WRONGCODE, FTPINVPASV, FTPNOPASV, RETRFINISHED, READERR, TRYLIMEXC, URLBADPATTERN, FILEBADFILE, RANGEERR, RETRBADPATTERN, RETNOTSUP, - ROBOTSOK, NOROBOTS, PROXERR, AUTHFAILED, QUOTEXC, WRITEFAILED + ROBOTSOK, NOROBOTS, PROXERR, AUTHFAILED, QUOTEXC, WRITEFAILED, + SSLERRCERTFILE,SSLERRCERTKEY,SSLERRCTXCREATE } uerr_t; typedef unsigned char boolean; @@ -239,4 +273,11 @@ typedef unsigned char boolean; the really awful !strcmp(a, b). */ #define EQ 0 +/* For most options, 0 means no limits, but with -p in the picture, that causes + a problem on the maximum recursion depth variable. To retain backwards + compatibility we allow users to consider "0" to be synonymous with "inf" for + -l, but internally infinite recursion is specified by -1 and 0 means to only + retrieve the requisites of a single document. */ +#define INFINITE_RECURSION -1 + #endif /* WGET_H */