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.18 by root, Sat Dec 24 11:55:41 2005 UTC

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

Diff Legend

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