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.171 by root, Wed Jan 11 03:13:26 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
… …
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;
… …
487 if (OPTION (Opt_scrollBar)) 503 if (OPTION (Opt_scrollBar))
488 scrollBar.setIdle (); /* set existence for size calculations */ 504 scrollBar.setIdle (); /* set existence for size calculations */
489#endif 505#endif
490 506
491#if ENABLE_PERL 507#if ENABLE_PERL
508 if (!rs[Rs_perl_ext_1])
509 rs[Rs_perl_ext_1] = "default";
510
492 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 511 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
493 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2]) 512 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
494 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) 513 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
495 { 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
496 rxvt_perl.init (); 528 rxvt_perl.init ();
497 PERL_INVOKE ((this, HOOK_INIT, DT_END)); 529 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
498 } 530 }
499#endif 531#endif
500 532
501 create_windows (argc, argv); 533 create_windows (argc, argv);
502 534
503 dDisp; 535 dDisp;
504 536
505 init_xlocale (); 537 init_xlocale ();
506 538
507 scr_reset (); /* initialize screen */ 539 scr_reset (); // initialize screen
508 540
509#if 0 541#if 0
510 XSynchronize (disp, True); 542 XSynchronize (disp, True);
511#endif 543#endif
512 544
… …
534 566
535 init_command (cmd_argv); 567 init_command (cmd_argv);
536 568
537 free (cmd_argv); 569 free (cmd_argv);
538 570
571 if (pty.pty >= 0)
539 pty_ev.start (pty.pty, EVENT_READ); 572 pty_ev.start (pty.pty, EVENT_READ);
540 573
541 check_ev.start (); 574 check_ev.start ();
542 575
543 PERL_INVOKE ((this, HOOK_START, DT_END)); 576 HOOK_INVOKE ((this, HOOK_START, DT_END));
544 577
545 return true; 578 return true;
546} 579}
547 580
548static struct sig_handlers 581static struct sig_handlers
… …
609 /* signal (SIGURG, SIG_DFL); */ 642 /* signal (SIGURG, SIG_DFL); */
610 643
611 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 644 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
612 // TODO: handle this with exceptions and tolerate the memory loss 645 // TODO: handle this with exceptions and tolerate the memory loss
613 XSetIOErrorHandler (rxvt_xioerror_handler); 646 XSetIOErrorHandler (rxvt_xioerror_handler);
647
648 XrmInitialize ();
614} 649}
615 650
616/* ------------------------------------------------------------------------- * 651/* ------------------------------------------------------------------------- *
617 * MEMORY ALLOCATION WRAPPERS * 652 * MEMORY ALLOCATION WRAPPERS *
618 * ------------------------------------------------------------------------- */ 653 * ------------------------------------------------------------------------- */
… …
654 * ------------------------------------------------------------------------- */ 689 * ------------------------------------------------------------------------- */
655/* take care of suid/sgid super-user (root) privileges */ 690/* take care of suid/sgid super-user (root) privileges */
656void 691void
657rxvt_privileges (rxvt_privaction action) 692rxvt_privileges (rxvt_privaction action)
658{ 693{
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__) 694#if ! defined(__CYGWIN32__)
665# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 695# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
666 /* setreuid () is the poor man's setuid (), seteuid () */ 696 /* setreuid () is the poor man's setuid (), seteuid () */
667# define seteuid(a) setreuid(-1, (a)) 697# define seteuid(a) setreuid(-1, (a))
668# define setegid(a) setregid(-1, (a)) 698# define setegid(a) setregid(-1, (a))
… …
678 */ 708 */
679 seteuid (getuid ()); 709 seteuid (getuid ());
680 setegid (getgid ()); 710 setegid (getgid ());
681 break; 711 break;
682 case SAVE: 712 case SAVE:
683 euid = geteuid (); 713 saved_euid = geteuid ();
684 egid = getegid (); 714 saved_egid = getegid ();
685 break; 715 break;
686 case RESTORE: 716 case RESTORE:
687 seteuid (euid); 717 seteuid (saved_euid);
688 setegid (egid); 718 setegid (saved_egid);
689 break; 719 break;
690 } 720 }
691# else 721# else
692 switch (action) 722 switch (action)
693 { 723 {
… …
1417 unsigned long fg, bg; 1447 unsigned long fg, bg;
1418 const char *p; 1448 const char *p;
1419 char **s; 1449 char **s;
1420 XIMStyles *xim_styles; 1450 XIMStyles *xim_styles;
1421 1451
1452 TEMP_ENV;
1453
1422 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1454 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1423 return false; 1455 return false;
1424 1456
1425 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1457 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1426 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