… | |
… | |
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__) |
|
|
52 | static uid_t saved_euid; |
|
|
53 | static gid_t saved_egid; |
|
|
54 | #endif |
|
|
55 | |
|
|
56 | bool |
|
|
57 | rxvt_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 | |
51 | vector<rxvt_term *> rxvt_term::termlist; |
66 | vector<rxvt_term *> rxvt_term::termlist; |
52 | |
67 | |
53 | static char curlocale[128], savelocale[128]; |
68 | static char curlocale[128], savelocale[128]; |
54 | |
69 | |
55 | bool |
70 | bool |
… | |
… | |
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 | |
66 | bool |
81 | void |
67 | rxvt_push_locale (const char *locale) |
82 | rxvt_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 | |
… | |
… | |
464 | /*----------------------------------------------------------------------*/ |
478 | /*----------------------------------------------------------------------*/ |
465 | bool |
479 | bool |
466 | rxvt_term::init (int argc, const char *const *argv) |
480 | rxvt_term::init (int argc, const char *const *argv) |
467 | { |
481 | { |
468 | SET_R (this); |
482 | SET_R (this); |
|
|
483 | TEMP_ENV; // few things in X do not call setlocale :( |
469 | |
484 | |
470 | set_locale (""); |
485 | set_locale (""); |
471 | |
486 | |
472 | if (!init_vars ()) |
487 | if (!init_vars ()) |
473 | return false; |
488 | return false; |
… | |
… | |
494 | |
509 | |
495 | if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) |
510 | if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) |
496 | || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2]) |
511 | || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2]) |
497 | || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) |
512 | || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) |
498 | { |
513 | { |
|
|
514 | #if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__) |
|
|
515 | // ignore some perl-related arguments if some bozo installed us set[ug]id |
|
|
516 | if (rxvt_tainted ()) |
|
|
517 | { |
|
|
518 | if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib]) |
|
|
519 | || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) |
|
|
520 | { |
|
|
521 | rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n"); |
|
|
522 | rs[Rs_perl_lib] = 0; |
|
|
523 | rs[Rs_perl_eval] = 0; |
|
|
524 | } |
|
|
525 | } |
|
|
526 | #endif |
499 | rxvt_perl.init (); |
527 | rxvt_perl.init (); |
500 | HOOK_INVOKE ((this, HOOK_INIT, DT_END)); |
528 | HOOK_INVOKE ((this, HOOK_INIT, DT_END)); |
501 | } |
529 | } |
502 | #endif |
530 | #endif |
503 | |
531 | |
… | |
… | |
505 | |
533 | |
506 | dDisp; |
534 | dDisp; |
507 | |
535 | |
508 | init_xlocale (); |
536 | init_xlocale (); |
509 | |
537 | |
510 | scr_reset (); /* initialize screen */ |
538 | scr_reset (); // initialize screen |
511 | |
539 | |
512 | #if 0 |
540 | #if 0 |
513 | XSynchronize (disp, True); |
541 | XSynchronize (disp, True); |
514 | #endif |
542 | #endif |
515 | |
543 | |
… | |
… | |
613 | /* signal (SIGURG, SIG_DFL); */ |
641 | /* signal (SIGURG, SIG_DFL); */ |
614 | |
642 | |
615 | old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); |
643 | old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); |
616 | // TODO: handle this with exceptions and tolerate the memory loss |
644 | // TODO: handle this with exceptions and tolerate the memory loss |
617 | XSetIOErrorHandler (rxvt_xioerror_handler); |
645 | XSetIOErrorHandler (rxvt_xioerror_handler); |
|
|
646 | |
|
|
647 | XrmInitialize (); |
618 | } |
648 | } |
619 | |
649 | |
620 | /* ------------------------------------------------------------------------- * |
650 | /* ------------------------------------------------------------------------- * |
621 | * MEMORY ALLOCATION WRAPPERS * |
651 | * MEMORY ALLOCATION WRAPPERS * |
622 | * ------------------------------------------------------------------------- */ |
652 | * ------------------------------------------------------------------------- */ |
… | |
… | |
658 | * ------------------------------------------------------------------------- */ |
688 | * ------------------------------------------------------------------------- */ |
659 | /* take care of suid/sgid super-user (root) privileges */ |
689 | /* take care of suid/sgid super-user (root) privileges */ |
660 | void |
690 | void |
661 | rxvt_privileges (rxvt_privaction action) |
691 | rxvt_privileges (rxvt_privaction action) |
662 | { |
692 | { |
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__) |
693 | #if ! defined(__CYGWIN32__) |
669 | # if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) |
694 | # if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) |
670 | /* setreuid () is the poor man's setuid (), seteuid () */ |
695 | /* setreuid () is the poor man's setuid (), seteuid () */ |
671 | # define seteuid(a) setreuid(-1, (a)) |
696 | # define seteuid(a) setreuid(-1, (a)) |
672 | # define setegid(a) setregid(-1, (a)) |
697 | # define setegid(a) setregid(-1, (a)) |
… | |
… | |
678 | case IGNORE: |
703 | case IGNORE: |
679 | /* |
704 | /* |
680 | * change effective uid/gid - not real uid/gid - so we can switch |
705 | * change effective uid/gid - not real uid/gid - so we can switch |
681 | * back to root later, as required |
706 | * back to root later, as required |
682 | */ |
707 | */ |
|
|
708 | setegid (getgid ()); |
683 | seteuid (getuid ()); |
709 | seteuid (getuid ()); |
684 | setegid (getgid ()); |
|
|
685 | break; |
710 | break; |
686 | case SAVE: |
711 | case SAVE: |
687 | euid = geteuid (); |
|
|
688 | egid = getegid (); |
712 | saved_egid = getegid (); |
|
|
713 | saved_euid = geteuid (); |
689 | break; |
714 | break; |
690 | case RESTORE: |
715 | case RESTORE: |
691 | seteuid (euid); |
|
|
692 | setegid (egid); |
716 | setegid (saved_egid); |
|
|
717 | seteuid (saved_euid); |
693 | break; |
718 | break; |
694 | } |
719 | } |
695 | # else |
720 | # else |
696 | switch (action) |
721 | switch (action) |
697 | { |
722 | { |
698 | case IGNORE: |
723 | case IGNORE: |
|
|
724 | setgid (getgid ()); |
699 | setuid (getuid ()); |
725 | setuid (getuid ()); |
700 | setgid (getgid ()); |
|
|
701 | /* FALLTHROUGH */ |
726 | /* FALLTHROUGH */ |
702 | case SAVE: |
727 | case SAVE: |
703 | /* FALLTHROUGH */ |
728 | /* FALLTHROUGH */ |
704 | case RESTORE: |
729 | case RESTORE: |
705 | break; |
730 | break; |
… | |
… | |
1421 | unsigned long fg, bg; |
1446 | unsigned long fg, bg; |
1422 | const char *p; |
1447 | const char *p; |
1423 | char **s; |
1448 | char **s; |
1424 | XIMStyles *xim_styles; |
1449 | XIMStyles *xim_styles; |
1425 | |
1450 | |
|
|
1451 | TEMP_ENV; |
|
|
1452 | |
1426 | if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) |
1453 | if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) |
1427 | return false; |
1454 | return false; |
1428 | |
1455 | |
1429 | D_MAIN ((stderr, "rxvt_IM_get_IC ()")); |
1456 | D_MAIN ((stderr, "rxvt_IM_get_IC ()")); |
1430 | input_method = display->get_xim (locale, modifiers); |
1457 | input_method = display->get_xim (locale, modifiers); |