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.174 by root, Thu Jan 12 00:11: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__)
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}
… …
269 if (parent[0]) 284 if (parent[0])
270 XDestroyWindow (disp, parent[0]); 285 XDestroyWindow (disp, parent[0]);
271 } 286 }
272 287
273 // TODO: free pixcolours, colours should become part of rxvt_display 288 // TODO: free pixcolours, colours should become part of rxvt_display
274
275 delete pix_colors_focused; 289 delete pix_colors_focused;
276#if OFF_FOCUS_FADING 290#if OFF_FOCUS_FADING
277 delete pix_colors_unfocused; 291 delete pix_colors_unfocused;
278#endif 292#endif
279 293
… …
465bool 479bool
466rxvt_term::init (int argc, const char *const *argv) 480rxvt_term::init (int argc, const char *const *argv)
467{ 481{
468 SET_R (this); 482 SET_R (this);
469 483
484 const char **cmd_argv;
485
486 {
487 TEMP_ENV; // few things in X do not call setlocale :(
488
470 set_locale (""); 489 set_locale ("");
471 490
472 if (!init_vars ()) 491 if (!init_vars ())
473 return false; 492 return false;
474 493
475 init_secondary (); 494 init_secondary ();
476 495
477 const char **cmd_argv = init_resources (argc, argv); 496 cmd_argv = init_resources (argc, argv);
478 497
479#ifdef KEYSYM_RESOURCE 498#ifdef KEYSYM_RESOURCE
480 keyboard->register_done (); 499 keyboard->register_done ();
481#endif 500#endif
482 501
483#if MENUBAR_MAX 502#if MENUBAR_MAX
484 menubar_read (rs[Rs_menu]); 503 menubar_read (rs[Rs_menu]);
485#endif 504#endif
486#ifdef HAVE_SCROLLBARS 505#ifdef HAVE_SCROLLBARS
487 if (OPTION (Opt_scrollBar)) 506 if (OPTION (Opt_scrollBar))
488 scrollBar.setIdle (); /* set existence for size calculations */ 507 scrollBar.setIdle (); /* set existence for size calculations */
489#endif 508#endif
509 }
490 510
491#if ENABLE_PERL 511#if ENABLE_PERL
492 if (!rs[Rs_perl_ext_1]) 512 if (!rs[Rs_perl_ext_1])
493 rs[Rs_perl_ext_1] = "default"; 513 rs[Rs_perl_ext_1] = "default";
494 514
495 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 515 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
496 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2]) 516 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
497 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) 517 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
498 { 518 {
519#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
520 // ignore some perl-related arguments if some bozo installed us set[ug]id
521 if (rxvt_tainted ())
522 {
523 if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
524 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
525 {
526 rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
527 rs[Rs_perl_lib] = 0;
528 rs[Rs_perl_eval] = 0;
529 }
530 }
531#endif
499 rxvt_perl.init (); 532 rxvt_perl.init ();
533 setlocale (LC_CTYPE, curlocale); // perl destroys this info
500 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 534 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
501 } 535 }
502#endif 536#endif
503 537
538 {
539 TEMP_ENV;
540
504 create_windows (argc, argv); 541 create_windows (argc, argv);
505 542
506 dDisp; 543 dDisp;
507 544
508 init_xlocale (); 545 init_xlocale ();
509 546
510 scr_reset (); /* initialize screen */ 547 scr_reset (); // initialize screen
511 548
512#if 0 549#if 0
513 XSynchronize (disp, True); 550 XSynchronize (disp, True);
514#endif 551#endif
515 552
516#ifdef HAVE_SCROLLBARS 553#ifdef HAVE_SCROLLBARS
517 if (OPTION (Opt_scrollBar)) 554 if (OPTION (Opt_scrollBar))
518 resize_scrollbar (); /* create and map scrollbar */ 555 resize_scrollbar (); /* create and map scrollbar */
519#endif 556#endif
520#if (MENUBAR_MAX) 557#if (MENUBAR_MAX)
521 if (menubar_visible ()) 558 if (menubar_visible ())
522 XMapWindow (disp, menuBar.win); 559 XMapWindow (disp, menuBar.win);
523#endif 560#endif
524#ifdef TRANSPARENT 561#ifdef TRANSPARENT
525 if (OPTION (Opt_transparent)) 562 if (OPTION (Opt_transparent))
526 { 563 {
527 XSelectInput (disp, display->root, PropertyChangeMask); 564 XSelectInput (disp, display->root, PropertyChangeMask);
528 check_our_parents (); 565 check_our_parents ();
529 rootwin_ev.start (display, display->root); 566 rootwin_ev.start (display, display->root);
530 } 567 }
531#endif 568#endif
532 569
533 XMapWindow (disp, vt); 570 XMapWindow (disp, vt);
534 XMapWindow (disp, parent[0]); 571 XMapWindow (disp, parent[0]);
535 572
536 set_colorfgbg (); 573 set_colorfgbg ();
537 574
538 init_command (cmd_argv); 575 init_command (cmd_argv);
539 576
540 free (cmd_argv); 577 free (cmd_argv);
541 578
542 if (pty.pty >= 0) 579 if (pty.pty >= 0)
543 pty_ev.start (pty.pty, EVENT_READ); 580 pty_ev.start (pty.pty, EVENT_READ);
544 581
545 check_ev.start (); 582 check_ev.start ();
546 583
547 HOOK_INVOKE ((this, HOOK_START, DT_END)); 584 HOOK_INVOKE ((this, HOOK_START, DT_END));
585 }
548 586
549 return true; 587 return true;
550} 588}
551 589
552static struct sig_handlers 590static struct sig_handlers
… …
613 /* signal (SIGURG, SIG_DFL); */ 651 /* signal (SIGURG, SIG_DFL); */
614 652
615 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 653 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
616 // TODO: handle this with exceptions and tolerate the memory loss 654 // TODO: handle this with exceptions and tolerate the memory loss
617 XSetIOErrorHandler (rxvt_xioerror_handler); 655 XSetIOErrorHandler (rxvt_xioerror_handler);
656
657 XrmInitialize ();
618} 658}
619 659
620/* ------------------------------------------------------------------------- * 660/* ------------------------------------------------------------------------- *
621 * MEMORY ALLOCATION WRAPPERS * 661 * MEMORY ALLOCATION WRAPPERS *
622 * ------------------------------------------------------------------------- */ 662 * ------------------------------------------------------------------------- */
… …
658 * ------------------------------------------------------------------------- */ 698 * ------------------------------------------------------------------------- */
659/* take care of suid/sgid super-user (root) privileges */ 699/* take care of suid/sgid super-user (root) privileges */
660void 700void
661rxvt_privileges (rxvt_privaction action) 701rxvt_privileges (rxvt_privaction action)
662{ 702{
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__) 703#if ! defined(__CYGWIN32__)
669# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 704# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
670 /* setreuid () is the poor man's setuid (), seteuid () */ 705 /* setreuid () is the poor man's setuid (), seteuid () */
671# define seteuid(a) setreuid(-1, (a)) 706# define seteuid(a) setreuid(-1, (a))
672# define setegid(a) setregid(-1, (a)) 707# define setegid(a) setregid(-1, (a))
… …
678 case IGNORE: 713 case IGNORE:
679 /* 714 /*
680 * change effective uid/gid - not real uid/gid - so we can switch 715 * change effective uid/gid - not real uid/gid - so we can switch
681 * back to root later, as required 716 * back to root later, as required
682 */ 717 */
718 setegid (getgid ());
683 seteuid (getuid ()); 719 seteuid (getuid ());
684 setegid (getgid ());
685 break; 720 break;
686 case SAVE: 721 case SAVE:
687 euid = geteuid ();
688 egid = getegid (); 722 saved_egid = getegid ();
723 saved_euid = geteuid ();
689 break; 724 break;
690 case RESTORE: 725 case RESTORE:
691 seteuid (euid);
692 setegid (egid); 726 setegid (saved_egid);
727 seteuid (saved_euid);
693 break; 728 break;
694 } 729 }
695# else 730# else
696 switch (action) 731 switch (action)
697 { 732 {
698 case IGNORE: 733 case IGNORE:
734 setgid (getgid ());
699 setuid (getuid ()); 735 setuid (getuid ());
700 setgid (getgid ());
701 /* FALLTHROUGH */ 736 /* FALLTHROUGH */
702 case SAVE: 737 case SAVE:
703 /* FALLTHROUGH */ 738 /* FALLTHROUGH */
704 case RESTORE: 739 case RESTORE:
705 break; 740 break;
… …
1421 unsigned long fg, bg; 1456 unsigned long fg, bg;
1422 const char *p; 1457 const char *p;
1423 char **s; 1458 char **s;
1424 XIMStyles *xim_styles; 1459 XIMStyles *xim_styles;
1425 1460
1461 TEMP_ENV;
1462
1426 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1463 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1427 return false; 1464 return false;
1428 1465
1429 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1466 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1430 input_method = display->get_xim (locale, modifiers); 1467 input_method = display->get_xim (locale, modifiers);

Diff Legend

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