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.29 by root, Sun Nov 18 00:17:20 2007 UTC vs.
Revision 1.33 by root, Mon Feb 21 07:41:02 2011 UTC

1/*----------------------------------------------------------------------* 1/*----------------------------------------------------------------------*
2 * File: rxvtc.C 2 * File: rxvtc.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2006 Marc Lehmann <schmorp@schmorp.de>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 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 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 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
47client::client () 47client::client ()
48{ 48{
49 sockaddr_un sa; 49 sockaddr_un sa;
50 char *sockname = rxvt_connection::unix_sockname (); 50 char *sockname = rxvt_connection::unix_sockname ();
51 51
52 if (strlen(sockname) >= sizeof(sa.sun_path)) 52 if (strlen (sockname) >= sizeof (sa.sun_path))
53 { 53 {
54 fputs ("socket name too long, aborting.\n", stderr); 54 fputs ("socket name too long, aborting.\n", stderr);
55 exit (STATUS_FAILURE); 55 exit (STATUS_FAILURE);
56 } 56 }
57 57
… …
75extern char **environ; 75extern char **environ;
76 76
77int 77int
78main (int argc, const char *const *argv) 78main (int argc, const char *const *argv)
79{ 79{
80 // instead of getcwd we could opendir (".") and pass the fd for fchdir *g*
81 char cwd[PATH_MAX];
82
83 if (!getcwd (cwd, sizeof (cwd)))
84 {
85 perror ("unable to determine current working directory");
86 exit (STATUS_FAILURE);
87 }
88
80 client c; 89 client c;
90
81 { 91 {
82 sigset_t ss; 92 sigset_t ss;
83 93
84 sigemptyset (&ss); 94 sigemptyset (&ss);
85 sigaddset (&ss, SIGHUP); 95 sigaddset (&ss, SIGHUP);
… …
87 sigprocmask (SIG_BLOCK, &ss, 0); 97 sigprocmask (SIG_BLOCK, &ss, 0);
88 } 98 }
89 99
90 c.send ("NEW"); 100 c.send ("NEW");
91 101
92 // instead of getcwd we could opendir (".") and pass the fd for fchdir *g*
93 char cwd[PATH_MAX];
94
95 if (!getcwd (cwd, sizeof (cwd)))
96 {
97 perror ("unable to determine current working directory");
98 exit (STATUS_FAILURE);
99 }
100
101 c.send ("CWD"), c.send (cwd);
102
103 for (char **var = environ; *var; var++) 102 for (char **var = environ; *var; var++)
104 c.send ("ENV"), c.send (*var); 103 c.send ("ENV"), c.send (*var);
105 104
106 const char *base = strrchr (argv[0], '/'); 105 const char *base = strrchr (argv[0], '/');
107 base = base ? base + 1 : argv[0]; 106 base = base ? base + 1 : argv[0];
108 c.send ("ARG"), c.send (strcmp (base, RXVTNAME "c") ? base : RXVTNAME); 107 c.send ("ARG"), c.send (strcmp (base, RXVTNAME "c") ? base : RXVTNAME);
108
109 c.send ("ARG"), c.send ("-cd");
110 c.send ("ARG"), c.send (cwd);
109 111
110 for (int i = 1; i < argc; i++) 112 for (int i = 1; i < argc; i++)
111 c.send ("ARG"), c.send (argv[i]); 113 c.send ("ARG"), c.send (argv[i]);
112 114
113 c.send ("END"); 115 c.send ("END");

Diff Legend

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