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.8 by pcg, Wed Mar 17 05:15:02 2004 UTC vs.
Revision 1.27 by root, Fri Aug 18 23:03:31 2006 UTC

1/*----------------------------------------------------------------------*
2 * File: rxvtc.C
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 *----------------------------------------------------------------------*/
22
1#include "../config.h" 23#include "../config.h"
2#include "rxvtdaemon.h"
3
4#include <cstdio> 24#include <cstdio>
5#include <cstdlib> 25#include <cstdlib>
26#include <cstring>
27#include <csignal>
6 28
7#include <unistd.h> 29#include <unistd.h>
8#include <signal.h>
9#include <sys/socket.h> 30#include <sys/socket.h>
10#include <sys/un.h> 31#include <sys/un.h>
32
33#include "rxvtdaemon.h"
34#include "libptytty.h"
35
36#include "rxvt.h"
37
38#define STATUS_SUCCESS 0
39#define STATUS_FAILURE 1
40#define STATUS_CONNECTION_FAILED 2
11 41
12struct client : rxvt_connection { 42struct client : rxvt_connection {
13 client (); 43 client ();
14}; 44};
15 45
16client::client () 46client::client ()
17{ 47{
48 sockaddr_un sa;
49 char *sockname = rxvt_connection::unix_sockname ();
50
51 if (strlen(sockname) >= sizeof(sa.sun_path))
52 {
53 fputs ("socket name too long, aborting.\n", stderr);
54 exit (STATUS_FAILURE);
55 }
56
18 if ((fd = socket (PF_LOCAL, SOCK_STREAM, 0)) < 0) 57 if ((fd = socket (AF_UNIX, SOCK_STREAM, 0)) < 0)
19 { 58 {
20 perror ("unable to create communications socket"); 59 perror ("unable to create communications socket");
21 exit (EXIT_FAILURE); 60 exit (STATUS_FAILURE);
22 } 61 }
23 62
24 char *sockname = rxvt_connection::unix_sockname ();
25 sockaddr_un sa;
26 sa.sun_family = AF_UNIX; 63 sa.sun_family = AF_UNIX;
27 strcpy (sa.sun_path, sockname); 64 strcpy (sa.sun_path, sockname);
28 free (sockname); 65 free (sockname);
29 66
30 if (connect (fd, (sockaddr *)&sa, sizeof (sa))) 67 if (connect (fd, (sockaddr *)&sa, sizeof (sa)))
31 { 68 {
32 perror ("unable to connect to rxvtd"); 69 perror ("unable to connect to the rxvt-unicode daemon");
33 exit (EXIT_FAILURE); 70 exit (STATUS_CONNECTION_FAILED);
34 } 71 }
35} 72}
36 73
37extern char **environ; 74extern char **environ;
38 75
39int 76int
40main (int argc, const char *const *argv) 77main (int argc, const char *const *argv)
41{ 78{
42 client c; 79 client c;
43 char buf[PATH_MAX];
44
45 { 80 {
46 sigset_t ss; 81 sigset_t ss;
47 82
48 sigemptyset (&ss); 83 sigemptyset (&ss);
49 sigaddset (&ss, SIGHUP); 84 sigaddset (&ss, SIGHUP);
85 sigaddset (&ss, SIGPIPE);
50 sigprocmask (SIG_BLOCK, &ss, 0); 86 sigprocmask (SIG_BLOCK, &ss, 0);
51 } 87 }
52 88
53 c.send ("NEW"); 89 c.send ("NEW");
90
54 // instead of getcwd we could opendir (".") and pass the fd for fchdir *g* 91 // instead of getcwd we could opendir (".") and pass the fd for fchdir *g*
55 c.send ("CWD"), c.send (getcwd (buf, sizeof (buf))); 92 char cwd[PATH_MAX];
56 93
57 for (char **var = environ; *environ; environ++) 94 if (!getcwd (cwd, sizeof (cwd)))
58 c.send ("ENV"), c.send (*environ); 95 {
96 perror ("unable to determine current working directory");
97 exit (STATUS_FAILURE);
98 }
59 99
100 c.send ("CWD"), c.send (cwd);
101
102 for (char **var = environ; *var; var++)
103 c.send ("ENV"), c.send (*var);
104
105 const char *base = strrchr (argv[0], '/');
106 base = base ? base + 1 : argv[0];
107 c.send ("ARG"), c.send (strcmp (base, RXVTNAME "c") ? base : RXVTNAME);
108
60 for (int i = 0; i < argc; i++) 109 for (int i = 1; i < argc; i++)
61 c.send ("ARG"), c.send (argv[i]); 110 c.send ("ARG"), c.send (argv[i]);
62 111
63 c.send ("END"); 112 c.send ("END");
64 113
65 auto_str tok; 114 auto_str tok;
115 int cint;
66 116
67 for (;;) 117 for (;;)
68 if (!c.recv (tok)) 118 if (!c.recv (tok))
69 { 119 {
70 fprintf (stderr, "protocol error: unexpected eof from server.\n"); 120 fprintf (stderr, "protocol error: unexpected eof from server.\n");
71 break; 121 break;
72 } 122 }
73 else if (!strcmp (tok, "MSG") && c.recv (tok)) 123 else if (!strcmp (tok, "MSG") && c.recv (tok))
74 fprintf (stderr, "%s", (const char *)tok); 124 fprintf (stderr, "%s", (const char *)tok);
125 else if (!strcmp (tok, "GETFD") && c.recv (cint))
126 {
127 if (!ptytty::send_fd (c.fd, cint))
128 {
129 fprintf (stderr, "unable to send fd %d: ", cint); perror (0);
130 exit (STATUS_FAILURE);
131 }
132 }
75 else if (!strcmp (tok, "END")) 133 else if (!strcmp (tok, "END"))
76 { 134 {
77 int success; 135 int success;
136
78 if (c.recv (success)) 137 if (c.recv (success))
79 exit (success ? EXIT_SUCCESS : EXIT_FAILURE); 138 exit (success ? STATUS_SUCCESS : STATUS_FAILURE);
80 } 139 }
81 else 140 else
82 { 141 {
83 fprintf (stderr, "protocol error: received illegal token '%s'.\n", (const char *)tok); 142 fprintf (stderr, "protocol error: received unsupported token '%s'.\n", (const char *)tok);
84 break; 143 break;
85 } 144 }
86 145
87 return EXIT_FAILURE; 146 return STATUS_FAILURE;
88} 147}
89 148

Diff Legend

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