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.165 by root, Sun Jan 8 00:20:12 2006 UTC vs.
Revision 1.171 by root, Wed Jan 11 03:13:26 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__)
52static uid_t saved_euid;
53static gid_t saved_egid;
54#endif
55
56bool
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
51vector<rxvt_term *> rxvt_term::termlist; 66vector<rxvt_term *> rxvt_term::termlist;
52 67
53static char curlocale[128], savelocale[128]; 68static char curlocale[128], savelocale[128];
54 69
55bool 70bool
… …
61 strncpy (curlocale, locale, 128); 76 strncpy (curlocale, locale, 128);
62 setlocale (LC_CTYPE, curlocale); 77 setlocale (LC_CTYPE, curlocale);
63 return true; 78 return true;
64} 79}
65 80
66bool 81void
67rxvt_push_locale (const char *locale) 82rxvt_push_locale (const char *locale)
68{ 83{
69 strcpy (savelocale, curlocale); 84 strcpy (savelocale, curlocale);
70 rxvt_set_locale (locale); 85 rxvt_set_locale (locale);
71} 86}
… …
464/*----------------------------------------------------------------------*/ 479/*----------------------------------------------------------------------*/
465bool 480bool
466rxvt_term::init (int argc, const char *const *argv) 481rxvt_term::init (int argc, const char *const *argv)
467{ 482{
468 SET_R (this); 483 SET_R (this);
484 TEMP_ENV; // few things in X do not call setlocale :(
469 485
470 set_locale (""); 486 set_locale ("");
471 487
472 if (!init_vars ()) 488 if (!init_vars ())
473 return false; 489 return false;
… …
494 510
495 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 511 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
496 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2]) 512 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
497 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) 513 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
498 { 514 {
515#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
516 // ignore some perl-related arguments if some bozo installed us set[ug]id
517 if (rxvt_tainted ())
518 {
519 if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
520 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
521 {
522 rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
523 rs[Rs_perl_lib] = 0;
524 rs[Rs_perl_eval] = 0;
525 }
526 }
527#endif
499 rxvt_perl.init (); 528 rxvt_perl.init ();
500 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 529 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
501 } 530 }
502#endif 531#endif
503 532
… …
505 534
506 dDisp; 535 dDisp;
507 536
508 init_xlocale (); 537 init_xlocale ();
509 538
510 scr_reset (); /* initialize screen */ 539 scr_reset (); // initialize screen
511 540
512#if 0 541#if 0
513 XSynchronize (disp, True); 542 XSynchronize (disp, True);
514#endif 543#endif
515 544
… …
613 /* signal (SIGURG, SIG_DFL); */ 642 /* signal (SIGURG, SIG_DFL); */
614 643
615 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 644 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
616 // TODO: handle this with exceptions and tolerate the memory loss 645 // TODO: handle this with exceptions and tolerate the memory loss
617 XSetIOErrorHandler (rxvt_xioerror_handler); 646 XSetIOErrorHandler (rxvt_xioerror_handler);
647
648 XrmInitialize ();
618} 649}
619 650
620/* ------------------------------------------------------------------------- * 651/* ------------------------------------------------------------------------- *
621 * MEMORY ALLOCATION WRAPPERS * 652 * MEMORY ALLOCATION WRAPPERS *
622 * ------------------------------------------------------------------------- */ 653 * ------------------------------------------------------------------------- */
… …
658 * ------------------------------------------------------------------------- */ 689 * ------------------------------------------------------------------------- */
659/* take care of suid/sgid super-user (root) privileges */ 690/* take care of suid/sgid super-user (root) privileges */
660void 691void
661rxvt_privileges (rxvt_privaction action) 692rxvt_privileges (rxvt_privaction action)
662{ 693{
663#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
664 static uid_t euid;
665 static gid_t egid;
666#endif
667
668#if ! defined(__CYGWIN32__) 694#if ! defined(__CYGWIN32__)
669# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 695# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
670 /* setreuid () is the poor man's setuid (), seteuid () */ 696 /* setreuid () is the poor man's setuid (), seteuid () */
671# define seteuid(a) setreuid(-1, (a)) 697# define seteuid(a) setreuid(-1, (a))
672# define setegid(a) setregid(-1, (a)) 698# define setegid(a) setregid(-1, (a))
… …
682 */ 708 */
683 seteuid (getuid ()); 709 seteuid (getuid ());
684 setegid (getgid ()); 710 setegid (getgid ());
685 break; 711 break;
686 case SAVE: 712 case SAVE:
687 euid = geteuid (); 713 saved_euid = geteuid ();
688 egid = getegid (); 714 saved_egid = getegid ();
689 break; 715 break;
690 case RESTORE: 716 case RESTORE:
691 seteuid (euid); 717 seteuid (saved_euid);
692 setegid (egid); 718 setegid (saved_egid);
693 break; 719 break;
694 } 720 }
695# else 721# else
696 switch (action) 722 switch (action)
697 { 723 {
… …
1421 unsigned long fg, bg; 1447 unsigned long fg, bg;
1422 const char *p; 1448 const char *p;
1423 char **s; 1449 char **s;
1424 XIMStyles *xim_styles; 1450 XIMStyles *xim_styles;
1425 1451
1452 TEMP_ENV;
1453
1426 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1454 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1427 return false; 1455 return false;
1428 1456
1429 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1457 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1430 input_method = display->get_xim (locale, modifiers); 1458 input_method = display->get_xim (locale, modifiers);

Diff Legend

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