--- rxvt-unicode/src/init.C	2010/05/23 00:02:52	1.265
+++ rxvt-unicode/src/init.C	2010/08/28 18:20:41	1.277
@@ -560,24 +560,6 @@
   set_option (Opt_buffered);
 }
 
-static void
-init_secondary ()
-{
-  int i;
-
-  if ((i = open ("/dev/null", O_RDONLY)) < 0)
-    {
-      dup2 (STDERR_FILENO, STDIN_FILENO);
-    }
-  else if (i != STDIN_FILENO)
-    {
-      dup2 (i, STDIN_FILENO);
-      close (i);
-    }
-
-  dup2 (STDERR_FILENO, STDOUT_FILENO);
-}
-
 /*----------------------------------------------------------------------*/
 const char **
 rxvt_term::init_resources (int argc, const char *const *argv)
@@ -792,8 +774,6 @@
 
   init_vars ();
 
-  init_secondary ();
-
   const char **cmd_argv = init_resources (argc, argv);
 
 #ifdef KEYSYM_RESOURCE
@@ -1393,7 +1373,7 @@
 # ifdef HAVE_AFTERIMAGE
   /*
    * set up icon hint
-   * rs [Rs_iconfile] is path to icon, asv has been created in init_resources
+   * rs [Rs_iconfile] is path to icon
    */
 
   if (rs [Rs_iconfile])
