--- rxvt-unicode/src/rxvtd.C	2003/11/24 19:52:16	1.2
+++ rxvt-unicode/src/rxvtd.C	2004/02/13 12:16:21	1.8
@@ -4,11 +4,19 @@
 
 #include <cstdio>
 #include <cstdlib>
+#include <cstdarg>
+#include <cstring>
 
 #include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 
+#include <cerrno>
+
+extern char **environ;
+
 struct server : rxvt_connection {
   void read_cb (io_watcher &w, short revents); io_watcher read_ev;
 
@@ -19,19 +27,19 @@
     read_ev.start (fd, EVENT_READ);
   }
 
-  void err ();
+  void err (const char *format = 0, ...);
 };
 
-struct listener {
+struct unix_listener {
   int fd;
 
   void accept_cb (io_watcher &w, short revents); io_watcher accept_ev;
 
-  listener ();
+  unix_listener (const char *sockname);
 };
 
-listener::listener ()
-: accept_ev (this, &listener::accept_cb)
+unix_listener::unix_listener (const char *sockname)
+: accept_ev (this, &unix_listener::accept_cb)
 {
   if ((fd = socket (PF_LOCAL, SOCK_STREAM, 0)) < 0)
     {
@@ -42,16 +50,20 @@
   sockaddr_un sa;
 
   sa.sun_family = AF_UNIX;
-  strcpy (sa.sun_path, rxvt_connection::unix_sockname ());
+  strcpy (sa.sun_path, sockname);
 
   unlink (rxvt_connection::unix_sockname ());
 
+  mode_t omask = umask (0077);
+
   if (bind (fd, (sockaddr *)&sa, sizeof (sa)))
     {
       perror ("unable to bind listening socket");
       exit (EXIT_FAILURE);
     }
 
+  umask (omask);
+
   if (listen (fd, 5))
     {
       perror ("unable to listen on socket");
@@ -61,7 +73,7 @@
   accept_ev.start (fd, EVENT_READ);
 }
 
-void listener::accept_cb (io_watcher &w, short revents)
+void unix_listener::accept_cb (io_watcher &w, short revents)
 {
   int fd2 = accept (fd, 0, 0);
 
@@ -69,8 +81,20 @@
     new server (fd2);
 }
 
-void server::err ()
+void server::err (const char *format, ...)
 {
+  if (format)
+    {
+      char err[1024];
+
+      va_list ap;
+      va_start (ap, format);
+      vsnprintf (err, 1024, format, ap);
+      va_end (ap);
+
+      send ("ERR"), send (err);
+    }
+
   close (fd);
   delete this;
 }
@@ -83,8 +107,8 @@
     {
       if (!strcmp (tok, "NEW"))
         {
-          auto_str display, cwd;
-          simplevec<auto_str> argv;
+          stringvec argv;
+          stringvec envv;
             
           for (;;)
             {
@@ -93,42 +117,58 @@
 
               if (!strcmp (tok, "END"))
                 break;
-              else if (!strcmp (tok, "DISPLAY") && recv (display))
-                ;
-              else if (!strcmp (tok, "CWD") && recv (cwd))
-                ;
+              else if (!strcmp (tok, "ENV") && recv (tok))
+                envv.push_back (tok.get ());
+              else if (!strcmp (tok, "CWD") && recv (tok))
+                {
+                  if (chdir (tok))
+                    err ("unable to change to working directory to '%s': %s",
+                         (char *)tok, strerror (errno));
+                }
               else if (!strcmp (tok, "ARG") && recv (tok))
-                argv.push_back (tok);
+                argv.push_back (tok.get ());
               else
-                return err ();
+                return err ("protocol error: unexpected NEW token");
             }
 
-          // TODO: no setenv, please
-          setenv ("DISPLAY", display.get (), 1);
+          envv.push_back (0);
+
+          {
+            char **old_environ = environ;
+            environ = envv.begin ();
+
+            rxvt_init (argv.size (), argv.begin ());
 
-          rxvt_init (argv.size (), reinterpret_cast<char **>(argv.begin ()));
-          dR;
-          rxvt_main_loop (aR);
+            environ = old_environ;
+            envv.clear (); // can't yet save the env 'cause rxvt modifies it : (
+          }
         }
       else
-        return err ();
+        return err ("protocol error: request '%s' unsupported.", (char *)tok);
     }
   else
     return err ();
 }
 
 int
-main(int argc, const char *const *argv)
+main (int argc, const char *const *argv)
 {
-  listener l;
+  rxvt_init_signals ();
+
+  char *sockname = rxvt_connection::unix_sockname ();
+  unix_listener l (sockname);
+  printf ("rxvtd listening on %s.\n", sockname);
+  free (sockname);
+
   iom.loop ();
 
 #if 0
-  if (rxvt_init(argc, argv) == NULL)
+  if (rxvt_init (argc, argv) == NULL)
       return EXIT_FAILURE;
 
   dR;
-  rxvt_main_loop(aR);	/* main processing loop */
+  rxvt_main_loop (aR);	/* main processing loop */
 #endif
   return EXIT_SUCCESS;
 }
+