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.23 by root, Wed Feb 1 18:07:18 2006 UTC vs.
Revision 1.36 by root, Thu May 22 18:54:33 2014 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 <schmorp@schmorp.de>
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 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
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 <cstdio> 24#include <stdio.h>
25#include <cstdlib> 25#include <stdlib.h>
26#include <cstring> 26#include <string.h>
27#include <csignal> 27#include <signal.h>
28 28
29#include <unistd.h> 29#include <unistd.h>
30#include <sys/socket.h> 30#include <sys/socket.h>
31#include <sys/un.h> 31#include <sys/un.h>
32 32
33#include "rxvtdaemon.h" 33#include "rxvtdaemon.h"
34#include "libptytty.h" 34#include "libptytty.h"
35 35
36#include "rxvt.h"
37
38#define STATUS_SUCCESS 0 36#define STATUS_SUCCESS 0
39#define STATUS_FAILURE 1 37#define STATUS_FAILURE 1
40#define STATUS_CONNECTION_FAILED 2 38#define STATUS_CONNECTION_FAILED 2
41 39
42struct client : rxvt_connection { 40struct client : rxvt_connection
41{
43 client (); 42 client ();
44}; 43};
45 44
46client::client () 45client::client ()
47{ 46{
47 sockaddr_un sa;
48 char *sockname = rxvt_connection::unix_sockname ();
49
50 if (strlen (sockname) >= sizeof (sa.sun_path))
51 {
52 fputs ("socket name too long, aborting.\n", stderr);
53 exit (STATUS_FAILURE);
54 }
55
48 if ((fd = socket (AF_UNIX, SOCK_STREAM, 0)) < 0) 56 if ((fd = socket (AF_UNIX, SOCK_STREAM, 0)) < 0)
49 { 57 {
50 perror ("unable to create communications socket"); 58 perror ("unable to create communications socket");
51 exit (STATUS_FAILURE); 59 exit (STATUS_FAILURE);
52 } 60 }
53 61
54 char *sockname = rxvt_connection::unix_sockname ();
55 sockaddr_un sa;
56 sa.sun_family = AF_UNIX; 62 sa.sun_family = AF_UNIX;
57 strcpy (sa.sun_path, sockname); 63 strcpy (sa.sun_path, sockname);
58 free (sockname); 64 free (sockname);
59 65
60 if (connect (fd, (sockaddr *)&sa, sizeof (sa))) 66 if (connect (fd, (sockaddr *)&sa, sizeof (sa)))
… …
67extern char **environ; 73extern char **environ;
68 74
69int 75int
70main (int argc, const char *const *argv) 76main (int argc, const char *const *argv)
71{ 77{
72 client c;
73 {
74 sigset_t ss;
75
76 sigemptyset (&ss);
77 sigaddset (&ss, SIGHUP);
78 sigprocmask (SIG_BLOCK, &ss, 0);
79 }
80
81 c.send ("NEW");
82
83 // instead of getcwd we could opendir (".") and pass the fd for fchdir *g* 78 // instead of getcwd we could opendir (".") and pass the fd for fchdir *g*
84 char cwd[PATH_MAX]; 79 char cwd[PATH_MAX];
85 80
86 if (!getcwd (cwd, sizeof (cwd))) 81 if (!getcwd (cwd, sizeof (cwd)))
87 { 82 {
88 perror ("unable to determine current working directory"); 83 perror ("unable to determine current working directory");
89 exit (STATUS_FAILURE); 84 exit (STATUS_FAILURE);
90 } 85 }
91 86
92 c.send ("CWD"), c.send (cwd); 87 client c;
88
89 {
90 sigset_t ss;
91
92 sigemptyset (&ss);
93 sigaddset (&ss, SIGHUP);
94 sigaddset (&ss, SIGPIPE);
95 sigprocmask (SIG_BLOCK, &ss, 0);
96 }
97
98 c.send ("NEW");
93 99
94 for (char **var = environ; *var; var++) 100 for (char **var = environ; *var; var++)
95 c.send ("ENV"), c.send (*var); 101 c.send ("ENV"), c.send (*var);
96 102
97 const char *base = strrchr (argv[0], '/'); 103 const char *base = strrchr (argv[0], '/');
98 base = base ? base + 1 : argv[0]; 104 base = base ? base + 1 : argv[0];
99 c.send ("ARG"), c.send (strcmp (base, RXVTNAME "c") ? base : RXVTNAME); 105 c.send ("ARG"), c.send (strcmp (base, RXVTNAME "c") ? base : RXVTNAME);
106
107 c.send ("ARG"), c.send ("-cd");
108 c.send ("ARG"), c.send (cwd);
100 109
101 for (int i = 1; i < argc; i++) 110 for (int i = 1; i < argc; i++)
102 c.send ("ARG"), c.send (argv[i]); 111 c.send ("ARG"), c.send (argv[i]);
103 112
104 c.send ("END"); 113 c.send ("END");

Diff Legend

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