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

Comparing rxvt-unicode/src/rxvtd.C (file contents):
Revision 1.3 by pcg, Tue Nov 25 11:52:42 2003 UTC vs.
Revision 1.36 by root, Sat Nov 17 07:28:00 2007 UTC

1#include "rxvtlib.h" 1/*----------------------------------------------------------------------*
2#include "rxvtdaemon.h" 2 * File: rxvtd.C
3#include "iom.h" 3 *----------------------------------------------------------------------*
4 *
5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
7 *
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
10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version.
12 *
13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details.
17 *
18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 *----------------------------------------------------------------------*/
4 22
23#include "../config.h"
5#include <cstdio> 24#include <cstdio>
6#include <cstdlib> 25#include <cstdlib>
7#include <cstdarg> 26#include <cstdarg>
8#include <cstring> 27#include <cstring>
9 28
10#include <unistd.h> 29#include <unistd.h>
30#include <fcntl.h>
31#include <sys/types.h>
32#include <sys/stat.h>
11#include <sys/socket.h> 33#include <sys/socket.h>
12#include <sys/un.h> 34#include <sys/un.h>
13 35
14#include <cerrno> 36#include <cerrno>
15 37
16extern char **environ; 38#include "rxvt.h"
39#include "rxvtdaemon.h"
40#include "libptytty.h"
17 41
18struct server : rxvt_connection { 42struct server : rxvt_connection {
43 log_callback log_cb;
44 getfd_callback getfd_cb;
45
19 void read_cb (io_watcher &w, short revents); io_watcher read_ev; 46 void read_cb (ev::io &w, int revents); ev::io read_ev;
47 void log_msg (const char *msg);
48 int getfd (int remote_fd);
20 49
21 server (int fd) 50 server (int fd)
22 : read_ev (this, &server::read_cb) 51 : read_ev (this, &server::read_cb),
52 log_cb (this, &server::log_msg),
53 getfd_cb (this, &server::getfd)
23 { 54 {
24 this->fd = fd; 55 fcntl (fd, F_SETFD, FD_CLOEXEC);
56 fcntl (fd, F_SETFL, 0);
25 read_ev.start (fd, EVENT_READ); 57 read_ev.start (fd, ev::READ);
26 } 58 }
27 59
28 void err (const char *format = 0, ...); 60 void err (const char *format = 0, ...);
29}; 61};
30 62
31struct listener { 63struct unix_listener {
32 int fd; 64 int fd;
33 65
34 void accept_cb (io_watcher &w, short revents); io_watcher accept_ev; 66 void accept_cb (ev::io &w, int revents); ev::io accept_ev;
35 67
36 listener (); 68 unix_listener (const char *sockname);
37}; 69};
38 70
39listener::listener () 71unix_listener::unix_listener (const char *sockname)
40: accept_ev (this, &listener::accept_cb) 72: accept_ev (this, &unix_listener::accept_cb)
41{ 73{
74 sockaddr_un sa;
75
76 if (strlen (sockname) >= sizeof(sa.sun_path))
77 {
78 fputs ("socket name too long, aborting.\n", stderr);
79 exit (EXIT_FAILURE);
80 }
81
42 if ((fd = socket (PF_LOCAL, SOCK_STREAM, 0)) < 0) 82 if ((fd = socket (AF_UNIX, SOCK_STREAM, 0)) < 0)
43 { 83 {
44 perror ("unable to create listening socket"); 84 perror ("unable to create listening socket");
45 exit (EXIT_FAILURE); 85 exit (EXIT_FAILURE);
46 } 86 }
47 87
48 sockaddr_un sa; 88 fcntl (fd, F_SETFD, FD_CLOEXEC);
89 fcntl (fd, F_SETFL, O_NONBLOCK);
49 90
50 sa.sun_family = AF_UNIX; 91 sa.sun_family = AF_UNIX;
51 strcpy (sa.sun_path, rxvt_connection::unix_sockname ()); 92 strcpy (sa.sun_path, sockname);
52 93
53 unlink (rxvt_connection::unix_sockname ()); 94 unlink (rxvt_connection::unix_sockname ());
54 95
96 mode_t omask = umask (0077);
97
55 if (bind (fd, (sockaddr *)&sa, sizeof (sa))) 98 if (bind (fd, (sockaddr *)&sa, sizeof (sa)))
56 { 99 {
57 perror ("unable to bind listening socket"); 100 perror ("unable to bind listening socket");
58 exit (EXIT_FAILURE); 101 exit (EXIT_FAILURE);
59 } 102 }
60 103
104 umask (omask);
105
61 if (listen (fd, 5)) 106 if (listen (fd, 5))
62 { 107 {
63 perror ("unable to listen on socket"); 108 perror ("unable to listen on socket");
64 exit (EXIT_FAILURE); 109 exit (EXIT_FAILURE);
65 } 110 }
66 111
67 accept_ev.start (fd, EVENT_READ); 112 accept_ev.start (fd, ev::READ);
68} 113}
69 114
70void listener::accept_cb (io_watcher &w, short revents) 115void unix_listener::accept_cb (ev::io &w, int revents)
71{ 116{
72 int fd2 = accept (fd, 0, 0); 117 int fd2 = accept (fd, 0, 0);
73 118
74 if (fd2 >= 0) 119 if (fd2 >= 0)
75 new server (fd2); 120 new server (fd2);
121}
122
123int server::getfd (int remote_fd)
124{
125 send ("GETFD");
126 send (remote_fd);
127 return ptytty::recv_fd (fd);
128}
129
130void server::log_msg (const char *msg)
131{
132 send ("MSG"), send (msg);
76} 133}
77 134
78void server::err (const char *format, ...) 135void server::err (const char *format, ...)
79{ 136{
80 if (format) 137 if (format)
… …
84 va_list ap; 141 va_list ap;
85 va_start (ap, format); 142 va_start (ap, format);
86 vsnprintf (err, 1024, format, ap); 143 vsnprintf (err, 1024, format, ap);
87 va_end (ap); 144 va_end (ap);
88 145
146 log_msg (err);
147 }
148
89 send ("ERR"), send (err); 149 send ("END"), send (0);
90 }
91
92 close (fd); 150 close (fd);
93 delete this; 151 delete this;
94} 152}
95 153
96void server::read_cb (io_watcher &w, short revents) 154void server::read_cb (ev::io &w, int revents)
97{ 155{
98 auto_str tok; 156 auto_str tok;
99 157
100 if (recv (tok)) 158 if (recv (tok))
101 { 159 {
102 if (!strcmp (tok, "NEW")) 160 if (!strcmp (tok, "NEW"))
103 { 161 {
104 stringvec argv; 162 stringvec *argv = new stringvec;
105 stringvec envv; 163 stringvec *envv = new stringvec;
106 164
107 for (;;) 165 for (;;)
108 { 166 {
109 if (!recv (tok)) 167 if (!recv (tok))
110 return err (); 168 return err ();
111 169
112 if (!strcmp (tok, "END")) 170 if (!strcmp (tok, "END"))
113 break; 171 break;
114 else if (!strcmp (tok, "ENV") && recv (tok)) 172 else if (!strcmp (tok, "ENV") && recv (tok))
115 envv.push_back (tok.get ()); 173 envv->push_back (strdup (tok));
116 else if (!strcmp (tok, "CWD") && recv (tok)) 174 else if (!strcmp (tok, "CWD") && recv (tok))
117 { 175 {
118 if (chdir (tok)) 176 if (chdir (tok))
177 {
178 delete envv;
179 delete argv;
119 err ("unable to change to working directory to '%s': %s", 180 return err ("unable to change to working directory to '%s', aborting: %s.\n",
120 (char *)tok, strerror (errno)); 181 (char *)tok, strerror (errno));
182 }
121 } 183 }
122 else if (!strcmp (tok, "ARG") && recv (tok)) 184 else if (!strcmp (tok, "ARG") && recv (tok))
123 argv.push_back (tok.get ()); 185 argv->push_back (strdup (tok));
124 else 186 else
125 return err ("protocol error: unexpected NEW token"); 187 return err ("protocol error: unexpected NEW token.\n");
126 } 188 }
127 189
128 envv.push_back (0); 190 envv->push_back (0);
129 191
130 { 192 {
131 char **old_environ = environ; 193 rxvt_term *term = new rxvt_term;
132 environ = envv.begin ();
133 194
134 rxvt_init (argv.size (), argv.begin ()); 195 term->log_hook = &log_cb;
196 term->getfd_hook = &getfd_cb;
197
198 bool success;
199
135 //dR; 200 try
136 //rxvt_main_loop (aR); 201 {
202 success = term->init (argv, envv);
203 }
204 catch (const class rxvt_failure_exception &e)
205 {
206 success = false;
207 }
137 208
138 environ = old_environ; 209 term->log_hook = 0;
210
211 chdir ("/");
212
213 if (!success)
214 term->destroy ();
215
216 send ("END"); send (success ? 1 : 0);
139 } 217 }
140 } 218 }
141 else 219 else
142 return err ("protocol error: request '%s' unsupported.", (char *)tok); 220 return err ("protocol error: request '%s' unsupported.\n", (char *)tok);
143 } 221 }
144 else 222 else
145 return err (); 223 return err ();
146} 224}
147 225
226int opt_fork, opt_opendisplay, opt_quiet;
227
148int 228int
149main(int argc, const char *const *argv) 229main (int argc, const char *const *argv)
150{ 230{
151 listener l; 231 rxvt_init ();
152 232
233 for (int i = 1; i < argc; i++)
153 { 234 {
154 sigset_t ss; 235 if (!strcmp (argv [i], "-f") || !strcmp (argv [i], "--fork"))
155 236 opt_fork = 1;
156 sigaddset (&ss, SIGHUP); 237 else if (!strcmp (argv [i], "-o") || !strcmp (argv [i], "--opendisplay"))
157 sigprocmask (SIG_BLOCK, &ss, 0); 238 opt_opendisplay = 1;
158 } 239 else if (!strcmp (argv [i], "-q") || !strcmp (argv [i], "--quiet"))
159 240 opt_quiet = 1;
160 printf ("rxvtd running.\n"); 241 else
161 iom.loop (); 242 {
162 243 rxvt_log ("%s: unknown option '%s', aborting.\n", argv [0], argv [i]);
163#if 0
164 if (rxvt_init(argc, argv) == NULL)
165 return EXIT_FAILURE; 244 return EXIT_FAILURE;
245 }
246 }
166 247
167 dR; 248 chdir ("/");
168 rxvt_main_loop(aR); /* main processing loop */ 249
169#endif 250 if (opt_opendisplay)
251 displays.get (getenv ("DISPLAY")); // open display and never release it
252
253 char *sockname = rxvt_connection::unix_sockname ();
254 unix_listener l (sockname);
255
256 if (!opt_quiet)
257 {
258 printf ("rxvt-unicode daemon listening on %s.\n", sockname);
259 fflush (stdout);
260 }
261
262 free (sockname);
263
264 if (opt_fork)
265 {
266 pid_t pid = fork ();
267
268 if (pid < 0)
269 {
270 rxvt_log ("unable to fork daemon, aborting.\n");
271 return EXIT_FAILURE;
272 }
273 else if (pid > 0)
274 _exit (EXIT_SUCCESS);
275 }
276
277 ev::ev_loop (0);
278
170 return EXIT_SUCCESS; 279 return EXIT_SUCCESS;
171} 280}
281

Diff Legend

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