|
|
1 | #include "../config.h" |
1 | #include "rxvtlib.h" |
2 | #include "rxvt.h" |
2 | #include "rxvtdaemon.h" |
3 | #include "rxvtdaemon.h" |
3 | #include "iom.h" |
4 | #include "iom.h" |
4 | |
5 | |
5 | #include <cstdio> |
6 | #include <cstdio> |
6 | #include <cstdlib> |
7 | #include <cstdlib> |
… | |
… | |
105 | |
106 | |
106 | if (recv (tok)) |
107 | if (recv (tok)) |
107 | { |
108 | { |
108 | if (!strcmp (tok, "NEW")) |
109 | if (!strcmp (tok, "NEW")) |
109 | { |
110 | { |
110 | stringvec argv; |
111 | stringvec *argv = new stringvec; |
111 | stringvec envv; |
112 | stringvec *envv = new stringvec; |
112 | |
113 | |
113 | for (;;) |
114 | for (;;) |
114 | { |
115 | { |
115 | if (!recv (tok)) |
116 | if (!recv (tok)) |
116 | return err (); |
117 | return err (); |
117 | |
118 | |
118 | if (!strcmp (tok, "END")) |
119 | if (!strcmp (tok, "END")) |
119 | break; |
120 | break; |
120 | else if (!strcmp (tok, "ENV") && recv (tok)) |
121 | else if (!strcmp (tok, "ENV") && recv (tok)) |
121 | envv.push_back (tok.get ()); |
122 | envv->push_back (tok.get ()); |
122 | else if (!strcmp (tok, "CWD") && recv (tok)) |
123 | else if (!strcmp (tok, "CWD") && recv (tok)) |
123 | { |
124 | { |
124 | if (chdir (tok)) |
125 | if (chdir (tok)) |
125 | err ("unable to change to working directory to '%s': %s", |
126 | err ("unable to change to working directory to '%s': %s", |
126 | (char *)tok, strerror (errno)); |
127 | (char *)tok, strerror (errno)); |
127 | } |
128 | } |
128 | else if (!strcmp (tok, "ARG") && recv (tok)) |
129 | else if (!strcmp (tok, "ARG") && recv (tok)) |
129 | argv.push_back (tok.get ()); |
130 | argv->push_back (tok.get ()); |
130 | else |
131 | else |
131 | return err ("protocol error: unexpected NEW token"); |
132 | return err ("protocol error: unexpected NEW token"); |
132 | } |
133 | } |
133 | |
134 | |
134 | envv.push_back (0); |
135 | envv->push_back (0); |
135 | |
136 | |
136 | { |
137 | { |
137 | char **old_environ = environ; |
138 | char **old_environ = environ; |
138 | environ = envv.begin (); |
139 | environ = envv->begin (); |
139 | |
140 | |
140 | rxvt_init (argv.size (), argv.begin ()); |
141 | rxvt_term *term = rxvt_init (argv->size (), argv->begin ()); |
|
|
142 | |
|
|
143 | term->argv = argv; |
|
|
144 | term->envv = envv; |
141 | |
145 | |
142 | environ = old_environ; |
146 | environ = old_environ; |
143 | envv.clear (); // can't yet save the env 'cause rxvt modifies it :( |
|
|
144 | } |
147 | } |
145 | } |
148 | } |
146 | else |
149 | else |
147 | return err ("protocol error: request '%s' unsupported.", (char *)tok); |
150 | return err ("protocol error: request '%s' unsupported.", (char *)tok); |
148 | } |
151 | } |
149 | else |
152 | else |
150 | return err (); |
153 | return err (); |
151 | } |
154 | } |
152 | |
155 | |
153 | int |
156 | int |
154 | main(int argc, const char *const *argv) |
157 | main (int argc, const char *const *argv) |
155 | { |
158 | { |
156 | { |
|
|
157 | sigset_t ss; |
|
|
158 | |
|
|
159 | sigaddset (&ss, SIGHUP); |
|
|
160 | sigaddset (&ss, SIGPIPE); |
|
|
161 | sigprocmask (SIG_BLOCK, &ss, 0); |
|
|
162 | } |
|
|
163 | |
|
|
164 | rxvt_init_signals (); |
159 | rxvt_init_signals (); |
165 | |
160 | |
166 | char *sockname = rxvt_connection::unix_sockname (); |
161 | char *sockname = rxvt_connection::unix_sockname (); |
167 | unix_listener l (sockname); |
162 | unix_listener l (sockname); |
168 | printf ("rxvtd listening on %s.\n", sockname); |
163 | printf ("rxvtd listening on %s.\n", sockname); |
169 | free (sockname); |
164 | free (sockname); |
170 | |
165 | |
171 | iom.loop (); |
166 | iom.loop (); |
172 | |
167 | |
173 | #if 0 |
168 | #if 0 |
174 | if (rxvt_init(argc, argv) == NULL) |
169 | if (rxvt_init (argc, argv) == NULL) |
175 | return EXIT_FAILURE; |
170 | return EXIT_FAILURE; |
176 | |
171 | |
177 | dR; |
172 | dR; |
178 | rxvt_main_loop(aR); /* main processing loop */ |
173 | rxvt_main_loop (aR); /* main processing loop */ |
179 | #endif |
174 | #endif |
180 | return EXIT_SUCCESS; |
175 | return EXIT_SUCCESS; |
181 | } |
176 | } |
|
|
177 | |