X-Git-Url: http://sjero.net/git/?a=blobdiff_plain;f=src%2Fmain.c;h=3e731e9d02924bf9dda268ad54d75f9f8193767f;hb=04f29f2f08da21cbcebbf86fe98de0522f024c64;hp=2846735900da5bccadd9b7818fd28fbdcd270fb4;hpb=e3820953b25ec3ea6472649375df36745aeb5696;p=wget

diff --git a/src/main.c b/src/main.c
index 28467359..3e731e9d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,6 +1,6 @@
 /* Command line parsing.
    Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-   2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
+   2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation,
    Inc.
 
 This file is part of GNU Wget.
@@ -56,7 +56,7 @@ as that of the covered work.  */
 #include "http.h"               /* for save_cookies */
 #include "ptimer.h"
 #include "warc.h"
-
+#include "closeout.h"
 #include <getopt.h>
 #include <getpass.h>
 #include <quote.h>
@@ -289,7 +289,9 @@ static struct cmdline_option option_data[] =
     { "wait", 'w', OPT_VALUE, "wait", -1 },
     { "waitretry", 0, OPT_VALUE, "waitretry", -1 },
     { "warc-cdx", 0, OPT_BOOLEAN, "warccdx", -1 },
+#ifdef HAVE_LIBZ
     { "warc-compression", 0, OPT_BOOLEAN, "warccompression", -1 },
+#endif
     { "warc-dedup", 0, OPT_VALUE, "warccdxdedup", -1 },
     { "warc-digests", 0, OPT_BOOLEAN, "warcdigests", -1 },
     { "warc-file", 0, OPT_VALUE, "warcfile", -1 },
@@ -674,8 +676,10 @@ WARC options:\n"),
        --warc-cdx                write CDX index files.\n"),
     N_("\
        --warc-dedup=FILENAME     do not store records listed in this CDX file.\n"),
+#ifdef HAVE_LIBZ
     N_("\
        --no-warc-compression     do not compress WARC files with GZIP.\n"),
+#endif
     N_("\
        --no-warc-digests         do not calculate SHA1 digests.\n"),
     N_("\
@@ -962,6 +966,8 @@ main (int argc, char **argv)
 
   i18n_initialize ();
 
+  atexit (close_stdout);
+
   /* Construct the name of the executable, without the directory part.  */
 #ifdef __VMS
   /* On VMS, lose the "dev:[dir]" prefix and the ".EXE;nnn" suffix. */
@@ -984,15 +990,20 @@ main (int argc, char **argv)
   for (i = 1; i < argc; i++)
     argstring_length += strlen (argv[i]) + 2 + 1;
   char *p = program_argstring = malloc (argstring_length * sizeof (char));
+  if (p == NULL)
+    {
+      fprintf (stderr, _("Memory allocation problem\n"));
+      exit (2);
+    }
   for (i = 1; i < argc; i++)
-  {
-    *p++ = '"';
-    int arglen = strlen (argv[i]);
-    memcpy (p, argv[i], arglen);
-    p += arglen;
-    *p++ = '"';
-    *p++ = ' ';
-  }
+    {
+      *p++ = '"';
+      int arglen = strlen (argv[i]);
+      memcpy (p, argv[i], arglen);
+      p += arglen;
+      *p++ = '"';
+      *p++ = ' ';
+    }
   *p = '\0';
 
   /* Load the hard-coded defaults.  */
@@ -1025,7 +1036,7 @@ main (int argc, char **argv)
             }
           if (!userrc_ret)
             {
-              printf ("Exiting due to error in %s\n", optarg);
+              fprintf (stderr, "Exiting due to error in %s\n", optarg);
               exit (2);
             }
           else
@@ -1053,9 +1064,10 @@ main (int argc, char **argv)
         {
           if (ret == '?')
             {
-              print_usage (0);
-              printf ("\n");
-              printf (_("Try `%s --help' for more options.\n"), exec_name);
+              print_usage (1);
+              fprintf (stderr, "\n");
+              fprintf (stderr, _("Try `%s --help' for more options.\n"),
+		       exec_name);
               exit (2);
             }
           /* Find the short option character in the mapping.  */
@@ -1298,7 +1310,7 @@ for details.\n\n"));
       /* No URL specified.  */
       fprintf (stderr, _("%s: missing URL\n"), exec_name);
       print_usage (1);
-      printf ("\n");
+      fprintf (stderr, "\n");
       /* #### Something nicer should be printed here -- similar to the
          pre-1.5 `--help' page.  */
       fprintf (stderr, _("Try `%s --help' for more options.\n"), exec_name);
@@ -1351,6 +1363,11 @@ for details.\n\n"));
 
   /* Fill in the arguments.  */
   url = alloca_array (char *, nurl + 1);
+  if (url == NULL)
+    {
+      fprintf (stderr, _("Memory allocation problem\n"));
+      exit (2);
+    }
   for (i = 0; i < nurl; i++, optind++)
     {
       char *rewritten = rewrite_shorthand_url (argv[optind]);