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.16 by root, Mon Nov 28 19:35:04 2005 UTC vs.
Revision 1.32 by root, Sun Jun 15 13:54:15 2008 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 "rxvtdaemon.h"
25
26#include "rxvt.h"
27
28#include <cstdio> 24#include <cstdio>
29#include <cstdlib> 25#include <cstdlib>
30#include <cstring> 26#include <cstring>
31#include <csignal> 27#include <csignal>
32 28
33#include <unistd.h> 29#include <unistd.h>
34#include <sys/socket.h> 30#include <sys/socket.h>
35#include <sys/un.h> 31#include <sys/un.h>
36 32
33#include "rxvtdaemon.h"
34#include "libptytty.h"
35
36#include "rxvt.h"
37
38#define STATUS_SUCCESS 0
39#define STATUS_FAILURE 1
40#define STATUS_CONNECTION_FAILED 2
41
37struct client : rxvt_connection { 42struct client : rxvt_connection
43{
38 client (); 44 client ();
39}; 45};
40 46
41client::client () 47client::client ()
42{ 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
43 if ((fd = socket (PF_UNIX, SOCK_STREAM, 0)) < 0) 58 if ((fd = socket (AF_UNIX, SOCK_STREAM, 0)) < 0)
44 { 59 {
45 perror ("unable to create communications socket"); 60 perror ("unable to create communications socket");
46 exit (EXIT_FAILURE); 61 exit (STATUS_FAILURE);
47 } 62 }
48 63
49 char *sockname = rxvt_connection::unix_sockname ();
50 sockaddr_un sa;
51 sa.sun_family = AF_UNIX; 64 sa.sun_family = AF_UNIX;
52 strcpy (sa.sun_path, sockname); 65 strcpy (sa.sun_path, sockname);
53 free (sockname); 66 free (sockname);
54 67
55 if (connect (fd, (sockaddr *)&sa, sizeof (sa))) 68 if (connect (fd, (sockaddr *)&sa, sizeof (sa)))
56 { 69 {
57 perror ("unable to connect to the rxvt-unicode daemon"); 70 perror ("unable to connect to the rxvt-unicode daemon");
58 exit (EXIT_FAILURE); 71 exit (STATUS_CONNECTION_FAILED);
59 } 72 }
60} 73}
61 74
62extern char **environ; 75extern char **environ;
63 76
64int 77int
65main (int argc, const char *const *argv) 78main (int argc, const char *const *argv)
66{ 79{
67 client c;
68 {
69 sigset_t ss;
70
71 sigemptyset (&ss);
72 sigaddset (&ss, SIGHUP);
73 sigprocmask (SIG_BLOCK, &ss, 0);
74 }
75
76 c.send ("NEW");
77
78 // instead of getcwd we could opendir (".") and pass the fd for fchdir *g* 80 // instead of getcwd we could opendir (".") and pass the fd for fchdir *g*
79 char cwd[PATH_MAX]; 81 char cwd[PATH_MAX];
80 82
81 if (!getcwd (cwd, sizeof (cwd))) 83 if (!getcwd (cwd, sizeof (cwd)))
82 { 84 {
83 perror ("unable to determine current working directory"); 85 perror ("unable to determine current working directory");
84 exit (EXIT_FAILURE); 86 exit (STATUS_FAILURE);
85 } 87 }
86 88
87 c.send ("CWD"), c.send (cwd); 89 client c;
90
91 {
92 sigset_t ss;
93
94 sigemptyset (&ss);
95 sigaddset (&ss, SIGHUP);
96 sigaddset (&ss, SIGPIPE);
97 sigprocmask (SIG_BLOCK, &ss, 0);
98 }
99
100 c.send ("NEW");
88 101
89 for (char **var = environ; *var; var++) 102 for (char **var = environ; *var; var++)
90 c.send ("ENV"), c.send (*var); 103 c.send ("ENV"), c.send (*var);
91 104
92 const char *base = strrchr (argv[0], '/'); 105 const char *base = strrchr (argv[0], '/');
93 base = base ? base + 1 : argv[0]; 106 base = base ? base + 1 : argv[0];
94 c.send ("ARG"), c.send (strcmp (base, RXVTNAME "c") ? base : RXVTNAME); 107 c.send ("ARG"), c.send (strcmp (base, RXVTNAME "c") ? base : RXVTNAME);
95 108
109 c.send ("ARG"), c.send ("-cd");
110 c.send ("ARG"), c.send (cwd);
111
96 for (int i = 1; i < argc; i++) 112 for (int i = 1; i < argc; i++)
97 c.send ("ARG"), c.send (argv[i]); 113 c.send ("ARG"), c.send (argv[i]);
98 114
99 c.send ("END"); 115 c.send ("END");
100 116
101 auto_str tok; 117 auto_str tok;
118 int cint;
102 119
103 for (;;) 120 for (;;)
104 if (!c.recv (tok)) 121 if (!c.recv (tok))
105 { 122 {
106 fprintf (stderr, "protocol error: unexpected eof from server.\n"); 123 fprintf (stderr, "protocol error: unexpected eof from server.\n");
107 break; 124 break;
108 } 125 }
109 else if (!strcmp (tok, "MSG") && c.recv (tok)) 126 else if (!strcmp (tok, "MSG") && c.recv (tok))
110 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 }
111 else if (!strcmp (tok, "END")) 136 else if (!strcmp (tok, "END"))
112 { 137 {
113 int success; 138 int success;
139
114 if (c.recv (success)) 140 if (c.recv (success))
115 exit (success ? EXIT_SUCCESS : EXIT_FAILURE); 141 exit (success ? STATUS_SUCCESS : STATUS_FAILURE);
116 } 142 }
117 else 143 else
118 { 144 {
119 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);
120 break; 146 break;
121 } 147 }
122 148
123 return EXIT_FAILURE; 149 return STATUS_FAILURE;
124} 150}
125 151

Diff Legend

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