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.18 by root, Sat Dec 24 11:55:41 2005 UTC vs.
Revision 1.32 by root, Sun Jun 15 13:54:15 2008 UTC

1/*--------------------------------*-C-*---------------------------------* 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-2004 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
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.
… …
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 "rxvtdaemon.h"
25#include "fdpass.h"
26
27#include "rxvt.h"
28
29#include <cstdio> 24#include <cstdio>
30#include <cstdlib> 25#include <cstdlib>
31#include <cstring> 26#include <cstring>
32#include <csignal> 27#include <csignal>
33 28
34#include <unistd.h> 29#include <unistd.h>
35#include <sys/socket.h> 30#include <sys/socket.h>
36#include <sys/un.h> 31#include <sys/un.h>
37 32
33#include "rxvtdaemon.h"
34#include "libptytty.h"
35
36#include "rxvt.h"
37
38#define STATUS_SUCCESS 0
39#define STATUS_FAILURE 1
40#define STATUS_CONNECTION_FAILED 2
41
38struct client : rxvt_connection { 42struct client : rxvt_connection
43{
39 client (); 44 client ();
40}; 45};
41 46
42client::client () 47client::client ()
43{ 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
44 if ((fd = socket (PF_UNIX, SOCK_STREAM, 0)) < 0) 58 if ((fd = socket (AF_UNIX, SOCK_STREAM, 0)) < 0)
45 { 59 {
46 perror ("unable to create communications socket"); 60 perror ("unable to create communications socket");
47 exit (EXIT_FAILURE); 61 exit (STATUS_FAILURE);
48 } 62 }
49 63
50 char *sockname = rxvt_connection::unix_sockname ();
51 sockaddr_un sa;
52 sa.sun_family = AF_UNIX; 64 sa.sun_family = AF_UNIX;
53 strcpy (sa.sun_path, sockname); 65 strcpy (sa.sun_path, sockname);
54 free (sockname); 66 free (sockname);
55 67
56 if (connect (fd, (sockaddr *)&sa, sizeof (sa))) 68 if (connect (fd, (sockaddr *)&sa, sizeof (sa)))
57 { 69 {
58 perror ("unable to connect to the rxvt-unicode daemon"); 70 perror ("unable to connect to the rxvt-unicode daemon");
59 exit (EXIT_FAILURE); 71 exit (STATUS_CONNECTION_FAILED);
60 } 72 }
61} 73}
62 74
63extern char **environ; 75extern char **environ;
64 76
65int 77int
66main (int argc, const char *const *argv) 78main (int argc, const char *const *argv)
67{ 79{
68 client c;
69 {
70 sigset_t ss;
71
72 sigemptyset (&ss);
73 sigaddset (&ss, SIGHUP);
74 sigprocmask (SIG_BLOCK, &ss, 0);
75 }
76
77 c.send ("NEW");
78
79 // 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*
80 char cwd[PATH_MAX]; 81 char cwd[PATH_MAX];
81 82
82 if (!getcwd (cwd, sizeof (cwd))) 83 if (!getcwd (cwd, sizeof (cwd)))
83 { 84 {
84 perror ("unable to determine current working directory"); 85 perror ("unable to determine current working directory");
85 exit (EXIT_FAILURE); 86 exit (STATUS_FAILURE);
86 } 87 }
87 88
88 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");
89 101
90 for (char **var = environ; *var; var++) 102 for (char **var = environ; *var; var++)
91 c.send ("ENV"), c.send (*var); 103 c.send ("ENV"), c.send (*var);
92 104
93 const char *base = strrchr (argv[0], '/'); 105 const char *base = strrchr (argv[0], '/');
94 base = base ? base + 1 : argv[0]; 106 base = base ? base + 1 : argv[0];
95 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);
96 111
97 for (int i = 1; i < argc; i++) 112 for (int i = 1; i < argc; i++)
98 c.send ("ARG"), c.send (argv[i]); 113 c.send ("ARG"), c.send (argv[i]);
99 114
100 c.send ("END"); 115 c.send ("END");
… …
108 fprintf (stderr, "protocol error: unexpected eof from server.\n"); 123 fprintf (stderr, "protocol error: unexpected eof from server.\n");
109 break; 124 break;
110 } 125 }
111 else if (!strcmp (tok, "MSG") && c.recv (tok)) 126 else if (!strcmp (tok, "MSG") && c.recv (tok))
112 fprintf (stderr, "%s", (const char *)tok); 127 fprintf (stderr, "%s", (const char *)tok);
113#if ENABLE_FRILLS && HAVE_UNIX_FDPASS
114 else if (!strcmp (tok, "GETFD") && c.recv (cint)) 128 else if (!strcmp (tok, "GETFD") && c.recv (cint))
115 { 129 {
116 if (rxvt_send_fd (c.fd, cint) < 0) 130 if (!ptytty::send_fd (c.fd, cint))
117 { 131 {
118 fprintf (stderr, "unable to send fd %d: ", cint); perror (0); 132 fprintf (stderr, "unable to send fd %d: ", cint); perror (0);
119 exit (EXIT_FAILURE); 133 exit (STATUS_FAILURE);
120 } 134 }
121 } 135 }
122#endif
123 else if (!strcmp (tok, "END")) 136 else if (!strcmp (tok, "END"))
124 { 137 {
125 int success; 138 int success;
139
126 if (c.recv (success)) 140 if (c.recv (success))
127 exit (success ? EXIT_SUCCESS : EXIT_FAILURE); 141 exit (success ? STATUS_SUCCESS : STATUS_FAILURE);
128 } 142 }
129 else 143 else
130 { 144 {
131 fprintf (stderr, "protocol error: received unsupported token '%s'.\n", (const char *)tok); 145 fprintf (stderr, "protocol error: received unsupported token '%s'.\n", (const char *)tok);
132 break; 146 break;
133 } 147 }
134 148
135 return EXIT_FAILURE; 149 return STATUS_FAILURE;
136} 150}
137 151

Diff Legend

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