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.25 by root, Mon Feb 20 22:42:00 2006 UTC vs.
Revision 1.33 by root, Mon Feb 21 07:41:02 2011 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 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
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{
49 sockaddr_un sa;
50 char *sockname = rxvt_connection::unix_sockname ();
51
52 if (strlen (sockname) >= sizeof (sa.sun_path))
53 {
54 fputs ("socket name too long, aborting.\n", stderr);
55 exit (STATUS_FAILURE);
56 }
57
48 if ((fd = socket (AF_UNIX, SOCK_STREAM, 0)) < 0) 58 if ((fd = socket (AF_UNIX, SOCK_STREAM, 0)) < 0)
49 { 59 {
50 perror ("unable to create communications socket"); 60 perror ("unable to create communications socket");
51 exit (STATUS_FAILURE); 61 exit (STATUS_FAILURE);
52 } 62 }
53 63
54 char *sockname = rxvt_connection::unix_sockname ();
55 sockaddr_un sa;
56 sa.sun_family = AF_UNIX; 64 sa.sun_family = AF_UNIX;
57 strcpy (sa.sun_path, sockname); 65 strcpy (sa.sun_path, sockname);
58 free (sockname); 66 free (sockname);
59 67
60 if (connect (fd, (sockaddr *)&sa, sizeof (sa))) 68 if (connect (fd, (sockaddr *)&sa, sizeof (sa)))
… …
67extern char **environ; 75extern char **environ;
68 76
69int 77int
70main (int argc, const char *const *argv) 78main (int argc, const char *const *argv)
71{ 79{
72 client c;
73 {
74 sigset_t ss;
75
76 sigemptyset (&ss);
77 sigaddset (&ss, SIGHUP);
78 sigprocmask (SIG_BLOCK, &ss, 0);
79 }
80
81 c.send ("NEW");
82
83 // instead of getcwd we could opendir (".") and pass the fd for fchdir *g* 80 // instead of getcwd we could opendir (".") and pass the fd for fchdir *g*
84 char cwd[PATH_MAX]; 81 char cwd[PATH_MAX];
85 82
86 if (!getcwd (cwd, sizeof (cwd))) 83 if (!getcwd (cwd, sizeof (cwd)))
87 { 84 {
88 perror ("unable to determine current working directory"); 85 perror ("unable to determine current working directory");
89 exit (STATUS_FAILURE); 86 exit (STATUS_FAILURE);
90 } 87 }
91 88
92 c.send ("CWD"), c.send (cwd); 89 client c;
90
91 {
92 sigset_t ss;
93
94 sigemptyset (&ss);
95 sigaddset (&ss, SIGHUP);
96 sigaddset (&ss, SIGPIPE);
97 sigprocmask (SIG_BLOCK, &ss, 0);
98 }
99
100 c.send ("NEW");
93 101
94 for (char **var = environ; *var; var++) 102 for (char **var = environ; *var; var++)
95 c.send ("ENV"), c.send (*var); 103 c.send ("ENV"), c.send (*var);
96 104
97 const char *base = strrchr (argv[0], '/'); 105 const char *base = strrchr (argv[0], '/');
98 base = base ? base + 1 : argv[0]; 106 base = base ? base + 1 : argv[0];
99 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);
100 111
101 for (int i = 1; i < argc; i++) 112 for (int i = 1; i < argc; i++)
102 c.send ("ARG"), c.send (argv[i]); 113 c.send ("ARG"), c.send (argv[i]);
103 114
104 c.send ("END"); 115 c.send ("END");

Diff Legend

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