[ViewVC] Diff of: cvs/rxvt-unicode/src/init.C

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.190 by sasha, Thu Jul 12 22:33:16 2007 UTC vs.
Revision 1.237 by ayin, Mon Dec 31 15:45:29 2007 UTC

  * All portions of code are copyright by their respective author/s.
  * Copyright (c) 1992      John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
  *                              - original version
  * Copyright (c) 1994      Robert Nation <nation@rocket.sanders.lockheed.com>
  *                              - extensive modifications
+ * Copyright (c) 1996      Chuck Blake <cblake@BBN.COM>
+ * Copyright (c) 1997      mj olesen <olesen@me.queensu.ca>
+ * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
  * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
  *                              - extensive modifications
- * Copyright (c) 1999      D J Hawkey Jr <hawkeyd@visi.com>
- *                              - QNX support
- * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
+ * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
 #include <limits>
 #include <csignal>
+#include <fcntl.h>
+#ifdef HAVE_XSETLOCALE
+# define X_LOCALE
+# include <X11/Xlocale.h>
+#else
+# ifdef HAVE_SETLOCALE
+#  include <clocale>
+# endif
+#endif
+#ifdef HAVE_NL_LANGINFO
+# include <langinfo.h>
+#endif
+#ifdef DISPLAY_IS_IP
+/* On Solaris link with -lsocket and -lnsl */
+#include <sys/types.h>
+#include <sys/socket.h>
+/* these next two are probably only on Sun (not Solaris) */
+#ifdef HAVE_SYS_SOCKIO_H
+#include <sys/sockio.h>
+#endif
+#ifdef HAVE_SYS_BYTEORDER_H
+#include <sys/byteorder.h>
+#endif
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <net/if.h>
+#include <net/if_arp.h>
+static char *
+rxvt_network_display (const char *display)
+{
+  char            buffer[1024], *rval = NULL;
+  struct ifconf   ifc;
+  struct ifreq   *ifr;
+  int             i, skfd;
+  if (display[0] != ':' && strncmp (display, "unix:", 5))
+    return (char *) display;		/* nothing to do */
+  ifc.ifc_len = sizeof (buffer);	/* Get names of all ifaces */
+  ifc.ifc_buf = buffer;
+  if ((skfd = socket (AF_INET, SOCK_DGRAM, 0)) < 0)
+    {
+      perror ("socket");
+      return NULL;
+    }
+  if (ioctl (skfd, SIOCGIFCONF, &ifc) < 0)
+    {
+      perror ("SIOCGIFCONF");
+      close (skfd);
+      return NULL;
+    }
+  for (i = 0, ifr = ifc.ifc_req;
+       i < (ifc.ifc_len / sizeof (struct ifreq));
+       i++, ifr++)
+    {
+      struct ifreq ifr2;
+      strcpy (ifr2.ifr_name, ifr->ifr_name);
+      if (ioctl (skfd, SIOCGIFADDR, &ifr2) >= 0)
+        {
+          unsigned long addr;
+          struct sockaddr_in *p_addr;
+          p_addr = (struct sockaddr_in *) &ifr2.ifr_addr;
+          addr = htonl ((unsigned long)p_addr->sin_addr.s_addr);
+          /*
+           * not "0.0.0.0" or "127.0.0.1" - so format the address
+           */
+          if (addr && addr != 0x7F000001)
+            {
+              char *colon = strchr (display, ':');
+              if (colon == NULL)
+                colon = ":0.0";
+              rval = rxvt_malloc (strlen (colon) + 16);
+              sprintf (rval, "%d.%d.%d.%d%s",
+                      (int) ((addr >> 030) & 0xFF),
+                      (int) ((addr >> 020) & 0xFF),
+                      (int) ((addr >> 010) & 0xFF),
+                      (int) (addr & 0xFF), colon);
+              break;
+            }
+        }
+    }
+  close (skfd);
+  return rval;
+}
+#endif
 const char *const def_colorName[] =
   {
     COLOR_FOREGROUND,
     COLOR_BACKGROUND,
     /* low-intensity colors */
     "rgb:00/cd/00",             // 2: green             (Green3)
     "rgb:cd/cd/00",             // 3: yellow            (Yellow3)
     "rgb:00/00/cd",             // 4: blue              (Blue3)
     "rgb:cd/00/cd",             // 5: magenta           (Magenta3)
     "rgb:00/cd/cd",             // 6: cyan              (Cyan3)
 # ifdef XTERM_COLORS
     "rgb:e5/e5/e5",             // 7: white             (Grey90)
 # else
     "rgb:fa/eb/d7",             // 7: white             (AntiqueWhite)
 # endif
     /* high-intensity colors */
 # ifdef XTERM_COLORS
     "rgb:4d/4d/4d",             // 8: bright black      (Grey30)
     "rgb:e7/e7/e7",
 #ifndef NO_CURSORCOLOR
     COLOR_CURSOR_BACKGROUND,
     COLOR_CURSOR_FOREGROUND,
-#endif                          /* ! NO_CURSORCOLOR */
+#endif /* ! NO_CURSORCOLOR */
     NULL,                       /* Color_pointer_fg               */
     NULL,                       /* Color_pointer_bg               */
     NULL,                       /* Color_border                   */
 #ifndef NO_BOLD_UNDERLINE_REVERSE
     NULL,                       /* Color_BD                       */
     NULL,                       /* Color_IT                       */
     NULL,                       /* Color_UL                       */
     NULL,                       /* Color_RV                       */
-#endif                          /* ! NO_BOLD_UNDERLINE_REVERSE */
+#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
 #if ENABLE_FRILLS
     NULL,			// Color_underline
 #endif
 #ifdef OPTION_HC
     NULL,
 #endif
 #ifdef KEEP_SCROLLCOLOR
     COLOR_SCROLLBAR,
     COLOR_SCROLLTROUGH,
-#endif                          /* KEEP_SCROLLCOLOR */
+#endif /* KEEP_SCROLLCOLOR */
-#if TINTING
+#if ENABLE_TRANSPARENCY
     NULL,
 #endif
 #if OFF_FOCUS_FADING
     "rgb:00/00/00",
 #endif
   };
