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.183 by root, Tue May 29 04:02:18 2007 UTC vs.
Revision 1.218 by ayin, Thu Oct 18 09:11:42 2007 UTC

… …
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>
… …
37#include "init.h" 40#include "init.h"
38 41
39#include <limits> 42#include <limits>
40 43
41#include <csignal> 44#include <csignal>
45
46#ifdef HAVE_XSETLOCALE
47# define X_LOCALE
48# include <X11/Xlocale.h>
49#else
50# ifdef HAVE_SETLOCALE
51# include <clocale>
52# endif
53#endif
54
55#ifdef HAVE_NL_LANGINFO
56# include <langinfo.h>
57#endif
58
59#ifdef DISPLAY_IS_IP
60/* On Solaris link with -lsocket and -lnsl */
61#include <sys/types.h>
62#include <sys/socket.h>
63
64/* these next two are probably only on Sun (not Solaris) */
65#ifdef HAVE_SYS_SOCKIO_H
66#include <sys/sockio.h>
67#endif
68#ifdef HAVE_SYS_BYTEORDER_H
69#include <sys/byteorder.h>
70#endif
71
72#include <netinet/in.h>
73#include <arpa/inet.h>
74#include <net/if.h>
75#include <net/if_arp.h>
76
77static char *
78rxvt_network_display (const char *display)
79{
80 char buffer[1024], *rval = NULL;
81 struct ifconf ifc;
82 struct ifreq *ifr;
83 int i, skfd;
84
85 if (display[0] != ':' && strncmp (display, "unix:", 5))
86 return (char *) display; /* nothing to do */
87
88 ifc.ifc_len = sizeof (buffer); /* Get names of all ifaces */
89 ifc.ifc_buf = buffer;
90
91 if ((skfd = socket (AF_INET, SOCK_DGRAM, 0)) < 0)
92 {
93 perror ("socket");
94 return NULL;
95 }
96
97 if (ioctl (skfd, SIOCGIFCONF, &ifc) < 0)
98 {
99 perror ("SIOCGIFCONF");
100 close (skfd);
101 return NULL;
102 }
103
104 for (i = 0, ifr = ifc.ifc_req;
105 i < (ifc.ifc_len / sizeof (struct ifreq));
106 i++, ifr++)
107 {
108 struct ifreq ifr2;
109
110 strcpy (ifr2.ifr_name, ifr->ifr_name);
111
112 if (ioctl (skfd, SIOCGIFADDR, &ifr2) >= 0)
113 {
114 unsigned long addr;
115 struct sockaddr_in *p_addr;
116
117 p_addr = (struct sockaddr_in *) &ifr2.ifr_addr;
118 addr = htonl ((unsigned long)p_addr->sin_addr.s_addr);
119
120 /*
121 * not "0.0.0.0" or "127.0.0.1" - so format the address
122 */
123 if (addr && addr != 0x7F000001)
124 {
125 char *colon = strchr (display, ':');
126
127 if (colon == NULL)
128 colon = ":0.0";
129
130 rval = rxvt_malloc (strlen (colon) + 16);
131 sprintf (rval, "%d.%d.%d.%d%s",
132 (int) ((addr >> 030) & 0xFF),
133 (int) ((addr >> 020) & 0xFF),
134 (int) ((addr >> 010) & 0xFF),
135 (int) (addr & 0xFF), colon);
136 break;
137 }
138 }
139 }
140
141 close (skfd);
142
143 return rval;
144}
145#endif
42 146
43const char *const def_colorName[] = 147const char *const def_colorName[] =
44 { 148 {
45 COLOR_FOREGROUND, 149 COLOR_FOREGROUND,
46 COLOR_BACKGROUND, 150 COLOR_BACKGROUND,
… …
166#endif 270#endif
167#ifdef KEEP_SCROLLCOLOR 271#ifdef KEEP_SCROLLCOLOR
168 COLOR_SCROLLBAR, 272 COLOR_SCROLLBAR,
169 COLOR_SCROLLTROUGH, 273 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 274#endif /* KEEP_SCROLLCOLOR */
171#if TINTING 275#if ENABLE_TRANSPARENCY
172 NULL, 276 NULL,
173#endif 277#endif
174#if OFF_FOCUS_FADING 278#if OFF_FOCUS_FADING
175 "rgb:00/00/00", 279 "rgb:00/00/00",
176#endif 280#endif
… …
183 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 287 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
184#ifdef OFF_FOCUS_FADING 288#ifdef OFF_FOCUS_FADING
185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 289 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
186#endif 290#endif
187 291
188#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
189 pixmap = None;
190#endif
191 292
192 MEvent.time = CurrentTime; 293 MEvent.time = CurrentTime;
193 MEvent.button = AnyButton; 294 MEvent.button = AnyButton;
194 want_refresh = 1; 295 want_refresh = 1;
195 priv_modes = SavedModes = PrivMode_Default; 296 priv_modes = SavedModes = PrivMode_Default;
… …
199 ext_bwidth = EXTERNALBORDERWIDTH; 300 ext_bwidth = EXTERNALBORDERWIDTH;
200 lineSpace = LINESPACE; 301 lineSpace = LINESPACE;
201 saveLines = SAVELINES; 302 saveLines = SAVELINES;
202 numpix_colors = TOTAL_COLORS; 303 numpix_colors = TOTAL_COLORS;
203 304
204 refresh_limit = 1;
205 refresh_type = SLOW_REFRESH; 305 refresh_type = SLOW_REFRESH;
206 306
207 oldcursor.row = oldcursor.col = -1; 307 oldcursor.row = oldcursor.col = -1;
208#ifdef XPM_BACKGROUND
209 /* bgPixmap.w = bgPixmap.h = 0; */
210 bgPixmap.x = bgPixmap.y = 0;
211 bgPixmap.pixmap = None;
212#endif
213
214 last_bot = last_state = -1; 308 last_bot = last_state = -1;
215 309
216 set_option (Opt_scrollBar); 310 set_option (Opt_scrollBar);
217 set_option (Opt_scrollTtyOutput); 311 set_option (Opt_scrollTtyOutput);
218 set_option (Opt_jumpScroll); 312 set_option (Opt_jumpScroll);
313 set_option (Opt_skipScroll);
219 set_option (Opt_secondaryScreen); 314 set_option (Opt_secondaryScreen);
220 set_option (Opt_secondaryScroll); 315 set_option (Opt_secondaryScroll);
221 set_option (Opt_pastableTabs); 316 set_option (Opt_pastableTabs);
222 set_option (Opt_intensityStyles); 317 set_option (Opt_intensityStyles);
318 set_option (Opt_iso14755_52);
223 319
224 return true; 320 return true;
225} 321}
226 322
227void 323void
… …
236 if ((i = open ("/dev/null", O_RDONLY)) < 0) 332 if ((i = open ("/dev/null", O_RDONLY)) < 0)
237 { 333 {
238 /* TODO: BOO HISS */ 334 /* TODO: BOO HISS */
239 dup2 (STDERR_FILENO, STDIN_FILENO); 335 dup2 (STDERR_FILENO, STDIN_FILENO);
240 } 336 }
241 else if (i > STDIN_FILENO) 337 else if (i != STDIN_FILENO)
242 { 338 {
243 dup2 (i, STDIN_FILENO); 339 dup2 (i, STDIN_FILENO);
244 close (i); 340 close (i);
245 } 341 }
246 342
… …
261/*----------------------------------------------------------------------*/ 357/*----------------------------------------------------------------------*/
262const char ** 358const char **
263rxvt_term::init_resources (int argc, const char *const *argv) 359rxvt_term::init_resources (int argc, const char *const *argv)
264{ 360{
265 int i, r_argc; 361 int i, r_argc;
266 char *val;
267 const char **cmd_argv, **r_argv; 362 const char **cmd_argv, **r_argv;
268 363
269 /* 364 /*
270 * Look for -e option. Find => split and make cmd_argv[] of command args 365 * Look for -e option. Find => split and make cmd_argv[] of command args
271 */ 366 */
272 for (r_argc = 0; r_argc < argc; r_argc++) 367 for (r_argc = 0; r_argc < argc; r_argc++)
273 if (!strcmp (argv[r_argc], "-e")) 368 if (!strcmp (argv[r_argc], "-e"))
274 break; 369 break;
275 370
371 if (r_argc == argc)
372 cmd_argv = NULL;
373 else if (!argv[r_argc + 1])
374 rxvt_fatal ("-e requires an argument\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 }
384
276 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 385 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
277 386
278 for (i = 0; i < r_argc; i++) 387 for (i = 0; i < r_argc; i++)
279 r_argv[i] = (const char *)argv[i]; 388 r_argv[i] = (const char *)argv[i];
280 389
281 r_argv[i] = NULL; 390 r_argv[i] = NULL;
282 391
283 if (r_argc == argc)
284 cmd_argv = NULL;
285 else
286 {
287 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
288
289 for (i = 0; i < argc - r_argc - 1; i++)
290 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
291
292 cmd_argv[i] = NULL;
293 }
294
295 rs[Rs_name] = rxvt_r_basename (argv[0]); 392 rs[Rs_name] = rxvt_basename (argv[0]);
296 393
297 /* 394 /*
298 * Open display, get options/resources and create the window 395 * Open display, get options/resources and create the window
299 */ 396 */
300 397
… …
302 rs[Rs_display_name] = ":0"; 399 rs[Rs_display_name] = ":0";
303 400
304 get_options (r_argc, r_argv); 401 get_options (r_argc, r_argv);
305 402
306 if (!(display = displays.get (rs[Rs_display_name]))) 403 if (!(display = displays.get (rs[Rs_display_name])))
404 {
405 free (r_argv);
307 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 }
308 408
309 // using a local pointer decreases code size a lot 409 // using a local pointer decreases code size a lot
310 xa = display->xa; 410 xa = display->xa;
311 411
312 set (display); 412 set (display);
… …
315#if XFT 415#if XFT
316 if (rs[Rs_depth]) 416 if (rs[Rs_depth])
317 select_visual (strtol (rs[Rs_depth], 0, 0)); 417 select_visual (strtol (rs[Rs_depth], 0, 0));
318#endif 418#endif
319 419
420#ifdef HAVE_AFTERIMAGE
421 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
422#endif
320 free (r_argv); 423 free (r_argv);
321 424
322 for (int i = NUM_RESOURCES; i--; ) 425 for (int i = NUM_RESOURCES; i--; )
323 if (rs [i] == resval_undef) 426 if (rs [i] == resval_undef)
324 rs [i] = 0; 427 rs [i] = 0;
… …
340 * set any defaults not already set 443 * set any defaults not already set
341 */ 444 */
342 if (cmd_argv && cmd_argv[0]) 445 if (cmd_argv && cmd_argv[0])
343 { 446 {
344 if (!rs[Rs_title]) 447 if (!rs[Rs_title])
345 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 448 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
346 if (!rs[Rs_iconName]) 449 if (!rs[Rs_iconName])
347 rs[Rs_iconName] = rs[Rs_title]; 450 rs[Rs_iconName] = rs[Rs_title];
348 } 451 }
349 else 452 else
350 { 453 {
… …
388 rs[Rs_cutchars] = CUTCHARS; 491 rs[Rs_cutchars] = CUTCHARS;
389 492
390#ifndef NO_BACKSPACE_KEY 493#ifndef NO_BACKSPACE_KEY
391 if (!rs[Rs_backspace_key]) 494 if (!rs[Rs_backspace_key])
392# ifdef DEFAULT_BACKSPACE 495# ifdef DEFAULT_BACKSPACE
393 key_backspace = DEFAULT_BACKSPACE; 496 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
394# else 497# else
395 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 498 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
396# endif 499# endif
397 else
398 {
399 val = strdup (rs[Rs_backspace_key]);
400 rxvt_Str_trim (val);
401 rxvt_Str_escaped (val);
402 key_backspace = val;
403 }
404#endif 500#endif
405 501
406#ifndef NO_DELETE_KEY 502#ifndef NO_DELETE_KEY
407 if (!rs[Rs_delete_key]) 503 if (!rs[Rs_delete_key])
408# ifdef DEFAULT_DELETE 504# ifdef DEFAULT_DELETE
409 key_delete = DEFAULT_DELETE; 505 rs[Rs_delete_key] = DEFAULT_DELETE;
410# else 506# else
411 key_delete = "\033[3~"; 507 rs[Rs_delete_key] = "\033[3~";
412# endif
413 else
414 {
415 val = strdup (rs[Rs_delete_key]);
416 rxvt_Str_trim (val);
417 rxvt_Str_escaped (val);
418 key_delete = val;
419 }
420#endif 508# endif
421 if (rs[Rs_answerbackstring]) 509#endif
422 {
423 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
424 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
425 }
426 510
427#ifdef HAVE_SCROLLBARS 511#ifdef HAVE_SCROLLBARS
428 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]);
429#endif 513#endif
430 514
… …
475/*----------------------------------------------------------------------*/ 559/*----------------------------------------------------------------------*/
476void 560void
477rxvt_term::init_env () 561rxvt_term::init_env ()
478{ 562{
479 int i; 563 int i;
480 unsigned int u;
481 char *val; 564 char *val;
482 565
483#ifdef DISPLAY_IS_IP 566#ifdef DISPLAY_IS_IP
484 /* Fixup display_name for export over pty to any interested terminal 567 /* Fixup display_name for export over pty to any interested terminal
485 * 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
… …
500 583
501 if (rs[Rs_display_name] == NULL) 584 if (rs[Rs_display_name] == NULL)
502 rs[Rs_display_name] = val; /* use broken `:0' value */ 585 rs[Rs_display_name] = val; /* use broken `:0' value */
503 586
504 i = strlen (val); 587 i = strlen (val);
505 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 588 env_display = (char *)rxvt_malloc (i + 9);
506 589
507 sprintf (env_display, "DISPLAY=%s", val); 590 sprintf (env_display, "DISPLAY=%s", val);
508 591
509 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 592 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
510 593
… …
531 else 614 else
532 putenv ("COLORTERM=" COLORTERMENVFULL); 615 putenv ("COLORTERM=" COLORTERMENVFULL);
533 616
534 if (rs[Rs_term_name] != NULL) 617 if (rs[Rs_term_name] != NULL)
535 { 618 {
536 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);
537 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 620 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
538 putenv (env_term); 621 putenv (env_term);
539 } 622 }
540 else 623 else
541 putenv ("TERM=" TERMENV); 624 putenv ("TERM=" TERMENV);
… …
641 priv_modes |= PrivMode_Keypress; 724 priv_modes |= PrivMode_Keypress;
642 if (!option (Opt_jumpScroll)) 725 if (!option (Opt_jumpScroll))
643 priv_modes |= PrivMode_smoothScroll; 726 priv_modes |= PrivMode_smoothScroll;
644 727
645#ifndef NO_BACKSPACE_KEY 728#ifndef NO_BACKSPACE_KEY
646 if (strcmp (key_backspace, "DEC") == 0) 729 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
647 priv_modes |= PrivMode_HaveBackSpace; 730 priv_modes |= PrivMode_HaveBackSpace;
648#endif 731#endif
649 732
650 /* add value for scrollBar */ 733 /* add value for scrollBar */
651 if (scrollBar.state) 734 if (scrollBar.state)
… …
878rxvt_term::create_windows (int argc, const char *const *argv) 961rxvt_term::create_windows (int argc, const char *const *argv)
879{ 962{
880 XClassHint classHint; 963 XClassHint classHint;
881 XWMHints wmHint; 964 XWMHints wmHint;
882#if ENABLE_FRILLS 965#if ENABLE_FRILLS
883 MWMHints mwmhints; 966 MWMHints mwmhints = { };
884#endif 967#endif
885 XGCValues gcvalue; 968 XGCValues gcvalue;
886 XSetWindowAttributes attributes; 969 XSetWindowAttributes attributes;
887 Window top, parent; 970 Window top, parent;
888 971
… …
901#if ENABLE_FRILLS 984#if ENABLE_FRILLS
902 if (option (Opt_borderLess)) 985 if (option (Opt_borderLess))
903 { 986 {
904 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 987 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
905 { 988 {
906 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 989 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
907 attributes.override_redirect = true; 990 attributes.override_redirect = true;
908 mwmhints.flags = 0;
909 } 991 }
910 else 992 else
911 { 993 {
912 mwmhints.flags = MWM_HINTS_DECORATIONS; 994 mwmhints.flags = MWM_HINTS_DECORATIONS;
913 mwmhints.decorations = 0;
914 } 995 }
915 } 996 }
916 else
917 mwmhints.flags = 0;
918#endif 997#endif
919 998
920#if ENABLE_XEMBED 999#if ENABLE_XEMBED
921 if (rs[Rs_embed]) 1000 if (rs[Rs_embed])
922 { 1001 {
… …
1032 vt_emask |= Button1MotionMask | Button3MotionMask; 1111 vt_emask |= Button1MotionMask | Button3MotionMask;
1033 1112
1034 vt_select_input (); 1113 vt_select_input ();
1035 1114
1036 vt_ev.start (display, vt); 1115 vt_ev.start (display, vt);
1037
1038#ifdef XPM_BACKGROUND
1039 if (rs[Rs_backgroundPixmap] != NULL
1040 && !option (Opt_transparent))
1041 {
1042 const char *p = rs[Rs_backgroundPixmap];
1043
1044 if ((p = strchr (p, ';')) != NULL)
1045 {
1046 p++;
1047 scale_pixmap (p);
1048 }
1049
1050 set_bgPixmap (rs[Rs_backgroundPixmap]);
1051 scr_touch (true);
1052 }
1053#endif
1054 1116
1055 /* graphics context for the vt window */ 1117 /* graphics context for the vt window */
1056 gcvalue.foreground = pix_colors[Color_fg]; 1118 gcvalue.foreground = pix_colors[Color_fg];
1057 gcvalue.background = pix_colors[Color_bg]; 1119 gcvalue.background = pix_colors[Color_bg];
1058 gcvalue.graphics_exposures = 0; 1120 gcvalue.graphics_exposures = 0;
… …
1275 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1337 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1276 1338
1277 int er; 1339 int er;
1278 1340
1279#ifndef NO_BACKSPACE_KEY 1341#ifndef NO_BACKSPACE_KEY
1280 if (key_backspace[0] && !key_backspace[1]) 1342 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1281 er = key_backspace[0]; 1343 er = rs[Rs_backspace_key][0];
1282 else if (strcmp (key_backspace, "DEC") == 0) 1344 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1283 er = '\177'; /* the initial state anyway */ 1345 er = '\177'; /* the initial state anyway */
1284 else 1346 else
1285#endif 1347#endif
1286 er = -1; 1348 er = -1;
1287 1349
… …
1391 sigset_t ss; 1453 sigset_t ss;
1392 sigemptyset (&ss); 1454 sigemptyset (&ss);
1393 sigprocmask (SIG_SETMASK, &ss, 0); 1455 sigprocmask (SIG_SETMASK, &ss, 0);
1394 1456
1395 /* command interpreter path */ 1457 /* command interpreter path */
1396 if (argv != NULL) 1458 if (argv)
1397 { 1459 {
1398# ifdef DEBUG_CMD 1460# ifdef DEBUG_CMD
1399 int i; 1461 int i;
1400 1462
1401 for (i = 0; argv[i]; i++) 1463 for (i = 0; argv[i]; i++)
… …
1410 const char *argv0, *shell; 1472 const char *argv0, *shell;
1411 1473
1412 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1474 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1413 shell = "/bin/sh"; 1475 shell = "/bin/sh";
1414 1476
1415 argv0 = (const char *)rxvt_r_basename (shell); 1477 argv0 = (const char *)rxvt_basename (shell);
1416 1478
1417 if (option (Opt_loginShell)) 1479 if (option (Opt_loginShell))
1418 { 1480 {
1419 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1481 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1420 1482
1421 login[0] = '-'; 1483 login[0] = '-';
1422 strcpy (&login[1], argv0); 1484 strcpy (&login[1], argv0);
1423 argv0 = login; 1485 argv0 = login;
1424 } 1486 }
1425 1487
1426 execlp (shell, argv0, NULL); 1488 execlp (shell, argv0, (char *)0);
1427 /* no error message: STDERR is closed! */ 1489 /* no error message: STDERR is closed! */
1428 } 1490 }
1429 1491
1430 return -1; 1492 return -1;
1431} 1493}

Diff Legend

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