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

Comparing rxvt-unicode/src/rxvtd.C (file contents):
Revision 1.49 by sf-exg, Sun Jul 25 00:47:58 2010 UTC vs.
Revision 1.63 by sf-exg, Sun May 9 05:53:12 2021 UTC

 /*----------------------------------------------------------------------*
  * File:	rxvtd.C
  *----------------------------------------------------------------------*
  *
  * All portions of code are copyright by their respective author/s.
- * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
+ * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
  *
  * 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *----------------------------------------------------------------------*/
 #include "../config.h"
-#include <cstdio>
+#include <stdio.h>
-#include <cstdlib>
+#include <stdlib.h>
-#include <cstdarg>
+#include <stdarg.h>
-#include <cstring>
+#include <string.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #if ENABLE_MLOCK
 # include <sys/mman.h>
 #endif
-#include <cerrno>
+#include <errno.h>
 #include "rxvt.h"
 #include "rxvtdaemon.h"
 #include "libptytty.h"
 struct unix_listener {
   int fd;
   void accept_cb (ev::io &w, int revents); ev::io accept_ev;
+  unix_listener (int fd);
-  unix_listener (const char *sockname);
+  static int open (const char *sockname);
 };
-unix_listener::unix_listener (const char *sockname)
+unix_listener::unix_listener (int fd) : fd (fd)
 {
   accept_ev.set<unix_listener, &unix_listener::accept_cb> (this);
-  sockaddr_un sa;
-  if (strlen (sockname) >= sizeof(sa.sun_path))
-    {
-      fputs ("socket name too long, aborting.\n", stderr);
-      exit (EXIT_FAILURE);
-    }
-  if ((fd = socket (AF_UNIX, SOCK_STREAM, 0)) < 0)
-    {
-      perror ("unable to create listening socket");
-      exit (EXIT_FAILURE);
-    }
   fcntl (fd, F_SETFD, FD_CLOEXEC);
   fcntl (fd, F_SETFL, O_NONBLOCK);
+  accept_ev.start (fd, ev::READ);
+}
+int unix_listener::open (const char *sockname)
+{
+  sockaddr_un sa;
+  if (strlen (sockname) >= sizeof(sa.sun_path))
+    {
+      fputs ("socket name too long, aborting.\n", stderr);
+      exit (EXIT_FAILURE);
+    }
+  int fd;
+  if ((fd = socket (AF_UNIX, SOCK_STREAM, 0)) < 0)
+    {
+      perror ("unable to create listening socket");
+      exit (EXIT_FAILURE);
+    }
   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)))
     {
     {
       perror ("unable to listen on socket");
       exit (EXIT_FAILURE);
     }
-  accept_ev.start (fd, ev::READ);
+  return fd;
 }
 void unix_listener::accept_cb (ev::io &w, int revents)
 {
   int fd2 = accept (fd, 0, 0);
                 argv->push_back (strdup (tok));
               else
                 return err ("protocol error: unexpected NEW token.\n");
             }
-          envv->push_back (0);
           {
             rxvt_term *term = new rxvt_term;
             term->log_hook = &log_cb;
             term->getfd_hook = &getfd_cb;
               term->destroy ();
             send ("END"); send (success ? 1 : 0);
           }
         }
+      else if (!strcmp (tok, "QUIT"))
+        _exit (0);
       else
         return err ("protocol error: request '%s' unsupported.\n", (char *)tok);
     }
   else
     return err ();
 }
