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.15 by root, Mon Feb 14 20:46:47 2005 UTC vs.
Revision 1.18 by root, Sat Dec 24 11:55:41 2005 UTC

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" 24#include "rxvtdaemon.h"
25#include "fdpass.h"
25 26
26#include "rxvt.h" 27#include "rxvt.h"
27 28
28#include <cstdio> 29#include <cstdio>
29#include <cstdlib> 30#include <cstdlib>
84 exit (EXIT_FAILURE); 85 exit (EXIT_FAILURE);
85 } 86 }
86 87
87 c.send ("CWD"), c.send (cwd); 88 c.send ("CWD"), c.send (cwd);
88 89
89 for (char **var = environ; *environ; environ++) 90 for (char **var = environ; *var; var++)
90 c.send ("ENV"), c.send (*environ); 91 c.send ("ENV"), c.send (*var);
91 92
92 const char *base = strrchr (argv[0], '/'); 93 const char *base = strrchr (argv[0], '/');
93 base = base ? base + 1 : argv[0]; 94 base = base ? base + 1 : argv[0];
94 c.send ("ARG"), c.send (strcmp (base, RXVTNAME "c") ? base : RXVTNAME); 95 c.send ("ARG"), c.send (strcmp (base, RXVTNAME "c") ? base : RXVTNAME);
95 96
97 c.send ("ARG"), c.send (argv[i]); 98 c.send ("ARG"), c.send (argv[i]);
98 99
99 c.send ("END"); 100 c.send ("END");
100 101
101 auto_str tok; 102 auto_str tok;
103 int cint;
102 104
103 for (;;) 105 for (;;)
104 if (!c.recv (tok)) 106 if (!c.recv (tok))
105 { 107 {
106 fprintf (stderr, "protocol error: unexpected eof from server.\n"); 108 fprintf (stderr, "protocol error: unexpected eof from server.\n");
107 break; 109 break;
108 } 110 }
109 else if (!strcmp (tok, "MSG") && c.recv (tok)) 111 else if (!strcmp (tok, "MSG") && c.recv (tok))
110 fprintf (stderr, "%s", (const char *)tok); 112 fprintf (stderr, "%s", (const char *)tok);
113#if ENABLE_FRILLS && HAVE_UNIX_FDPASS
114 else if (!strcmp (tok, "GETFD") && c.recv (cint))
115 {
116 if (rxvt_send_fd (c.fd, cint) < 0)
117 {
118 fprintf (stderr, "unable to send fd %d: ", cint); perror (0);
119 exit (EXIT_FAILURE);
120 }
121 }
122#endif
111 else if (!strcmp (tok, "END")) 123 else if (!strcmp (tok, "END"))
112 { 124 {
113 int success; 125 int success;
114 if (c.recv (success)) 126 if (c.recv (success))
115 exit (success ? EXIT_SUCCESS : EXIT_FAILURE); 127 exit (success ? EXIT_SUCCESS : EXIT_FAILURE);
116 } 128 }
117 else 129 else
118 { 130 {
119 fprintf (stderr, "protocol error: received illegal token '%s'.\n", (const char *)tok); 131 fprintf (stderr, "protocol error: received unsupported token '%s'.\n", (const char *)tok);
120 break; 132 break;
121 } 133 }
122 134
123 return EXIT_FAILURE; 135 return EXIT_FAILURE;
124} 136}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines