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.122 by root, Sun Dec 18 00:59:42 2005 UTC vs.
Revision 1.134 by root, Fri Jan 6 05:37:59 2006 UTC

… …
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 10 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
11 * - extensive modifications 11 * - extensive modifications
12 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com> 12 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
13 * - QNX support 13 * - QNX support
14 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 14 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
15 * 15 *
16 * This program is free software; you can redistribute it and/or modify 16 * This program is free software; you can redistribute it and/or modify
17 * it under the terms of the GNU General Public License as published by 17 * it under the terms of the GNU General Public License as published by
18 * the Free Software Foundation; either version 2 of the License, or 18 * the Free Software Foundation; either version 2 of the License, or
19 * (at your option) any later version. 19 * (at your option) any later version.
… …
34#include "../config.h" /* NECESSARY */ 34#include "../config.h" /* NECESSARY */
35#include "rxvt.h" /* NECESSARY */ 35#include "rxvt.h" /* NECESSARY */
36#include "rxvtutil.h" 36#include "rxvtutil.h"
37#include "init.h" 37#include "init.h"
38 38
39#include <limits>
40
39#include <csignal> 41#include <csignal>
40 42
41const char *const def_colorName[] = 43const char *const def_colorName[] =
42 { 44 {
43 COLOR_FOREGROUND, 45 COLOR_FOREGROUND,
44 COLOR_BACKGROUND, 46 COLOR_BACKGROUND,
45 /* low-intensity colors */ 47 /* low-intensity colors */
46 "Black", /* 0: black (#000000) */ 48 "Black", /* 0: black (#000000) */
47#ifndef NO_BRIGHTCOLOR
48 "Red3", /* 1: red (#CD0000) */ 49 "Red3", /* 1: red (#CD0000) */
49 "Green3", /* 2: green (#00CD00) */ 50 "Green3", /* 2: green (#00CD00) */
50 "Yellow3", /* 3: yellow (#CDCD00) */ 51 "Yellow3", /* 3: yellow (#CDCD00) */
51 "Blue3", /* 4: blue (#0000CD) */ 52 "Blue3", /* 4: blue (#0000CD) */
52 "Magenta3", /* 5: magenta (#CD00CD) */ 53 "Magenta3", /* 5: magenta (#CD00CD) */
… …
60# ifdef XTERM_COLORS 61# ifdef XTERM_COLORS
61 "Grey30", /* 8: bright black (#4D4D4D) */ 62 "Grey30", /* 8: bright black (#4D4D4D) */
62# else 63# else
63 "Grey25", /* 8: bright black (#404040) */ 64 "Grey25", /* 8: bright black (#404040) */
64# endif 65# endif
65#endif /* NO_BRIGHTCOLOR */
66 "Red", /* 1/9: bright red (#FF0000) */ 66 "Red", /* 1/9: bright red (#FF0000) */
67 "Green", /* 2/10: bright green (#00FF00) */ 67 "Green", /* 2/10: bright green (#00FF00) */
68 "Yellow", /* 3/11: bright yellow (#FFFF00) */ 68 "Yellow", /* 3/11: bright yellow (#FFFF00) */
69 "Blue", /* 4/12: bright blue (#0000FF) */ 69 "Blue", /* 4/12: bright blue (#0000FF) */
70 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 70 "Magenta", /* 5/13: bright magenta (#FF00FF) */
… …
369 if (!rs[Rs_iconName]) 369 if (!rs[Rs_iconName])
370 rs[Rs_iconName] = rs[Rs_name]; 370 rs[Rs_iconName] = rs[Rs_name];
371 } 371 }
372 372
373 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 373 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
374 saveLines = BOUND_POSITIVE_INT16 (i); 374 saveLines = min (i, MAX_SAVELINES);
375 375
376#if ENABLE_FRILLS 376#if ENABLE_FRILLS
377 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0) 377 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
378 int_bwidth = min (i, 100); /* arbitrary limit */ 378 int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
379
379 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 380 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
380 ext_bwidth = min (i, 100); /* arbitrary limit */ 381 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
382
381 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 383 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
382 lineSpace = min (i, 100); /* arbitrary limit */ 384 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
383#endif 385#endif
384 386
385#ifdef POINTER_BLANK 387#ifdef POINTER_BLANK
386 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 388 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
387 pointerBlankDelay = i; 389 pointerBlankDelay = i;
… …
389 pointerBlankDelay = 2; 391 pointerBlankDelay = 2;
390#endif 392#endif
391 393
392 /* no point having a scrollbar without having any scrollback! */ 394 /* no point having a scrollbar without having any scrollback! */
393 if (!saveLines) 395 if (!saveLines)
394 options &= ~Opt_scrollBar; 396 CLR_OPTION (Opt_scrollBar);
395 397
396#ifdef PRINTPIPE 398#ifdef PRINTPIPE
397 if (!rs[Rs_print_pipe]) 399 if (!rs[Rs_print_pipe])
398 rs[Rs_print_pipe] = PRINTPIPE; 400 rs[Rs_print_pipe] = PRINTPIPE;
399#endif 401#endif
… …
442 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 444 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
443#endif 445#endif
444 446
445#ifdef XTERM_REVERSE_VIDEO 447#ifdef XTERM_REVERSE_VIDEO
446 /* this is how xterm implements reverseVideo */ 448 /* this is how xterm implements reverseVideo */
447 if (options & Opt_reverseVideo) 449 if (OPTION (Opt_reverseVideo))
448 { 450 {
449 if (!rs[Rs_color + Color_fg]) 451 if (!rs[Rs_color + Color_fg])
450 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 452 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
451 if (!rs[Rs_color + Color_bg]) 453 if (!rs[Rs_color + Color_bg])
452 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 454 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
… …
457 if (!rs[Rs_color + i]) 459 if (!rs[Rs_color + i])
458 rs[Rs_color + i] = def_colorName[i]; 460 rs[Rs_color + i] = def_colorName[i];
459 461
460#ifndef XTERM_REVERSE_VIDEO 462#ifndef XTERM_REVERSE_VIDEO
461 /* this is how we implement reverseVideo */ 463 /* this is how we implement reverseVideo */
462 if (options & Opt_reverseVideo) 464 if (OPTION (Opt_reverseVideo))
463 SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *); 465 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
464#endif 466#endif
465 467
466 /* convenient aliases for setting fg/bg to colors */ 468 /* convenient aliases for setting fg/bg to colors */
467 color_aliases (Color_fg); 469 color_aliases (Color_fg);
468 color_aliases (Color_bg); 470 color_aliases (Color_bg);
… …
521 523
522 /* avoiding the math library: 524 /* avoiding the math library:
523 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */ 525 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
524 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++) 526 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
525 ; 527 ;
526 MAX_IT (i, 1); 528 max_it (i, 1);
527 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char)); 529 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
528 530
529 sprintf (env_windowid, "WINDOWID=%u", 531 sprintf (env_windowid, "WINDOWID=%u",
530 (unsigned int)parent[0]); 532 (unsigned int)parent[0]);
531 533
… …
644 * Initialize the command connection. 646 * Initialize the command connection.
645 * This should be called after the X server connection is established. 647 * This should be called after the X server connection is established.
646 */ 648 */
647 649
648#ifdef META8_OPTION 650#ifdef META8_OPTION
649 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 651 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;
650#endif 652#endif
651 653
652 get_ourmods (); 654 get_ourmods ();
653 655
654 if (!(options & Opt_scrollTtyOutput)) 656 if (!OPTION (Opt_scrollTtyOutput))
655 priv_modes |= PrivMode_TtyOutputInh; 657 priv_modes |= PrivMode_TtyOutputInh;
656 if (options & Opt_scrollTtyKeypress) 658 if (OPTION (Opt_scrollTtyKeypress))
657 priv_modes |= PrivMode_Keypress; 659 priv_modes |= PrivMode_Keypress;
658 if (!(options & Opt_jumpScroll)) 660 if (!OPTION (Opt_jumpScroll))
659 priv_modes |= PrivMode_smoothScroll; 661 priv_modes |= PrivMode_smoothScroll;
660 662
661#ifndef NO_BACKSPACE_KEY 663#ifndef NO_BACKSPACE_KEY
662 if (strcmp (key_backspace, "DEC") == 0) 664 if (strcmp (key_backspace, "DEC") == 0)
663 priv_modes |= PrivMode_HaveBackSpace; 665 priv_modes |= PrivMode_HaveBackSpace;
… …
673 if (menubar_visible ()) 675 if (menubar_visible ())
674 { 676 {
675 priv_modes |= PrivMode_menuBar; 677 priv_modes |= PrivMode_menuBar;
676 SavedModes |= PrivMode_menuBar; 678 SavedModes |= PrivMode_menuBar;
677 } 679 }
678
679#ifdef CURSOR_BLINK
680 if (options & Opt_cursorBlink)
681 (void)gettimeofday (&lastcursorchange, NULL);
682#endif
683 680
684 run_command (argv); 681 run_command (argv);
685} 682}
686 683
687/*----------------------------------------------------------------------*/ 684/*----------------------------------------------------------------------*/
… …
702 continue; 699 continue;
703 700
704 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 701 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
705 { 702 {
706#ifndef XTERM_REVERSE_VIDEO 703#ifndef XTERM_REVERSE_VIDEO
707 if (i < 2 && (options & Opt_reverseVideo)) 704 if (i < 2 && OPTION (Opt_reverseVideo))
708 rs[Rs_color + i] = def_colorName[!i]; 705 rs[Rs_color + i] = def_colorName[!i];
709 else 706 else
710#endif 707#endif
711 rs[Rs_color + i] = def_colorName[i]; 708 rs[Rs_color + i] = def_colorName[i];
712 709
… …
809 int i = atoi (rs[Rs_color + idx]); 806 int i = atoi (rs[Rs_color + idx]);
810 807
811 if (i >= 8 && i <= 15) 808 if (i >= 8 && i <= 15)
812 { /* bright colors */ 809 { /* bright colors */
813 i -= 8; 810 i -= 8;
814#ifndef NO_BRIGHTCOLOR
815 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 811 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
816 return; 812 return;
817#endif
818 } 813 }
819 814
820 if (i >= 0 && i <= 7) /* normal colors */ 815 if (i >= 0 && i <= 7) /* normal colors */
821 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 816 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
822 } 817 }
… …
935#endif 930#endif
936 931
937 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 932 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
938 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); 933 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
939 934
940 if (options & Opt_transparent) 935 if (OPTION (Opt_transparent))
941 { 936 {
942 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 937 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
943 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 938 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
944 } 939 }
945 940
946#if ENABLE_FRILLS 941#if ENABLE_FRILLS
947 if (options & Opt_borderLess) 942 if (OPTION (Opt_borderLess))
948 { 943 {
949 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 944 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);
950 945
951 if (prop == None) 946 if (prop == None)
952 { 947 {
… …
1022 classHint.res_name = (char *)rs[Rs_name]; 1017 classHint.res_name = (char *)rs[Rs_name];
1023 classHint.res_class = (char *)RESCLASS; 1018 classHint.res_class = (char *)RESCLASS;
1024 1019
1025 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1020 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1026 wmHint.input = True; 1021 wmHint.input = True;
1027 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1022 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1028 wmHint.window_group = top; 1023 wmHint.window_group = top;
1029 1024
1030 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 1025 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1031 &szHint, &wmHint, &classHint); 1026 &szHint, &wmHint, &classHint);
1032 1027
… …
1037#endif 1032#endif
1038 }; 1033 };
1039 1034
1040 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1035 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1041 1036
1037#if ENABLE_FRILLS
1038 if (rs[Rs_transient_for])
1039 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1040#endif
1041
1042#if ENABLE_EWMH 1042#if ENABLE_EWMH
1043 long pid = getpid (); 1043 long pid = getpid ();
1044 1044
1045 XChangeProperty (disp, top, 1045 XChangeProperty (disp, top,
1046 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1046 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
… …
1075 1075
1076 /* the vt window */ 1076 /* the vt window */
1077 vt = XCreateSimpleWindow (disp, top, 1077 vt = XCreateSimpleWindow (disp, top,
1078 window_vt_x, 1078 window_vt_x,
1079 window_vt_y, 1079 window_vt_y,
1080 TermWin_TotalWidth (), 1080 width,
1081 TermWin_TotalHeight (), 1081 height,
1082 0, 1082 0,
1083 pix_colors_focused[Color_fg], 1083 pix_colors_focused[Color_fg],
1084 pix_colors_focused[Color_bg]); 1084 pix_colors_focused[Color_bg]);
1085#ifdef DEBUG_X 1085#ifdef DEBUG_X
1086 XStoreName (disp, vt, "vt window"); 1086 XStoreName (disp, vt, "vt window");
… …
1089 attributes.bit_gravity = NorthWestGravity; 1089 attributes.bit_gravity = NorthWestGravity;
1090 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1090 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1091 1091
1092 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1092 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1093 1093
1094#ifdef POINTER_BLANK 1094 if (OPTION (Opt_pointerBlank)
1095 if (options & Opt_pointerBlank) 1095#ifdef ENABLE_PERL
1096 || self
1097#endif
1098 )
1096 vt_emask |= PointerMotionMask; 1099 vt_emask |= PointerMotionMask;
1097 else 1100 else
1098#endif
1099 vt_emask |= Button1MotionMask | Button3MotionMask; 1101 vt_emask |= Button1MotionMask | Button3MotionMask;
1100 1102
1101 XSelectInput (disp, vt, vt_emask); 1103 XSelectInput (disp, vt, vt_emask);
1102 vt_ev.start (display, vt); 1104 vt_ev.start (display, vt);
1103 1105
1104#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1106#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1105 if (menuBar_height ()) 1107 if (menuBar_height ())
1106 { 1108 {
1107 menuBar.win = XCreateSimpleWindow (disp, top, 1109 menuBar.win = XCreateSimpleWindow (disp, top,
1108 window_vt_x, 0, 1110 window_vt_x, 0,
1109 TermWin_TotalWidth (), 1111 width,
1110 menuBar_TotalHeight (), 1112 menuBar_TotalHeight (),
1111 0, 1113 0,
1112 pix_colors_focused[Color_fg], 1114 pix_colors_focused[Color_fg],
1113 pix_colors_focused[Color_scroll]); 1115 pix_colors_focused[Color_scroll]);
1114 1116
… …
1127 } 1129 }
1128#endif 1130#endif
1129 1131
1130#ifdef XPM_BACKGROUND 1132#ifdef XPM_BACKGROUND
1131 if (rs[Rs_backgroundPixmap] != NULL 1133 if (rs[Rs_backgroundPixmap] != NULL
1132 && ! (options & Opt_transparent)) 1134 && ! OPTION (Opt_transparent))
1133 { 1135 {
1134 const char *p = rs[Rs_backgroundPixmap]; 1136 const char *p = rs[Rs_backgroundPixmap];
1135 1137
1136 if ((p = strchr (p, ';')) != NULL) 1138 if ((p = strchr (p, ';')) != NULL)
1137 { 1139 {
… …
1193 /* 1195 /*
1194 * standard System V termios interface 1196 * standard System V termios interface
1195 */ 1197 */
1196 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1198 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1197 { 1199 {
1198 /* return error - use system defaults */ 1200 // return error - use system defaults,
1201 // where possible, and zero elsewhere
1202 memset (tio, 0, sizeof (ttymode_t));
1203
1199 tio->c_cc[VINTR] = CINTR; 1204 tio->c_cc[VINTR] = CINTR;
1200 tio->c_cc[VQUIT] = CQUIT; 1205 tio->c_cc[VQUIT] = CQUIT;
1201 tio->c_cc[VERASE] = CERASE; 1206 tio->c_cc[VERASE] = CERASE;
1207#ifdef VERASE2
1208 tio->c_cc[VERASE2] = CERASE2;
1209#endif
1202 tio->c_cc[VKILL] = CKILL; 1210 tio->c_cc[VKILL] = CKILL;
1203 tio->c_cc[VSTART] = CSTART; 1211 tio->c_cc[VSTART] = CSTART;
1204 tio->c_cc[VSTOP] = CSTOP; 1212 tio->c_cc[VSTOP] = CSTOP;
1205 tio->c_cc[VSUSP] = CSUSP; 1213 tio->c_cc[VSUSP] = CSUSP;
1206# ifdef VDSUSP 1214# ifdef VDSUSP
… …
1400{ 1408{
1401#if ENABLE_FRILLS 1409#if ENABLE_FRILLS
1402 if (rs[Rs_pty_fd]) 1410 if (rs[Rs_pty_fd])
1403 { 1411 {
1404 pty.pty = atoi (rs[Rs_pty_fd]); 1412 pty.pty = atoi (rs[Rs_pty_fd]);
1413
1414 if (pty.pty >= 0)
1415 {
1416 if (getfd_hook)
1417 pty.pty = (*getfd_hook) (pty.pty);
1418
1405 fcntl (pty.pty, F_SETFL, O_NONBLOCK); 1419 if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK))
1420 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1421 }
1406 } 1422 }
1407 else 1423 else
1408#endif 1424#endif
1409 if (!pty.get ()) 1425 if (!pty.get ())
1410 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1426 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
… …
1511{ 1527{
1512 char *login; 1528 char *login;
1513 1529
1514 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */ 1530 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1515 1531
1516 if (options & Opt_console) 1532 if (OPTION (Opt_console))
1517 { /* be virtual console, fail silently */ 1533 { /* be virtual console, fail silently */
1518#ifdef TIOCCONS 1534#ifdef TIOCCONS
1519 unsigned int on = 1; 1535 unsigned int on = 1;
1520 1536
1521 ioctl (STDIN_FILENO, TIOCCONS, &on); 1537 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1571 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1587 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1572 shell = "/bin/sh"; 1588 shell = "/bin/sh";
1573 1589
1574 argv0 = (const char *)rxvt_r_basename (shell); 1590 argv0 = (const char *)rxvt_r_basename (shell);
1575 1591
1576 if (options & Opt_loginShell) 1592 if (OPTION (Opt_loginShell))
1577 { 1593 {
1578 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1594 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1579 1595
1580 login[0] = '-'; 1596 login[0] = '-';
1581 strcpy (&login[1], argv0); 1597 strcpy (&login[1], argv0);
… …
1616 if ((command = getenv ("SHELL")) == NULL || *command == '\0') 1632 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1617 command = "/bin/sh"; 1633 command = "/bin/sh";
1618 1634
1619 arg_a[0] = my_basename (command); 1635 arg_a[0] = my_basename (command);
1620 1636
1621 if (options & Opt_loginShell) 1637 if (OPTION (Opt_loginShell))
1622 { 1638 {
1623 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char)); 1639 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1624 1640
1625 login[0] = '-'; 1641 login[0] = '-';
1626 strcpy (&login[1], arg_a[0]); 1642 strcpy (&login[1], arg_a[0]);

Diff Legend

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