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

Diff Legend

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