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.3 by pcg, Tue Nov 25 11:52:42 2003 UTC vs.
Revision 1.14 by root, Mon Dec 20 16:44:31 2004 UTC

1/*--------------------------------*-C-*---------------------------------*
2 * File: rxvtc.C
3 *----------------------------------------------------------------------*
4 *
5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
7 *
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
10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version.
12 *
13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details.
17 *
18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 *----------------------------------------------------------------------*/
22
23#include "../config.h"
1#include "rxvtdaemon.h" 24#include "rxvtdaemon.h"
25
26#include "rxvt.h"
2 27
3#include <cstdio> 28#include <cstdio>
4#include <cstdlib> 29#include <cstdlib>
30#include <cstring>
31#include <csignal>
5 32
6#include <unistd.h> 33#include <unistd.h>
7#include <signal.h>
8#include <sys/socket.h> 34#include <sys/socket.h>
9#include <sys/un.h> 35#include <sys/un.h>
10 36
11struct client : rxvt_connection { 37struct client : rxvt_connection {
12 client (); 38 client ();
13}; 39};
14 40
15client::client () 41client::client ()
16{ 42{
17 if ((fd = socket (PF_LOCAL, SOCK_STREAM, 0)) < 0) 43 if ((fd = socket (PF_UNIX, SOCK_STREAM, 0)) < 0)
18 { 44 {
19 perror ("unable to create listening socket"); 45 perror ("unable to create communications socket");
20 exit (EXIT_FAILURE); 46 exit (EXIT_FAILURE);
21 } 47 }
22 48
49 char *sockname = rxvt_connection::unix_sockname ();
23 sockaddr_un sa; 50 sockaddr_un sa;
24
25 sa.sun_family = AF_UNIX; 51 sa.sun_family = AF_UNIX;
26 strcpy (sa.sun_path, rxvt_connection::unix_sockname ()); 52 strcpy (sa.sun_path, sockname);
53 free (sockname);
27 54
28 if (connect (fd, (sockaddr *)&sa, sizeof (sa))) 55 if (connect (fd, (sockaddr *)&sa, sizeof (sa)))
29 { 56 {
30 perror ("unable to bind listening socket"); 57 perror ("unable to connect to the rxvt-unicode daemon");
31 exit (EXIT_FAILURE); 58 exit (EXIT_FAILURE);
32 } 59 }
33} 60}
34 61
35extern char **environ; 62extern char **environ;
36 63
37int 64int
38main(int argc, const char *const *argv) 65main (int argc, const char *const *argv)
39{ 66{
40 client c; 67 client c;
41 char buf[PATH_MAX]; 68 char buf[PATH_MAX];
42 69
43 { 70 {
44 sigset_t ss; 71 sigset_t ss;
45 72
73 sigemptyset (&ss);
46 sigaddset (&ss, SIGHUP); 74 sigaddset (&ss, SIGHUP);
47 sigprocmask (SIG_BLOCK, &ss, 0); 75 sigprocmask (SIG_BLOCK, &ss, 0);
48 } 76 }
49 77
50 c.send ("NEW"); 78 c.send ("NEW");
51 // instead of getcwd we could opendir(".") and pass the fd for fchdir *g* 79 // instead of getcwd we could opendir (".") and pass the fd for fchdir *g*
52 c.send ("CWD"), c.send (getcwd (buf, sizeof (buf))); 80 c.send ("CWD"), c.send (getcwd (buf, sizeof (buf)));
53 81
54 for (char **var = environ; *environ; environ++) 82 for (char **var = environ; *environ; environ++)
55 c.send ("ENV"), c.send (*environ); 83 c.send ("ENV"), c.send (*environ);
56 84
85 const char *base = strrchr (argv[0], '/');
86 base = base ? base + 1 : argv[0];
87 c.send ("ARG"), c.send (strcmp (base, RXVTNAME "c") ? base : RXVTNAME);
88
57 for (int i = 0; i < argc; i++) 89 for (int i = 1; i < argc; i++)
58 c.send ("ARG"), c.send (argv[i]); 90 c.send ("ARG"), c.send (argv[i]);
59 91
60 c.send ("END"); 92 c.send ("END");
93
94 auto_str tok;
95
96 for (;;)
97 if (!c.recv (tok))
98 {
99 fprintf (stderr, "protocol error: unexpected eof from server.\n");
100 break;
101 }
102 else if (!strcmp (tok, "MSG") && c.recv (tok))
103 fprintf (stderr, "%s", (const char *)tok);
104 else if (!strcmp (tok, "END"))
105 {
106 int success;
107 if (c.recv (success))
108 exit (success ? EXIT_SUCCESS : EXIT_FAILURE);
109 }
110 else
111 {
112 fprintf (stderr, "protocol error: received illegal token '%s'.\n", (const char *)tok);
113 break;
114 }
115
116 return EXIT_FAILURE;
61} 117}
62 118

Diff Legend

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