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.2 by pcg, Mon Nov 24 19:52:16 2003 UTC vs.
Revision 1.30 by root, Wed Aug 9 22:01:07 2006 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>
26#include <cstdarg>
27#include <cstring>
7 28
8#include <unistd.h> 29#include <unistd.h>
30#include <fcntl.h>
31#include <sys/types.h>
32#include <sys/stat.h>
9#include <sys/socket.h> 33#include <sys/socket.h>
10#include <sys/un.h> 34#include <sys/un.h>
11 35
36#include <cerrno>
37
38#include "rxvt.h"
39#include "rxvtdaemon.h"
40#include "libptytty.h"
41#include "iom.h"
42
12struct server : rxvt_connection { 43struct server : rxvt_connection {
44 log_callback log_cb;
45 getfd_callback getfd_cb;
46
13 void read_cb (io_watcher &w, short revents); io_watcher read_ev; 47 void read_cb (io_watcher &w, short revents); io_watcher read_ev;
48 void log_msg (const char *msg);
49 int getfd (int remote_fd);
14 50
15 server (int fd) 51 server (int fd)
16 : read_ev (this, &server::read_cb) 52 : read_ev (this, &server::read_cb),
53 log_cb (this, &server::log_msg),
54 getfd_cb (this, &server::getfd)
17 { 55 {
18 this->fd = fd; 56 this->fd = fd;
19 read_ev.start (fd, EVENT_READ); 57 read_ev.start (fd, EVENT_READ);
20 } 58 }
21 59
22 void err (); 60 void err (const char *format = 0, ...);
23}; 61};
24 62
25struct listener { 63struct unix_listener {
26 int fd; 64 int fd;
27 65
28 void accept_cb (io_watcher &w, short revents); io_watcher accept_ev; 66 void accept_cb (io_watcher &w, short revents); io_watcher accept_ev;
29 67
30 listener (); 68 unix_listener (const char *sockname);
31}; 69};
32 70
33listener::listener () 71unix_listener::unix_listener (const char *sockname)
34: accept_ev (this, &listener::accept_cb) 72: accept_ev (this, &unix_listener::accept_cb)
35{ 73{
74 sockaddr_un sa;
75
76 if (strlen(sockname) >= sizeof(sa.sun_path))
77 rxvt_fatal ("socket name too long, aborting.\n");
78
36 if ((fd = socket (PF_LOCAL, SOCK_STREAM, 0)) < 0) 79 if ((fd = socket (AF_UNIX, SOCK_STREAM, 0)) < 0)
37 { 80 {
38 perror ("unable to create listening socket"); 81 perror ("unable to create listening socket");
39 exit (EXIT_FAILURE); 82 exit (EXIT_FAILURE);
40 } 83 }
41 84
42 sockaddr_un sa; 85 fcntl (fd, F_SETFD, FD_CLOEXEC);
43 86
44 sa.sun_family = AF_UNIX; 87 sa.sun_family = AF_UNIX;
45 strcpy (sa.sun_path, rxvt_connection::unix_sockname ()); 88 strcpy (sa.sun_path, sockname);
46 89
47 unlink (rxvt_connection::unix_sockname ()); 90 unlink (rxvt_connection::unix_sockname ());
91
92 mode_t omask = umask (0077);
48 93
49 if (bind (fd, (sockaddr *)&sa, sizeof (sa))) 94 if (bind (fd, (sockaddr *)&sa, sizeof (sa)))
50 { 95 {
51 perror ("unable to bind listening socket"); 96 perror ("unable to bind listening socket");
52 exit (EXIT_FAILURE); 97 exit (EXIT_FAILURE);
53 } 98 }
54 99
100 umask (omask);
101
55 if (listen (fd, 5)) 102 if (listen (fd, 5))
56 { 103 {
57 perror ("unable to listen on socket"); 104 perror ("unable to listen on socket");
58 exit (EXIT_FAILURE); 105 exit (EXIT_FAILURE);
59 } 106 }
60 107
61 accept_ev.start (fd, EVENT_READ); 108 accept_ev.start (fd, EVENT_READ);
62} 109}
63 110
64void listener::accept_cb (io_watcher &w, short revents) 111void unix_listener::accept_cb (io_watcher &w, short revents)
65{ 112{
66 int fd2 = accept (fd, 0, 0); 113 int fd2 = accept (fd, 0, 0);
67 114
68 if (fd2 >= 0) 115 if (fd2 >= 0)
116 {
117 fcntl (fd2, F_SETFD, FD_CLOEXEC);
69 new server (fd2); 118 new server (fd2);
119 }
70} 120}
71 121
72void server::err () 122int server::getfd (int remote_fd)
73{ 123{
124 send ("GETFD");
125 send (remote_fd);
126 return ptytty::recv_fd (fd);
127}
128
129void server::log_msg (const char *msg)
130{
131 send ("MSG"), send (msg);
132}
133
134void server::err (const char *format, ...)
135{
136 if (format)
137 {
138 char err[1024];
139
140 va_list ap;
141 va_start (ap, format);
142 vsnprintf (err, 1024, format, ap);
143 va_end (ap);
144
145 send ("MSG"), send (err);
146 }
147
148 send ("END", 0);
74 close (fd); 149 close (fd);
75 delete this; 150 delete this;
76} 151}
77 152
78void server::read_cb (io_watcher &w, short revents) 153void server::read_cb (io_watcher &w, short revents)
… …
81 156
82 if (recv (tok)) 157 if (recv (tok))
83 { 158 {
84 if (!strcmp (tok, "NEW")) 159 if (!strcmp (tok, "NEW"))
85 { 160 {
86 auto_str display, cwd; 161 stringvec *argv = new stringvec;
87 simplevec<auto_str> argv; 162 stringvec *envv = new stringvec;
88 163
89 for (;;) 164 for (;;)
90 { 165 {
91 if (!recv (tok)) 166 if (!recv (tok))
92 return err (); 167 return err ();
93 168
94 if (!strcmp (tok, "END")) 169 if (!strcmp (tok, "END"))
95 break; 170 break;
96 else if (!strcmp (tok, "DISPLAY") && recv (display)) 171 else if (!strcmp (tok, "ENV") && recv (tok))
97 ; 172 envv->push_back (strdup (tok));
98 else if (!strcmp (tok, "CWD") && recv (cwd)) 173 else if (!strcmp (tok, "CWD") && recv (tok))
99 ; 174 {
175 if (chdir (tok))
176 err ("unable to change to working directory to '%s': %s",
177 (char *)tok, strerror (errno));
178 }
100 else if (!strcmp (tok, "ARG") && recv (tok)) 179 else if (!strcmp (tok, "ARG") && recv (tok))
101 argv.push_back (tok); 180 argv->push_back (strdup (tok));
102 else 181 else
103 return err (); 182 return err ("protocol error: unexpected NEW token");
104 } 183 }
105 184
106 // TODO: no setenv, please 185 envv->push_back (0);
107 setenv ("DISPLAY", display.get (), 1);
108 186
109 rxvt_init (argv.size (), reinterpret_cast<char **>(argv.begin ()));
110 dR; 187 {
111 rxvt_main_loop (aR); 188 rxvt_term *term = new rxvt_term;
189
190 term->log_hook = &log_cb;
191 term->getfd_hook = &getfd_cb;
192
193 bool success;
194
195 try
196 {
197 success = term->init (argv, envv);
198 }
199 catch (const class rxvt_failure_exception &e)
200 {
201 success = false;
202 }
203
204 term->log_hook = 0;
205
206 chdir ("/");
207
208 if (!success)
209 term->destroy ();
210
211 send ("END"); send (success ? 1 : 0);
212 }
112 } 213 }
113 else 214 else
114 return err (); 215 return err ("protocol error: request '%s' unsupported.", (char *)tok);
115 } 216 }
116 else 217 else
117 return err (); 218 return err ();
118} 219}
119 220
221int opt_fork, opt_opendisplay, opt_quiet;
222
120int 223int
121main(int argc, const char *const *argv) 224main (int argc, const char *const *argv)
122{ 225{
123 listener l; 226 rxvt_init ();
124 iom.loop ();
125 227
126#if 0 228 for (int i = 1; i < argc; i++)
127 if (rxvt_init(argc, argv) == NULL) 229 {
230 if (!strcmp (argv [i], "-f") || !strcmp (argv [i], "--fork"))
231 opt_fork = 1;
232 else if (!strcmp (argv [i], "-o") || !strcmp (argv [i], "--opendisplay"))
233 opt_opendisplay = 1;
234 else if (!strcmp (argv [i], "-q") || !strcmp (argv [i], "--quiet"))
235 opt_quiet = 1;
236 else
237 {
238 rxvt_log ("%s: unknown option '%s', aborting.\n", argv [0], argv [i]);
128 return EXIT_FAILURE; 239 return EXIT_FAILURE;
240 }
241 }
242
243 chdir ("/");
129 244
130 dR; 245 if (opt_opendisplay)
131 rxvt_main_loop(aR); /* main processing loop */ 246 displays.get (getenv ("DISPLAY")); // open display and never release it
132#endif 247
248 char *sockname = rxvt_connection::unix_sockname ();
249 unix_listener l (sockname);
250
251 if (!opt_quiet)
252 {
253 printf ("rxvt-unicode daemon listening on %s.\n", sockname);
254 fflush (stdout);
255 }
256
257 free (sockname);
258
259 if (opt_fork)
260 {
261 pid_t pid = fork ();
262
263 if (pid < 0)
264 {
265 rxvt_log ("unable to fork daemon, aborting.\n");
266 return EXIT_FAILURE;
267 }
268 else if (pid > 0)
269 _exit (EXIT_SUCCESS);
270 }
271
272 io_manager::loop ();
273
133 return EXIT_SUCCESS; 274 return EXIT_SUCCESS;
134} 275}
276

Diff Legend

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