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

Diff Legend

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