Subject: Re: small fixes

From: Dominik Vogt <[email-masked]>
Date: Thu, 17 Jun 1999 13:51:50 -0600

On Thu, Jun 17, 1999 at 02:30:54AM +0300, [email-masked] wrote:
> Hi, Dominik.
> Please apply this fix now (if you don't sleep yet):
>   patch -p 1 -u <restart-19990617.patch
> It fixes 2 typos and bad spacings; I used suggested in fvwm homepage
> options for cvs diff (-b -B), which are not good.

Gm, that patch didn't apply to the CVS code. I looks right, but still I had
to do it by hand. Is there something wrong with the CVS instructions on
our home page?

> No need for ChangeLog.
> 
> Thank you and sorry for bothering you.
> 
> Regards,
> Mikhael.

>   ========
> diff -u -r fvwm-2.3.4/fvwm/fvwm.c fvwm-changed/fvwm/fvwm.c
> --- fvwm-2.3.4/fvwm/fvwm.c	Thu Jun 17 01:16:51 1999
> +++ fvwm-changed/fvwm/fvwm.c	Thu Jun 17 01:52:42 1999
> @@ -1750,9 +1750,9 @@
>  
>      if (command == NULL) command = "";
>      if (
> -      command[0] == '\0' || strcmp(command, g_argv[0]) ||
> +      command[0] == '\0' || strcmp(command, g_argv[0]) == 0 ||
>        (getBasename(command) == command || getBasename(g_argv[0]) == g_argv[0])
> -      && strcmp(getBasename(command), getBasename(g_argv[0])) != 0
> +      && strcmp(getBasename(command), getBasename(g_argv[0])) == 0
>      ) native = 1;
>  
>      if (native) {
> @@ -1781,19 +1781,19 @@
>      if (command[0] != '\0') {
>        const int MAX_ARG_SIZE = 20;
>        char *my_argv[MAX_ARG_SIZE];
> -        const char *errorMsg;
> +      const char *errorMsg;
>        int n = parseCommandArgs(command, my_argv, MAX_ARG_SIZE, &errorMsg);
>        if (n <= 0) {
>          fvwm_msg(ERR, "Done", "Restart command parsing error in (%s): [%s]",
> -            command, errorMsg);
> -        } else {
> -          command = my_argv[0];
> +          command, errorMsg);
> +      } else {
> +        command = my_argv[0];
>          execvp(command, my_argv);
> -          fvwm_msg(ERR, "Done", "Call of '%s' failed!!!! (restarting '%s' instead)",
> -            command, g_argv[0]);
> -          perror("  system error description");
> -        }
> +        fvwm_msg(ERR, "Done", "Call of '%s' failed!!!! (restarting '%s' instead)",
> +          command, g_argv[0]);
> +        perror("  system error description");
>        }
> +    }
>  
>      execvp(g_argv[0], g_argv);    /* that _should_ work */
>      fvwm_msg(ERR,"Done","Call of '%s' failed!!!!", g_argv[0]);
> 
>   ========
> diff -u -r fvwm-2.3.4/fvwm/placement.c fvwm-changed/fvwm/placement.c
> --- fvwm-2.3.4/fvwm/placement.c	Thu Jun 17 01:16:52 1999
> +++ fvwm-changed/fvwm/placement.c	Thu Jun 17 02:05:00 1999
> @@ -557,7 +557,7 @@
>        if (prop != NULL) {
>          tmp_win->Desk = *(unsigned long *)prop;
>          XFree(prop);
> -    }
> +      }
>      }
>    }
>  

-- 
Dominik Vogt, Hewlett-Packard GmbH, Dept. BVS
Herrenberger Str.130, 71034 Boeblingen, Germany
phone: 07031/14-4596, fax: 07031/14-3883, [email-masked]
--
Visit the official FVWM web page at <URL:http://www.fvwm.org/>.
To unsubscribe from the list, send "unsubscribe fvwm-workers" in the
body of a message to [email-masked].
To report problems, send mail to [email-masked]