@@ -1401,38 +1381,38 @@
       init_asv ();
 
       ASImage *im = file2ASImage (rs [Rs_iconfile], 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
-      if (asv && im)
+      if (im)
         {
           int w = im->width;
           int h = im->height;
-          long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
           ASImage *result = scale_asimage (asv, im,
                                            w, h, ASA_ARGB32,
                                            100, ASIMAGE_QUALITY_DEFAULT);
           destroy_asimage (&im);
 
-          if (buffer && result)
+          if (result)
             {
-              ARGB32 *asbuf = result->alt.argb32;
-              buffer [0] = w;
-              buffer [1] = h;
-
-              for (unsigned int i = 0; i < w * h; ++i)
-                buffer [i + 2] = asbuf [i];
+              long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
+              if (buffer)
+                {
+                  ARGB32 *asbuf = result->alt.argb32;
+                  buffer [0] = w;
+                  buffer [1] = h;
+
+                  for (unsigned int i = 0; i < w * h; ++i)
+                    buffer [i + 2] = asbuf [i];
+
+                  XChangeProperty (dpy, top, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
+                                   PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
+                  free (buffer);
+                }
+              else
+                rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
 
               destroy_asimage (&result);
-              XChangeProperty (dpy, top, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
-                               PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
-              free (buffer);
             }
           else
-            {
-              if (!buffer)
-                rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
-
-              if (!result)
-                rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
-            }
+            rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
         }
       else
         rxvt_warn ("Loading image icon failed, continuing without.\n");
@@ -1526,168 +1506,6 @@
   scr_recolour ();
 }
 
-/* ------------------------------------------------------------------------- *
- *                            GET TTY CURRENT STATE                          *
- * ------------------------------------------------------------------------- */
-void
-rxvt_get_ttymode (struct termios *tio, int erase)
-{
-  /*
-   * standard System V termios interface
-   */
-  if (tcgetattr (STDIN_FILENO, tio) < 0)
-    {
-      // return error - use system defaults,
-      // where possible, and zero elsewhere
-      memset (tio, 0, sizeof (struct termios));
-
-      tio->c_cc[VINTR] = CINTR;
-      tio->c_cc[VQUIT] = CQUIT;
-      tio->c_cc[VERASE] = CERASE;
-#ifdef VERASE2
-      tio->c_cc[VERASE2] = CERASE2;
-#endif
-      tio->c_cc[VKILL] = CKILL;
-      tio->c_cc[VSTART] = CSTART;
-      tio->c_cc[VSTOP] = CSTOP;
-      tio->c_cc[VSUSP] = CSUSP;
-# ifdef VDSUSP
-      tio->c_cc[VDSUSP] = CDSUSP;
-# endif
-# ifdef VREPRINT
-      tio->c_cc[VREPRINT] = CRPRNT;
-# endif
-# ifdef VDISCRD
-      tio->c_cc[VDISCRD] = CFLUSH;
-# endif
-# ifdef VWERSE
-      tio->c_cc[VWERSE] = CWERASE;
-# endif
-# ifdef VLNEXT
-      tio->c_cc[VLNEXT] = CLNEXT;
-# endif
-    }
-
-  tio->c_cc[VEOF] = CEOF;
-  tio->c_cc[VEOL] = VDISABLE;
-# ifdef VEOL2
-  tio->c_cc[VEOL2] = VDISABLE;
-# endif
-# ifdef VSWTC
-  tio->c_cc[VSWTC] = VDISABLE;
-# endif
-# ifdef VSWTCH
-  tio->c_cc[VSWTCH] = VDISABLE;
-# endif
-# if VMIN != VEOF
-  tio->c_cc[VMIN] = 1;
-# endif
-# if VTIME != VEOL
-  tio->c_cc[VTIME] = 0;
-# endif
-
-  if (erase != -1)
-    tio->c_cc[VERASE] = (char)erase;
-
-  /* input modes */
-  tio->c_iflag = (BRKINT | IGNPAR | ICRNL
-# ifdef IMAXBEL
-                  | IMAXBEL
-# endif
-                  | IXON);
-
-  /* output modes */
-  tio->c_oflag = (OPOST | ONLCR);
-
-  /* control modes */
-  tio->c_cflag = (CS8 | CREAD);
-
-  /* line discipline modes */
-  tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
-# if defined (ECHOCTL) && defined (ECHOKE)
-                  | ECHOCTL | ECHOKE
-# endif
-                  | ECHOE | ECHOK);
-
-  /*
-   * Debugging
-   */
-#ifdef DEBUG_TTYMODE
-  /* c_iflag bits */
-  fprintf (stderr, "Input flags\n");
-
-  /* cpp token stringize doesn't work on all machines <sigh> */
-# define FOO(flag,name)                 \
-    if ((tio->c_iflag) & flag)          \
-        fprintf (stderr, "%s ", name)
-
-  /* c_iflag bits */
-  FOO (IGNBRK, "IGNBRK");
-  FOO (BRKINT, "BRKINT");
-  FOO (IGNPAR, "IGNPAR");
-  FOO (PARMRK, "PARMRK");
-  FOO (INPCK, "INPCK");
-  FOO (ISTRIP, "ISTRIP");
-  FOO (INLCR, "INLCR");
-  FOO (IGNCR, "IGNCR");
-  FOO (ICRNL, "ICRNL");
-  FOO (IXON, "IXON");
-  FOO (IXOFF, "IXOFF");
-# ifdef IUCLC
-  FOO (IUCLC, "IUCLC");
-# endif
-# ifdef IXANY
-  FOO (IXANY, "IXANY");
-# endif
-# ifdef IMAXBEL
-  FOO (IMAXBEL, "IMAXBEL");
-# endif
-
-  fprintf (stderr, "\n");
-
-# undef FOO
-# define FOO(entry, name)                                       \
-    fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
-
-  FOO (VINTR, "VINTR");
-  FOO (VQUIT, "VQUIT");
-  FOO (VERASE, "VERASE");
-  FOO (VKILL, "VKILL");
-  FOO (VEOF, "VEOF");
-  FOO (VEOL, "VEOL");
-# ifdef VEOL2
-  FOO (VEOL2, "VEOL2");
-# endif
-# ifdef VSWTC
-  FOO (VSWTC, "VSWTC");
-# endif
-# ifdef VSWTCH
-  FOO (VSWTCH, "VSWTCH");
-# endif
-  FOO (VSTART, "VSTART");
-  FOO (VSTOP, "VSTOP");
-  FOO (VSUSP, "VSUSP");
-# ifdef VDSUSP
-  FOO (VDSUSP, "VDSUSP");
-# endif
-# ifdef VREPRINT
-  FOO (VREPRINT, "VREPRINT");
-# endif
-# ifdef VDISCRD
-  FOO (VDISCRD, "VDISCRD");
-# endif
-# ifdef VWERSE
-  FOO (VWERSE, "VWERSE");
-# endif
-# ifdef VLNEXT
-  FOO (VLNEXT, "VLNEXT");
-# endif
-
-  fprintf (stderr, "\n");
-# undef FOO
-#endif /* DEBUG_TTYMODE */
-}
-
 /*----------------------------------------------------------------------*/
 /*
  * Run the command in a subprocess and return a file descriptor for the
@@ -1716,18 +1534,15 @@
     if (!pty->get ())
       rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
 
-  int er;
+  struct termios tio = def_tio;
 
 #ifndef NO_BACKSPACE_KEY
   if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
-    er = rs[Rs_backspace_key][0];
+    tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
   else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
-    er = '\177';            /* the initial state anyway */
-  else
+    tio.c_cc[VERASE] = '\177';            /* the initial state anyway */
 #endif
-    er = -1;
 
-  rxvt_get_ttymode (&tio, er);
   /* init terminal attributes */
   cfsetospeed (&tio, BAUDRATE);
   cfsetispeed (&tio, BAUDRATE);
@@ -1824,7 +1639,7 @@
   signal (SIGHUP,  SIG_DFL);
   signal (SIGPIPE, SIG_DFL);
   /*
-   * mimick login's behavior by disabling the job control signals
+   * mimic login's behavior by disabling the job control signals
    * a shell that wants them can turn them back on
    */
 #ifdef SIGTSTP