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

Diff Legend

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