ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/rxvtc.C
(Generate patch)

Comparing rxvt-unicode/src/rxvtc.C (file contents):
Revision 1.29 by root, Sun Nov 18 00:17:20 2007 UTC vs.
Revision 1.37 by sf-exg, Mon Oct 6 11:14:49 2014 UTC

1/*----------------------------------------------------------------------* 1/*----------------------------------------------------------------------*
2 * File: rxvtc.C 2 * File: rxvtc.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2006 Marc Lehmann <schmorp@schmorp.de>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
19 * along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 *----------------------------------------------------------------------*/ 21 *----------------------------------------------------------------------*/
22 22
23#include "../config.h" 23#include "../config.h"
24#include <cstdio> 24#include <stdio.h>
25#include <cstdlib> 25#include <stdlib.h>
26#include <cstring> 26#include <string.h>
27#include <csignal> 27#include <signal.h>
28 28
29#include <unistd.h> 29#include <unistd.h>
30#include <sys/socket.h> 30#include <sys/socket.h>
31#include <sys/un.h> 31#include <sys/un.h>
32 32
33#include "rxvtdaemon.h" 33#include "rxvtdaemon.h"
34#include "libptytty.h" 34#include "libptytty.h"
35
36#include "rxvt.h"
37 35
38#define STATUS_SUCCESS 0 36#define STATUS_SUCCESS 0
39#define STATUS_FAILURE 1 37#define STATUS_FAILURE 1
40#define STATUS_CONNECTION_FAILED 2 38#define STATUS_CONNECTION_FAILED 2
41 39
… …
47client::client () 45client::client ()
48{ 46{
49 sockaddr_un sa; 47 sockaddr_un sa;
50 char *sockname = rxvt_connection::unix_sockname (); 48 char *sockname = rxvt_connection::unix_sockname ();
51 49
52 if (strlen(sockname) >= sizeof(sa.sun_path)) 50 if (strlen (sockname) >= sizeof (sa.sun_path))
53 { 51 {
54 fputs ("socket name too long, aborting.\n", stderr); 52 fputs ("socket name too long, aborting.\n", stderr);
55 exit (STATUS_FAILURE); 53 exit (STATUS_FAILURE);
56 } 54 }
57 55
… …
75extern char **environ; 73extern char **environ;
76 74
77int 75int
78main (int argc, const char *const *argv) 76main (int argc, const char *const *argv)
79{ 77{
78 // instead of getcwd we could opendir (".") and pass the fd for fchdir *g*
79 char cwd[PATH_MAX];
80
81 if (!getcwd (cwd, sizeof (cwd)))
82 {
83 perror ("unable to determine current working directory");
84 exit (STATUS_FAILURE);
85 }
86
80 client c; 87 client c;
88
81 { 89 {
82 sigset_t ss; 90 sigset_t ss;
83 91
84 sigemptyset (&ss); 92 sigemptyset (&ss);
85 sigaddset (&ss, SIGHUP); 93 sigaddset (&ss, SIGHUP);
86 sigaddset (&ss, SIGPIPE); 94 sigaddset (&ss, SIGPIPE);
87 sigprocmask (SIG_BLOCK, &ss, 0); 95 sigprocmask (SIG_BLOCK, &ss, 0);
88 } 96 }
89 97
90 c.send ("NEW"); 98 if (argc >= 2 && !strcmp (argv[1], "-k"))
91
92 // instead of getcwd we could opendir (".") and pass the fd for fchdir *g*
93 char cwd[PATH_MAX];
94
95 if (!getcwd (cwd, sizeof (cwd)))
96 { 99 {
97 perror ("unable to determine current working directory"); 100 c.send ("QUIT");
98 exit (STATUS_FAILURE); 101 return 0;
99 } 102 }
100 103
101 c.send ("CWD"), c.send (cwd); 104 c.send ("NEW");
102 105
103 for (char **var = environ; *var; var++) 106 for (char **var = environ; *var; var++)
104 c.send ("ENV"), c.send (*var); 107 c.send ("ENV"), c.send (*var);
105 108
106 const char *base = strrchr (argv[0], '/'); 109 const char *base = strrchr (argv[0], '/');
107 base = base ? base + 1 : argv[0]; 110 base = base ? base + 1 : argv[0];
108 c.send ("ARG"), c.send (strcmp (base, RXVTNAME "c") ? base : RXVTNAME); 111 c.send ("ARG"), c.send (strcmp (base, RXVTNAME "c") ? base : RXVTNAME);
112
113 c.send ("ARG"), c.send ("-cd");
114 c.send ("ARG"), c.send (cwd);
109 115
110 for (int i = 1; i < argc; i++) 116 for (int i = 1; i < argc; i++)
111 c.send ("ARG"), c.send (argv[i]); 117 c.send ("ARG"), c.send (argv[i]);
112 118
113 c.send ("END"); 119 c.send ("END");

Diff Legend

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