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.15 by root, Mon Feb 14 20:46:47 2005 UTC vs.
Revision 1.36 by root, Thu May 22 18:54:33 2014 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 <schmorp@schmorp.de>
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 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
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 <stdio.h>
29#include <cstdlib> 25#include <stdlib.h>
30#include <cstring> 26#include <string.h>
31#include <csignal> 27#include <signal.h>
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#define STATUS_SUCCESS 0
37#define STATUS_FAILURE 1
38#define STATUS_CONNECTION_FAILED 2
39
37struct client : rxvt_connection { 40struct client : rxvt_connection
41{
38 client (); 42 client ();
39}; 43};
40 44
41client::client () 45client::client ()
42{ 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
43 if ((fd = socket (PF_UNIX, SOCK_STREAM, 0)) < 0) 56 if ((fd = socket (AF_UNIX, SOCK_STREAM, 0)) < 0)
44 { 57 {
45 perror ("unable to create communications socket"); 58 perror ("unable to create communications socket");
46 exit (EXIT_FAILURE); 59 exit (STATUS_FAILURE);
47 } 60 }
48 61
49 char *sockname = rxvt_connection::unix_sockname ();
50 sockaddr_un sa;
51 sa.sun_family = AF_UNIX; 62 sa.sun_family = AF_UNIX;
52 strcpy (sa.sun_path, sockname); 63 strcpy (sa.sun_path, sockname);
53 free (sockname); 64 free (sockname);
54 65
55 if (connect (fd, (sockaddr *)&sa, sizeof (sa))) 66 if (connect (fd, (sockaddr *)&sa, sizeof (sa)))
56 { 67 {
57 perror ("unable to connect to the rxvt-unicode daemon"); 68 perror ("unable to connect to the rxvt-unicode daemon");
58 exit (EXIT_FAILURE); 69 exit (STATUS_CONNECTION_FAILED);
59 } 70 }
60} 71}
61 72
62extern char **environ; 73extern char **environ;
63 74
64int 75int
65main (int argc, const char *const *argv) 76main (int argc, const char *const *argv)
66{ 77{
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* 78 // instead of getcwd we could opendir (".") and pass the fd for fchdir *g*
79 char cwd[PATH_MAX]; 79 char cwd[PATH_MAX];
80 80
81 if (!getcwd (cwd, sizeof (cwd))) 81 if (!getcwd (cwd, sizeof (cwd)))
82 { 82 {
83 perror ("unable to determine current working directory"); 83 perror ("unable to determine current working directory");
84 exit (EXIT_FAILURE); 84 exit (STATUS_FAILURE);
85 } 85 }
86 86
87 c.send ("CWD"), c.send (cwd); 87 client c;
88 88
89 {
90 sigset_t ss;
91
92 sigemptyset (&ss);
93 sigaddset (&ss, SIGHUP);
94 sigaddset (&ss, SIGPIPE);
95 sigprocmask (SIG_BLOCK, &ss, 0);
96 }
97
98 c.send ("NEW");
99
89 for (char **var = environ; *environ; environ++) 100 for (char **var = environ; *var; var++)
90 c.send ("ENV"), c.send (*environ); 101 c.send ("ENV"), c.send (*var);
91 102
92 const char *base = strrchr (argv[0], '/'); 103 const char *base = strrchr (argv[0], '/');
93 base = base ? base + 1 : argv[0]; 104 base = base ? base + 1 : argv[0];
94 c.send ("ARG"), c.send (strcmp (base, RXVTNAME "c") ? base : RXVTNAME); 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);
95 109
96 for (int i = 1; i < argc; i++) 110 for (int i = 1; i < argc; i++)
97 c.send ("ARG"), c.send (argv[i]); 111 c.send ("ARG"), c.send (argv[i]);
98 112
99 c.send ("END"); 113 c.send ("END");
100 114
101 auto_str tok; 115 auto_str tok;
116 int cint;
102 117
103 for (;;) 118 for (;;)
104 if (!c.recv (tok)) 119 if (!c.recv (tok))
105 { 120 {
106 fprintf (stderr, "protocol error: unexpected eof from server.\n"); 121 fprintf (stderr, "protocol error: unexpected eof from server.\n");
107 break; 122 break;
108 } 123 }
109 else if (!strcmp (tok, "MSG") && c.recv (tok)) 124 else if (!strcmp (tok, "MSG") && c.recv (tok))
110 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 }
111 else if (!strcmp (tok, "END")) 134 else if (!strcmp (tok, "END"))
112 { 135 {
113 int success; 136 int success;
137
114 if (c.recv (success)) 138 if (c.recv (success))
115 exit (success ? EXIT_SUCCESS : EXIT_FAILURE); 139 exit (success ? STATUS_SUCCESS : STATUS_FAILURE);
116 } 140 }
117 else 141 else
118 { 142 {
119 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);
120 break; 144 break;
121 } 145 }
122 146
123 return EXIT_FAILURE; 147 return STATUS_FAILURE;
124} 148}
125 149

Diff Legend

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