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.9 by pcg, Fri Feb 13 13:28:17 2004 UTC vs.
Revision 1.18 by root, Thu Sep 2 07:44:40 2004 UTC

1/*--------------------------------*-C-*---------------------------------*
2 * File: rxvtd.C
3 *----------------------------------------------------------------------*
4 *
5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2003-2004 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 *----------------------------------------------------------------------*/
22
1#include "../config.h" 23#include "../config.h"
2#include "rxvt.h" 24#include "rxvt.h"
3#include "rxvtdaemon.h" 25#include "rxvtdaemon.h"
4#include "iom.h" 26#include "iom.h"
5 27
… …
7#include <cstdlib> 29#include <cstdlib>
8#include <cstdarg> 30#include <cstdarg>
9#include <cstring> 31#include <cstring>
10 32
11#include <unistd.h> 33#include <unistd.h>
34#include <fcntl.h>
12#include <sys/types.h> 35#include <sys/types.h>
13#include <sys/stat.h> 36#include <sys/stat.h>
14#include <sys/socket.h> 37#include <sys/socket.h>
15#include <sys/un.h> 38#include <sys/un.h>
16 39
17#include <cerrno> 40#include <cerrno>
18 41
19extern char **environ; 42extern char **environ;
20 43
21struct server : rxvt_connection { 44struct server : rxvt_connection {
45 log_callback log_cb;
46
22 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);
23 49
24 server (int fd) 50 server (int fd)
25 : read_ev (this, &server::read_cb) 51 : read_ev (this, &server::read_cb),
52 log_cb (this, &server::log_msg)
26 { 53 {
27 this->fd = fd; 54 this->fd = fd;
28 read_ev.start (fd, EVENT_READ); 55 read_ev.start (fd, EVENT_READ);
29 } 56 }
30 57
… …
40}; 67};
41 68
42unix_listener::unix_listener (const char *sockname) 69unix_listener::unix_listener (const char *sockname)
43: accept_ev (this, &unix_listener::accept_cb) 70: accept_ev (this, &unix_listener::accept_cb)
44{ 71{
45 if ((fd = socket (PF_LOCAL, SOCK_STREAM, 0)) < 0) 72 if ((fd = socket (PF_UNIX, SOCK_STREAM, 0)) < 0)
46 { 73 {
47 perror ("unable to create listening socket"); 74 perror ("unable to create listening socket");
48 exit (EXIT_FAILURE); 75 exit (EXIT_FAILURE);
49 } 76 }
50 77
78 fcntl (fd, F_SETFD, FD_CLOEXEC);
79
51 sockaddr_un sa; 80 sockaddr_un sa;
52 81
53 sa.sun_family = AF_UNIX; 82 sa.sun_family = AF_UNIX;
54 strcpy (sa.sun_path, sockname); 83 strcpy (sa.sun_path, sockname);
55 84
… …
77void unix_listener::accept_cb (io_watcher &w, short revents) 106void unix_listener::accept_cb (io_watcher &w, short revents)
78{ 107{
79 int fd2 = accept (fd, 0, 0); 108 int fd2 = accept (fd, 0, 0);
80 109
81 if (fd2 >= 0) 110 if (fd2 >= 0)
111 {
112 fcntl (fd2, F_SETFD, FD_CLOEXEC);
82 new server (fd2); 113 new server (fd2);
114 }
115}
116
117void server::log_msg (const char *msg)
118{
119 send ("MSG"), send (msg);
83} 120}
84 121
85void server::err (const char *format, ...) 122void server::err (const char *format, ...)
86{ 123{
87 if (format) 124 if (format)
… …
91 va_list ap; 128 va_list ap;
92 va_start (ap, format); 129 va_start (ap, format);
93 vsnprintf (err, 1024, format, ap); 130 vsnprintf (err, 1024, format, ap);
94 va_end (ap); 131 va_end (ap);
95 132
96 send ("ERR"), send (err); 133 send ("MSG"), send (err);
97 } 134 }
98 135
136 send ("END", 0);
99 close (fd); 137 close (fd);
100 delete this; 138 delete this;
101} 139}
102 140
103void server::read_cb (io_watcher &w, short revents) 141void server::read_cb (io_watcher &w, short revents)
… …
136 174
137 { 175 {
138 char **old_environ = environ; 176 char **old_environ = environ;
139 environ = envv->begin (); 177 environ = envv->begin ();
140 178
141 rxvt_term *term = rxvt_init (argv->size (), argv->begin ()); 179 rxvt_term *term = new rxvt_term;
142 180
181 term->log_hook = &log_cb;
143 term->argv = argv; 182 term->argv = argv;
144 term->envv = envv; 183 term->envv = envv;
145 184
185 bool success;
186
187 try
188 {
189 success = term->init (argv->size (), argv->begin ());
190 }
191 catch (const class rxvt_failure_exception &e)
192 {
193 success = false;
194 }
195
196 term->log_hook = 0;
197
146 environ = old_environ; 198 environ = old_environ;
199
200 if (!success)
201 term->destroy ();
202
203 send ("END"); send (success ? 1 : 0);
147 } 204 }
148 } 205 }
149 else 206 else
150 return err ("protocol error: request '%s' unsupported.", (char *)tok); 207 return err ("protocol error: request '%s' unsupported.", (char *)tok);
151 } 208 }
… …
154} 211}
155 212
156int 213int
157main (int argc, const char *const *argv) 214main (int argc, const char *const *argv)
158{ 215{
159 rxvt_init_signals (); 216 rxvt_init ();
160 217
161 char *sockname = rxvt_connection::unix_sockname (); 218 char *sockname = rxvt_connection::unix_sockname ();
162 unix_listener l (sockname); 219 unix_listener l (sockname);
163 printf ("rxvtd listening on %s.\n", sockname); 220 printf ("rxvt-unicode daemon listening on %s.\n", sockname);
164 free (sockname); 221 free (sockname);
165 222
166 iom.loop (); 223 io_manager::loop ();
167 224
168#if 0
169 if (rxvt_init (argc, argv) == NULL)
170 return EXIT_FAILURE;
171
172 dR;
173 rxvt_main_loop (aR); /* main processing loop */
174#endif
175 return EXIT_SUCCESS; 225 return EXIT_SUCCESS;
176} 226}
177 227

Diff Legend

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