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.12 by pcg, Sun Apr 4 23:52:37 2004 UTC vs.
Revision 1.21 by root, Thu Jul 7 19:37:47 2005 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
45}; 67};
46 68
47unix_listener::unix_listener (const char *sockname) 69unix_listener::unix_listener (const char *sockname)
48: accept_ev (this, &unix_listener::accept_cb) 70: accept_ev (this, &unix_listener::accept_cb)
49{ 71{
50 if ((fd = socket (PF_LOCAL, SOCK_STREAM, 0)) < 0) 72 if ((fd = socket (PF_UNIX, SOCK_STREAM, 0)) < 0)
51 { 73 {
52 perror ("unable to create listening socket"); 74 perror ("unable to create listening socket");
53 exit (EXIT_FAILURE); 75 exit (EXIT_FAILURE);
54 } 76 }
55 77
169 catch (const class rxvt_failure_exception &e) 191 catch (const class rxvt_failure_exception &e)
170 { 192 {
171 success = false; 193 success = false;
172 } 194 }
173 195
196 term->log_hook = 0;
197
174 environ = old_environ; 198 environ = old_environ;
199 chdir ("/");
175 200
176 if (!success) 201 if (!success)
177 term->destroy (); 202 term->destroy ();
178 203
179 send ("END"); send (success ? 1 : 0); 204 send ("END"); send (success ? 1 : 0);
184 } 209 }
185 else 210 else
186 return err (); 211 return err ();
187} 212}
188 213
214int opt_fork, opt_opendisplay, opt_quiet;
215
189int 216int
190main (int argc, const char *const *argv) 217main (int argc, const char *const *argv)
191{ 218{
219 for (int i = 1; i < argc; i++)
220 {
221 if (!strcmp (argv [i], "-f") || !strcmp (argv [i], "--fork"))
222 opt_fork = 1;
223 else if (!strcmp (argv [i], "-o") || !strcmp (argv [i], "--opendisplay"))
224 opt_opendisplay = 1;
225 else if (!strcmp (argv [i], "-q") || !strcmp (argv [i], "--quiet"))
226 opt_quiet = 1;
227 else
228 {
229 rxvt_log ("%s: unknown option '%s', aborting.\n", argv [0], argv [i]);
230 return EXIT_FAILURE;
231 }
232 }
233
192 rxvt_init_signals (); 234 rxvt_init ();
235
236 chdir ("/");
237
238 if (opt_opendisplay)
239 displays.get (getenv ("DISPLAY")); // open display and never release it
193 240
194 char *sockname = rxvt_connection::unix_sockname (); 241 char *sockname = rxvt_connection::unix_sockname ();
195 unix_listener l (sockname); 242 unix_listener l (sockname);
243
244 if (!opt_quiet)
245 {
196 printf ("rxvtd listening on %s.\n", sockname); 246 printf ("rxvt-unicode daemon listening on %s.\n", sockname);
247 fflush (stdout);
248 }
249
197 free (sockname); 250 free (sockname);
198 251
199 iom.loop (); 252 if (opt_fork)
253 {
254 pid_t pid = fork ();
200 255
201#if 0 256 if (pid < 0)
202 if (rxvt_init (argc, argv) == NULL) 257 {
258 rxvt_log ("unable to fork daemon, aborting.\n");
203 return EXIT_FAILURE; 259 return EXIT_FAILURE;
260 }
261 else if (pid > 0)
262 _exit (EXIT_SUCCESS);
263 }
204 264
205 dR; 265 io_manager::loop ();
206 rxvt_main_loop (aR); /* main processing loop */ 266
207#endif
208 return EXIT_SUCCESS; 267 return EXIT_SUCCESS;
209} 268}
210 269

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines