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.22 by root, Sun Jan 22 16:36:40 2006 UTC vs.
Revision 1.23 by root, Wed Feb 1 18:07:18 2006 UTC

33#include "rxvtdaemon.h" 33#include "rxvtdaemon.h"
34#include "libptytty.h" 34#include "libptytty.h"
35 35
36#include "rxvt.h" 36#include "rxvt.h"
37 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 (AF_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++)
113 else if (!strcmp (tok, "GETFD") && c.recv (cint)) 117 else if (!strcmp (tok, "GETFD") && c.recv (cint))
114 { 118 {
115 if (!ptytty::send_fd (c.fd, cint)) 119 if (!ptytty::send_fd (c.fd, cint))
116 { 120 {
117 fprintf (stderr, "unable to send fd %d: ", cint); perror (0); 121 fprintf (stderr, "unable to send fd %d: ", cint); perror (0);
118 exit (EXIT_FAILURE); 122 exit (STATUS_FAILURE);
119 } 123 }
120 } 124 }
121 else if (!strcmp (tok, "END")) 125 else if (!strcmp (tok, "END"))
122 { 126 {
123 int success; 127 int success;
124 128
125 if (c.recv (success)) 129 if (c.recv (success))
126 exit (success ? EXIT_SUCCESS : EXIT_FAILURE); 130 exit (success ? STATUS_SUCCESS : STATUS_FAILURE);
127 } 131 }
128 else 132 else
129 { 133 {
130 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);
131 break; 135 break;
132 } 136 }
133 137
134 return EXIT_FAILURE; 138 return STATUS_FAILURE;
135} 139}
136 140

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines