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.160 by root, Wed Jan 4 05:35:34 2006 UTC vs.
Revision 1.168 by root, Sun Jan 8 08:49:20 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
… …
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
… …
273 // TODO: free pixcolours, colours should become part of rxvt_display 288 // TODO: free pixcolours, colours should become part of rxvt_display
274 289
275 delete pix_colors_focused; 290 delete pix_colors_focused;
276#if OFF_FOCUS_FADING 291#if OFF_FOCUS_FADING
277 delete pix_colors_unfocused; 292 delete pix_colors_unfocused;
293#endif
294#if USE_XGETDEFAULT
295 XrmDestroyDatabase (xrmdatabase);
278#endif 296#endif
279 297
280 displays.put (display); 298 displays.put (display);
281 299
282 scr_release (); 300 scr_release ();
… …
487 if (OPTION (Opt_scrollBar)) 505 if (OPTION (Opt_scrollBar))
488 scrollBar.setIdle (); /* set existence for size calculations */ 506 scrollBar.setIdle (); /* set existence for size calculations */
489#endif 507#endif
490 508
491#if ENABLE_PERL 509#if ENABLE_PERL
510 if (!rs[Rs_perl_ext_1])
511 rs[Rs_perl_ext_1] = "default";
512
492 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 513 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
493 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2]) 514 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
494 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) 515 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
495 { 516 {
517#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
518 // ignore some perl-related arguments if some bozo installed us set[ug]id
519 if (rxvt_tainted ())
520 {
521 if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
522 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
523 {
524 rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
525 rs[Rs_perl_lib] = 0;
526 rs[Rs_perl_eval] = 0;
527 }
528 }
529#endif
496 rxvt_perl.init (); 530 rxvt_perl.init ();
497 PERL_INVOKE ((this, HOOK_INIT, DT_END)); 531 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
498 } 532 }
499#endif 533#endif
500 534
501 create_windows (argc, argv); 535 create_windows (argc, argv);
502 536
… …
534 568
535 init_command (cmd_argv); 569 init_command (cmd_argv);
536 570
537 free (cmd_argv); 571 free (cmd_argv);
538 572
573 if (pty.pty >= 0)
539 pty_ev.start (pty.pty, EVENT_READ); 574 pty_ev.start (pty.pty, EVENT_READ);
540 575
541 check_ev.start (); 576 check_ev.start ();
542 577
543 PERL_INVOKE ((this, HOOK_START, DT_END)); 578 HOOK_INVOKE ((this, HOOK_START, DT_END));
544 579
545 return true; 580 return true;
546} 581}
547 582
548static struct sig_handlers 583static struct sig_handlers
… …
609 /* signal (SIGURG, SIG_DFL); */ 644 /* signal (SIGURG, SIG_DFL); */
610 645
611 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 646 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
612 // TODO: handle this with exceptions and tolerate the memory loss 647 // TODO: handle this with exceptions and tolerate the memory loss
613 XSetIOErrorHandler (rxvt_xioerror_handler); 648 XSetIOErrorHandler (rxvt_xioerror_handler);
649
650#ifdef USE_XGETDEFAULT
651 XrmInitialize ();
652#endif
614} 653}
615 654
616/* ------------------------------------------------------------------------- * 655/* ------------------------------------------------------------------------- *
617 * MEMORY ALLOCATION WRAPPERS * 656 * MEMORY ALLOCATION WRAPPERS *
618 * ------------------------------------------------------------------------- */ 657 * ------------------------------------------------------------------------- */
… …
654 * ------------------------------------------------------------------------- */ 693 * ------------------------------------------------------------------------- */
655/* take care of suid/sgid super-user (root) privileges */ 694/* take care of suid/sgid super-user (root) privileges */
656void 695void
657rxvt_privileges (rxvt_privaction action) 696rxvt_privileges (rxvt_privaction action)
658{ 697{
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__) 698#if ! defined(__CYGWIN32__)
665# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 699# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
666 /* setreuid () is the poor man's setuid (), seteuid () */ 700 /* setreuid () is the poor man's setuid (), seteuid () */
667# define seteuid(a) setreuid(-1, (a)) 701# define seteuid(a) setreuid(-1, (a))
668# define setegid(a) setregid(-1, (a)) 702# define setegid(a) setregid(-1, (a))
… …
678 */ 712 */
679 seteuid (getuid ()); 713 seteuid (getuid ());
680 setegid (getgid ()); 714 setegid (getgid ());
681 break; 715 break;
682 case SAVE: 716 case SAVE:
683 euid = geteuid (); 717 saved_euid = geteuid ();
684 egid = getegid (); 718 saved_egid = getegid ();
685 break; 719 break;
686 case RESTORE: 720 case RESTORE:
687 seteuid (euid); 721 seteuid (saved_euid);
688 setegid (egid); 722 setegid (saved_egid);
689 break; 723 break;
690 } 724 }
691# else 725# else
692 switch (action) 726 switch (action)
693 { 727 {
… …
1026 i = atoi (color); 1060 i = atoi (color);
1027 1061
1028 if (i >= 8 && i <= 15) 1062 if (i >= 8 && i <= 15)
1029 { /* bright colors */ 1063 { /* bright colors */
1030 i -= 8; 1064 i -= 8;
1031# ifndef NO_BRIGHTCOLOR
1032 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 1065 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1033 SET_PIXCOLOR (idx); 1066 SET_PIXCOLOR (idx);
1034 goto done; 1067 goto done;
1035# endif
1036 } 1068 }
1037 1069
1038 if (i >= 0 && i <= 7) 1070 if (i >= 0 && i <= 7)
1039 { /* normal colors */ 1071 { /* normal colors */
1040 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1072 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];

Diff Legend

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