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

Diff Legend

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