… | |
… | |
38 | #include "init.h" |
38 | #include "init.h" |
39 | #include "keyboard.h" |
39 | #include "keyboard.h" |
40 | |
40 | |
41 | #include <limits> |
41 | #include <limits> |
42 | |
42 | |
43 | #include <csignal> |
43 | #include <signal.h> |
44 | |
44 | |
45 | #include <fcntl.h> |
45 | #include <fcntl.h> |
46 | |
46 | |
47 | #ifdef HAVE_XSETLOCALE |
47 | #ifdef HAVE_XSETLOCALE |
48 | # define X_LOCALE |
48 | # define X_LOCALE |
49 | # include <X11/Xlocale.h> |
49 | # include <X11/Xlocale.h> |
50 | #else |
50 | #else |
51 | # ifdef HAVE_SETLOCALE |
|
|
52 | # include <clocale> |
51 | # include <locale.h> |
53 | # endif |
|
|
54 | #endif |
52 | #endif |
55 | |
53 | |
56 | #ifdef HAVE_NL_LANGINFO |
54 | #ifdef HAVE_NL_LANGINFO |
57 | # include <langinfo.h> |
55 | # include <langinfo.h> |
58 | #endif |
56 | #endif |
… | |
… | |
567 | |
565 | |
568 | /*----------------------------------------------------------------------*/ |
566 | /*----------------------------------------------------------------------*/ |
569 | const char ** |
567 | const char ** |
570 | rxvt_term::init_resources (int argc, const char *const *argv) |
568 | rxvt_term::init_resources (int argc, const char *const *argv) |
571 | { |
569 | { |
572 | int i, r_argc; |
570 | int i; |
573 | const char **cmd_argv; |
571 | const char **cmd_argv; |
574 | |
|
|
575 | /* |
|
|
576 | * Look for -e option. Find => split and make cmd_argv[] of command args |
|
|
577 | */ |
|
|
578 | for (r_argc = 0; r_argc < argc; r_argc++) |
|
|
579 | if (!strcmp (argv[r_argc], "-e")) |
|
|
580 | break; |
|
|
581 | |
|
|
582 | if (r_argc == argc) |
|
|
583 | cmd_argv = NULL; |
|
|
584 | else if (!argv[r_argc + 1]) |
|
|
585 | rxvt_fatal ("option '-e' requires an argument, aborting.\n"); |
|
|
586 | else |
|
|
587 | { |
|
|
588 | cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc)); |
|
|
589 | |
|
|
590 | for (i = 0; i < argc - r_argc - 1; i++) |
|
|
591 | cmd_argv[i] = (const char *)argv[i + r_argc + 1]; |
|
|
592 | |
|
|
593 | cmd_argv[i] = NULL; |
|
|
594 | } |
|
|
595 | |
572 | |
596 | rs[Rs_name] = rxvt_basename (argv[0]); |
573 | rs[Rs_name] = rxvt_basename (argv[0]); |
597 | |
574 | |
598 | /* |
575 | /* |
599 | * Open display, get options/resources and create the window |
576 | * Open display, get options/resources and create the window |
600 | */ |
577 | */ |
601 | |
578 | |
602 | if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) |
579 | if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) |
603 | rs[Rs_display_name] = ":0"; |
580 | rs[Rs_display_name] = ":0"; |
604 | |
581 | |
605 | get_options (r_argc, argv); |
582 | cmd_argv = get_options (argc, argv); |
606 | |
583 | |
607 | if (!(display = displays.get (rs[Rs_display_name]))) |
584 | if (!(display = displays.get (rs[Rs_display_name]))) |
608 | rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); |
585 | rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); |
609 | |
586 | |
610 | // using a local pointer decreases code size a lot |
587 | // using a local pointer decreases code size a lot |
… | |
… | |
754 | return cmd_argv; |
731 | return cmd_argv; |
755 | } |
732 | } |
756 | |
733 | |
757 | /*----------------------------------------------------------------------*/ |
734 | /*----------------------------------------------------------------------*/ |
758 | void |
735 | void |
|
|
736 | rxvt_term::init (stringvec *argv, stringvec *envv) |
|
|
737 | { |
|
|
738 | argv->push_back (0); |
|
|
739 | envv->push_back (0); |
|
|
740 | |
|
|
741 | this->argv = argv; |
|
|
742 | this->envv = envv; |
|
|
743 | |
|
|
744 | init2 (argv->size () - 1, argv->begin ()); |
|
|
745 | } |
|
|
746 | |
|
|
747 | void |
|
|
748 | rxvt_term::init (int argc, const char *const *argv, const char *const *envv) |
|
|
749 | { |
|
|
750 | #if ENABLE_PERL |
|
|
751 | // perl might want to access the stringvecs later, so we need to copy them |
|
|
752 | stringvec *args = new stringvec; |
|
|
753 | for (int i = 0; i < argc; i++) |
|
|
754 | args->push_back (strdup (argv [i])); |
|
|
755 | |
|
|
756 | stringvec *envs = new stringvec; |
|
|
757 | for (const char *const *var = envv; *var; var++) |
|
|
758 | envs->push_back (strdup (*var)); |
|
|
759 | |
|
|
760 | init (args, envs); |
|
|
761 | #else |
|
|
762 | init2 (argc, argv); |
|
|
763 | #endif |
|
|
764 | } |
|
|
765 | |
|
|
766 | void |
759 | rxvt_term::init (int argc, const char *const *argv) |
767 | rxvt_term::init2 (int argc, const char *const *argv) |
760 | { |
768 | { |
761 | SET_R (this); |
769 | SET_R (this); |
762 | set_locale (""); |
770 | set_locale (""); |
763 | set_environ (envv); // a few things in X do not call setlocale :( |
771 | set_environ (envv); // a few things in X do not call setlocale :( |
764 | |
772 | |
… | |
… | |
783 | if (option (Opt_scrollBar)) |
791 | if (option (Opt_scrollBar)) |
784 | scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */ |
792 | scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */ |
785 | |
793 | |
786 | pty = ptytty::create (); |
794 | pty = ptytty::create (); |
787 | |
795 | |
788 | #ifdef HAVE_AFTERIMAGE |
|
|
789 | set_application_name ((char *)rs[Rs_name]); |
|
|
790 | set_output_threshold (OUTPUT_LEVEL_WARNING); |
|
|
791 | #endif |
|
|
792 | |
|
|
793 | // must be called before create_windows, because the latter may call set_icon |
796 | // must be called before create_windows, because the latter may call set_icon |
794 | #ifdef HAVE_PIXBUF |
797 | #ifdef HAVE_PIXBUF |
795 | g_type_init (); |
798 | g_type_init (); |
796 | #endif |
799 | #endif |
797 | |
800 | |
… | |
… | |
831 | } |
834 | } |
832 | #endif |
835 | #endif |
833 | |
836 | |
834 | #ifdef BG_IMAGE_FROM_FILE |
837 | #ifdef BG_IMAGE_FROM_FILE |
835 | if (rs[Rs_backgroundPixmap]) |
838 | if (rs[Rs_backgroundPixmap]) |
836 | { |
|
|
837 | if (bg_set_file (rs[Rs_backgroundPixmap])) |
839 | if (bg_set_file (rs[Rs_backgroundPixmap])) |
838 | if (!bg_window_position_sensitive ()) |
840 | if (!bg_window_position_sensitive ()) |
839 | update_background (); |
841 | update_background (); |
840 | } |
|
|
841 | #endif |
842 | #endif |
842 | } |
843 | } |
843 | #endif |
844 | #endif |
844 | |
845 | |
845 | #if ENABLE_PERL |
846 | #if ENABLE_PERL |
846 | rootwin_ev.start (display, display->root); |
847 | rootwin_ev.start (display, display->root); |
847 | #endif |
848 | #endif |
848 | |
849 | |
849 | set_colorfgbg (); |
850 | init_done = 1; |
850 | |
851 | |
851 | init_command (cmd_argv); |
852 | init_command (cmd_argv); |
852 | |
|
|
853 | free (cmd_argv); |
|
|
854 | |
853 | |
855 | if (pty->pty >= 0) |
854 | if (pty->pty >= 0) |
856 | pty_ev.start (pty->pty, ev::READ); |
855 | pty_ev.start (pty->pty, ev::READ); |
857 | |
856 | |
858 | HOOK_INVOKE ((this, HOOK_START, DT_END)); |
857 | HOOK_INVOKE ((this, HOOK_START, DT_END)); |
… | |
… | |
900 | /*----------------------------------------------------------------------*/ |
899 | /*----------------------------------------------------------------------*/ |
901 | void |
900 | void |
902 | rxvt_term::init_env () |
901 | rxvt_term::init_env () |
903 | { |
902 | { |
904 | char *val; |
903 | char *val; |
|
|
904 | char *env_display; |
|
|
905 | char *env_windowid; |
|
|
906 | char *env_colorfgbg; |
|
|
907 | char *env_term; |
905 | |
908 | |
906 | #ifdef DISPLAY_IS_IP |
909 | #ifdef DISPLAY_IS_IP |
907 | /* Fixup display_name for export over pty to any interested terminal |
910 | /* Fixup display_name for export over pty to any interested terminal |
908 | * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number |
911 | * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number |
909 | * (for the first non-loopback interface) that we get from |
912 | * (for the first non-loopback interface) that we get from |
… | |
… | |
926 | |
929 | |
927 | env_display = (char *)rxvt_malloc (strlen (val) + 9); |
930 | env_display = (char *)rxvt_malloc (strlen (val) + 9); |
928 | |
931 | |
929 | sprintf (env_display, "DISPLAY=%s", val); |
932 | sprintf (env_display, "DISPLAY=%s", val); |
930 | |
933 | |
|
|
934 | env_windowid = (char *)rxvt_malloc (21); |
931 | sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent); |
935 | sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent); |
932 | |
936 | |
933 | /* add entries to the environment: |
937 | /* add entries to the environment: |
934 | * @ DISPLAY: in case we started with -display |
938 | * @ DISPLAY: in case we started with -display |
935 | * @ WINDOWID: X window id number of the window |
939 | * @ WINDOWID: X window id number of the window |
… | |
… | |
939 | * @ COLORFGBG: fg;bg color codes |
943 | * @ COLORFGBG: fg;bg color codes |
940 | */ |
944 | */ |
941 | putenv (env_display); |
945 | putenv (env_display); |
942 | putenv (env_windowid); |
946 | putenv (env_windowid); |
943 | |
947 | |
944 | if (env_colorfgbg) |
948 | env_colorfgbg = get_colorfgbg (); |
945 | putenv (env_colorfgbg); |
949 | putenv (env_colorfgbg); |
946 | |
950 | |
947 | #ifdef RXVT_TERMINFO |
951 | #ifdef RXVT_TERMINFO |
948 | putenv ("TERMINFO=" RXVT_TERMINFO); |
952 | putenv ("TERMINFO=" RXVT_TERMINFO); |
949 | #endif |
953 | #endif |
950 | |
954 | |
… | |
… | |
969 | unsetenv ("TERMCAP"); /* terminfo should be okay */ |
973 | unsetenv ("TERMCAP"); /* terminfo should be okay */ |
970 | #endif /* HAVE_UNSETENV */ |
974 | #endif /* HAVE_UNSETENV */ |
971 | } |
975 | } |
972 | |
976 | |
973 | /*----------------------------------------------------------------------*/ |
977 | /*----------------------------------------------------------------------*/ |
974 | /* |
|
|
975 | * This is more or less stolen straight from XFree86 xterm. |
|
|
976 | * This should support all European type languages. |
|
|
977 | */ |
|
|
978 | void |
978 | void |
979 | rxvt_term::set_locale (const char *locale) |
979 | rxvt_term::set_locale (const char *locale) |
980 | { |
980 | { |
981 | set_environ (envv); |
981 | set_environ (envv); |
982 | |
982 | |
983 | #if HAVE_XSETLOCALE || HAVE_SETLOCALE |
|
|
984 | free (this->locale); |
983 | free (this->locale); |
985 | this->locale = setlocale (LC_CTYPE, locale); |
984 | this->locale = setlocale (LC_CTYPE, locale); |
986 | |
985 | |
987 | if (!this->locale) |
986 | if (!this->locale) |
988 | { |
987 | { |
… | |
… | |
999 | |
998 | |
1000 | |
999 | |
1001 | this->locale = strdup (this->locale); |
1000 | this->locale = strdup (this->locale); |
1002 | SET_LOCALE (this->locale); |
1001 | SET_LOCALE (this->locale); |
1003 | mbstate.reset (); |
1002 | mbstate.reset (); |
1004 | #endif |
|
|
1005 | |
1003 | |
1006 | #if HAVE_NL_LANGINFO |
1004 | #if HAVE_NL_LANGINFO |
1007 | char *codeset = strdup (nl_langinfo (CODESET)); |
1005 | char *codeset = nl_langinfo (CODESET); |
1008 | // /^UTF.?8/i |
1006 | // /^UTF.?8/i |
1009 | enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') |
1007 | enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') |
1010 | && (codeset[1] == 'T' || codeset[1] == 't') |
1008 | && (codeset[1] == 'T' || codeset[1] == 't') |
1011 | && (codeset[2] == 'F' || codeset[2] == 'f') |
1009 | && (codeset[2] == 'F' || codeset[2] == 'f') |
1012 | && (codeset[3] == '8' || codeset[4] == '8'); |
1010 | && (codeset[3] == '8' || codeset[4] == '8'); |
1013 | free (codeset); |
|
|
1014 | #else |
1011 | #else |
1015 | enc_utf8 = 0; |
1012 | enc_utf8 = 0; |
1016 | #endif |
1013 | #endif |
1017 | } |
1014 | } |
1018 | |
1015 | |
… | |
… | |
1021 | { |
1018 | { |
1022 | set_environ (envv); |
1019 | set_environ (envv); |
1023 | |
1020 | |
1024 | #ifdef USE_XIM |
1021 | #ifdef USE_XIM |
1025 | if (!locale) |
1022 | if (!locale) |
1026 | rxvt_warn ("setting locale failed, working without locale support.\n"); |
1023 | rxvt_warn ("setting locale failed, continuing without locale support.\n"); |
1027 | else |
1024 | else |
1028 | { |
1025 | { |
1029 | set_string_property (xa[XA_WM_LOCALE_NAME], locale); |
1026 | set_string_property (xa[XA_WM_LOCALE_NAME], locale); |
1030 | |
1027 | |
1031 | if (!XSupportsLocale ()) |
1028 | if (!XSupportsLocale ()) |
1032 | { |
1029 | { |
1033 | rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); |
1030 | rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n"); |
1034 | return; |
1031 | return; |
1035 | } |
1032 | } |
1036 | |
1033 | |
1037 | im_ev.start (display); |
1034 | im_ev.start (display); |
1038 | |
1035 | |
… | |
… | |
1187 | /*----------------------------------------------------------------------*/ |
1184 | /*----------------------------------------------------------------------*/ |
1188 | /* color aliases, fg/bg bright-bold */ |
1185 | /* color aliases, fg/bg bright-bold */ |
1189 | void |
1186 | void |
1190 | rxvt_term::color_aliases (int idx) |
1187 | rxvt_term::color_aliases (int idx) |
1191 | { |
1188 | { |
1192 | if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) |
1189 | if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx])) |
1193 | { |
1190 | { |
1194 | int i = atoi (rs[Rs_color + idx]); |
1191 | int i = atoi (rs[Rs_color + idx]); |
1195 | |
1192 | |
1196 | if (i >= 8 && i <= 15) |
1193 | if (i >= 8 && i <= 15) |
1197 | /* bright colors */ |
1194 | /* bright colors */ |
… | |
… | |
1292 | } |
1289 | } |
1293 | |
1290 | |
1294 | void |
1291 | void |
1295 | rxvt_term::set_icon (const char *file) |
1292 | rxvt_term::set_icon (const char *file) |
1296 | { |
1293 | { |
1297 | #ifdef HAVE_AFTERIMAGE |
|
|
1298 | init_asv (); |
|
|
1299 | |
|
|
1300 | ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL); |
|
|
1301 | if (!im) |
|
|
1302 | { |
|
|
1303 | rxvt_warn ("Loading image icon failed, continuing without.\n"); |
|
|
1304 | return; |
|
|
1305 | } |
|
|
1306 | |
|
|
1307 | unsigned int w = im->width; |
|
|
1308 | unsigned int h = im->height; |
|
|
1309 | |
|
|
1310 | if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383)) |
|
|
1311 | { |
|
|
1312 | rxvt_warn ("Icon image too big, continuing without.\n"); |
|
|
1313 | destroy_asimage (&im); |
|
|
1314 | return; |
|
|
1315 | } |
|
|
1316 | |
|
|
1317 | ASImage *result = scale_asimage (asv, im, |
|
|
1318 | w, h, ASA_ARGB32, |
|
|
1319 | 100, ASIMAGE_QUALITY_DEFAULT); |
|
|
1320 | destroy_asimage (&im); |
|
|
1321 | |
|
|
1322 | if (!result) |
|
|
1323 | { |
|
|
1324 | rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n"); |
|
|
1325 | return; |
|
|
1326 | } |
|
|
1327 | |
|
|
1328 | long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)); |
|
|
1329 | if (buffer) |
|
|
1330 | { |
|
|
1331 | ARGB32 *asbuf = result->alt.argb32; |
|
|
1332 | buffer [0] = w; |
|
|
1333 | buffer [1] = h; |
|
|
1334 | |
|
|
1335 | for (unsigned int i = 0; i < w * h; ++i) |
|
|
1336 | buffer [i + 2] = asbuf [i]; |
|
|
1337 | |
|
|
1338 | XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32, |
|
|
1339 | PropModeReplace, (const unsigned char *) buffer, 2 + w * h); |
|
|
1340 | free (buffer); |
|
|
1341 | } |
|
|
1342 | else |
|
|
1343 | rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n"); |
|
|
1344 | |
|
|
1345 | destroy_asimage (&result); |
|
|
1346 | #endif |
|
|
1347 | |
|
|
1348 | #ifdef HAVE_PIXBUF |
1294 | #ifdef HAVE_PIXBUF |
1349 | GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); |
1295 | GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); |
1350 | if (!pixbuf) |
1296 | if (!pixbuf) |
1351 | { |
1297 | { |
1352 | rxvt_warn ("Loading image icon failed, continuing without.\n"); |
1298 | rxvt_warn ("Loading image icon failed, continuing without.\n"); |
… | |
… | |
1473 | CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, |
1419 | CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, |
1474 | &attributes); |
1420 | &attributes); |
1475 | |
1421 | |
1476 | this->parent = top; |
1422 | this->parent = top; |
1477 | |
1423 | |
1478 | old_width = szHint.width; |
|
|
1479 | old_height = szHint.height; |
|
|
1480 | |
|
|
1481 | set_title (rs [Rs_title]); |
1424 | set_title (rs [Rs_title]); |
1482 | set_icon_name (rs [Rs_iconName]); |
1425 | set_icon_name (rs [Rs_iconName]); |
1483 | |
1426 | |
1484 | classHint.res_name = (char *)rs[Rs_name]; |
1427 | classHint.res_name = (char *)rs[Rs_name]; |
1485 | classHint.res_class = (char *)RESCLASS; |
1428 | classHint.res_class = (char *)RESCLASS; |
… | |
… | |
1547 | TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); |
1490 | TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); |
1548 | |
1491 | |
1549 | /* the vt window */ |
1492 | /* the vt window */ |
1550 | vt = XCreateSimpleWindow (dpy, top, |
1493 | vt = XCreateSimpleWindow (dpy, top, |
1551 | window_vt_x, window_vt_y, |
1494 | window_vt_x, window_vt_y, |
1552 | width, height, |
1495 | vt_width, vt_height, |
1553 | 0, |
1496 | 0, |
1554 | pix_colors_focused[Color_fg], |
1497 | pix_colors_focused[Color_fg], |
1555 | pix_colors_focused[Color_bg]); |
1498 | pix_colors_focused[Color_bg]); |
1556 | |
1499 | |
1557 | attributes.bit_gravity = NorthWestGravity; |
1500 | attributes.bit_gravity = NorthWestGravity; |
… | |
… | |
1606 | if (pty->pty >= 0) |
1549 | if (pty->pty >= 0) |
1607 | { |
1550 | { |
1608 | if (getfd_hook) |
1551 | if (getfd_hook) |
1609 | pty->pty = (*getfd_hook) (pty->pty); |
1552 | pty->pty = (*getfd_hook) (pty->pty); |
1610 | |
1553 | |
1611 | if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) |
1554 | if (pty->pty < 0) |
1612 | rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); |
1555 | rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); |
1613 | } |
1556 | } |
1614 | } |
1557 | } |
1615 | else |
1558 | else |
1616 | #endif |
1559 | #endif |
1617 | if (!pty->get ()) |
1560 | if (!pty->get ()) |
1618 | rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); |
1561 | rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); |
|
|
1562 | |
|
|
1563 | fcntl (pty->pty, F_SETFL, O_NONBLOCK); |
1619 | |
1564 | |
1620 | struct termios tio = def_tio; |
1565 | struct termios tio = def_tio; |
1621 | |
1566 | |
1622 | #ifndef NO_BACKSPACE_KEY |
1567 | #ifndef NO_BACKSPACE_KEY |
1623 | if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) |
1568 | if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) |
… | |
… | |
1673 | |
1618 | |
1674 | _exit (EXIT_FAILURE); |
1619 | _exit (EXIT_FAILURE); |
1675 | |
1620 | |
1676 | default: |
1621 | default: |
1677 | if (!option (Opt_utmpInhibit)) |
1622 | if (!option (Opt_utmpInhibit)) |
|
|
1623 | { |
|
|
1624 | #ifdef LOG_ONLY_ON_LOGIN |
|
|
1625 | bool login_shell = option (Opt_loginShell); |
|
|
1626 | #else |
|
|
1627 | bool login_shell = true; |
|
|
1628 | #endif |
1678 | pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); |
1629 | pty->login (cmd_pid, login_shell, rs[Rs_display_name]); |
|
|
1630 | } |
1679 | |
1631 | |
1680 | pty->close_tty (); |
1632 | pty->close_tty (); |
1681 | |
1633 | |
1682 | child_ev.start (cmd_pid); |
1634 | child_ev.start (cmd_pid); |
1683 | |
1635 | |
… | |
… | |
1708 | #elif defined (SRIOCSREDIR) |
1660 | #elif defined (SRIOCSREDIR) |
1709 | int fd; |
1661 | int fd; |
1710 | |
1662 | |
1711 | fd = open (CONSOLE, O_WRONLY, 0); |
1663 | fd = open (CONSOLE, O_WRONLY, 0); |
1712 | if (fd >= 0) |
1664 | if (fd >= 0) |
1713 | if (ioctl (fd, SRIOCSREDIR, NULL) < 0) |
1665 | { |
|
|
1666 | ioctl (fd, SRIOCSREDIR, STDIN_FILENO); |
1714 | close (fd); |
1667 | close (fd); |
|
|
1668 | } |
1715 | #endif /* SRIOCSREDIR */ |
1669 | #endif /* SRIOCSREDIR */ |
1716 | } |
1670 | } |
1717 | |
1671 | |
1718 | /* reset signals and spin off the command interpreter */ |
1672 | /* reset signals and spin off the command interpreter */ |
1719 | signal (SIGINT, SIG_DFL); |
1673 | signal (SIGINT, SIG_DFL); |