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.9 by pcg, Fri Apr 2 20:41:01 2004 UTC vs.
Revision 1.16 by root, Mon Nov 28 19:35:04 2005 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
1#include "../config.h" 23#include "../config.h"
2#include "rxvtdaemon.h" 24#include "rxvtdaemon.h"
3 25
4#include "rxvt.h" 26#include "rxvt.h"
5 27
6#include <cstdio> 28#include <cstdio>
7#include <cstdlib> 29#include <cstdlib>
30#include <cstring>
31#include <csignal>
8 32
9#include <unistd.h> 33#include <unistd.h>
10#include <signal.h>
11#include <sys/socket.h> 34#include <sys/socket.h>
12#include <sys/un.h> 35#include <sys/un.h>
13 36
14struct client : rxvt_connection { 37struct client : rxvt_connection {
15 client (); 38 client ();
16}; 39};
17 40
18client::client () 41client::client ()
19{ 42{
20 if ((fd = socket (PF_LOCAL, SOCK_STREAM, 0)) < 0) 43 if ((fd = socket (PF_UNIX, SOCK_STREAM, 0)) < 0)
21 { 44 {
22 perror ("unable to create communications socket"); 45 perror ("unable to create communications socket");
23 exit (EXIT_FAILURE); 46 exit (EXIT_FAILURE);
24 } 47 }
25 48
… …
29 strcpy (sa.sun_path, sockname); 52 strcpy (sa.sun_path, sockname);
30 free (sockname); 53 free (sockname);
31 54
32 if (connect (fd, (sockaddr *)&sa, sizeof (sa))) 55 if (connect (fd, (sockaddr *)&sa, sizeof (sa)))
33 { 56 {
34 perror ("unable to connect to rxvtd"); 57 perror ("unable to connect to the rxvt-unicode daemon");
35 exit (EXIT_FAILURE); 58 exit (EXIT_FAILURE);
36 } 59 }
37} 60}
38 61
39extern char **environ; 62extern char **environ;
40 63
41int 64int
42main (int argc, const char *const *argv) 65main (int argc, const char *const *argv)
43{ 66{
44 client c; 67 client c;
45 char buf[PATH_MAX];
46
47 { 68 {
48 sigset_t ss; 69 sigset_t ss;
49 70
50 sigemptyset (&ss); 71 sigemptyset (&ss);
51 sigaddset (&ss, SIGHUP); 72 sigaddset (&ss, SIGHUP);
52 sigprocmask (SIG_BLOCK, &ss, 0); 73 sigprocmask (SIG_BLOCK, &ss, 0);
53 } 74 }
54 75
55 c.send ("NEW"); 76 c.send ("NEW");
77
56 // instead of getcwd we could opendir (".") and pass the fd for fchdir *g* 78 // instead of getcwd we could opendir (".") and pass the fd for fchdir *g*
57 c.send ("CWD"), c.send (getcwd (buf, sizeof (buf))); 79 char cwd[PATH_MAX];
58 80
59 for (char **var = environ; *environ; environ++) 81 if (!getcwd (cwd, sizeof (cwd)))
60 c.send ("ENV"), c.send (*environ); 82 {
83 perror ("unable to determine current working directory");
84 exit (EXIT_FAILURE);
85 }
61 86
87 c.send ("CWD"), c.send (cwd);
88
89 for (char **var = environ; *var; var++)
90 c.send ("ENV"), c.send (*var);
91
92 const char *base = strrchr (argv[0], '/');
93 base = base ? base + 1 : argv[0];
94 c.send ("ARG"), c.send (strcmp (base, RXVTNAME "c") ? base : RXVTNAME);
95
62 for (int i = 0; i < argc; i++) 96 for (int i = 1; i < argc; i++)
63 c.send ("ARG"), c.send (argv[i]); 97 c.send ("ARG"), c.send (argv[i]);
64 98
65 c.send ("END"); 99 c.send ("END");
66 100
67 auto_str tok; 101 auto_str tok;

Diff Legend

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