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.11 by pcg, Thu Apr 8 20:31:45 2004 UTC vs.
Revision 1.30 by root, Sun Nov 18 00:21:34 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: rxvtc.C 2 * File: rxvtc.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 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 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 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
19 * along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 *----------------------------------------------------------------------*/ 21 *----------------------------------------------------------------------*/
22 22
23#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
24#include "rxvtdaemon.h" 33#include "rxvtdaemon.h"
34#include "libptytty.h"
25 35
26#include "rxvt.h" 36#include "rxvt.h"
27 37
28#include <cstdio> 38#define STATUS_SUCCESS 0
29#include <cstdlib> 39#define STATUS_FAILURE 1
40#define STATUS_CONNECTION_FAILED 2
30 41
31#include <unistd.h>
32#include <signal.h>
33#include <sys/socket.h>
34#include <sys/un.h>
35
36struct client : rxvt_connection { 42struct client : rxvt_connection
43{
37 client (); 44 client ();
38}; 45};
39 46
40client::client () 47client::client ()
41{ 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
42 if ((fd = socket (PF_UNIX, SOCK_STREAM, 0)) < 0) 58 if ((fd = socket (AF_UNIX, SOCK_STREAM, 0)) < 0)
43 { 59 {
44 perror ("unable to create communications socket"); 60 perror ("unable to create communications socket");
45 exit (EXIT_FAILURE); 61 exit (STATUS_FAILURE);
46 } 62 }
47 63
48 char *sockname = rxvt_connection::unix_sockname ();
49 sockaddr_un sa;
50 sa.sun_family = AF_UNIX; 64 sa.sun_family = AF_UNIX;
51 strcpy (sa.sun_path, sockname); 65 strcpy (sa.sun_path, sockname);
52 free (sockname); 66 free (sockname);
53 67
54 if (connect (fd, (sockaddr *)&sa, sizeof (sa))) 68 if (connect (fd, (sockaddr *)&sa, sizeof (sa)))
55 { 69 {
56 perror ("unable to connect to rxvtd"); 70 perror ("unable to connect to the rxvt-unicode daemon");
57 exit (EXIT_FAILURE); 71 exit (STATUS_CONNECTION_FAILED);
58 } 72 }
59} 73}
60 74
61extern char **environ; 75extern char **environ;
62 76
63int 77int
64main (int argc, const char *const *argv) 78main (int argc, const char *const *argv)
65{ 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
66 client c; 89 client c;
67 char buf[PATH_MAX];
68 90
69 { 91 {
70 sigset_t ss; 92 sigset_t ss;
71 93
72 sigemptyset (&ss); 94 sigemptyset (&ss);
73 sigaddset (&ss, SIGHUP); 95 sigaddset (&ss, SIGHUP);
96 sigaddset (&ss, SIGPIPE);
74 sigprocmask (SIG_BLOCK, &ss, 0); 97 sigprocmask (SIG_BLOCK, &ss, 0);
75 } 98 }
76 99
77 c.send ("NEW"); 100 c.send ("NEW");
78 // instead of getcwd we could opendir (".") and pass the fd for fchdir *g* 101 c.send ("CWD"), c.send (cwd);
79 c.send ("CWD"), c.send (getcwd (buf, sizeof (buf)));
80 102
81 for (char **var = environ; *environ; environ++) 103 for (char **var = environ; *var; var++)
82 c.send ("ENV"), c.send (*environ); 104 c.send ("ENV"), c.send (*var);
83 105
106 const char *base = strrchr (argv[0], '/');
107 base = base ? base + 1 : argv[0];
108 c.send ("ARG"), c.send (strcmp (base, RXVTNAME "c") ? base : RXVTNAME);
109
84 for (int i = 0; i < argc; i++) 110 for (int i = 1; i < argc; i++)
85 c.send ("ARG"), c.send (argv[i]); 111 c.send ("ARG"), c.send (argv[i]);
86 112
87 c.send ("END"); 113 c.send ("END");
88 114
89 auto_str tok; 115 auto_str tok;
116 int cint;
90 117
91 for (;;) 118 for (;;)
92 if (!c.recv (tok)) 119 if (!c.recv (tok))
93 { 120 {
94 fprintf (stderr, "protocol error: unexpected eof from server.\n"); 121 fprintf (stderr, "protocol error: unexpected eof from server.\n");
95 break; 122 break;
96 } 123 }
97 else if (!strcmp (tok, "MSG") && c.recv (tok)) 124 else if (!strcmp (tok, "MSG") && c.recv (tok))
98 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 }
99 else if (!strcmp (tok, "END")) 134 else if (!strcmp (tok, "END"))
100 { 135 {
101 int success; 136 int success;
137
102 if (c.recv (success)) 138 if (c.recv (success))
103 exit (success ? EXIT_SUCCESS : EXIT_FAILURE); 139 exit (success ? STATUS_SUCCESS : STATUS_FAILURE);
104 } 140 }
105 else 141 else
106 { 142 {
107 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);
108 break; 144 break;
109 } 145 }
110 146
111 return EXIT_FAILURE; 147 return STATUS_FAILURE;
112} 148}
113 149

Diff Legend

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