+#ifdef ENABLE_FRILLS
+enum {
+  SD_LISTEN_FDS_START = 3,
+};
+// https://www.freedesktop.org/software/systemd/man/sd_listen_fds.html
+// https://github.com/systemd/systemd/blob/main/src/libsystemd/sd-daemon/sd-daemon.c
+static int get_listen_fds ()
+{
+  const char *listen_pid = getenv ("LISTEN_PID");
+  if (!listen_pid)
+    return 0;
+  char *end;
+  errno = 0;
+  long pid = strtol (listen_pid, &end, 10);
+  if (errno || end == listen_pid || *end)
+    return -1;
+  if (getpid () != pid)
+    return 0;
+  const char *listen_fds = getenv ("LISTEN_FDS");
+  if (!listen_fds)
+    return 0;
+  errno = 0;
+  long n = strtol (listen_fds, &end, 10);
+  if (errno || end == listen_fds || *end)
+    return -1;
+  if (n <= 0 || n > INT_MAX - SD_LISTEN_FDS_START)
+    return -1;
+  unsetenv ("LISTEN_PID");
+  unsetenv ("LISTEN_FDS");
+  unsetenv ("LISTEN_FDNAMES");
+  return n;
+}
+#endif
 int
-main (int argc, const char *const *argv)
+main (int argc, char *argv[])
 {
+  ptytty::init ();
-  int opt_fork, opt_opendisplay, opt_quiet;
+  static char opt_fork, opt_opendisplay, opt_quiet;
+#if ENABLE_PERL
+  static char *opt_eval;
+#endif
 #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;
         opt_quiet = 1;
 #if ENABLE_MLOCK
       else if (!strcmp (argv [i], "-m") || !strcmp (argv [i], "--mlock"))
         opt_lock = 1;
 #endif
+#if ENABLE_PERL
+      else if (!strcmp (argv [i], "-e") || !strcmp (argv [i], "--eval"))
+        opt_eval = argv [++i];
+#endif
       else
         {
           rxvt_log ("%s: unknown option '%s', aborting.\n", argv [0], argv [i]);
           return EXIT_FAILURE;
         }
     }
+  rxvt_init ();
+#if ENABLE_PERL
+  if (opt_eval)
+    {
+      rxvt_perl.init ();
+      rxvt_perl.eval (opt_eval);
+    }
+#endif
   // 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?
+  int fd;
+#ifdef ENABLE_FRILLS
+  int n = get_listen_fds ();
+  if (n > 1)
+    {
+      fputs ("received multiple file descriptors, aborting.\n", stderr);
+      exit (EXIT_FAILURE);
+    }
+  else if (n == 1)
+    {
+      fd = SD_LISTEN_FDS_START;
+      if (!opt_quiet)
+        {
+          printf ("rxvt-unicode daemon listening on fd.\n");
+          fflush (stdout);
+        }
+    }
+  else
+#endif
+    {
-  char *sockname = rxvt_connection::unix_sockname ();
+      char *sockname = rxvt_connection::unix_sockname ();
+      fd = unix_listener::open (sockname);
+      if (!opt_quiet)
+        {
+          printf ("rxvt-unicode daemon listening on %s.\n", sockname);
+          fflush (stdout);
+        }
+      free (sockname);
+    }
-  unix_listener l (sockname);
+  unix_listener l (fd);
   chdir ("/");
-  if (!opt_quiet)
-    {
-      printf ("rxvt-unicode daemon listening on %s.\n", sockname);
-      fflush (stdout);
-    }
-  free (sockname);
   pid_t pid = 0;
   if (opt_fork)
     {
       pid = fork ();
           return EXIT_FAILURE;
         }
       else if (pid > 0)
         _exit (EXIT_SUCCESS);
-      ev_default_fork ();
+      ev_loop_fork (EV_DEFAULT_UC);
     }
-  ev_loop (0);
+  ev_run ();
   return EXIT_SUCCESS;
 }

Diff Legend

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

Comparing rxvt-unicode/src/rxvtd.C (file contents): Revision 1.49 by sf-exg, Sun Jul 25 00:47:58 2010 UTC vs. Revision 1.63 by sf-exg, Sun May 9 05:53:12 2021 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtd.C (file contents):
Revision 1.49 by sf-exg, Sun Jul 25 00:47:58 2010 UTC vs.
Revision 1.63 by sf-exg, Sun May 9 05:53:12 2021 UTC