--- rxvt-unicode/src/rxvtc.C	2007/11/18 00:21:34	1.30
+++ rxvt-unicode/src/rxvtc.C	2014/10/06 11:14:49	1.37
@@ -3,11 +3,11 @@
  *----------------------------------------------------------------------*
  *
  * All portions of code are copyright by their respective author/s.
- * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
+ * Copyright (c) 2003-2006 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,
@@ -21,10 +21,10 @@
  *----------------------------------------------------------------------*/
 
 #include "../config.h"
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
-#include <csignal>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <signal.h>
 
 #include <unistd.h>
 #include <sys/socket.h>
@@ -33,8 +33,6 @@
 #include "rxvtdaemon.h"
 #include "libptytty.h"
 
-#include "rxvt.h"
-
 #define STATUS_SUCCESS           0
 #define STATUS_FAILURE           1
 #define STATUS_CONNECTION_FAILED 2
@@ -49,7 +47,7 @@
   sockaddr_un sa;
   char *sockname = rxvt_connection::unix_sockname ();
 
-  if (strlen(sockname) >= sizeof(sa.sun_path))
+  if (strlen (sockname) >= sizeof (sa.sun_path))
     {
       fputs ("socket name too long, aborting.\n", stderr);
       exit (STATUS_FAILURE);
@@ -97,8 +95,13 @@
     sigprocmask (SIG_BLOCK, &ss, 0);
   }
 
+  if (argc >= 2 && !strcmp (argv[1], "-k"))
+    {
+      c.send ("QUIT");
+      return 0;
+    }
+
   c.send ("NEW");
-  c.send ("CWD"), c.send (cwd);
 
   for (char **var = environ; *var; var++)
     c.send ("ENV"), c.send (*var);
@@ -107,6 +110,9 @@
   base = base ? base + 1 : argv[0];
   c.send ("ARG"), c.send (strcmp (base, RXVTNAME "c") ? base : RXVTNAME);
 
+  c.send ("ARG"), c.send ("-cd");
+  c.send ("ARG"), c.send (cwd);
+
   for (int i = 1; i < argc; i++)
     c.send ("ARG"), c.send (argv[i]);