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.19 by root, Tue Jan 10 04:23:39 2006 UTC vs.
Revision 1.25 by root, Mon Feb 20 22:42:00 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{
44 if ((fd = socket (PF_UNIX, SOCK_STREAM, 0)) < 0) 48 if ((fd = socket (AF_UNIX, SOCK_STREAM, 0)) < 0)
45 { 49 {
46 perror ("unable to create communications socket"); 50 perror ("unable to create communications socket");
47 exit (EXIT_FAILURE); 51 exit (STATUS_FAILURE);
48 } 52 }
49 53
50 char *sockname = rxvt_connection::unix_sockname (); 54 char *sockname = rxvt_connection::unix_sockname ();
51 sockaddr_un sa; 55 sockaddr_un sa;
52 sa.sun_family = AF_UNIX; 56 sa.sun_family = AF_UNIX;
… …
54 free (sockname); 58 free (sockname);
55 59
56 if (connect (fd, (sockaddr *)&sa, sizeof (sa))) 60 if (connect (fd, (sockaddr *)&sa, sizeof (sa)))
57 { 61 {
58 perror ("unable to connect to the rxvt-unicode daemon"); 62 perror ("unable to connect to the rxvt-unicode daemon");
59 exit (EXIT_FAILURE); 63 exit (STATUS_CONNECTION_FAILED);
60 } 64 }
61} 65}
62 66
63extern char **environ; 67extern char **environ;
64 68
… …
80 char cwd[PATH_MAX]; 84 char cwd[PATH_MAX];
81 85
82 if (!getcwd (cwd, sizeof (cwd))) 86 if (!getcwd (cwd, sizeof (cwd)))
83 { 87 {
84 perror ("unable to determine current working directory"); 88 perror ("unable to determine current working directory");
85 exit (EXIT_FAILURE); 89 exit (STATUS_FAILURE);
86 } 90 }
87 91
88 c.send ("CWD"), c.send (cwd); 92 c.send ("CWD"), c.send (cwd);
89 93
90 for (char **var = environ; *var; var++) 94 for (char **var = environ; *var; var++)
… …
108 fprintf (stderr, "protocol error: unexpected eof from server.\n"); 112 fprintf (stderr, "protocol error: unexpected eof from server.\n");
109 break; 113 break;
110 } 114 }
111 else if (!strcmp (tok, "MSG") && c.recv (tok)) 115 else if (!strcmp (tok, "MSG") && c.recv (tok))
112 fprintf (stderr, "%s", (const char *)tok); 116 fprintf (stderr, "%s", (const char *)tok);
113#if ENABLE_FRILLS && HAVE_UNIX_FDPASS
114 else if (!strcmp (tok, "GETFD") && c.recv (cint)) 117 else if (!strcmp (tok, "GETFD") && c.recv (cint))
115 { 118 {
116 if (rxvt_send_fd (c.fd, cint) < 0) 119 if (!ptytty::send_fd (c.fd, cint))
117 { 120 {
118 fprintf (stderr, "unable to send fd %d: ", cint); perror (0); 121 fprintf (stderr, "unable to send fd %d: ", cint); perror (0);
119 exit (EXIT_FAILURE); 122 exit (STATUS_FAILURE);
120 } 123 }
121 } 124 }
122#endif
123 else if (!strcmp (tok, "END")) 125 else if (!strcmp (tok, "END"))
124 { 126 {
125 int success; 127 int success;
126 128
127 if (c.recv (success)) 129 if (c.recv (success))
128 exit (success ? EXIT_SUCCESS : EXIT_FAILURE); 130 exit (success ? STATUS_SUCCESS : STATUS_FAILURE);
129 } 131 }
130 else 132 else
131 { 133 {
132 fprintf (stderr, "protocol error: received unsupported token '%s'.\n", (const char *)tok); 134 fprintf (stderr, "protocol error: received unsupported token '%s'.\n", (const char *)tok);
133 break; 135 break;
134 } 136 }
135 137
136 return EXIT_FAILURE; 138 return STATUS_FAILURE;
137} 139}
138 140

Diff Legend

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