Re: [Bug-wget] [Patch] fix bug #44516, -o- log to stdout

[Miquel Llobet]

removed braces from the second if statement, as per GNU's coding standards

--- src/log.c.origin 2015-03-13 01:32:27.000000000 +0100
+++ src/log.c 2015-03-13 02:28:25.000000000 +0100
@@ -598,11 +598,16 @@
 {
   if (file)
     {
-      logfp = fopen (file, appendp ? "a" : "w");
-      if (!logfp)
+      if (HYPHENP (file))
+        logfp = stdout;
+      else
         {
-          fprintf (stderr, "%s: %s: %s\n", exec_name, file, strerror
(errno));
-          exit (WGET_EXIT_GENERIC_ERROR);
+          logfp = fopen (file, appendp ? "a" : "w");
+          if (!logfp)
+            {
+              fprintf (stderr, "%s: %s: %s\n", exec_name, file, strerror
(errno));
+              exit (WGET_EXIT_GENERIC_ERROR);
+            }
         }
     }
   else


Miquel Llobet



On Fri, Mar 13, 2015 at 2:04 AM, Miquel Llobet <address@hidden> wrote:

> wget now correctly reads that -o- means logging to stdout instead of the
> file '-'.
> I just checked for a hyphen at log_init, didn't see any caveats to this.
>
> --- src/log.c.origin 2015-03-13 01:32:27.000000000 +0100
> +++ src/log.c 2015-03-13 01:44:31.000000000 +0100
> @@ -598,11 +598,18 @@
>  {
>    if (file)
>      {
> -      logfp = fopen (file, appendp ? "a" : "w");
> -      if (!logfp)
> +      if (HYPHENP (file))
>          {
> -          fprintf (stderr, "%s: %s: %s\n", exec_name, file, strerror
> (errno));
> -          exit (WGET_EXIT_GENERIC_ERROR);
> +            logfp = stdout;
> +        }
> +      else
> +        {
> +          logfp = fopen (file, appendp ? "a" : "w");
> +          if (!logfp)
> +            {
> +              fprintf (stderr, "%s: %s: %s\n", exec_name, file, strerror
> (errno));
> +              exit (WGET_EXIT_GENERIC_ERROR);
> +            }
>          }
>      }
>    else
>
> Miquel Llobet
>
>
>