-bool
+void
 rxvt_term::init_vars ()
 {
-  pix_colors           = //
+  pix_colors = pix_colors_focused;
-  pix_colors_focused   = new rxvt_color [TOTAL_COLORS];
-#ifdef OFF_FOCUS_FADING
-  pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
-#endif
-#if defined(XPM_BACKGROUND) || defined(ENABLE_TRANSPARENCY)
-  pixmap = None;
-#endif
   MEvent.time = CurrentTime;
   MEvent.button = AnyButton;
   want_refresh = 1;
   priv_modes = SavedModes = PrivMode_Default;
   nrow = 24;
   int_bwidth = INTERNALBORDERWIDTH;
   ext_bwidth = EXTERNALBORDERWIDTH;
   lineSpace = LINESPACE;
   saveLines = SAVELINES;
-  numpix_colors = TOTAL_COLORS;
   refresh_type = SLOW_REFRESH;
   oldcursor.row = oldcursor.col = -1;
-#ifdef XPM_BACKGROUND
-  /*  bgPixmap.w = bgPixmap.h = 0; */
-  bgPixmap.x = bgPixmap.y = 0;
-  bgPixmap.pixmap = None;
-#endif
-  last_bot = last_state = -1;
   set_option (Opt_scrollBar);
   set_option (Opt_scrollTtyOutput);
   set_option (Opt_jumpScroll);
   set_option (Opt_skipScroll);
   set_option (Opt_secondaryScreen);
   set_option (Opt_secondaryScroll);
   set_option (Opt_pastableTabs);
   set_option (Opt_intensityStyles);
   set_option (Opt_iso14755_52);
-  return true;
 }
 void
 rxvt_term::init_secondary ()
 {
   if ((i = open ("/dev/null", O_RDONLY)) < 0)
     {
       /* TODO: BOO HISS */
       dup2 (STDERR_FILENO, STDIN_FILENO);
     }
-  else if (i > STDIN_FILENO)
+  else if (i != STDIN_FILENO)
     {
       dup2 (i, STDIN_FILENO);
       close (i);
     }
 /*----------------------------------------------------------------------*/
 const char **
 rxvt_term::init_resources (int argc, const char *const *argv)
 {
   int i, r_argc;
-  char *val;
   const char **cmd_argv, **r_argv;
   /*
    * Look for -e option. Find => split and make cmd_argv[] of command args
    */
   for (r_argc = 0; r_argc < argc; r_argc++)
     if (!strcmp (argv[r_argc], "-e"))
       break;
+  if (r_argc == argc)
+    cmd_argv = NULL;
+  else if (!argv[r_argc + 1])
+    rxvt_fatal ("option '-e' requires an argument, aborting.\n");
+  else
+    {
+      cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
+      for (i = 0; i < argc - r_argc - 1; i++)
+        cmd_argv[i] = (const char *)argv[i + r_argc + 1];
+      cmd_argv[i] = NULL;
+    }
   r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
   for (i = 0; i < r_argc; i++)
     r_argv[i] = (const char *)argv[i];
   r_argv[i] = NULL;
-  if (r_argc == argc)
-    cmd_argv = NULL;
-  else
-    {
-      cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
-      for (i = 0; i < argc - r_argc - 1; i++)
-        cmd_argv[i] = (const char *)argv[i + r_argc + 1];
-      cmd_argv[i] = NULL;
-    }
-  rs[Rs_name] = rxvt_r_basename (argv[0]);
+  rs[Rs_name] = rxvt_basename (argv[0]);
   /*
    * Open display, get options/resources and create the window
    */
     rs[Rs_display_name] = ":0";
   get_options (r_argc, r_argv);
   if (!(display = displays.get (rs[Rs_display_name])))
+    {
+      free (r_argv);
-    rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
+      rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
+    }
   // using a local pointer decreases code size a lot
   xa = display->xa;
   set (display);
   if (rs[Rs_depth])
     select_visual (strtol (rs[Rs_depth], 0, 0));
 #endif
 #ifdef HAVE_AFTERIMAGE
-  ::dpy = NULL ; /* init global var from libAfter... */
+  set_application_name ((char*)rs[Rs_name]);
+  set_output_threshold (OUTPUT_LEVEL_WARNING);
-  asv = AFTERIMAGE_DPY_OP(create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL));
+  asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
 #endif
   free (r_argv);
   for (int i = NUM_RESOURCES; i--; )
     if (rs [i] == resval_undef)
    * set any defaults not already set
    */
   if (cmd_argv && cmd_argv[0])
     {
       if (!rs[Rs_title])
-        rs[Rs_title] = rxvt_r_basename (cmd_argv[0]);
+        rs[Rs_title] = rxvt_basename (cmd_argv[0]);
       if (!rs[Rs_iconName])
         rs[Rs_iconName] = rs[Rs_title];
     }
   else
     {
     rs[Rs_cutchars] = CUTCHARS;
 #ifndef NO_BACKSPACE_KEY
   if (!rs[Rs_backspace_key])
 # ifdef DEFAULT_BACKSPACE
-    key_backspace = DEFAULT_BACKSPACE;
+    rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
 # else
-    key_backspace = "DEC";       /* can toggle between \010 or \177 */
+    rs[Rs_backspace_key] = "DEC";       /* can toggle between \010 or \177 */
 # endif
-  else
-    {
-      val = strdup (rs[Rs_backspace_key]);
-      rxvt_Str_trim (val);
-      rxvt_Str_escaped (val);
-      key_backspace = val;
-    }
 #endif
 #ifndef NO_DELETE_KEY
   if (!rs[Rs_delete_key])
 # ifdef DEFAULT_DELETE
-    key_delete = DEFAULT_DELETE;
+    rs[Rs_delete_key] = DEFAULT_DELETE;
 # else
-    key_delete = "\033[3~";
+    rs[Rs_delete_key] = "\033[3~";
-# endif
-  else
-    {
-      val = strdup (rs[Rs_delete_key]);
-      rxvt_Str_trim (val);
-      rxvt_Str_escaped (val);
-      key_delete = val;
-    }
-#endif
+# endif
-  if (rs[Rs_answerbackstring])
+#endif
-    {
-      rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
-      rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
-    }
 #ifdef HAVE_SCROLLBARS
   setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
 #endif
   color_aliases (Color_fg);
   color_aliases (Color_bg);
 #ifndef NO_CURSORCOLOR
   color_aliases (Color_cursor);
   color_aliases (Color_cursor2);
-#endif                          /* NO_CURSORCOLOR */
+#endif /* NO_CURSORCOLOR */
   color_aliases (Color_pointer_fg);
   color_aliases (Color_pointer_bg);
   color_aliases (Color_border);
 #ifndef NO_BOLD_UNDERLINE_REVERSE
   color_aliases (Color_BD);
   color_aliases (Color_UL);
   color_aliases (Color_RV);
-#endif                          /* ! NO_BOLD_UNDERLINE_REVERSE */
+#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
   if (!rs[Rs_color + Color_border])
     rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
   return cmd_argv;
 /*----------------------------------------------------------------------*/
 void
 rxvt_term::init_env ()
 {
   int i;
-  unsigned int u;
   char *val;
 #ifdef DISPLAY_IS_IP
   /* Fixup display_name for export over pty to any interested terminal
    * clients via "ESC[7n" (e.g. shells).  Note we use the pure IP number
    */
   val = rxvt_network_display (rs[Rs_display_name]);
   rs[Rs_display_name] = (const char *)val;
   if (val == NULL)
-#endif                          /* DISPLAY_IS_IP */
+#endif /* DISPLAY_IS_IP */
     val = XDisplayString (dpy);
   if (rs[Rs_display_name] == NULL)
     rs[Rs_display_name] = val;   /* use broken `:0' value */
   i = strlen (val);
-  env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
+  env_display = (char *)rxvt_malloc (i + 9);
   sprintf (env_display, "DISPLAY=%s", val);
   sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
   else
     putenv ("COLORTERM=" COLORTERMENVFULL);
   if (rs[Rs_term_name] != NULL)
     {
-      env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char));
+      env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
       sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
       putenv (env_term);
     }
   else
     putenv ("TERM=" TERMENV);
 #ifdef HAVE_UNSETENV
   /* avoid passing old settings and confusing term size */
   unsetenv ("LINES");
   unsetenv ("COLUMNS");
   unsetenv ("TERMCAP");        /* terminfo should be okay */
-#endif                          /* HAVE_UNSETENV */
+#endif /* HAVE_UNSETENV */
 }
 /*----------------------------------------------------------------------*/
 /*
  * This is more or less stolen straight from XFree86 xterm.
       this->locale = "C";
     }
-  this->locale = rxvt_strdup (this->locale);
+  this->locale = strdup (this->locale);
   SET_LOCALE (this->locale);
   mbstate.reset ();
 #endif
 #if HAVE_NL_LANGINFO
     priv_modes |= PrivMode_Keypress;
   if (!option (Opt_jumpScroll))
     priv_modes |= PrivMode_smoothScroll;
 #ifndef NO_BACKSPACE_KEY
-  if (strcmp (key_backspace, "DEC") == 0)
+  if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
     priv_modes |= PrivMode_HaveBackSpace;
 #endif
   /* add value for scrollBar */
   if (scrollBar.state)
   int i;
 #ifdef OFF_FOCUS_FADING
   pix_colors = pix_colors_focused;
 #endif
   for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
     {
       const char *name = rs[Rs_color + i];
       if (!name)
                          min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
                          cscroll.a)
                        ))
         alias_color (Color_topShadow, Color_White);
     }
