ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.180 by root, Mon Jan 16 15:00:20 2006 UTC vs.
Revision 1.195 by root, Sun Jan 22 00:48:13 2006 UTC

… …
46 46
47#ifdef HAVE_TERMIOS_H 47#ifdef HAVE_TERMIOS_H
48# include <termios.h> 48# include <termios.h>
49#endif 49#endif
50 50
51#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__) 51vector<rxvt_term *> rxvt_term::termlist;
52static uid_t saved_euid; 52
53static gid_t saved_egid; 53// used to tell global functions which terminal instance is "active"
54#endif 54rxvt_t rxvt_current_term;
55
56static char curlocale[128], savelocale[128];
55 57
56bool 58bool
57rxvt_tainted ()
58{
59#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
60 return getuid () != saved_euid || getgid () != saved_egid;
61#else
62 return false;
63#endif
64}
65
66vector<rxvt_term *> rxvt_term::termlist;
67
68static char curlocale[128], savelocale[128];
69
70bool
71rxvt_set_locale (const char *locale) 59rxvt_set_locale (const char *locale) NOTHROW
72{ 60{
73 if (!locale || !strncmp (locale, curlocale, 128)) 61 if (!locale || !strncmp (locale, curlocale, 128))
74 return false; 62 return false;
75 63
76 strncpy (curlocale, locale, 128); 64 strncpy (curlocale, locale, 128);
77 setlocale (LC_CTYPE, curlocale); 65 setlocale (LC_CTYPE, curlocale);
78 return true; 66 return true;
79} 67}
80 68
81void 69void
82rxvt_push_locale (const char *locale) 70rxvt_push_locale (const char *locale) NOTHROW
83{ 71{
84 strcpy (savelocale, curlocale); 72 strcpy (savelocale, curlocale);
85 rxvt_set_locale (locale); 73 rxvt_set_locale (locale);
86} 74}
87 75
88void 76void
89rxvt_pop_locale () 77rxvt_pop_locale () NOTHROW
90{ 78{
91 rxvt_set_locale (savelocale); 79 rxvt_set_locale (savelocale);
92} 80}
93 81
94#if ENABLE_COMBINING 82#if ENABLE_COMBINING
… …
182 pointer_ev (this, &rxvt_term::pointer_cb), 170 pointer_ev (this, &rxvt_term::pointer_cb),
183#endif 171#endif
184#ifdef USE_XIM 172#ifdef USE_XIM
185 im_ev (this, &rxvt_term::im_cb), 173 im_ev (this, &rxvt_term::im_cb),
186#endif 174#endif
175#ifndef NO_BELL
176 bell_ev (this, &rxvt_term::bell_cb),
177#endif
187 termwin_ev (this, &rxvt_term::x_cb), 178 termwin_ev (this, &rxvt_term::x_cb),
188 vt_ev (this, &rxvt_term::x_cb), 179 vt_ev (this, &rxvt_term::x_cb),
180 child_ev (this, &rxvt_term::child_cb),
189 check_ev (this, &rxvt_term::check_cb), 181 check_ev (this, &rxvt_term::check_cb),
190 flush_ev (this, &rxvt_term::flush_cb), 182 flush_ev (this, &rxvt_term::flush_cb),
191 destroy_ev (this, &rxvt_term::destroy_cb), 183 destroy_ev (this, &rxvt_term::destroy_cb),
192 pty_ev (this, &rxvt_term::pty_cb), 184 pty_ev (this, &rxvt_term::pty_cb),
193 incr_ev (this, &rxvt_term::incr_cb) 185 incr_ev (this, &rxvt_term::incr_cb)
… …
196 188
197 termlist.push_back (this); 189 termlist.push_back (this);
198 190
199#ifdef KEYSYM_RESOURCE 191#ifdef KEYSYM_RESOURCE
200 keyboard = new keyboard_manager; 192 keyboard = new keyboard_manager;
201
202 if (!keyboard)
203 rxvt_fatal ("out of memory, aborting.\n");
204#endif 193#endif
205} 194}
206 195
207// clean up the most important stuff, do *not* call x or free mem etc. 196// clean up the most important stuff, do *not* call x or free mem etc.
208// for use before an emergency exit 197// for use before an emergency exit
209void rxvt_term::emergency_cleanup () 198void rxvt_term::emergency_cleanup ()
210{ 199{
211 if (cmd_pid) 200 if (cmd_pid)
212 kill (-cmd_pid, SIGHUP); 201 kill (-cmd_pid, SIGHUP);
213 202
214#ifdef UTMP_SUPPORT 203 delete pty; pty = 0;
215 privileged_utmp (RESTORE);
216#endif
217
218 pty.put ();
219} 204}
220 205
221rxvt_term::~rxvt_term () 206rxvt_term::~rxvt_term ()
222{ 207{
223 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
224
225 termlist.erase (find (termlist.begin (), termlist.end(), this)); 208 termlist.erase (find (termlist.begin (), termlist.end(), this));
226 209
227 emergency_cleanup (); 210 emergency_cleanup ();
228 211
229#if ENABLE_STYLES 212#if ENABLE_STYLES
… …
304#ifdef KEYSYM_RESOURCE 287#ifdef KEYSYM_RESOURCE
305 delete keyboard; 288 delete keyboard;
306#endif 289#endif
307} 290}
308 291
292// child has exited, usually destroys
309void 293void
310rxvt_term::child_exit () 294rxvt_term::child_cb (child_watcher &w, int status)
311{ 295{
296 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
297
312 cmd_pid = 0; 298 cmd_pid = 0;
313 299
314 if (!OPTION (Opt_hold)) 300 if (!OPTION (Opt_hold))
315 destroy (); 301 destroy ();
316} 302}
317 303
318void 304void
319rxvt_term::destroy () 305rxvt_term::destroy ()
320{ 306{
321 if (destroy_ev.active) 307 if (destroy_ev.active)
308 return;
309
310 if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)))
322 return; 311 return;
323 312
324#if ENABLE_OVERLAY 313#if ENABLE_OVERLAY
325 scr_overlay_off (); 314 scr_overlay_off ();
326#endif 315#endif
… …
461 _exit (EXIT_FAILURE); 450 _exit (EXIT_FAILURE);
462} 451}
463 452
464/*----------------------------------------------------------------------*/ 453/*----------------------------------------------------------------------*/
465bool 454bool
466rxvt_term::init (int argc, const char *const *argv) 455rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
467{ 456{
457 this->envv = envv;
458
468 SET_R (this); 459 SET_R (this);
469 set_locale (""); 460 set_locale ("");
470 set_environ (envv); // few things in X do not call setlocale :( 461 set_environ (envv); // few things in X do not call setlocale :(
471 462
472 if (!init_vars ()) 463 if (!init_vars ())
… …
483#ifdef HAVE_SCROLLBARS 474#ifdef HAVE_SCROLLBARS
484 if (OPTION (Opt_scrollBar)) 475 if (OPTION (Opt_scrollBar))
485 scrollBar.setIdle (); /* set existence for size calculations */ 476 scrollBar.setIdle (); /* set existence for size calculations */
486#endif 477#endif
487 478
488#if ENABLE_PERL 479 pty = ptytty_new ();
489 if (!rs[Rs_perl_ext_1])
490 rs[Rs_perl_ext_1] = "default";
491
492 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
493 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
494 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
495 {
496#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
497 // ignore some perl-related arguments if some bozo installed us set[ug]id
498 if (rxvt_tainted ())
499 {
500 if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
501 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
502 {
503 rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
504 rs[Rs_perl_lib] = 0;
505 rs[Rs_perl_eval] = 0;
506 }
507 }
508#endif
509 rxvt_perl.init (this);
510 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
511 }
512#endif
513 480
514 create_windows (argc, argv); 481 create_windows (argc, argv);
515 482
516 dDisp; 483 dDisp;
517 484
… …
534 check_our_parents (); 501 check_our_parents ();
535 rootwin_ev.start (display, display->root); 502 rootwin_ev.start (display, display->root);
536 } 503 }
537#endif 504#endif
538 505
506 set_colorfgbg ();
507
508 init_command (cmd_argv);
509
510 free (cmd_argv);
511
512 if (pty->pty >= 0)
513 pty_ev.start (pty->pty, EVENT_READ);
514
515 check_ev.start ();
516
517 HOOK_INVOKE ((this, HOOK_START, DT_END));
518
539 XMapWindow (disp, vt); 519 XMapWindow (disp, vt);
540 XMapWindow (disp, parent[0]); 520 XMapWindow (disp, parent[0]);
541 521
542 set_colorfgbg ();
543
544 init_command (cmd_argv);
545
546 free (cmd_argv);
547
548 if (pty.pty >= 0)
549 pty_ev.start (pty.pty, EVENT_READ);
550
551 check_ev.start ();
552
553 HOOK_INVOKE ((this, HOOK_START, DT_END));
554
555 return true; 522 return true;
556} 523}
557 524
558static struct sig_handlers 525static struct sig_handlers
559{ 526{
560 sig_watcher sw_chld, sw_term, sw_int; 527 sig_watcher sw_term, sw_int;
561 528
562 void sig_chld (sig_watcher &w)
563 {
564 // we are being called for every SIGCHLD, find the corresponding term
565 int pid;
566
567 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
568 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
569 if (pid == (*t)->cmd_pid)
570 {
571 (*t)->child_exit ();
572 break;
573 }
574 }
575
576 /* 529 /*
577 * Catch a fatal signal and tidy up before quitting 530 * Catch a fatal signal and tidy up before quitting
578 */ 531 */
579 void 532 void
580 sig_term (sig_watcher &w) 533 sig_term (sig_watcher &w)
… …
586 signal (w.signum, SIG_DFL); 539 signal (w.signum, SIG_DFL);
587 kill (getpid (), w.signum); 540 kill (getpid (), w.signum);
588 } 541 }
589 542
590 sig_handlers () 543 sig_handlers ()
591 : sw_chld (this, &sig_handlers::sig_chld),
592 sw_term (this, &sig_handlers::sig_term), 544 : sw_term (this, &sig_handlers::sig_term),
593 sw_int (this, &sig_handlers::sig_term) 545 sw_int (this, &sig_handlers::sig_term)
594 { 546 {
595 } 547 }
596} sig_handlers; 548} sig_handlers;
597 549
598char **rxvt_environ; // startup environment 550char **rxvt_environ; // startup environment
599 551
600void 552void
601rxvt_init () 553rxvt_init ()
602{ 554{
555 uid_t uid = getuid ();
556 gid_t gid = getgid ();
557
558 // before doing anything else, check for setuid/setgid operation,
559 // start the helper process and drop privileges
560 if (uid != geteuid ()
561 || gid != getegid ())
562 {
563#if PTYTTY_HELPER
564 ptytty_server ();
565#else
566 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
567#endif
568
569 // drop privileges
570#if HAVE_SETRESUID
571 setresgid (gid, gid, gid);
572 setresuid (uid, uid, uid);
573#elif HAVE_SETREUID
574 setregid (gid, gid);
575 setreuid (uid, uid);
576#elif HAVE_SETUID
577 setgid (gid);
578 setuid (uid);
579#endif
580
581 if (uid != geteuid ()
582 || gid != getegid ())
583 rxvt_fatal ("unable to drop privileges, aborting.\n");
584 }
585
603 rxvt_environ = environ; 586 rxvt_environ = environ;
604
605 /*
606 * Save and then give up any super-user privileges
607 * If we need privileges in any area then we must specifically request it.
608 * We should only need to be root in these cases:
609 * 1. write utmp entries on some systems
610 * 2. chown tty on some systems
611 */
612 rxvt_privileges (SAVE);
613 rxvt_privileges (IGNORE);
614 587
615 signal (SIGHUP, SIG_IGN); 588 signal (SIGHUP, SIG_IGN);
616 signal (SIGPIPE, SIG_IGN); 589 signal (SIGPIPE, SIG_IGN);
617 590
618 sig_handlers.sw_chld.start (SIGCHLD);
619 sig_handlers.sw_term.start (SIGTERM); 591 sig_handlers.sw_term.start (SIGTERM);
620 sig_handlers.sw_int.start (SIGINT); 592 sig_handlers.sw_int.start (SIGINT);
621 593
622 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 594 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
623 /* signal (SIGURG, SIG_DFL); */ 595 /* signal (SIGURG, SIG_DFL); */
… …
652 rxvt_fatal ("memory allocation failure. aborting.\n"); 624 rxvt_fatal ("memory allocation failure. aborting.\n");
653 625
654 return p; 626 return p;
655} 627}
656 628
657void * 629void *
658rxvt_realloc (void *ptr, size_t size) 630rxvt_realloc (void *ptr, size_t size)
659{ 631{
660 void *p = realloc (ptr, size); 632 void *p = realloc (ptr, size);
661 633
662 if (!p) 634 if (!p)
663 rxvt_fatal ("memory allocation failure. aborting.\n"); 635 rxvt_fatal ("memory allocation failure. aborting.\n");
664 636
665 return p; 637 return p;
666} 638}
667
668/* ------------------------------------------------------------------------- *
669 * PRIVILEGED OPERATIONS *
670 * ------------------------------------------------------------------------- */
671/* take care of suid/sgid super-user (root) privileges */
672void
673rxvt_privileges (rxvt_privaction action)
674{
675#if ! defined(__CYGWIN32__)
676# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
677 /* setreuid () is the poor man's setuid (), seteuid () */
678# define seteuid(a) setreuid(-1, (a))
679# define setegid(a) setregid(-1, (a))
680# define HAVE_SETEUID
681# endif
682# ifdef HAVE_SETEUID
683 switch (action)
684 {
685 case IGNORE:
686 /*
687 * change effective uid/gid - not real uid/gid - so we can switch
688 * back to root later, as required
689 */
690 setegid (getgid ());
691 seteuid (getuid ());
692 break;
693 case SAVE:
694 saved_egid = getegid ();
695 saved_euid = geteuid ();
696 break;
697 case RESTORE:
698 setegid (saved_egid);
699 seteuid (saved_euid);
700 break;
701 }
702# else
703 switch (action)
704 {
705 case IGNORE:
706 setgid (getgid ());
707 setuid (getuid ());
708 /* FALLTHROUGH */
709 case SAVE:
710 /* FALLTHROUGH */
711 case RESTORE:
712 break;
713 }
714# endif
715#endif
716}
717
718#ifdef UTMP_SUPPORT
719void
720rxvt_term::privileged_utmp (rxvt_privaction action)
721{
722 if (OPTION (Opt_utmpInhibit)
723 || !pty.name || !*pty.name)
724 return;
725
726 rxvt_privileges (RESTORE);
727
728 if (action == SAVE)
729 makeutent (pty.name, rs[Rs_display_name]);
730 else
731 cleanutent ();
732
733 rxvt_privileges (IGNORE);
734}
735#endif
736 639
737/*----------------------------------------------------------------------*/ 640/*----------------------------------------------------------------------*/
738/* 641/*
739 * window size/position calculcations for XSizeHint and other storage. 642 * window size/position calculcations for XSizeHint and other storage.
740 * if width/height are non-zero then override calculated width/height 643 * if width/height are non-zero then override calculated width/height
… …
874 * Called after a window size change. 777 * Called after a window size change.
875 */ 778 */
876void 779void
877rxvt_term::tt_winch () 780rxvt_term::tt_winch ()
878{ 781{
879 if (pty.pty < 0) 782 if (pty->pty < 0)
880 return; 783 return;
881 784
882 struct winsize ws; 785 struct winsize ws;
883 786
884 ws.ws_col = ncol; 787 ws.ws_col = ncol;
885 ws.ws_row = nrow; 788 ws.ws_row = nrow;
886 ws.ws_xpixel = width; 789 ws.ws_xpixel = width;
887 ws.ws_ypixel = height; 790 ws.ws_ypixel = height;
888 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 791 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
889 792
890#if 0 793#if 0
891 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 794 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
892 if (cmd_pid) /* force through to the command */ 795 if (cmd_pid) /* force through to the command */
893 kill (-cmd_pid, SIGWINCH); 796 kill (-cmd_pid, SIGWINCH);
… …
1679 XFree (preedit_attr); 1582 XFree (preedit_attr);
1680 XFree (status_attr); 1583 XFree (status_attr);
1681} 1584}
1682#endif /* USE_XIM */ 1585#endif /* USE_XIM */
1683 1586
1684/*----------------------------------------------------------------------*/
1685rxvt_t rxvt_current_term;
1686
1687/*----------------------- end-of-file (C source) -----------------------*/ 1587/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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