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.307 by root, Sat Dec 17 23:17:33 2011 UTC vs.
Revision 1.336 by sf-exg, Wed Sep 3 18:20:37 2014 UTC

… …
14 * - extensive modifications 14 * - extensive modifications
15 * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de> 15 * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de>
16 * 16 *
17 * This program is free software; you can redistribute it and/or modify 17 * This program is free software; you can redistribute it and/or modify
18 * it under the terms of the GNU General Public License as published by 18 * it under the terms of the GNU General Public License as published by
19 * the Free Software Foundation; either version 2 of the License, or 19 * the Free Software Foundation; either version 3 of the License, or
20 * (at your option) any later version. 20 * (at your option) any later version.
21 * 21 *
22 * This program is distributed in the hope that it will be useful, 22 * This program is distributed in the hope that it will be useful,
23 * but WITHOUT ANY WARRANTY; without even the implied warranty of 23 * but WITHOUT ANY WARRANTY; without even the implied warranty of
24 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 24 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
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
… …
78#include <netinet/in.h> 76#include <netinet/in.h>
79#include <arpa/inet.h> 77#include <arpa/inet.h>
80#include <net/if.h> 78#include <net/if.h>
81#include <net/if_arp.h> 79#include <net/if_arp.h>
82 80
83static char * 81static char * ecb_cold
84rxvt_network_display (const char *display) 82rxvt_network_display (const char *display)
85{ 83{
86 char buffer[1024], *rval = NULL; 84 char buffer[1024], *rval = NULL;
87 struct ifconf ifc; 85 struct ifconf ifc;
88 struct ifreq *ifr; 86 struct ifreq *ifr;
… …
521#endif 519#endif
522 COLOR_SCROLLBAR, 520 COLOR_SCROLLBAR,
523#ifdef RXVT_SCROLLBAR 521#ifdef RXVT_SCROLLBAR
524 COLOR_SCROLLTROUGH, 522 COLOR_SCROLLTROUGH,
525#endif 523#endif
526#if ENABLE_TRANSPARENCY 524#if BG_IMAGE_FROM_ROOT
527 NULL, 525 NULL,
528#endif 526#endif
529#if OFF_FOCUS_FADING 527#if OFF_FOCUS_FADING
530 "rgb:00/00/00", 528 "rgb:00/00/00",
531#endif 529#endif
… …
567 565
568/*----------------------------------------------------------------------*/ 566/*----------------------------------------------------------------------*/
569const char ** 567const char **
570rxvt_term::init_resources (int argc, const char *const *argv) 568rxvt_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 cmd_argv = (const char **)argv + r_argc + 1;
588 572
589 rs[Rs_name] = rxvt_basename (argv[0]); 573 rs[Rs_name] = rxvt_basename (argv[0]);
590 574
591 /* 575 /*
592 * Open display, get options/resources and create the window 576 * Open display, get options/resources and create the window
593 */ 577 */
594 578
595 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 579 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
596 rs[Rs_display_name] = ":0"; 580 rs[Rs_display_name] = ":0";
597 581
598 get_options (r_argc, argv); 582 cmd_argv = get_options (argc, argv);
599 583
600 if (!(display = displays.get (rs[Rs_display_name]))) 584 if (!(display = displays.get (rs[Rs_display_name])))
601 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]);
602 586
603 // using a local pointer decreases code size a lot 587 // using a local pointer decreases code size a lot
604 xa = display->xa; 588 xa = display->xa;
605 589
606 set (display); 590 set (display);
607 extract_resources (); 591 extract_resources ();
608 592
609#if XFT 593#if ENABLE_FRILLS
610 if (rs[Rs_depth]) 594 if (rs[Rs_visual])
611 select_visual (strtol (rs[Rs_depth], 0, 0)); 595 select_visual (strtol (rs[Rs_visual], 0, 0));
596 else if (rs[Rs_depth])
597 select_depth (strtol (rs[Rs_depth], 0, 0));
612#endif 598#endif
613 599
614 for (int i = NUM_RESOURCES; i--; ) 600 for (int i = NUM_RESOURCES; i--; )
615 if (rs [i] == resval_undef) 601 if (rs [i] == resval_undef)
616 rs [i] = 0; 602 rs [i] = 0;
… …
626 rxvt_perl.init (this); 612 rxvt_perl.init (this);
627 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 613 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
628 } 614 }
629#endif 615#endif
630 616
631 // must be called after initialising the perl interpreter as it
632 // may invoke the `on_register_command' hook
633 extract_keysym_resources (); 617 extract_keysym_resources ();
634 618
635 /* 619 /*
636 * set any defaults not already set 620 * set any defaults not already set
637 */ 621 */
… …
673 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 657 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
674 pointerBlankDelay = i; 658 pointerBlankDelay = i;
675 else 659 else
676 pointerBlankDelay = 2; 660 pointerBlankDelay = 2;
677#endif 661#endif
662
663 if (rs[Rs_multiClickTime] && (i = atoi (rs[Rs_multiClickTime])) >= 0)
664 multiClickTime = i;
665 else
666 multiClickTime = 500;
667
668 cursor_type = option (Opt_cursorUnderline) ? 1 : 0;
678 669
679 /* no point having a scrollbar without having any scrollback! */ 670 /* no point having a scrollbar without having any scrollback! */
680 if (!saveLines) 671 if (!saveLines)
681 set_option (Opt_scrollBar, 0); 672 set_option (Opt_scrollBar, 0);
682 673
… …
807 if (option (Opt_scrollBar)) 798 if (option (Opt_scrollBar))
808 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */ 799 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
809 800
810 pty = ptytty::create (); 801 pty = ptytty::create ();
811 802
812#ifdef HAVE_AFTERIMAGE
813 set_application_name ((char *)rs[Rs_name]);
814 set_output_threshold (OUTPUT_LEVEL_WARNING);
815#endif
816
817 // must be called before create_windows, because the latter may call set_icon
818#ifdef HAVE_PIXBUF
819 g_type_init ();
820#endif
821
822 create_windows (argc, argv); 803 create_windows (argc, argv);
823 804
824 init_xlocale (); 805 init_xlocale ();
825 806
826 scr_poweron (); // initialize screen 807 scr_poweron (); // initialize screen
… …
829 XSynchronize (dpy, True); 810 XSynchronize (dpy, True);
830#endif 811#endif
831 812
832 if (option (Opt_scrollBar)) 813 if (option (Opt_scrollBar))
833 scrollBar.resize (); /* create and map scrollbar */ 814 scrollBar.resize (); /* create and map scrollbar */
815
834#ifdef HAVE_BG_PIXMAP 816#ifdef HAVE_BG_PIXMAP
835 {
836 bg_init (); 817 bg_init ();
837
838#ifdef ENABLE_TRANSPARENCY
839 if (option (Opt_transparent))
840 {
841 bg_set_transparent ();
842
843 if (rs [Rs_blurradius])
844 bg_set_blur (rs [Rs_blurradius]);
845
846 if (ISSET_PIXCOLOR (Color_tint))
847 bg_set_tint (pix_colors_focused [Color_tint]);
848
849 if (rs [Rs_shade])
850 bg_set_shade (rs [Rs_shade]);
851
852 bg_set_root_pixmap ();
853 XSelectInput (dpy, display->root, PropertyChangeMask);
854 rootwin_ev.start (display, display->root);
855 }
856#endif
857
858#ifdef BG_IMAGE_FROM_FILE
859 if (rs[Rs_backgroundPixmap])
860 if (bg_set_file (rs[Rs_backgroundPixmap]))
861 if (!bg_window_position_sensitive ())
862 update_background ();
863#endif
864 }
865#endif 818#endif
866 819
867#if ENABLE_PERL 820#if ENABLE_PERL
868 rootwin_ev.start (display, display->root); 821 rootwin_ev.start (display, display->root);
869#endif 822#endif
870 823
871 set_colorfgbg (); 824 init_done = 1;
872 825
873 init_command (cmd_argv); 826 init_command (cmd_argv);
874 827
875 if (pty->pty >= 0) 828 if (pty->pty >= 0)
876 pty_ev.start (pty->pty, ev::READ); 829 pty_ev.start (pty->pty, ev::READ);
… …
920/*----------------------------------------------------------------------*/ 873/*----------------------------------------------------------------------*/
921void 874void
922rxvt_term::init_env () 875rxvt_term::init_env ()
923{ 876{
924 char *val; 877 char *val;
878 char *env_display;
879 char *env_windowid;
880 char *env_colorfgbg;
881 char *env_term;
925 882
926#ifdef DISPLAY_IS_IP 883#ifdef DISPLAY_IS_IP
927 /* Fixup display_name for export over pty to any interested terminal 884 /* Fixup display_name for export over pty to any interested terminal
928 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 885 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
929 * (for the first non-loopback interface) that we get from 886 * (for the first non-loopback interface) that we get from
… …
946 903
947 env_display = (char *)rxvt_malloc (strlen (val) + 9); 904 env_display = (char *)rxvt_malloc (strlen (val) + 9);
948 905
949 sprintf (env_display, "DISPLAY=%s", val); 906 sprintf (env_display, "DISPLAY=%s", val);
950 907
908 env_windowid = (char *)rxvt_malloc (21);
951 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent); 909 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
952 910
953 /* add entries to the environment: 911 /* add entries to the environment:
954 * @ DISPLAY: in case we started with -display 912 * @ DISPLAY: in case we started with -display
955 * @ WINDOWID: X window id number of the window 913 * @ WINDOWID: X window id number of the window
… …
959 * @ COLORFGBG: fg;bg color codes 917 * @ COLORFGBG: fg;bg color codes
960 */ 918 */
961 putenv (env_display); 919 putenv (env_display);
962 putenv (env_windowid); 920 putenv (env_windowid);
963 921
964 if (env_colorfgbg) 922 env_colorfgbg = get_colorfgbg ();
965 putenv (env_colorfgbg); 923 putenv (env_colorfgbg);
966 924
967#ifdef RXVT_TERMINFO 925#ifdef RXVT_TERMINFO
968 putenv ("TERMINFO=" RXVT_TERMINFO); 926 putenv ("TERMINFO=" RXVT_TERMINFO);
969#endif 927#endif
970 928
… …
994void 952void
995rxvt_term::set_locale (const char *locale) 953rxvt_term::set_locale (const char *locale)
996{ 954{
997 set_environ (envv); 955 set_environ (envv);
998 956
999#if HAVE_XSETLOCALE || HAVE_SETLOCALE
1000 free (this->locale); 957 free (this->locale);
1001 this->locale = setlocale (LC_CTYPE, locale); 958 this->locale = setlocale (LC_CTYPE, locale);
1002 959
1003 if (!this->locale) 960 if (!this->locale)
1004 { 961 {
… …
1015 972
1016 973
1017 this->locale = strdup (this->locale); 974 this->locale = strdup (this->locale);
1018 SET_LOCALE (this->locale); 975 SET_LOCALE (this->locale);
1019 mbstate.reset (); 976 mbstate.reset ();
1020#endif
1021 977
1022#if HAVE_NL_LANGINFO 978#if HAVE_NL_LANGINFO
1023 char *codeset = nl_langinfo (CODESET); 979 char *codeset = nl_langinfo (CODESET);
1024 // /^UTF.?8/i 980 // /^UTF.?8/i
1025 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 981 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
… …
1034void 990void
1035rxvt_term::init_xlocale () 991rxvt_term::init_xlocale ()
1036{ 992{
1037 set_environ (envv); 993 set_environ (envv);
1038 994
1039#ifdef USE_XIM 995#if USE_XIM
1040 if (!locale) 996 if (!locale)
1041 rxvt_warn ("setting locale failed, continuing without locale support.\n"); 997 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1042 else 998 else
1043 { 999 {
1044 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1000 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
… …
1202/*----------------------------------------------------------------------*/ 1158/*----------------------------------------------------------------------*/
1203/* color aliases, fg/bg bright-bold */ 1159/* color aliases, fg/bg bright-bold */
1204void 1160void
1205rxvt_term::color_aliases (int idx) 1161rxvt_term::color_aliases (int idx)
1206{ 1162{
1207 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1163 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
1208 { 1164 {
1209 int i = atoi (rs[Rs_color + idx]); 1165 int i = atoi (rs[Rs_color + idx]);
1210 1166
1211 if (i >= 8 && i <= 15) 1167 if (i >= 8 && i <= 15)
1212 /* bright colors */ 1168 /* bright colors */
… …
1307} 1263}
1308 1264
1309void 1265void
1310rxvt_term::set_icon (const char *file) 1266rxvt_term::set_icon (const char *file)
1311{ 1267{
1312#ifdef HAVE_AFTERIMAGE
1313 init_asv ();
1314
1315 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1316 if (!im)
1317 {
1318 rxvt_warn ("Loading image icon failed, continuing without.\n");
1319 return;
1320 }
1321
1322 unsigned int w = im->width;
1323 unsigned int h = im->height;
1324
1325 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1326 {
1327 rxvt_warn ("Icon image too big, continuing without.\n");
1328 destroy_asimage (&im);
1329 return;
1330 }
1331
1332 ASImage *result = scale_asimage (asv, im,
1333 w, h, ASA_ARGB32,
1334 100, ASIMAGE_QUALITY_DEFAULT);
1335 destroy_asimage (&im);
1336
1337 if (!result)
1338 {
1339 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1340 return;
1341 }
1342
1343 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1344 if (buffer)
1345 {
1346 ARGB32 *asbuf = result->alt.argb32;
1347 buffer [0] = w;
1348 buffer [1] = h;
1349
1350 for (unsigned int i = 0; i < w * h; ++i)
1351 buffer [i + 2] = asbuf [i];
1352
1353 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1354 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1355 free (buffer);
1356 }
1357 else
1358 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1359
1360 destroy_asimage (&result);
1361#endif
1362
1363#ifdef HAVE_PIXBUF 1268#if HAVE_PIXBUF
1364 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); 1269 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1365 if (!pixbuf) 1270 if (!pixbuf)
1366 { 1271 {
1367 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1272 rxvt_warn ("Loading image icon failed, continuing without.\n");
1368 return; 1273 return;
… …
1488 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1393 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1489 &attributes); 1394 &attributes);
1490 1395
1491 this->parent = top; 1396 this->parent = top;
1492 1397
1493 old_width = szHint.width;
1494 old_height = szHint.height;
1495
1496 set_title (rs [Rs_title]); 1398 set_title (rs [Rs_title]);
1497 set_icon_name (rs [Rs_iconName]); 1399 set_icon_name (rs [Rs_iconName]);
1498 1400
1499 classHint.res_name = (char *)rs[Rs_name]; 1401 classHint.res_name = (char *)rs[Rs_name];
1500 classHint.res_class = (char *)RESCLASS; 1402 classHint.res_class = (char *)RESCLASS;
1501 1403
1502 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1404 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1503 wmHint.input = True; 1405 wmHint.input = True;
1504 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1406 wmHint.initial_state = option (Opt_iconic) ? IconicState
1407 : option (Opt_dockapp) ? WithdrawnState
1408 : NormalState;
1505 wmHint.window_group = top; 1409 wmHint.window_group = top;
1506 1410
1507 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1411 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1508 &szHint, &wmHint, &classHint); 1412 &szHint, &wmHint, &classHint);
1509#if ENABLE_EWMH 1413#if ENABLE_EWMH
… …
1511 * set up icon hint 1415 * set up icon hint
1512 * rs [Rs_iconfile] is path to icon 1416 * rs [Rs_iconfile] is path to icon
1513 */ 1417 */
1514 1418
1515 if (rs [Rs_iconfile]) 1419 if (rs [Rs_iconfile])
1516 {
1517 set_icon (rs [Rs_iconfile]); 1420 set_icon (rs [Rs_iconfile]);
1518 }
1519#endif 1421#endif
1520 1422
1521#if ENABLE_FRILLS 1423#if ENABLE_FRILLS
1522 if (mwmhints.flags) 1424 if (mwmhints.flags)
1523 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1425 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
… …
1562 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1464 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1563 1465
1564 /* the vt window */ 1466 /* the vt window */
1565 vt = XCreateSimpleWindow (dpy, top, 1467 vt = XCreateSimpleWindow (dpy, top,
1566 window_vt_x, window_vt_y, 1468 window_vt_x, window_vt_y,
1567 width, height, 1469 vt_width, vt_height,
1568 0, 1470 0,
1569 pix_colors_focused[Color_fg], 1471 pix_colors_focused[Color_fg],
1570 pix_colors_focused[Color_bg]); 1472 pix_colors_focused[Color_bg]);
1571 1473
1572 attributes.bit_gravity = NorthWestGravity; 1474 attributes.bit_gravity = NorthWestGravity;
… …
1621 if (pty->pty >= 0) 1523 if (pty->pty >= 0)
1622 { 1524 {
1623 if (getfd_hook) 1525 if (getfd_hook)
1624 pty->pty = (*getfd_hook) (pty->pty); 1526 pty->pty = (*getfd_hook) (pty->pty);
1625 1527
1626 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1528 if (pty->pty < 0)
1627 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1529 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1628 } 1530 }
1629 } 1531 }
1630 else 1532 else
1631#endif 1533#endif
1632 if (!pty->get ()) 1534 if (!pty->get ())
1633 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1535 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1536
1537 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1634 1538
1635 struct termios tio = def_tio; 1539 struct termios tio = def_tio;
1636 1540
1637#ifndef NO_BACKSPACE_KEY 1541#ifndef NO_BACKSPACE_KEY
1638 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1542 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
… …
1688 1592
1689 _exit (EXIT_FAILURE); 1593 _exit (EXIT_FAILURE);
1690 1594
1691 default: 1595 default:
1692 if (!option (Opt_utmpInhibit)) 1596 if (!option (Opt_utmpInhibit))
1597 {
1598#ifdef LOG_ONLY_ON_LOGIN
1599 bool login_shell = option (Opt_loginShell);
1600#else
1601 bool login_shell = true;
1602#endif
1693 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1603 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1604 }
1694 1605
1695 pty->close_tty (); 1606 pty->close_tty ();
1696 1607
1697 child_ev.start (cmd_pid); 1608 child_ev.start (cmd_pid);
1698 1609
… …
1723#elif defined (SRIOCSREDIR) 1634#elif defined (SRIOCSREDIR)
1724 int fd; 1635 int fd;
1725 1636
1726 fd = open (CONSOLE, O_WRONLY, 0); 1637 fd = open (CONSOLE, O_WRONLY, 0);
1727 if (fd >= 0) 1638 if (fd >= 0)
1728 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1639 {
1640 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1729 close (fd); 1641 close (fd);
1642 }
1730#endif /* SRIOCSREDIR */ 1643#endif /* SRIOCSREDIR */
1731 } 1644 }
1732 1645
1733 /* reset signals and spin off the command interpreter */ 1646 /* reset signals and spin off the command interpreter */
1734 signal (SIGINT, SIG_DFL); 1647 signal (SIGINT, SIG_DFL);

Diff Legend

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