-#endif                          /* KEEP_SCROLLCOLOR */
+#endif /* KEEP_SCROLLCOLOR */
 #ifdef OFF_FOCUS_FADING
   for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
     update_fade_color (i);
 #endif
   if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
     {
       int i = atoi (rs[Rs_color + idx]);
       if (i >= 8 && i <= 15)
-        {        /* bright colors */
+        /* bright colors */
-          i -= 8;
-          rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
+        rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
-          return;
+      else if (i >= 0 && i <= 7)
-        }
+        /* normal colors */
-      if (i >= 0 && i <= 7)   /* normal colors */
         rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
     }
 }
 /*----------------------------------------------------------------------*/
 rxvt_term::create_windows (int argc, const char *const *argv)
 {
   XClassHint classHint;
   XWMHints wmHint;
 #if ENABLE_FRILLS
-  MWMHints mwmhints;
+  MWMHints mwmhints = { };
 #endif
   XGCValues gcvalue;
   XSetWindowAttributes attributes;
   Window top, parent;
 #if ENABLE_FRILLS
   if (option (Opt_borderLess))
     {
       if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
         {
-          /*     print_warning("Window Manager does not support MWM hints.  Bypassing window manager control for borderless window.\n");*/
+          // rxvt_warn("Window Manager does not support MWM hints.  Bypassing window manager control for borderless window.\n");
           attributes.override_redirect = true;
-          mwmhints.flags = 0;
         }
       else
         {
           mwmhints.flags = MWM_HINTS_DECORATIONS;
-          mwmhints.decorations = 0;
         }
     }
-  else
-    mwmhints.flags = 0;
 #endif
 #if ENABLE_XEMBED
   if (rs[Rs_embed])
     {
   vt_select_input ();
   vt_ev.start (display, vt);
-#ifdef XPM_BACKGROUND
-  if (rs[Rs_backgroundPixmap] != NULL
-#ifndef HAVE_AFTERIMAGE
-      && !option (Opt_transparent)
-#endif
-    )
-    {
-      const char *p = rs[Rs_backgroundPixmap];
-      if ((p = strchr (p, ';')) != NULL)
-        {
-          p++;
-          scale_pixmap (p);
-        }
-      set_bgPixmap (rs[Rs_backgroundPixmap]);
-      scr_touch (true);
-    }
-#endif
   /* graphics context for the vt window */
   gcvalue.foreground         = pix_colors[Color_fg];
   gcvalue.background         = pix_colors[Color_bg];
   gcvalue.graphics_exposures = 0;
                   GCForeground | GCBackground | GCGraphicsExposures,
                   &gcvalue);
   drawable = new rxvt_drawable (this, vt);
-#ifdef RXVT_SCROLLBAR
-  gcvalue.foreground = pix_colors[Color_topShadow];
-  topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
-  gcvalue.foreground = pix_colors[Color_bottomShadow];
-  botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
-  gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
-  scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
-#endif
 #ifdef OFF_FOCUS_FADING
   // initially we are in unfocused state
   if (rs[Rs_fade])
     pix_colors = pix_colors_unfocused;
 #endif
 /* ------------------------------------------------------------------------- *
  *                            GET TTY CURRENT STATE                          *
  * ------------------------------------------------------------------------- */
 void
-rxvt_get_ttymode (ttymode_t *tio, int erase)
+rxvt_get_ttymode (struct termios *tio, int erase)
 {
   /*
    * standard System V termios interface
    */
-  if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
+  if (tcgetattr (STDIN_FILENO, tio) < 0)
     {
       // return error - use system defaults,
       // where possible, and zero elsewhere
-      memset (tio, 0, sizeof (ttymode_t));
+      memset (tio, 0, sizeof (struct termios));
       tio->c_cc[VINTR] = CINTR;
       tio->c_cc[VQUIT] = CQUIT;
       tio->c_cc[VERASE] = CERASE;
 #ifdef VERASE2
   /*
    * Debugging
    */
 #ifdef DEBUG_TTYMODE
-#ifdef HAVE_TERMIOS_H
   /* c_iflag bits */
   fprintf (stderr, "Input flags\n");
   /* cpp token stringize doesn't work on all machines <sigh> */
 # define FOO(flag,name)                 \
   FOO (VLNEXT, "VLNEXT");
 # endif
   fprintf (stderr, "\n");
 # undef FOO
-# endif                         /* HAVE_TERMIOS_H */
+#endif /* DEBUG_TTYMODE */
-#endif                          /* DEBUG_TTYMODE */
 }
 /*----------------------------------------------------------------------*/
 /*
  * Run the command in a subprocess and return a file descriptor for the
       rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
   int er;
 #ifndef NO_BACKSPACE_KEY
-  if (key_backspace[0] && !key_backspace[1])
+  if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
-    er = key_backspace[0];
+    er = rs[Rs_backspace_key][0];
-  else if (strcmp (key_backspace, "DEC") == 0)
+  else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
     er = '\177';            /* the initial state anyway */
   else
 #endif
     er = -1;
   rxvt_get_ttymode (&tio, er);
-  SET_TERMIOS (pty->tty, &tio);       /* init terminal attributes */
+  /* init terminal attributes */
+  cfsetospeed (&tio, BAUDRATE);
+  cfsetispeed (&tio, BAUDRATE);
+  tcsetattr (pty->tty, TCSANOW, &tio);
   pty->set_utf8_mode (enc_utf8);
   /* set initial window size */
   tt_winch ();
 rxvt_term::run_child (const char *const *argv)
 {
   char *login;
   if (option (Opt_console))
+    {
-    {     /* be virtual console, fail silently */
+      /* be virtual console, fail silently */
 #ifdef TIOCCONS
       unsigned int on = 1;
       ioctl (STDIN_FILENO, TIOCCONS, &on);
 #elif defined (SRIOCSREDIR)
       fd = open (CONSOLE, O_WRONLY, 0);
       if (fd >= 0)
         if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
           close (fd);
-#endif                          /* SRIOCSREDIR */
+#endif /* SRIOCSREDIR */
     }
   /* reset signals and spin off the command interpreter */
   signal (SIGINT,  SIG_DFL);
   signal (SIGQUIT, SIG_DFL);
    */
 #ifdef SIGTSTP
   signal (SIGTSTP, SIG_IGN);
   signal (SIGTTIN, SIG_IGN);
   signal (SIGTTOU, SIG_IGN);
-#endif                          /* SIGTSTP */
+#endif /* SIGTSTP */
   // unblock signals (signals are blocked by iom.C
   sigset_t ss;
   sigemptyset (&ss);
   sigprocmask (SIG_SETMASK, &ss, 0);
   /* command interpreter path */
-  if (argv != NULL)
+  if (argv)
     {
 # ifdef DEBUG_CMD
       int             i;
       for (i = 0; argv[i]; i++)
       const char *argv0, *shell;
       if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
         shell = "/bin/sh";
-      argv0 = (const char *)rxvt_r_basename (shell);
+      argv0 = (const char *)rxvt_basename (shell);
       if (option (Opt_loginShell))
         {
-          login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
+          login = (char *)rxvt_malloc (strlen (argv0) + 2);
           login[0] = '-';
           strcpy (&login[1], argv0);
           argv0 = login;
         }
-      execlp (shell, argv0, NULL);
+      execlp (shell, argv0, (char *)0);
       /* no error message: STDERR is closed! */
     }
   return -1;
 }

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing rxvt-unicode/src/init.C (file contents): Revision 1.190 by sasha, Thu Jul 12 22:33:16 2007 UTC vs. Revision 1.237 by ayin, Mon Dec 31 15:45:29 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.190 by sasha, Thu Jul 12 22:33:16 2007 UTC vs.
Revision 1.237 by ayin, Mon Dec 31 15:45:29 2007 UTC