… | |
… | |
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. |
… | |
… | |
256 | bgPixmap.pixmap = None; |
256 | bgPixmap.pixmap = None; |
257 | #endif |
257 | #endif |
258 | |
258 | |
259 | last_bot = last_state = -1; |
259 | last_bot = last_state = -1; |
260 | |
260 | |
261 | #ifdef MENUBAR |
|
|
262 | menu_readonly = 1; |
|
|
263 | # if ! (MENUBAR_MAX > 1) |
|
|
264 | CurrentBar = &BarList; |
|
|
265 | # endif /* (MENUBAR_MAX > 1) */ |
|
|
266 | #endif |
|
|
267 | |
|
|
268 | return true; |
261 | return true; |
269 | } |
262 | } |
270 | |
263 | |
271 | void |
264 | void |
272 | rxvt_term::init_secondary () |
265 | rxvt_term::init_secondary () |
… | |
… | |
339 | rs[Rs_name] = rxvt_r_basename (argv[0]); |
332 | rs[Rs_name] = rxvt_r_basename (argv[0]); |
340 | |
333 | |
341 | /* |
334 | /* |
342 | * Open display, get options/resources and create the window |
335 | * Open display, get options/resources and create the window |
343 | */ |
336 | */ |
|
|
337 | |
344 | if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) |
338 | if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) |
345 | rs[Rs_display_name] = ":0"; |
339 | rs[Rs_display_name] = ":0"; |
346 | |
340 | |
347 | get_options (r_argc, r_argv); |
341 | get_options (r_argc, r_argv); |
348 | |
342 | |
349 | if (!(display = displays.get (rs[Rs_display_name]))) |
343 | if (!(display = displays.get (rs[Rs_display_name]))) |
350 | rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); |
344 | rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); |
351 | |
345 | |
352 | extract_resources (); |
346 | extract_resources (); |
|
|
347 | |
353 | free (r_argv); |
348 | free (r_argv); |
354 | |
349 | |
355 | /* |
350 | /* |
356 | * set any defaults not already set |
351 | * set any defaults not already set |
357 | */ |
352 | */ |
… | |
… | |
391 | pointerBlankDelay = 2; |
386 | pointerBlankDelay = 2; |
392 | #endif |
387 | #endif |
393 | |
388 | |
394 | /* no point having a scrollbar without having any scrollback! */ |
389 | /* no point having a scrollbar without having any scrollback! */ |
395 | if (!saveLines) |
390 | if (!saveLines) |
396 | CLR_OPTION (Opt_scrollBar); |
391 | set_option (Opt_scrollBar, 0); |
397 | |
392 | |
398 | #ifdef PRINTPIPE |
393 | #ifdef PRINTPIPE |
399 | if (!rs[Rs_print_pipe]) |
394 | if (!rs[Rs_print_pipe]) |
400 | rs[Rs_print_pipe] = PRINTPIPE; |
395 | rs[Rs_print_pipe] = PRINTPIPE; |
401 | #endif |
396 | #endif |
… | |
… | |
576 | * This should support all European type languages. |
571 | * This should support all European type languages. |
577 | */ |
572 | */ |
578 | void |
573 | void |
579 | rxvt_term::set_locale (const char *locale) |
574 | rxvt_term::set_locale (const char *locale) |
580 | { |
575 | { |
|
|
576 | set_environ (envv); |
|
|
577 | |
581 | #if HAVE_XSETLOCALE || HAVE_SETLOCALE |
578 | #if HAVE_XSETLOCALE || HAVE_SETLOCALE |
582 | free (this->locale); |
579 | free (this->locale); |
583 | this->locale = setlocale (LC_CTYPE, locale); |
580 | this->locale = setlocale (LC_CTYPE, locale); |
584 | |
581 | |
585 | if (!this->locale) |
582 | if (!this->locale) |
586 | { |
583 | { |
587 | if (*locale) |
584 | if (*locale) |
588 | { |
585 | { |
589 | rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale); |
586 | rxvt_warn ("unable to set locale \"%s\", using C locale instead.\n", locale); |
590 | setlocale (LC_CTYPE, ""); |
587 | setlocale (LC_CTYPE, "C"); |
591 | } |
588 | } |
592 | else |
589 | else |
593 | rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n"); |
590 | rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n"); |
594 | |
591 | |
595 | this->locale = ""; |
592 | this->locale = "C"; |
596 | } |
593 | } |
597 | |
594 | |
598 | |
595 | |
599 | this->locale = rxvt_strdup (this->locale); |
596 | this->locale = rxvt_strdup (this->locale); |
600 | SET_LOCALE (this->locale); |
597 | SET_LOCALE (this->locale); |
… | |
… | |
615 | } |
612 | } |
616 | |
613 | |
617 | void |
614 | void |
618 | rxvt_term::init_xlocale () |
615 | rxvt_term::init_xlocale () |
619 | { |
616 | { |
|
|
617 | set_environ (envv); |
|
|
618 | |
620 | #ifdef USE_XIM |
619 | #ifdef USE_XIM |
621 | if (!locale) |
620 | if (!locale) |
622 | rxvt_warn ("setting locale failed, working without locale support.\n"); |
621 | rxvt_warn ("setting locale failed, working without locale support.\n"); |
623 | else |
622 | else |
624 | { |
623 | { |
… | |
… | |
664 | if (strcmp (key_backspace, "DEC") == 0) |
663 | if (strcmp (key_backspace, "DEC") == 0) |
665 | priv_modes |= PrivMode_HaveBackSpace; |
664 | priv_modes |= PrivMode_HaveBackSpace; |
666 | #endif |
665 | #endif |
667 | |
666 | |
668 | /* add value for scrollBar */ |
667 | /* add value for scrollBar */ |
669 | if (scrollbar_visible ()) |
668 | if (scrollBar.state) |
670 | { |
669 | { |
671 | priv_modes |= PrivMode_scrollBar; |
670 | priv_modes |= PrivMode_scrollBar; |
672 | SavedModes |= PrivMode_scrollBar; |
671 | SavedModes |= PrivMode_scrollBar; |
673 | } |
|
|
674 | |
|
|
675 | if (menubar_visible ()) |
|
|
676 | { |
|
|
677 | priv_modes |= PrivMode_menuBar; |
|
|
678 | SavedModes |= PrivMode_menuBar; |
|
|
679 | } |
672 | } |
680 | |
673 | |
681 | run_command (argv); |
674 | run_command (argv); |
682 | } |
675 | } |
683 | |
676 | |
… | |
… | |
751 | if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; |
744 | if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; |
752 | if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; |
745 | if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; |
753 | } |
746 | } |
754 | |
747 | |
755 | /* |
748 | /* |
756 | * get scrollBar/menuBar shadow colors |
749 | * get scrollBar shadow colors |
757 | * |
750 | * |
758 | * The calculations of topShadow/bottomShadow values are adapted |
751 | * The calculations of topShadow/bottomShadow values are adapted |
759 | * from the fvwm window manager. |
752 | * from the fvwm window manager. |
760 | */ |
753 | */ |
761 | #ifdef KEEP_SCROLLCOLOR |
754 | #ifdef KEEP_SCROLLCOLOR |
… | |
… | |
916 | #if ENABLE_FRILLS |
909 | #if ENABLE_FRILLS |
917 | Atom prop = None; |
910 | Atom prop = None; |
918 | MWMHints mwmhints; |
911 | MWMHints mwmhints; |
919 | #endif |
912 | #endif |
920 | XGCValues gcvalue; |
913 | XGCValues gcvalue; |
921 | long vt_emask; |
|
|
922 | XSetWindowAttributes attributes; |
914 | XSetWindowAttributes attributes; |
923 | XWindowAttributes gattr; |
915 | XWindowAttributes gattr; |
924 | Window top, parent; |
916 | Window top, parent; |
925 | dDisp; |
917 | dDisp; |
926 | |
918 | |
… | |
… | |
1032 | #endif |
1024 | #endif |
1033 | }; |
1025 | }; |
1034 | |
1026 | |
1035 | XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); |
1027 | XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); |
1036 | |
1028 | |
|
|
1029 | #if ENABLE_FRILLS |
|
|
1030 | if (rs[Rs_transient_for]) |
|
|
1031 | XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); |
|
|
1032 | #endif |
|
|
1033 | |
1037 | #if ENABLE_EWMH |
1034 | #if ENABLE_EWMH |
1038 | long pid = getpid (); |
1035 | long pid = getpid (); |
1039 | |
1036 | |
1040 | XChangeProperty (disp, top, |
1037 | XChangeProperty (disp, top, |
1041 | xa[XA_NET_WM_PID], XA_CARDINAL, 32, |
1038 | xa[XA_NET_WM_PID], XA_CARDINAL, 32, |
… | |
… | |
1061 | #endif |
1058 | #endif |
1062 | |
1059 | |
1063 | /* vt cursor: Black-on-White is standard, but this is more popular */ |
1060 | /* vt cursor: Black-on-White is standard, but this is more popular */ |
1064 | TermWin_cursor = XCreateFontCursor (disp, XC_xterm); |
1061 | TermWin_cursor = XCreateFontCursor (disp, XC_xterm); |
1065 | |
1062 | |
1066 | #if defined(HAVE_SCROLLBARS) || defined(MENUBAR) |
1063 | #ifdef HAVE_SCROLLBARS |
1067 | /* cursor (menuBar/scrollBar): Black-on-White */ |
1064 | /* cursor scrollBar: Black-on-White */ |
1068 | leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); |
1065 | leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); |
1069 | #endif |
1066 | #endif |
1070 | |
1067 | |
1071 | /* the vt window */ |
1068 | /* the vt window */ |
1072 | vt = XCreateSimpleWindow (disp, top, |
1069 | vt = XCreateSimpleWindow (disp, top, |
… | |
… | |
1084 | attributes.bit_gravity = NorthWestGravity; |
1081 | attributes.bit_gravity = NorthWestGravity; |
1085 | XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); |
1082 | XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); |
1086 | |
1083 | |
1087 | vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; |
1084 | vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; |
1088 | |
1085 | |
1089 | #ifdef POINTER_BLANK |
|
|
1090 | if (OPTION (Opt_pointerBlank)) |
1086 | if (OPTION (Opt_pointerBlank)) |
1091 | vt_emask |= PointerMotionMask; |
1087 | vt_emask |= PointerMotionMask; |
1092 | else |
1088 | else |
1093 | #endif |
|
|
1094 | vt_emask |= Button1MotionMask | Button3MotionMask; |
1089 | vt_emask |= Button1MotionMask | Button3MotionMask; |
1095 | |
1090 | |
1096 | XSelectInput (disp, vt, vt_emask); |
1091 | vt_select_input (); |
|
|
1092 | |
1097 | vt_ev.start (display, vt); |
1093 | vt_ev.start (display, vt); |
1098 | |
|
|
1099 | #if defined(MENUBAR) && (MENUBAR_MAX > 1) |
|
|
1100 | if (menuBar_height ()) |
|
|
1101 | { |
|
|
1102 | menuBar.win = XCreateSimpleWindow (disp, top, |
|
|
1103 | window_vt_x, 0, |
|
|
1104 | width, |
|
|
1105 | menuBar_TotalHeight (), |
|
|
1106 | 0, |
|
|
1107 | pix_colors_focused[Color_fg], |
|
|
1108 | pix_colors_focused[Color_scroll]); |
|
|
1109 | |
|
|
1110 | #ifdef DEBUG_X |
|
|
1111 | XStoreName (disp, menuBar.win, "menubar"); |
|
|
1112 | #endif |
|
|
1113 | |
|
|
1114 | menuBar.drawable = new rxvt_drawable (display, menuBar.win); |
|
|
1115 | |
|
|
1116 | XDefineCursor (disp, menuBar.win, |
|
|
1117 | XCreateFontCursor (disp, XC_left_ptr)); |
|
|
1118 | |
|
|
1119 | XSelectInput (disp, menuBar.win, |
|
|
1120 | (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask)); |
|
|
1121 | menubar_ev.start (display, menuBar.win); |
|
|
1122 | } |
|
|
1123 | #endif |
|
|
1124 | |
1094 | |
1125 | #ifdef XPM_BACKGROUND |
1095 | #ifdef XPM_BACKGROUND |
1126 | if (rs[Rs_backgroundPixmap] != NULL |
1096 | if (rs[Rs_backgroundPixmap] != NULL |
1127 | && ! OPTION (Opt_transparent)) |
1097 | && ! OPTION (Opt_transparent)) |
1128 | { |
1098 | { |
… | |
… | |
1147 | GCForeground | GCBackground | GCGraphicsExposures, |
1117 | GCForeground | GCBackground | GCGraphicsExposures, |
1148 | &gcvalue); |
1118 | &gcvalue); |
1149 | |
1119 | |
1150 | drawable = new rxvt_drawable (display, vt); |
1120 | drawable = new rxvt_drawable (display, vt); |
1151 | |
1121 | |
1152 | #if defined(MENUBAR) || defined(RXVT_SCROLLBAR) |
1122 | #ifdef RXVT_SCROLLBAR |
1153 | gcvalue.foreground = pix_colors[Color_topShadow]; |
1123 | gcvalue.foreground = pix_colors[Color_topShadow]; |
1154 | topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); |
1124 | topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); |
1155 | gcvalue.foreground = pix_colors[Color_bottomShadow]; |
1125 | gcvalue.foreground = pix_colors[Color_bottomShadow]; |
1156 | botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); |
1126 | botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); |
1157 | gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; |
1127 | gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; |
… | |
… | |
1400 | rxvt_term::run_command (const char *const *argv) |
1370 | rxvt_term::run_command (const char *const *argv) |
1401 | { |
1371 | { |
1402 | #if ENABLE_FRILLS |
1372 | #if ENABLE_FRILLS |
1403 | if (rs[Rs_pty_fd]) |
1373 | if (rs[Rs_pty_fd]) |
1404 | { |
1374 | { |
1405 | pty.pty = atoi (rs[Rs_pty_fd]); |
1375 | pty->pty = atoi (rs[Rs_pty_fd]); |
1406 | |
1376 | |
1407 | if (pty.pty >= 0) |
1377 | if (pty->pty >= 0) |
1408 | { |
1378 | { |
1409 | if (getfd_hook) |
1379 | if (getfd_hook) |
1410 | pty.pty = (*getfd_hook) (pty.pty); |
1380 | pty->pty = (*getfd_hook) (pty->pty); |
1411 | |
1381 | |
1412 | if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK)) |
1382 | if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) |
1413 | rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); |
1383 | rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); |
1414 | } |
1384 | } |
1415 | } |
1385 | } |
1416 | else |
1386 | else |
1417 | #endif |
1387 | #endif |
1418 | if (!pty.get ()) |
1388 | if (!pty->get ()) |
1419 | rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); |
1389 | rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); |
1420 | |
1390 | |
1421 | pty.set_utf8_mode (enc_utf8); |
1391 | pty->set_utf8_mode (enc_utf8); |
1422 | |
1392 | |
1423 | /* set initial window size */ |
1393 | /* set initial window size */ |
1424 | tt_winch (); |
1394 | tt_winch (); |
1425 | |
1395 | |
1426 | int er; |
1396 | int er; |
… | |
… | |
1439 | #if ENABLE_FRILLS |
1409 | #if ENABLE_FRILLS |
1440 | if (rs[Rs_pty_fd]) |
1410 | if (rs[Rs_pty_fd]) |
1441 | return; |
1411 | return; |
1442 | #endif |
1412 | #endif |
1443 | |
1413 | |
1444 | #ifndef __QNX__ |
|
|
1445 | /* spin off the command interpreter */ |
1414 | /* spin off the command interpreter */ |
1446 | switch (cmd_pid = fork ()) |
1415 | switch (cmd_pid = fork ()) |
1447 | { |
1416 | { |
1448 | case -1: |
1417 | case -1: |
1449 | { |
1418 | { |
… | |
… | |
1451 | rxvt_fatal ("can't fork, aborting.\n"); |
1420 | rxvt_fatal ("can't fork, aborting.\n"); |
1452 | } |
1421 | } |
1453 | case 0: |
1422 | case 0: |
1454 | init_env (); |
1423 | init_env (); |
1455 | |
1424 | |
1456 | if (!pty.make_controlling_tty ()) |
1425 | if (!pty->make_controlling_tty ()) |
1457 | fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); |
1426 | fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); |
1458 | else |
1427 | else |
1459 | { |
1428 | { |
1460 | /* Reopen stdin, stdout and stderr over the tty file descriptor */ |
1429 | /* Reopen stdin, stdout and stderr over the tty file descriptor */ |
1461 | dup2 (pty.tty, STDIN_FILENO); |
1430 | dup2 (pty->tty, STDIN_FILENO); |
1462 | dup2 (pty.tty, STDOUT_FILENO); |
1431 | dup2 (pty->tty, STDOUT_FILENO); |
1463 | dup2 (pty.tty, STDERR_FILENO); |
1432 | dup2 (pty->tty, STDERR_FILENO); |
1464 | |
1433 | |
1465 | // close all our file handles that we do no longer need |
1434 | // close all our file handles that we do no longer need |
1466 | for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) |
1435 | for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) |
1467 | { |
1436 | { |
1468 | if ((*t)->pty.pty > 2) close ((*t)->pty.pty); |
1437 | if ((*t)->pty->pty > 2) close ((*t)->pty->pty); |
1469 | if ((*t)->pty.tty > 2) close ((*t)->pty.tty); |
1438 | if ((*t)->pty->tty > 2) close ((*t)->pty->tty); |
1470 | } |
1439 | } |
1471 | |
1440 | |
1472 | run_child (argv); |
1441 | run_child (argv); |
1473 | fprintf (stderr, "%s: unable to exec child.", RESNAME); |
1442 | fprintf (stderr, "%s: unable to exec child.", RESNAME); |
1474 | } |
1443 | } |
… | |
… | |
1479 | { |
1448 | { |
1480 | #if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) |
1449 | #if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) |
1481 | int fdstdin; |
1450 | int fdstdin; |
1482 | |
1451 | |
1483 | fdstdin = dup (STDIN_FILENO); |
1452 | fdstdin = dup (STDIN_FILENO); |
1484 | dup2 (pty.tty, STDIN_FILENO); |
1453 | dup2 (pty->tty, STDIN_FILENO); |
1485 | #endif |
1454 | #endif |
1486 | |
1455 | |
1487 | #ifdef UTMP_SUPPORT |
1456 | #ifdef UTMP_SUPPORT |
1488 | privileged_utmp (SAVE); |
1457 | privileged_utmp (SAVE); |
1489 | #endif |
1458 | #endif |
… | |
… | |
1493 | dup2 (fdstdin, STDIN_FILENO); |
1462 | dup2 (fdstdin, STDIN_FILENO); |
1494 | close (fdstdin); |
1463 | close (fdstdin); |
1495 | #endif |
1464 | #endif |
1496 | } |
1465 | } |
1497 | |
1466 | |
1498 | pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */ |
1467 | pty->close_tty (); |
1499 | break; |
1468 | break; |
1500 | } |
1469 | } |
1501 | #else /* __QNX__ uses qnxspawn () */ |
|
|
1502 | fchmod (pty.tty, 0622); |
|
|
1503 | fcntl (pty.tty, F_SETFD, FD_CLOEXEC); |
|
|
1504 | fcntl (pty.pty, F_SETFD, FD_CLOEXEC); |
|
|
1505 | |
|
|
1506 | if (run_child (argv) == -1) |
|
|
1507 | exit (EXIT_FAILURE); |
|
|
1508 | #endif |
|
|
1509 | } |
1470 | } |
1510 | |
1471 | |
1511 | /* ------------------------------------------------------------------------- * |
1472 | /* ------------------------------------------------------------------------- * |
1512 | * CHILD PROCESS OPERATIONS * |
1473 | * CHILD PROCESS OPERATIONS * |
1513 | * ------------------------------------------------------------------------- */ |
1474 | * ------------------------------------------------------------------------- */ |
… | |
… | |
1557 | // unblock signals (signals are blocked by iom.C |
1518 | // unblock signals (signals are blocked by iom.C |
1558 | sigset_t ss; |
1519 | sigset_t ss; |
1559 | sigemptyset (&ss); |
1520 | sigemptyset (&ss); |
1560 | sigprocmask (SIG_SETMASK, &ss, 0); |
1521 | sigprocmask (SIG_SETMASK, &ss, 0); |
1561 | |
1522 | |
1562 | #ifndef __QNX__ |
|
|
1563 | /* command interpreter path */ |
1523 | /* command interpreter path */ |
1564 | if (argv != NULL) |
1524 | if (argv != NULL) |
1565 | { |
1525 | { |
1566 | # ifdef DEBUG_CMD |
1526 | # ifdef DEBUG_CMD |
1567 | int i; |
1527 | int i; |
… | |
… | |
1573 | execvp (argv[0], (char *const *)argv); |
1533 | execvp (argv[0], (char *const *)argv); |
1574 | /* no error message: STDERR is closed! */ |
1534 | /* no error message: STDERR is closed! */ |
1575 | } |
1535 | } |
1576 | else |
1536 | else |
1577 | { |
1537 | { |
1578 | const char *argv0, *shell; |
1538 | const char *argv0, *shell; |
1579 | |
1539 | |
1580 | if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') |
1540 | if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') |
1581 | shell = "/bin/sh"; |
1541 | shell = "/bin/sh"; |
1582 | |
1542 | |
1583 | argv0 = (const char *)rxvt_r_basename (shell); |
1543 | argv0 = (const char *)rxvt_r_basename (shell); |
… | |
… | |
1588 | |
1548 | |
1589 | login[0] = '-'; |
1549 | login[0] = '-'; |
1590 | strcpy (&login[1], argv0); |
1550 | strcpy (&login[1], argv0); |
1591 | argv0 = login; |
1551 | argv0 = login; |
1592 | } |
1552 | } |
|
|
1553 | |
1593 | execlp (shell, argv0, NULL); |
1554 | execlp (shell, argv0, NULL); |
1594 | /* no error message: STDERR is closed! */ |
1555 | /* no error message: STDERR is closed! */ |
1595 | } |
1556 | } |
1596 | |
1557 | |
1597 | #else /* __QNX__ uses qnxspawn () */ |
|
|
1598 | |
|
|
1599 | char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }; |
|
|
1600 | char *command = NULL, fullcommand[_MAX_PATH]; |
|
|
1601 | char **arg_v, *arg_a[2] = { NULL, NULL }; |
|
|
1602 | |
|
|
1603 | if (argv != NULL) |
|
|
1604 | { |
|
|
1605 | if (access (argv[0], X_OK) == -1) |
|
|
1606 | { |
|
|
1607 | if (strchr (argv[0], '/') == NULL) |
|
|
1608 | { |
|
|
1609 | searchenv (argv[0], "PATH", fullcommand); |
|
|
1610 | |
|
|
1611 | if (fullcommand[0] != '\0') |
|
|
1612 | command = fullcommand; |
|
|
1613 | } |
|
|
1614 | |
|
|
1615 | if (access (command, X_OK) == -1) |
|
|
1616 | return -1; |
|
|
1617 | } |
|
|
1618 | else |
|
|
1619 | command = argv[0]; |
|
|
1620 | |
|
|
1621 | arg_v = argv; |
|
|
1622 | } |
|
|
1623 | else |
|
|
1624 | { |
|
|
1625 | if ((command = getenv ("SHELL")) == NULL || *command == '\0') |
|
|
1626 | command = "/bin/sh"; |
|
|
1627 | |
|
|
1628 | arg_a[0] = my_basename (command); |
|
|
1629 | |
|
|
1630 | if (OPTION (Opt_loginShell)) |
|
|
1631 | { |
|
|
1632 | login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char)); |
|
|
1633 | |
|
|
1634 | login[0] = '-'; |
|
|
1635 | strcpy (&login[1], arg_a[0]); |
|
|
1636 | arg_a[0] = login; |
|
|
1637 | } |
|
|
1638 | |
|
|
1639 | arg_v = arg_a; |
|
|
1640 | } |
|
|
1641 | |
|
|
1642 | iov_a[0] = iov_a[1] = iov_a[2] = pty.tty; |
|
|
1643 | cmd_pid = qnx_spawn (0, 0, 0, -1, -1, |
|
|
1644 | _SPAWN_SETSID | _SPAWN_TCSETPGRP, |
|
|
1645 | command, arg_v, environ, iov_a, 0); |
|
|
1646 | if (login) |
|
|
1647 | free (login); |
|
|
1648 | |
|
|
1649 | pty.close_tty (); |
|
|
1650 | return pty.pty; |
|
|
1651 | #endif |
|
|
1652 | |
|
|
1653 | return -1; |
1558 | return -1; |
1654 | } |
1559 | } |
1655 | |
1560 | |
1656 | /*----------------------- end-of-file (C source) -----------------------*/ |
1561 | /*----------------------- end-of-file (C source) -----------------------*/ |