minor captive ctwm fixes for 3.5

From: Diab Jerius (dj@pelf.harvard.edu)
Date: Fri Feb 27 1998 - 16:50:55 CET


If USEM4 isn't true, ctwm ignored the -name option. The patch below
fixes that, as well as the usage string.

On another note, the CHANGES file refers to "ctwm.captive", but I
think it should be "ctwm.redirect".

---------------------------------------------------------

*** ctwm.c.orig Mon Nov 24 05:19:38 1997
--- ctwm.c Fri Feb 27 10:42:40 1998
***************
*** 355,365 ****
--- 355,369 ----
              case 'k': /* -keep m4 tmp file */
                KeepTmpFile = True;
                continue;
+ #endif
              case 'n': /* -don't preprocess through m4 */
+ #ifdef USEM4
                if (!strcmp(argv[i],"-name")) {
+ #endif
                    if (++i >= argc) goto usage;
                    captivename = argv[i];
                    continue;
+ #ifdef USEM4
                }
                GoThroughM4 = False;
                continue;
***************
*** 379,387 ****
        usage:
        fprintf (stderr, "usage: %s [-display dpy] [-version] [-info]", ProgramName);
  #ifdef USEM4
! fprintf (stderr, " [-f file] [-s] [-q] [-v] [-W] [-w [wid]] [-k] [-n]\n");
  #else
! fprintf (stderr, " [-f file] [-s] [-q] [-v] [-W] [-w [wid]]\n");
  #endif
        exit (1);
      }
--- 383,391 ----
        usage:
        fprintf (stderr, "usage: %s [-display dpy] [-version] [-info]", ProgramName);
  #ifdef USEM4
! fprintf (stderr, " [-f file] [-s] [-q] [-v] [-W] [-w [wid]] [-k] [-n] [-name captive ctwm name]\n");
  #else
! fprintf (stderr, " [-f file] [-s] [-q] [-v] [-W] [-w [wid]] [-name captive ctwm name] \n");
  #endif
        exit (1);
      }



This archive was generated by hypermail 2.1.2 : Sat Jun 22 2002 - 06:45:04 CEST