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.161 by root, Wed Jan 4 20:43:38 2006 UTC vs.
Revision 1.174 by root, Thu Jan 12 00:11:13 2006 UTC

… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
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}
… …
206 pty.put (); 221 pty.put ();
207} 222}
208 223
209rxvt_term::~rxvt_term () 224rxvt_term::~rxvt_term ()
210{ 225{
211 PERL_INVOKE ((this, HOOK_DESTROY, DT_END)); 226 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
212 227
213 termlist.erase (find (termlist.begin (), termlist.end(), this)); 228 termlist.erase (find (termlist.begin (), termlist.end(), this));
214 229
215 emergency_cleanup (); 230 emergency_cleanup ();
216 231
… …
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
512 if (!rs[Rs_perl_ext_1])
513 rs[Rs_perl_ext_1] = "default";
514
492 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 515 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
493 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2]) 516 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
494 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) 517 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
495 { 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
496 rxvt_perl.init (); 532 rxvt_perl.init ();
533 setlocale (LC_CTYPE, curlocale); // perl destroys this info
497 PERL_INVOKE ((this, HOOK_INIT, DT_END)); 534 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
498 } 535 }
499#endif 536#endif
500 537
538 {
539 TEMP_ENV;
540
501 create_windows (argc, argv); 541 create_windows (argc, argv);
502 542
503 dDisp; 543 dDisp;
504 544
505 init_xlocale (); 545 init_xlocale ();
506 546
507 scr_reset (); /* initialize screen */ 547 scr_reset (); // initialize screen
508 548
509#if 0 549#if 0
510 XSynchronize (disp, True); 550 XSynchronize (disp, True);
511#endif 551#endif
512 552
513#ifdef HAVE_SCROLLBARS 553#ifdef HAVE_SCROLLBARS
514 if (OPTION (Opt_scrollBar)) 554 if (OPTION (Opt_scrollBar))
515 resize_scrollbar (); /* create and map scrollbar */ 555 resize_scrollbar (); /* create and map scrollbar */
516#endif 556#endif
517#if (MENUBAR_MAX) 557#if (MENUBAR_MAX)
518 if (menubar_visible ()) 558 if (menubar_visible ())
519 XMapWindow (disp, menuBar.win); 559 XMapWindow (disp, menuBar.win);
520#endif 560#endif
521#ifdef TRANSPARENT 561#ifdef TRANSPARENT
522 if (OPTION (Opt_transparent)) 562 if (OPTION (Opt_transparent))
523 { 563 {
524 XSelectInput (disp, display->root, PropertyChangeMask); 564 XSelectInput (disp, display->root, PropertyChangeMask);
525 check_our_parents (); 565 check_our_parents ();
526 rootwin_ev.start (display, display->root); 566 rootwin_ev.start (display, display->root);
527 } 567 }
528#endif 568#endif
529 569
530 XMapWindow (disp, vt); 570 XMapWindow (disp, vt);
531 XMapWindow (disp, parent[0]); 571 XMapWindow (disp, parent[0]);
532 572
533 set_colorfgbg (); 573 set_colorfgbg ();
534 574
535 init_command (cmd_argv); 575 init_command (cmd_argv);
536 576
537 free (cmd_argv); 577 free (cmd_argv);
538 578
579 if (pty.pty >= 0)
539 pty_ev.start (pty.pty, EVENT_READ); 580 pty_ev.start (pty.pty, EVENT_READ);
540 581
541 check_ev.start (); 582 check_ev.start ();
542 583
543 PERL_INVOKE ((this, HOOK_START, DT_END)); 584 HOOK_INVOKE ((this, HOOK_START, DT_END));
585 }
544 586
545 return true; 587 return true;
546} 588}
547 589
548static struct sig_handlers 590static struct sig_handlers
… …
609 /* signal (SIGURG, SIG_DFL); */ 651 /* signal (SIGURG, SIG_DFL); */
610 652
611 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 653 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
612 // TODO: handle this with exceptions and tolerate the memory loss 654 // TODO: handle this with exceptions and tolerate the memory loss
613 XSetIOErrorHandler (rxvt_xioerror_handler); 655 XSetIOErrorHandler (rxvt_xioerror_handler);
656
657 XrmInitialize ();
614} 658}
615 659
616/* ------------------------------------------------------------------------- * 660/* ------------------------------------------------------------------------- *
617 * MEMORY ALLOCATION WRAPPERS * 661 * MEMORY ALLOCATION WRAPPERS *
618 * ------------------------------------------------------------------------- */ 662 * ------------------------------------------------------------------------- */
… …
654 * ------------------------------------------------------------------------- */ 698 * ------------------------------------------------------------------------- */
655/* take care of suid/sgid super-user (root) privileges */ 699/* take care of suid/sgid super-user (root) privileges */
656void 700void
657rxvt_privileges (rxvt_privaction action) 701rxvt_privileges (rxvt_privaction action)
658{ 702{
659#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
660 static uid_t euid;
661 static gid_t egid;
662#endif
663
664#if ! defined(__CYGWIN32__) 703#if ! defined(__CYGWIN32__)
665# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 704# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
666 /* setreuid () is the poor man's setuid (), seteuid () */ 705 /* setreuid () is the poor man's setuid (), seteuid () */
667# define seteuid(a) setreuid(-1, (a)) 706# define seteuid(a) setreuid(-1, (a))
668# define setegid(a) setregid(-1, (a)) 707# define setegid(a) setregid(-1, (a))
… …
674 case IGNORE: 713 case IGNORE:
675 /* 714 /*
676 * 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
677 * back to root later, as required 716 * back to root later, as required
678 */ 717 */
718 setegid (getgid ());
679 seteuid (getuid ()); 719 seteuid (getuid ());
680 setegid (getgid ());
681 break; 720 break;
682 case SAVE: 721 case SAVE:
683 euid = geteuid ();
684 egid = getegid (); 722 saved_egid = getegid ();
723 saved_euid = geteuid ();
685 break; 724 break;
686 case RESTORE: 725 case RESTORE:
687 seteuid (euid);
688 setegid (egid); 726 setegid (saved_egid);
727 seteuid (saved_euid);
689 break; 728 break;
690 } 729 }
691# else 730# else
692 switch (action) 731 switch (action)
693 { 732 {
694 case IGNORE: 733 case IGNORE:
734 setgid (getgid ());
695 setuid (getuid ()); 735 setuid (getuid ());
696 setgid (getgid ());
697 /* FALLTHROUGH */ 736 /* FALLTHROUGH */
698 case SAVE: 737 case SAVE:
699 /* FALLTHROUGH */ 738 /* FALLTHROUGH */
700 case RESTORE: 739 case RESTORE:
701 break; 740 break;
… …
1417 unsigned long fg, bg; 1456 unsigned long fg, bg;
1418 const char *p; 1457 const char *p;
1419 char **s; 1458 char **s;
1420 XIMStyles *xim_styles; 1459 XIMStyles *xim_styles;
1421 1460
1461 TEMP_ENV;
1462
1422 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1463 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1423 return false; 1464 return false;
1424 1465
1425 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1466 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1426 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