ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/init.C
(Generate patch)

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.170 by root, Sat Feb 18 15:24:39 2006 UTC vs.
Revision 1.227 by ayin, Wed Dec 12 09:33:48 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: init.C 2 * File: init.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) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM>
11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca>
12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
10 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
11 * - extensive modifications 14 * - extensive modifications
12 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com> 15 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
13 * - QNX support 16 * - QNX support
14 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 17 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
… …
38 41
39#include <limits> 42#include <limits>
40 43
41#include <csignal> 44#include <csignal>
42 45
46#include <fcntl.h>
47
48#ifdef HAVE_XSETLOCALE
49# define X_LOCALE
50# include <X11/Xlocale.h>
51#else
52# ifdef HAVE_SETLOCALE
53# include <clocale>
54# endif
55#endif
56
57#ifdef HAVE_NL_LANGINFO
58# include <langinfo.h>
59#endif
60
61#ifdef DISPLAY_IS_IP
62/* On Solaris link with -lsocket and -lnsl */
63#include <sys/types.h>
64#include <sys/socket.h>
65
66/* these next two are probably only on Sun (not Solaris) */
67#ifdef HAVE_SYS_SOCKIO_H
68#include <sys/sockio.h>
69#endif
70#ifdef HAVE_SYS_BYTEORDER_H
71#include <sys/byteorder.h>
72#endif
73
74#include <netinet/in.h>
75#include <arpa/inet.h>
76#include <net/if.h>
77#include <net/if_arp.h>
78
79static char *
80rxvt_network_display (const char *display)
81{
82 char buffer[1024], *rval = NULL;
83 struct ifconf ifc;
84 struct ifreq *ifr;
85 int i, skfd;
86
87 if (display[0] != ':' && strncmp (display, "unix:", 5))
88 return (char *) display; /* nothing to do */
89
90 ifc.ifc_len = sizeof (buffer); /* Get names of all ifaces */
91 ifc.ifc_buf = buffer;
92
93 if ((skfd = socket (AF_INET, SOCK_DGRAM, 0)) < 0)
94 {
95 perror ("socket");
96 return NULL;
97 }
98
99 if (ioctl (skfd, SIOCGIFCONF, &ifc) < 0)
100 {
101 perror ("SIOCGIFCONF");
102 close (skfd);
103 return NULL;
104 }
105
106 for (i = 0, ifr = ifc.ifc_req;
107 i < (ifc.ifc_len / sizeof (struct ifreq));
108 i++, ifr++)
109 {
110 struct ifreq ifr2;
111
112 strcpy (ifr2.ifr_name, ifr->ifr_name);
113
114 if (ioctl (skfd, SIOCGIFADDR, &ifr2) >= 0)
115 {
116 unsigned long addr;
117 struct sockaddr_in *p_addr;
118
119 p_addr = (struct sockaddr_in *) &ifr2.ifr_addr;
120 addr = htonl ((unsigned long)p_addr->sin_addr.s_addr);
121
122 /*
123 * not "0.0.0.0" or "127.0.0.1" - so format the address
124 */
125 if (addr && addr != 0x7F000001)
126 {
127 char *colon = strchr (display, ':');
128
129 if (colon == NULL)
130 colon = ":0.0";
131
132 rval = rxvt_malloc (strlen (colon) + 16);
133 sprintf (rval, "%d.%d.%d.%d%s",
134 (int) ((addr >> 030) & 0xFF),
135 (int) ((addr >> 020) & 0xFF),
136 (int) ((addr >> 010) & 0xFF),
137 (int) (addr & 0xFF), colon);
138 break;
139 }
140 }
141 }
142
143 close (skfd);
144
145 return rval;
146}
147#endif
148
43const char *const def_colorName[] = 149const char *const def_colorName[] =
44 { 150 {
45 COLOR_FOREGROUND, 151 COLOR_FOREGROUND,
46 COLOR_BACKGROUND, 152 COLOR_BACKGROUND,
47 /* low-intensity colors */ 153 /* low-intensity colors */
48 "rgb:00/00/00", // 0: black (Black) 154 "rgb:00/00/00", // 0: black (Black)
49 "rgb:cd/00/00", // 1: red (Red3) 155 "rgb:cd/00/00", // 1: red (Red3)
50 "rgb:00/cd/00", // 2: green (Green3) 156 "rgb:00/cd/00", // 2: green (Green3)
51 "rgb:cd/cd/00", // 3: ywlloe (Yellow3) 157 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "rgb:00/00/cd", // 4: blue (Blue3) 158 "rgb:00/00/cd", // 4: blue (Blue3)
53 "rgb:cd/00/cd", // 5: magenta (Magenta3) 159 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "rgb:00/cd/cd", // 6: cyan (Cyan3) 160 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 161# ifdef XTERM_COLORS
56 "rgb:e5/e5/e5", // 7: white (Grey90) 162 "rgb:e5/e5/e5", // 7: white (Grey90)
57# else 163# else
58 "rgb:fa/eb/d7", // 7: white (AntiqueWhite) 164 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
59# endif 165# endif
60 /* high-intensity colors */ 166 /* high-intensity colors */
61# ifdef XTERM_COLORS 167# ifdef XTERM_COLORS
62 "rgb:4d/4d/4d", // 8: bright black (Grey30) 168 "rgb:4d/4d/4d", // 8: bright black (Grey30)
… …
146 "rgb:e7/e7/e7", 252 "rgb:e7/e7/e7",
147 253
148#ifndef NO_CURSORCOLOR 254#ifndef NO_CURSORCOLOR
149 COLOR_CURSOR_BACKGROUND, 255 COLOR_CURSOR_BACKGROUND,
150 COLOR_CURSOR_FOREGROUND, 256 COLOR_CURSOR_FOREGROUND,
151#endif /* ! NO_CURSORCOLOR */ 257#endif /* ! NO_CURSORCOLOR */
152 NULL, /* Color_pointer_fg */ 258 NULL, /* Color_pointer_fg */
153 NULL, /* Color_pointer_bg */ 259 NULL, /* Color_pointer_bg */
154 NULL, /* Color_border */ 260 NULL, /* Color_border */
155#ifndef NO_BOLD_UNDERLINE_REVERSE 261#ifndef NO_BOLD_UNDERLINE_REVERSE
156 NULL, /* Color_BD */ 262 NULL, /* Color_BD */
157 NULL, /* Color_IT */ 263 NULL, /* Color_IT */
158 NULL, /* Color_UL */ 264 NULL, /* Color_UL */
159 NULL, /* Color_RV */ 265 NULL, /* Color_RV */
160#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 266#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
161#if ENABLE_FRILLS 267#if ENABLE_FRILLS
162 NULL, // Color_underline 268 NULL, // Color_underline
163#endif 269#endif
164#ifdef OPTION_HC 270#ifdef OPTION_HC
165 NULL, 271 NULL,
166#endif 272#endif
167#ifdef KEEP_SCROLLCOLOR 273#ifdef KEEP_SCROLLCOLOR
168 COLOR_SCROLLBAR, 274 COLOR_SCROLLBAR,
169 COLOR_SCROLLTROUGH, 275 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 276#endif /* KEEP_SCROLLCOLOR */
171#if TINTING 277#if ENABLE_TRANSPARENCY
172 NULL, 278 NULL,
173#endif 279#endif
174#if OFF_FOCUS_FADING 280#if OFF_FOCUS_FADING
175 "rgb:00/00/00", 281 "rgb:00/00/00",
176#endif 282#endif
177 }; 283 };
178 284
179bool 285void
180rxvt_term::init_vars () 286rxvt_term::init_vars ()
181{ 287{
182 pix_colors = // 288 pix_colors = //
183 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 289 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
184#ifdef OFF_FOCUS_FADING 290#ifdef OFF_FOCUS_FADING
185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 291 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
186#endif 292#endif
187 293
188#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
189 pixmap = None;
190#endif
191 294
192 MEvent.time = CurrentTime; 295 MEvent.time = CurrentTime;
193 MEvent.button = AnyButton; 296 MEvent.button = AnyButton;
194 options = DEFAULT_OPTIONS;
195 want_refresh = 1; 297 want_refresh = 1;
196 priv_modes = SavedModes = PrivMode_Default; 298 priv_modes = SavedModes = PrivMode_Default;
197 ncol = 80; 299 ncol = 80;
198 nrow = 24; 300 nrow = 24;
199 int_bwidth = INTERNALBORDERWIDTH; 301 int_bwidth = INTERNALBORDERWIDTH;
200 ext_bwidth = EXTERNALBORDERWIDTH; 302 ext_bwidth = EXTERNALBORDERWIDTH;
201 lineSpace = LINESPACE; 303 lineSpace = LINESPACE;
202 saveLines = SAVELINES; 304 saveLines = SAVELINES;
203 numpix_colors = TOTAL_COLORS; 305 numpix_colors = TOTAL_COLORS;
204 306
205 refresh_limit = 1;
206 refresh_type = SLOW_REFRESH; 307 refresh_type = SLOW_REFRESH;
207 308
208 oldcursor.row = oldcursor.col = -1; 309 oldcursor.row = oldcursor.col = -1;
209#ifdef XPM_BACKGROUND
210 /* bgPixmap.w = bgPixmap.h = 0; */
211 bgPixmap.x = bgPixmap.y = 50;
212 bgPixmap.pixmap = None;
213#endif
214
215 last_bot = last_state = -1; 310 last_bot = last_state = -1;
216 311
217 return true; 312 set_option (Opt_scrollBar);
313 set_option (Opt_scrollTtyOutput);
314 set_option (Opt_jumpScroll);
315 set_option (Opt_skipScroll);
316 set_option (Opt_secondaryScreen);
317 set_option (Opt_secondaryScroll);
318 set_option (Opt_pastableTabs);
319 set_option (Opt_intensityStyles);
320 set_option (Opt_iso14755_52);
218} 321}
219 322
220void 323void
221rxvt_term::init_secondary () 324rxvt_term::init_secondary ()
222{ 325{
… …
229 if ((i = open ("/dev/null", O_RDONLY)) < 0) 332 if ((i = open ("/dev/null", O_RDONLY)) < 0)
230 { 333 {
231 /* TODO: BOO HISS */ 334 /* TODO: BOO HISS */
232 dup2 (STDERR_FILENO, STDIN_FILENO); 335 dup2 (STDERR_FILENO, STDIN_FILENO);
233 } 336 }
234 else if (i > STDIN_FILENO) 337 else if (i != STDIN_FILENO)
235 { 338 {
236 dup2 (i, STDIN_FILENO); 339 dup2 (i, STDIN_FILENO);
237 close (i); 340 close (i);
238 } 341 }
239 342
… …
254/*----------------------------------------------------------------------*/ 357/*----------------------------------------------------------------------*/
255const char ** 358const char **
256rxvt_term::init_resources (int argc, const char *const *argv) 359rxvt_term::init_resources (int argc, const char *const *argv)
257{ 360{
258 int i, r_argc; 361 int i, r_argc;
259 char *val;
260 const char **cmd_argv, **r_argv; 362 const char **cmd_argv, **r_argv;
261 363
262 /* 364 /*
263 * Look for -exec option. Find => split and make cmd_argv[] of command args 365 * Look for -e option. Find => split and make cmd_argv[] of command args
264 */ 366 */
265 for (r_argc = 0; r_argc < argc; r_argc++) 367 for (r_argc = 0; r_argc < argc; r_argc++)
266 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 368 if (!strcmp (argv[r_argc], "-e"))
267 break; 369 break;
370
371 if (r_argc == argc)
372 cmd_argv = NULL;
373 else if (!argv[r_argc + 1])
374 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
375 else
376 {
377 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
378
379 for (i = 0; i < argc - r_argc - 1; i++)
380 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
381
382 cmd_argv[i] = NULL;
383 }
268 384
269 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 385 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
270 386
271 for (i = 0; i < r_argc; i++) 387 for (i = 0; i < r_argc; i++)
272 r_argv[i] = (const char *)argv[i]; 388 r_argv[i] = (const char *)argv[i];
273 389
274 r_argv[i] = NULL; 390 r_argv[i] = NULL;
275 391
276 if (r_argc == argc)
277 cmd_argv = NULL;
278 else
279 {
280 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
281
282 for (i = 0; i < argc - r_argc - 1; i++)
283 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
284
285 cmd_argv[i] = NULL;
286 }
287
288 rs[Rs_name] = rxvt_r_basename (argv[0]); 392 rs[Rs_name] = rxvt_basename (argv[0]);
289 393
290 /* 394 /*
291 * Open display, get options/resources and create the window 395 * Open display, get options/resources and create the window
292 */ 396 */
293 397
… …
295 rs[Rs_display_name] = ":0"; 399 rs[Rs_display_name] = ":0";
296 400
297 get_options (r_argc, r_argv); 401 get_options (r_argc, r_argv);
298 402
299 if (!(display = displays.get (rs[Rs_display_name]))) 403 if (!(display = displays.get (rs[Rs_display_name])))
404 {
405 free (r_argv);
300 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 406 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
407 }
301 408
302 // using a local pointer decreases code size a lot 409 // using a local pointer decreases code size a lot
303 xa = display->xa; 410 xa = display->xa;
304 411
412 set (display);
413 extract_resources ();
414
305#if XFT 415#if XFT
306 if (rs[Rs_depth]) 416 if (rs[Rs_depth])
307 set (display, strtol (rs[Rs_depth], 0, 0)); 417 select_visual (strtol (rs[Rs_depth], 0, 0));
308 else
309#endif 418#endif
310 set (display);
311 419
312 extract_resources (); 420#ifdef HAVE_AFTERIMAGE
313 421 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
422#endif
314 free (r_argv); 423 free (r_argv);
315 424
316 for (int i = NUM_RESOURCES; i--; ) 425 for (int i = NUM_RESOURCES; i--; )
317 if (rs [i] == resval_undef) 426 if (rs [i] == resval_undef)
318 rs [i] = 0; 427 rs [i] = 0;
… …
334 * set any defaults not already set 443 * set any defaults not already set
335 */ 444 */
336 if (cmd_argv && cmd_argv[0]) 445 if (cmd_argv && cmd_argv[0])
337 { 446 {
338 if (!rs[Rs_title]) 447 if (!rs[Rs_title])
339 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 448 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
340 if (!rs[Rs_iconName]) 449 if (!rs[Rs_iconName])
341 rs[Rs_iconName] = rs[Rs_title]; 450 rs[Rs_iconName] = rs[Rs_title];
342 } 451 }
343 else 452 else
344 { 453 {
… …
382 rs[Rs_cutchars] = CUTCHARS; 491 rs[Rs_cutchars] = CUTCHARS;
383 492
384#ifndef NO_BACKSPACE_KEY 493#ifndef NO_BACKSPACE_KEY
385 if (!rs[Rs_backspace_key]) 494 if (!rs[Rs_backspace_key])
386# ifdef DEFAULT_BACKSPACE 495# ifdef DEFAULT_BACKSPACE
387 key_backspace = DEFAULT_BACKSPACE; 496 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
388# else 497# else
389 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 498 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
390# endif 499# endif
391 else
392 {
393 val = strdup (rs[Rs_backspace_key]);
394 rxvt_Str_trim (val);
395 rxvt_Str_escaped (val);
396 key_backspace = val;
397 }
398#endif 500#endif
399 501
400#ifndef NO_DELETE_KEY 502#ifndef NO_DELETE_KEY
401 if (!rs[Rs_delete_key]) 503 if (!rs[Rs_delete_key])
402# ifdef DEFAULT_DELETE 504# ifdef DEFAULT_DELETE
403 key_delete = DEFAULT_DELETE; 505 rs[Rs_delete_key] = DEFAULT_DELETE;
404# else 506# else
405 key_delete = "\033[3~"; 507 rs[Rs_delete_key] = "\033[3~";
406# endif
407 else
408 {
409 val = strdup (rs[Rs_delete_key]);
410 rxvt_Str_trim (val);
411 rxvt_Str_escaped (val);
412 key_delete = val;
413 }
414#endif 508# endif
415 if (rs[Rs_answerbackstring]) 509#endif
416 {
417 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
418 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
419 }
420 510
421#ifdef HAVE_SCROLLBARS 511#ifdef HAVE_SCROLLBARS
422 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 512 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
423#endif 513#endif
424 514
425#ifdef XTERM_REVERSE_VIDEO 515#ifdef XTERM_REVERSE_VIDEO
426 /* this is how xterm implements reverseVideo */ 516 /* this is how xterm implements reverseVideo */
427 if (OPTION (Opt_reverseVideo)) 517 if (option (Opt_reverseVideo))
428 { 518 {
429 if (!rs[Rs_color + Color_fg]) 519 if (!rs[Rs_color + Color_fg])
430 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 520 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
431 521
432 if (!rs[Rs_color + Color_bg]) 522 if (!rs[Rs_color + Color_bg])
… …
438 if (!rs[Rs_color + i]) 528 if (!rs[Rs_color + i])
439 rs[Rs_color + i] = def_colorName[i]; 529 rs[Rs_color + i] = def_colorName[i];
440 530
441#ifndef XTERM_REVERSE_VIDEO 531#ifndef XTERM_REVERSE_VIDEO
442 /* this is how we implement reverseVideo */ 532 /* this is how we implement reverseVideo */
443 if (OPTION (Opt_reverseVideo)) 533 if (option (Opt_reverseVideo))
444 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 534 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
445#endif 535#endif
446 536
447 /* convenient aliases for setting fg/bg to colors */ 537 /* convenient aliases for setting fg/bg to colors */
448 color_aliases (Color_fg); 538 color_aliases (Color_fg);
449 color_aliases (Color_bg); 539 color_aliases (Color_bg);
450#ifndef NO_CURSORCOLOR 540#ifndef NO_CURSORCOLOR
451 color_aliases (Color_cursor); 541 color_aliases (Color_cursor);
452 color_aliases (Color_cursor2); 542 color_aliases (Color_cursor2);
453#endif /* NO_CURSORCOLOR */ 543#endif /* NO_CURSORCOLOR */
454 color_aliases (Color_pointer_fg); 544 color_aliases (Color_pointer_fg);
455 color_aliases (Color_pointer_bg); 545 color_aliases (Color_pointer_bg);
456 color_aliases (Color_border); 546 color_aliases (Color_border);
457#ifndef NO_BOLD_UNDERLINE_REVERSE 547#ifndef NO_BOLD_UNDERLINE_REVERSE
458 color_aliases (Color_BD); 548 color_aliases (Color_BD);
459 color_aliases (Color_UL); 549 color_aliases (Color_UL);
460 color_aliases (Color_RV); 550 color_aliases (Color_RV);
461#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 551#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
462 552
463 if (!rs[Rs_color + Color_border]) 553 if (!rs[Rs_color + Color_border])
464 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 554 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
465 555
466 return cmd_argv; 556 return cmd_argv;
… …
469/*----------------------------------------------------------------------*/ 559/*----------------------------------------------------------------------*/
470void 560void
471rxvt_term::init_env () 561rxvt_term::init_env ()
472{ 562{
473 int i; 563 int i;
474 unsigned int u;
475 char *val; 564 char *val;
476 565
477#ifdef DISPLAY_IS_IP 566#ifdef DISPLAY_IS_IP
478 /* Fixup display_name for export over pty to any interested terminal 567 /* Fixup display_name for export over pty to any interested terminal
479 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 568 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
487 */ 576 */
488 val = rxvt_network_display (rs[Rs_display_name]); 577 val = rxvt_network_display (rs[Rs_display_name]);
489 rs[Rs_display_name] = (const char *)val; 578 rs[Rs_display_name] = (const char *)val;
490 579
491 if (val == NULL) 580 if (val == NULL)
492#endif /* DISPLAY_IS_IP */ 581#endif /* DISPLAY_IS_IP */
493 val = XDisplayString (dpy); 582 val = XDisplayString (dpy);
494 583
495 if (rs[Rs_display_name] == NULL) 584 if (rs[Rs_display_name] == NULL)
496 rs[Rs_display_name] = val; /* use broken `:0' value */ 585 rs[Rs_display_name] = val; /* use broken `:0' value */
497 586
498 i = strlen (val); 587 i = strlen (val);
499 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 588 env_display = (char *)rxvt_malloc (i + 9);
500 589
501 sprintf (env_display, "DISPLAY=%s", val); 590 sprintf (env_display, "DISPLAY=%s", val);
502 591
503 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 592 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
504 593
… …
525 else 614 else
526 putenv ("COLORTERM=" COLORTERMENVFULL); 615 putenv ("COLORTERM=" COLORTERMENVFULL);
527 616
528 if (rs[Rs_term_name] != NULL) 617 if (rs[Rs_term_name] != NULL)
529 { 618 {
530 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 619 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
531 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 620 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
532 putenv (env_term); 621 putenv (env_term);
533 } 622 }
534 else 623 else
535 putenv ("TERM=" TERMENV); 624 putenv ("TERM=" TERMENV);
… …
537#ifdef HAVE_UNSETENV 626#ifdef HAVE_UNSETENV
538 /* avoid passing old settings and confusing term size */ 627 /* avoid passing old settings and confusing term size */
539 unsetenv ("LINES"); 628 unsetenv ("LINES");
540 unsetenv ("COLUMNS"); 629 unsetenv ("COLUMNS");
541 unsetenv ("TERMCAP"); /* terminfo should be okay */ 630 unsetenv ("TERMCAP"); /* terminfo should be okay */
542#endif /* HAVE_UNSETENV */ 631#endif /* HAVE_UNSETENV */
543} 632}
544 633
545/*----------------------------------------------------------------------*/ 634/*----------------------------------------------------------------------*/
546/* 635/*
547 * This is more or less stolen straight from XFree86 xterm. 636 * This is more or less stolen straight from XFree86 xterm.
… …
568 657
569 this->locale = "C"; 658 this->locale = "C";
570 } 659 }
571 660
572 661
573 this->locale = rxvt_strdup (this->locale); 662 this->locale = strdup (this->locale);
574 SET_LOCALE (this->locale); 663 SET_LOCALE (this->locale);
575 mbstate.reset (); 664 mbstate.reset ();
576#endif 665#endif
577 666
578#if HAVE_NL_LANGINFO 667#if HAVE_NL_LANGINFO
… …
622 * Initialize the command connection. 711 * Initialize the command connection.
623 * This should be called after the X server connection is established. 712 * This should be called after the X server connection is established.
624 */ 713 */
625 714
626#ifdef META8_OPTION 715#ifdef META8_OPTION
627 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 716 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
628#endif 717#endif
629 718
630 get_ourmods (); 719 get_ourmods ();
631 720
632 if (!OPTION (Opt_scrollTtyOutput)) 721 if (!option (Opt_scrollTtyOutput))
633 priv_modes |= PrivMode_TtyOutputInh; 722 priv_modes |= PrivMode_TtyOutputInh;
634 if (OPTION (Opt_scrollTtyKeypress)) 723 if (option (Opt_scrollTtyKeypress))
635 priv_modes |= PrivMode_Keypress; 724 priv_modes |= PrivMode_Keypress;
636 if (!OPTION (Opt_jumpScroll)) 725 if (!option (Opt_jumpScroll))
637 priv_modes |= PrivMode_smoothScroll; 726 priv_modes |= PrivMode_smoothScroll;
638 727
639#ifndef NO_BACKSPACE_KEY 728#ifndef NO_BACKSPACE_KEY
640 if (strcmp (key_backspace, "DEC") == 0) 729 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
641 priv_modes |= PrivMode_HaveBackSpace; 730 priv_modes |= PrivMode_HaveBackSpace;
642#endif 731#endif
643 732
644 /* add value for scrollBar */ 733 /* add value for scrollBar */
645 if (scrollBar.state) 734 if (scrollBar.state)
… …
658 int i; 747 int i;
659 748
660#ifdef OFF_FOCUS_FADING 749#ifdef OFF_FOCUS_FADING
661 pix_colors = pix_colors_focused; 750 pix_colors = pix_colors_focused;
662#endif 751#endif
663 752
664 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 753 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
665 { 754 {
666 const char *name = rs[Rs_color + i]; 755 const char *name = rs[Rs_color + i];
667 756
668 if (!name) 757 if (!name)
… …
671 rxvt_color xcol; 760 rxvt_color xcol;
672 761
673 if (!set_color (xcol, name)) 762 if (!set_color (xcol, name))
674 { 763 {
675#ifndef XTERM_REVERSE_VIDEO 764#ifndef XTERM_REVERSE_VIDEO
676 if (i < 2 && OPTION (Opt_reverseVideo)) 765 if (i < 2 && option (Opt_reverseVideo))
677 name = def_colorName [1 - i]; 766 name = def_colorName [1 - i];
678 else 767 else
679#endif 768#endif
680 name = def_colorName [i]; 769 name = def_colorName [i];
681 770
… …
746 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 835 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
747 cscroll.a) 836 cscroll.a)
748 )) 837 ))
749 alias_color (Color_topShadow, Color_White); 838 alias_color (Color_topShadow, Color_White);
750 } 839 }
751#endif /* KEEP_SCROLLCOLOR */ 840#endif /* KEEP_SCROLLCOLOR */
752 841
753#ifdef OFF_FOCUS_FADING 842#ifdef OFF_FOCUS_FADING
754 if (rs[Rs_fade])
755 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 843 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
756 { 844 update_fade_color (i);
757 rgba c;
758 pix_colors [Color_fade].get (c);
759 pix_colors_focused [i].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused[i],c);
760 }
761#endif 845#endif
762} 846}
763 847
764/*----------------------------------------------------------------------*/ 848/*----------------------------------------------------------------------*/
765/* color aliases, fg/bg bright-bold */ 849/* color aliases, fg/bg bright-bold */
… …
769 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 853 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
770 { 854 {
771 int i = atoi (rs[Rs_color + idx]); 855 int i = atoi (rs[Rs_color + idx]);
772 856
773 if (i >= 8 && i <= 15) 857 if (i >= 8 && i <= 15)
774 { /* bright colors */ 858 /* bright colors */
775 i -= 8;
776 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 859 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
777 return; 860 else if (i >= 0 && i <= 7)
778 } 861 /* normal colors */
779
780 if (i >= 0 && i <= 7) /* normal colors */
781 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 862 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
782 } 863 }
783} 864}
784 865
785/*----------------------------------------------------------------------*/ 866/*----------------------------------------------------------------------*/
… …
877rxvt_term::create_windows (int argc, const char *const *argv) 958rxvt_term::create_windows (int argc, const char *const *argv)
878{ 959{
879 XClassHint classHint; 960 XClassHint classHint;
880 XWMHints wmHint; 961 XWMHints wmHint;
881#if ENABLE_FRILLS 962#if ENABLE_FRILLS
882 MWMHints mwmhints; 963 MWMHints mwmhints = { };
883#endif 964#endif
884 XGCValues gcvalue; 965 XGCValues gcvalue;
885 XSetWindowAttributes attributes; 966 XSetWindowAttributes attributes;
886 Window top, parent; 967 Window top, parent;
887 968
… …
893 if (!set_fonts ()) 974 if (!set_fonts ())
894 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 975 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
895 976
896 parent = display->root; 977 parent = display->root;
897 978
898 attributes.override_redirect = !!OPTION (Opt_override_redirect); 979 attributes.override_redirect = !!option (Opt_override_redirect);
899 980
900#if ENABLE_FRILLS 981#if ENABLE_FRILLS
901 if (OPTION (Opt_borderLess)) 982 if (option (Opt_borderLess))
902 { 983 {
903 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 984 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
904 { 985 {
905 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 986 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
906 attributes.override_redirect = true; 987 attributes.override_redirect = true;
907 mwmhints.flags = 0;
908 } 988 }
909 else 989 else
910 { 990 {
911 mwmhints.flags = MWM_HINTS_DECORATIONS; 991 mwmhints.flags = MWM_HINTS_DECORATIONS;
912 mwmhints.decorations = 0;
913 } 992 }
914 } 993 }
915 else
916 mwmhints.flags = 0;
917#endif 994#endif
918 995
919#if ENABLE_XEMBED 996#if ENABLE_XEMBED
920 if (rs[Rs_embed]) 997 if (rs[Rs_embed])
921 { 998 {
… …
956 classHint.res_name = (char *)rs[Rs_name]; 1033 classHint.res_name = (char *)rs[Rs_name];
957 classHint.res_class = (char *)RESCLASS; 1034 classHint.res_class = (char *)RESCLASS;
958 1035
959 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1036 wmHint.flags = InputHint | StateHint | WindowGroupHint;
960 wmHint.input = True; 1037 wmHint.input = True;
961 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 1038 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
962 wmHint.window_group = top; 1039 wmHint.window_group = top;
963 1040
964 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1041 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
965 &szHint, &wmHint, &classHint); 1042 &szHint, &wmHint, &classHint);
966 1043
… …
1023 attributes.bit_gravity = NorthWestGravity; 1100 attributes.bit_gravity = NorthWestGravity;
1024 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes); 1101 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1025 1102
1026 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1103 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1027 1104
1028 if (OPTION (Opt_pointerBlank)) 1105 if (option (Opt_pointerBlank))
1029 vt_emask |= PointerMotionMask; 1106 vt_emask |= PointerMotionMask;
1030 else 1107 else
1031 vt_emask |= Button1MotionMask | Button3MotionMask; 1108 vt_emask |= Button1MotionMask | Button3MotionMask;
1032 1109
1033 vt_select_input (); 1110 vt_select_input ();
1034 1111
1035 vt_ev.start (display, vt); 1112 vt_ev.start (display, vt);
1036
1037#ifdef XPM_BACKGROUND
1038 if (rs[Rs_backgroundPixmap] != NULL
1039 && !OPTION (Opt_transparent))
1040 {
1041 const char *p = rs[Rs_backgroundPixmap];
1042
1043 if ((p = strchr (p, ';')) != NULL)
1044 {
1045 p++;
1046 scale_pixmap (p);
1047 }
1048
1049 set_bgPixmap (rs[Rs_backgroundPixmap]);
1050 scr_touch (true);
1051 }
1052#endif
1053 1113
1054 /* graphics context for the vt window */ 1114 /* graphics context for the vt window */
1055 gcvalue.foreground = pix_colors[Color_fg]; 1115 gcvalue.foreground = pix_colors[Color_fg];
1056 gcvalue.background = pix_colors[Color_bg]; 1116 gcvalue.background = pix_colors[Color_bg];
1057 gcvalue.graphics_exposures = 0; 1117 gcvalue.graphics_exposures = 0;
… …
1085 * GET TTY CURRENT STATE * 1145 * GET TTY CURRENT STATE *
1086 * ------------------------------------------------------------------------- */ 1146 * ------------------------------------------------------------------------- */
1087void 1147void
1088rxvt_get_ttymode (ttymode_t *tio, int erase) 1148rxvt_get_ttymode (ttymode_t *tio, int erase)
1089{ 1149{
1090#ifdef HAVE_TERMIOS_H
1091 /* 1150 /*
1092 * standard System V termios interface 1151 * standard System V termios interface
1093 */ 1152 */
1094 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1153 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1095 { 1154 {
… …
1162 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1221 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1163# if defined (ECHOCTL) && defined (ECHOKE) 1222# if defined (ECHOCTL) && defined (ECHOKE)
1164 | ECHOCTL | ECHOKE 1223 | ECHOCTL | ECHOKE
1165# endif 1224# endif
1166 | ECHOE | ECHOK); 1225 | ECHOE | ECHOK);
1167# else /* HAVE_TERMIOS_H */
1168
1169 /*
1170 * sgtty interface
1171 */
1172
1173 /* get parameters -- gtty */
1174 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1175 {
1176 tio->sg.sg_erase = CERASE; /* ^H */
1177 tio->sg.sg_kill = CKILL; /* ^U */
1178 }
1179
1180 if (erase != -1)
1181 tio->sg.sg_erase = (char)erase;
1182
1183 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1184
1185 /* get special characters */
1186 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1187 {
1188 tio->tc.t_intrc = CINTR; /* ^C */
1189 tio->tc.t_quitc = CQUIT; /* ^\ */
1190 tio->tc.t_startc = CSTART; /* ^Q */
1191 tio->tc.t_stopc = CSTOP; /* ^S */
1192 tio->tc.t_eofc = CEOF; /* ^D */
1193 tio->tc.t_brkc = -1;
1194 }
1195
1196 /* get local special chars */
1197 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1198 {
1199 tio->lc.t_suspc = CSUSP; /* ^Z */
1200 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1201 tio->lc.t_rprntc = CRPRNT; /* ^R */
1202 tio->lc.t_flushc = CFLUSH; /* ^O */
1203 tio->lc.t_werasc = CWERASE; /* ^W */
1204 tio->lc.t_lnextc = CLNEXT; /* ^V */
1205 }
1206 /* get line discipline */
1207 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1208# ifdef NTTYDISC
1209 tio->line = NTTYDISC;
1210# endif /* NTTYDISC */
1211
1212 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1213#endif /* HAVE_TERMIOS_H */
1214 1226
1215 /* 1227 /*
1216 * Debugging 1228 * Debugging
1217 */ 1229 */
1218#ifdef DEBUG_TTYMODE 1230#ifdef DEBUG_TTYMODE
1219#ifdef HAVE_TERMIOS_H
1220 /* c_iflag bits */ 1231 /* c_iflag bits */
1221 fprintf (stderr, "Input flags\n"); 1232 fprintf (stderr, "Input flags\n");
1222 1233
1223 /* cpp token stringize doesn't work on all machines <sigh> */ 1234 /* cpp token stringize doesn't work on all machines <sigh> */
1224# define FOO(flag,name) \ 1235# define FOO(flag,name) \
… …
1287 FOO (VLNEXT, "VLNEXT"); 1298 FOO (VLNEXT, "VLNEXT");
1288# endif 1299# endif
1289 1300
1290 fprintf (stderr, "\n"); 1301 fprintf (stderr, "\n");
1291# undef FOO 1302# undef FOO
1292# endif /* HAVE_TERMIOS_H */ 1303#endif /* DEBUG_TTYMODE */
1293#endif /* DEBUG_TTYMODE */
1294} 1304}
1295 1305
1296/*----------------------------------------------------------------------*/ 1306/*----------------------------------------------------------------------*/
1297/* 1307/*
1298 * Run the command in a subprocess and return a file descriptor for the 1308 * Run the command in a subprocess and return a file descriptor for the
… …
1319 else 1329 else
1320#endif 1330#endif
1321 if (!pty->get ()) 1331 if (!pty->get ())
1322 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1332 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1323 1333
1334 int er;
1335
1336#ifndef NO_BACKSPACE_KEY
1337 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1338 er = rs[Rs_backspace_key][0];
1339 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1340 er = '\177'; /* the initial state anyway */
1341 else
1342#endif
1343 er = -1;
1344
1345 rxvt_get_ttymode (&tio, er);
1346 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
1324 pty->set_utf8_mode (enc_utf8); 1347 pty->set_utf8_mode (enc_utf8);
1325 1348
1326 /* set initial window size */ 1349 /* set initial window size */
1327 tt_winch (); 1350 tt_winch ();
1328
1329 int er;
1330
1331#ifndef NO_BACKSPACE_KEY
1332 if (key_backspace[0] && !key_backspace[1])
1333 er = key_backspace[0];
1334 else if (strcmp (key_backspace, "DEC") == 0)
1335 er = '\177'; /* the initial state anyway */
1336 else
1337#endif
1338 er = -1;
1339
1340 rxvt_get_ttymode (&tio, er);
1341 1351
1342#if ENABLE_FRILLS 1352#if ENABLE_FRILLS
1343 if (rs[Rs_pty_fd]) 1353 if (rs[Rs_pty_fd])
1344 return; 1354 return;
1345#endif 1355#endif
… …
1376 } 1386 }
1377 1387
1378 _exit (EXIT_FAILURE); 1388 _exit (EXIT_FAILURE);
1379 1389
1380 default: 1390 default:
1381 if (!OPTION (Opt_utmpInhibit)) 1391 if (!option (Opt_utmpInhibit))
1382 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1392 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1383 1393
1384 pty->close_tty (); 1394 pty->close_tty ();
1385 1395
1386 child_ev.start (cmd_pid); 1396 child_ev.start (cmd_pid);
1387 1397
… …
1400int 1410int
1401rxvt_term::run_child (const char *const *argv) 1411rxvt_term::run_child (const char *const *argv)
1402{ 1412{
1403 char *login; 1413 char *login;
1404 1414
1405 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1406
1407 if (OPTION (Opt_console)) 1415 if (option (Opt_console))
1416 {
1408 { /* be virtual console, fail silently */ 1417 /* be virtual console, fail silently */
1409#ifdef TIOCCONS 1418#ifdef TIOCCONS
1410 unsigned int on = 1; 1419 unsigned int on = 1;
1411 1420
1412 ioctl (STDIN_FILENO, TIOCCONS, &on); 1421 ioctl (STDIN_FILENO, TIOCCONS, &on);
1413#elif defined (SRIOCSREDIR) 1422#elif defined (SRIOCSREDIR)
… …
1415 1424
1416 fd = open (CONSOLE, O_WRONLY, 0); 1425 fd = open (CONSOLE, O_WRONLY, 0);
1417 if (fd >= 0) 1426 if (fd >= 0)
1418 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1427 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1419 close (fd); 1428 close (fd);
1420#endif /* SRIOCSREDIR */ 1429#endif /* SRIOCSREDIR */
1421 } 1430 }
1422 1431
1423 /* reset signals and spin off the command interpreter */ 1432 /* reset signals and spin off the command interpreter */
1424 signal (SIGINT, SIG_DFL); 1433 signal (SIGINT, SIG_DFL);
1425 signal (SIGQUIT, SIG_DFL); 1434 signal (SIGQUIT, SIG_DFL);
… …
1432 */ 1441 */
1433#ifdef SIGTSTP 1442#ifdef SIGTSTP
1434 signal (SIGTSTP, SIG_IGN); 1443 signal (SIGTSTP, SIG_IGN);
1435 signal (SIGTTIN, SIG_IGN); 1444 signal (SIGTTIN, SIG_IGN);
1436 signal (SIGTTOU, SIG_IGN); 1445 signal (SIGTTOU, SIG_IGN);
1437#endif /* SIGTSTP */ 1446#endif /* SIGTSTP */
1438 1447
1439 // unblock signals (signals are blocked by iom.C 1448 // unblock signals (signals are blocked by iom.C
1440 sigset_t ss; 1449 sigset_t ss;
1441 sigemptyset (&ss); 1450 sigemptyset (&ss);
1442 sigprocmask (SIG_SETMASK, &ss, 0); 1451 sigprocmask (SIG_SETMASK, &ss, 0);
1443 1452
1444 /* command interpreter path */ 1453 /* command interpreter path */
1445 if (argv != NULL) 1454 if (argv)
1446 { 1455 {
1447# ifdef DEBUG_CMD 1456# ifdef DEBUG_CMD
1448 int i; 1457 int i;
1449 1458
1450 for (i = 0; argv[i]; i++) 1459 for (i = 0; argv[i]; i++)
… …
1459 const char *argv0, *shell; 1468 const char *argv0, *shell;
1460 1469
1461 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1470 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1462 shell = "/bin/sh"; 1471 shell = "/bin/sh";
1463 1472
1464 argv0 = (const char *)rxvt_r_basename (shell); 1473 argv0 = (const char *)rxvt_basename (shell);
1465 1474
1466 if (OPTION (Opt_loginShell)) 1475 if (option (Opt_loginShell))
1467 { 1476 {
1468 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1477 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1469 1478
1470 login[0] = '-'; 1479 login[0] = '-';
1471 strcpy (&login[1], argv0); 1480 strcpy (&login[1], argv0);
1472 argv0 = login; 1481 argv0 = login;
1473 } 1482 }
1474 1483
1475 execlp (shell, argv0, NULL); 1484 execlp (shell, argv0, (char *)0);
1476 /* no error message: STDERR is closed! */ 1485 /* no error message: STDERR is closed! */
1477 } 1486 }
1478 1487
1479 return -1; 1488 return -1;
1480} 1489}

Diff Legend

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