Turn --debug into no-op if compiled without debugging support

diff --git a/src/ChangeLog b/src/ChangeLog
index 12f2a0489960a254d4cce2c58c4acd71f0a8850d..33eb5ed6a4ad6e6198e3cdccb1227136512d0e7a 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2014-01-29  Darshit Shah  <darnir@gmail.com>
+
+       * main.c: Remove pre-processor variable WHEN_DEBUG
+       (option_data[]): Do not fail on --debug even if debug support is not
+       compiled in.
+       (main): Explicitly set opt.debug to false in case debugging support was not
+       compiled.
+       * init.c (commands[]): Support --debug wven when support is not compiled in.
+       * options.h: Same
+
 2014-01-17  Darshit Shah  <darnir@gmail.com>
 
        * init.c (commands[]): Add --no-config.

diff --git a/src/init.c b/src/init.c
index 43d5ae989cd34dc40f8d29f20fffde817a6d69e7..56fef508807b745007ece19eb2f00b27488ad4ad 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -157,9 +157,7 @@ static const struct {
   { "convertlinks",     &opt.convert_links,     cmd_boolean },
   { "cookies",          &opt.cookies,           cmd_boolean },
   { "cutdirs",          &opt.cut_dirs,          cmd_number },
-#ifdef ENABLE_DEBUG
   { "debug",            &opt.debug,             cmd_boolean },
-#endif
   { "defaultpage",      &opt.default_page,      cmd_string },
   { "deleteafter",      &opt.delete_after,      cmd_boolean },
   { "dirprefix",        &opt.dir_prefix,        cmd_directory },

diff --git a/src/main.c b/src/main.c
index 2aa961da8543021d9bd4806def770fb15ca55dc2..6b6f72f3d958482053cc525bf12618acb3fdcd74 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -128,12 +128,6 @@ static void print_version (void);
 # define IF_SSL(x) NULL
 #endif
 
-#ifdef ENABLE_DEBUG
-# define WHEN_DEBUG(x) x
-#else
-# define WHEN_DEBUG(x) NULL
-#endif
-
 struct cmdline_option {
   const char *long_name;
   char short_name;
@@ -184,7 +178,7 @@ static struct cmdline_option option_data[] =
     { "content-on-error", 0, OPT_BOOLEAN, "contentonerror", -1 },
     { "cookies", 0, OPT_BOOLEAN, "cookies", -1 },
     { "cut-dirs", 0, OPT_VALUE, "cutdirs", -1 },
-    { WHEN_DEBUG ("debug"), 'd', OPT_BOOLEAN, "debug", -1 },
+    { "debug", 'd', OPT_BOOLEAN, "debug", -1 },
     { "default-page", 0, OPT_VALUE, "defaultpage", -1 },
     { "delete-after", 0, OPT_BOOLEAN, "deleteafter", -1 },
     { "directories", 0, OPT_BOOLEAN, "dirstruct", -1 },
@@ -312,7 +306,6 @@ static struct cmdline_option option_data[] =
 #endif
   };
 
-#undef WHEN_DEBUG
 #undef IF_SSL
 
 /* Return a string that contains S with "no-" prepended.  The string
@@ -1206,9 +1199,22 @@ main (int argc, char **argv)
 
   nurl = argc - optind;
 
+  /* If we do not have Debug support compiled in AND Wget is invoked with the
+   * --debug switch, instead of failing, we silently turn it into a no-op. For
+   *  this no-op, we explicitly set opt.debug to false and hence none of the
+   *  Debug output messages will be printed.
+   */
+#ifndef ENABLE_DEBUG
+  if (opt.debug)
+    {
+      fprintf (stderr, _("Debugging support not compiled in. "
+                         "Ignoring --debug flag.\n"));
+      opt.debug = false;
+    }
+#endif
+
   /* All user options have now been processed, so it's now safe to do
      interoption dependency checks. */
-
   if (opt.noclobber && opt.convert_links)
     {
       fprintf (stderr,

diff --git a/src/options.h b/src/options.h
index e00fadc784a537f0c287505a1873cf64b883c8b5..06783cc3eeed9907d03730896348694b47da413f 100644 (file)
--- a/src/options.h
+++ b/src/options.h
@@ -156,9 +156,7 @@ struct options
   bool content_on_error;       /* Do we output the content when the HTTP
                                   status code indicates a server error */
 
-#ifdef ENABLE_DEBUG
   bool debug;                  /* Debugging on/off */
-#endif
 
 #ifdef USE_WATT32
   bool wdebug;                  /* Watt-32 tcp/ip debugging on/off */