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

Diff Legend

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