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

Comparing rxvt-unicode/src/rxvtd.C (file contents):
Revision 1.50 by root, Fri Oct 22 05:58:00 2010 UTC vs.
Revision 1.55 by sf-exg, Sun Dec 12 19:30:10 2010 UTC

   fcntl (fd, F_SETFL, O_NONBLOCK);
   sa.sun_family = AF_UNIX;
   strcpy (sa.sun_path, sockname);
-  unlink (rxvt_connection::unix_sockname ());
+  unlink (sockname);
   mode_t omask = umask (0077);
   if (bind (fd, (sockaddr *)&sa, sizeof (sa)))
     {
 }
 int
 main (int argc, const char *const *argv)
 {
+  ptytty::init ();
-  int opt_fork, opt_opendisplay, opt_quiet;
+  static char opt_fork, opt_opendisplay, opt_quiet;
 #if ENABLE_MLOCK
-  int opt_lock;
+  static char opt_lock;
 #endif
-  rxvt_init ();
   for (int i = 1; i < argc; i++)
     {
       if (!strcmp (argv [i], "-f") || !strcmp (argv [i], "--fork"))
         opt_fork = 1;
           rxvt_log ("%s: unknown option '%s', aborting.\n", argv [0], argv [i]);
           return EXIT_FAILURE;
         }
     }
+  rxvt_init ();
   // optionally open display and never release it.
   if (opt_opendisplay)
     if (const char *dpy = getenv ("DISPLAY"))
       displays.get (dpy ? dpy : ":0"); // move string logic into rxvt_display maybe?
           return EXIT_FAILURE;
         }
       else if (pid > 0)
         _exit (EXIT_SUCCESS);
-      ev_default_fork ();
+      ev_loop_fork (EV_DEFAULT_UC);
     }
   ev_run ();
   return EXIT_SUCCESS;

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