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

Diff Legend

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