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.8 by pcg, Wed Mar 17 05:15:02 2004 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
1#include "../config.h" 23#include "../config.h"
2#include "rxvtdaemon.h" 24#include "rxvtdaemon.h"
3 25
26#include "rxvt.h"
27
4#include <cstdio> 28#include <cstdio>
5#include <cstdlib> 29#include <cstdlib>
30#include <cstring>
31#include <csignal>
6 32
7#include <unistd.h> 33#include <unistd.h>
8#include <signal.h>
9#include <sys/socket.h> 34#include <sys/socket.h>
10#include <sys/un.h> 35#include <sys/un.h>
11 36
12struct client : rxvt_connection { 37struct client : rxvt_connection {
13 client (); 38 client ();
14}; 39};
15 40
16client::client () 41client::client ()
17{ 42{
18 if ((fd = socket (PF_LOCAL, SOCK_STREAM, 0)) < 0) 43 if ((fd = socket (PF_UNIX, SOCK_STREAM, 0)) < 0)
19 { 44 {
20 perror ("unable to create communications socket"); 45 perror ("unable to create communications socket");
21 exit (EXIT_FAILURE); 46 exit (EXIT_FAILURE);
22 } 47 }
23 48
27 strcpy (sa.sun_path, sockname); 52 strcpy (sa.sun_path, sockname);
28 free (sockname); 53 free (sockname);
29 54
30 if (connect (fd, (sockaddr *)&sa, sizeof (sa))) 55 if (connect (fd, (sockaddr *)&sa, sizeof (sa)))
31 { 56 {
32 perror ("unable to connect to rxvtd"); 57 perror ("unable to connect to the rxvt-unicode daemon");
33 exit (EXIT_FAILURE); 58 exit (EXIT_FAILURE);
34 } 59 }
35} 60}
36 61
37extern char **environ; 62extern char **environ;
55 c.send ("CWD"), c.send (getcwd (buf, sizeof (buf))); 80 c.send ("CWD"), c.send (getcwd (buf, sizeof (buf)));
56 81
57 for (char **var = environ; *environ; environ++) 82 for (char **var = environ; *environ; environ++)
58 c.send ("ENV"), c.send (*environ); 83 c.send ("ENV"), c.send (*environ);
59 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
60 for (int i = 0; i < argc; i++) 89 for (int i = 1; i < argc; i++)
61 c.send ("ARG"), c.send (argv[i]); 90 c.send ("ARG"), c.send (argv[i]);
62 91
63 c.send ("END"); 92 c.send ("END");
64 93
65 auto_str tok; 94 auto_str tok;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines