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.27 by root, Fri Aug 18 23:03:31 2006 UTC vs.
Revision 1.32 by root, Sun Jun 15 13:54:15 2008 UTC

… …
37 37
38#define STATUS_SUCCESS 0 38#define STATUS_SUCCESS 0
39#define STATUS_FAILURE 1 39#define STATUS_FAILURE 1
40#define STATUS_CONNECTION_FAILED 2 40#define STATUS_CONNECTION_FAILED 2
41 41
42struct client : rxvt_connection { 42struct client : rxvt_connection
43{
43 client (); 44 client ();
44}; 45};
45 46
46client::client () 47client::client ()
47{ 48{
48 sockaddr_un sa; 49 sockaddr_un sa;
49 char *sockname = rxvt_connection::unix_sockname (); 50 char *sockname = rxvt_connection::unix_sockname ();
50 51
51 if (strlen(sockname) >= sizeof(sa.sun_path)) 52 if (strlen (sockname) >= sizeof (sa.sun_path))
52 { 53 {
53 fputs ("socket name too long, aborting.\n", stderr); 54 fputs ("socket name too long, aborting.\n", stderr);
54 exit (STATUS_FAILURE); 55 exit (STATUS_FAILURE);
55 } 56 }
56 57
57 if ((fd = socket (AF_UNIX, SOCK_STREAM, 0)) < 0) 58 if ((fd = socket (AF_UNIX, SOCK_STREAM, 0)) < 0)
58 { 59 {
59 perror ("unable to create communications socket"); 60 perror ("unable to create communications socket");
60 exit (STATUS_FAILURE); 61 exit (STATUS_FAILURE);
61 } 62 }
… …
74extern char **environ; 75extern char **environ;
75 76
76int 77int
77main (int argc, const char *const *argv) 78main (int argc, const char *const *argv)
78{ 79{
80 // instead of getcwd we could opendir (".") and pass the fd for fchdir *g*
81 char cwd[PATH_MAX];
82
83 if (!getcwd (cwd, sizeof (cwd)))
84 {
85 perror ("unable to determine current working directory");
86 exit (STATUS_FAILURE);
87 }
88
79 client c; 89 client c;
90
80 { 91 {
81 sigset_t ss; 92 sigset_t ss;
82 93
83 sigemptyset (&ss); 94 sigemptyset (&ss);
84 sigaddset (&ss, SIGHUP); 95 sigaddset (&ss, SIGHUP);
… …
86 sigprocmask (SIG_BLOCK, &ss, 0); 97 sigprocmask (SIG_BLOCK, &ss, 0);
87 } 98 }
88 99
89 c.send ("NEW"); 100 c.send ("NEW");
90 101
91 // instead of getcwd we could opendir (".") and pass the fd for fchdir *g*
92 char cwd[PATH_MAX];
93
94 if (!getcwd (cwd, sizeof (cwd)))
95 {
96 perror ("unable to determine current working directory");
97 exit (STATUS_FAILURE);
98 }
99
100 c.send ("CWD"), c.send (cwd);
101
102 for (char **var = environ; *var; var++) 102 for (char **var = environ; *var; var++)
103 c.send ("ENV"), c.send (*var); 103 c.send ("ENV"), c.send (*var);
104 104
105 const char *base = strrchr (argv[0], '/'); 105 const char *base = strrchr (argv[0], '/');
106 base = base ? base + 1 : argv[0]; 106 base = base ? base + 1 : argv[0];
107 c.send ("ARG"), c.send (strcmp (base, RXVTNAME "c") ? base : RXVTNAME); 107 c.send ("ARG"), c.send (strcmp (base, RXVTNAME "c") ? base : RXVTNAME);
108
109 c.send ("ARG"), c.send ("-cd");
110 c.send ("ARG"), c.send (cwd);
108 111
109 for (int i = 1; i < argc; i++) 112 for (int i = 1; i < argc; i++)
110 c.send ("ARG"), c.send (argv[i]); 113 c.send ("ARG"), c.send (argv[i]);
111 114
112 c.send ("END"); 115 c.send ("END");

Diff Legend

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