diff options
author | William Jon McCann <mccann@jhu.edu> | 2007-10-04 23:19:31 +0000 |
---|---|---|
committer | William Jon McCann <mccann@src.gnome.org> | 2007-10-04 23:19:31 +0000 |
commit | cc0647cd1d972a68658a72b9ee296780129bc729 (patch) | |
tree | a6959fb293d8a8dadb3213c12116bf6f0082b614 /common/gdm-common.c | |
parent | ac350bf546831febb13c5a5d73a1329083182f49 (diff) | |
download | gdm-cc0647cd1d972a68658a72b9ee296780129bc729.tar.gz |
Remove some more obsolete stuff. Make distcheck happy.
2007-10-04 William Jon McCann <mccann@jhu.edu>
* common/gdm-common-unknown-origin.c: (gdm_safe_fopen_w):
* common/gdm-common-unknown-origin.h:
* common/gdm-common.c:
* configure.ac:
* daemon/gdm-slave.c: (gdm_slave_connect_to_x11_display):
* daemon/gdm-xdmcp-display-factory.c:
(gdm_xdmcp_handle_indirect_query),
(gdm_xdmcp_handle_managed_forward):
* daemon/main.c: (main_restoreenv), (gdm_restart_now),
(check_logdir), (check_servauthdir), (set_effective_user_group),
(gdm_daemon_check_permissions), (gdm_daemon_change_user), (main):
Remove some more obsolete stuff. Make distcheck happy.
svn path=/branches/mccann-gobject/; revision=5342
Diffstat (limited to 'common/gdm-common.c')
-rw-r--r-- | common/gdm-common.c | 159 |
1 files changed, 1 insertions, 158 deletions
diff --git a/common/gdm-common.c b/common/gdm-common.c index 6e138dc3..8eb86df1 100644 --- a/common/gdm-common.c +++ b/common/gdm-common.c @@ -25,171 +25,14 @@ #include <stdlib.h> #include <locale.h> #include <fcntl.h> -#include <sys/types.h> -#include <sys/socket.h> -#include <arpa/inet.h> -#include <setjmp.h> -#include <dirent.h> - -#ifdef HAVE_CRT_EXTERNS_H -#include <crt_externs.h> -#endif #include <glib.h> #include <glib/gi18n.h> +#include <glib/gstdio.h> #include "gdm-common.h" #include "gdm-md5.h" -static int sigchld_blocked = 0; -static sigset_t sigchldblock_mask, sigchldblock_oldmask; - -static int sigterm_blocked = 0; -static sigset_t sigtermblock_mask, sigtermblock_oldmask; - -static int sigusr2_blocked = 0; -static sigset_t sigusr2block_mask, sigusr2block_oldmask; - -void -gdm_sigchld_block_push (void) -{ - sigchld_blocked++; - - if (sigchld_blocked == 1) { - /* Set signal mask */ - sigemptyset (&sigchldblock_mask); - sigaddset (&sigchldblock_mask, SIGCHLD); - sigprocmask (SIG_BLOCK, &sigchldblock_mask, &sigchldblock_oldmask); - } -} - -void -gdm_sigchld_block_pop (void) -{ - sigchld_blocked --; - - if (sigchld_blocked == 0) { - /* Reset signal mask back */ - sigprocmask (SIG_SETMASK, &sigchldblock_oldmask, NULL); - } -} - -void -gdm_sigterm_block_push (void) -{ - sigterm_blocked++; - - if (sigterm_blocked == 1) { - /* Set signal mask */ - sigemptyset (&sigtermblock_mask); - sigaddset (&sigtermblock_mask, SIGTERM); - sigaddset (&sigtermblock_mask, SIGINT); - sigaddset (&sigtermblock_mask, SIGHUP); - sigprocmask (SIG_BLOCK, &sigtermblock_mask, &sigtermblock_oldmask); - } -} - -void -gdm_sigterm_block_pop (void) -{ - sigterm_blocked --; - - if (sigterm_blocked == 0) { - /* Reset signal mask back */ - sigprocmask (SIG_SETMASK, &sigtermblock_oldmask, NULL); - } -} - -void -gdm_sigusr2_block_push (void) -{ - sigset_t oldmask; - - if (sigusr2_blocked == 0) { - /* Set signal mask */ - sigemptyset (&sigusr2block_mask); - sigaddset (&sigusr2block_mask, SIGUSR2); - sigprocmask (SIG_BLOCK, &sigusr2block_mask, &oldmask); - } - - sigusr2_blocked++; - - sigusr2block_oldmask = oldmask; -} - -void -gdm_sigusr2_block_pop (void) -{ - sigset_t oldmask; - - oldmask = sigusr2block_oldmask; - - sigusr2_blocked--; - - if (sigusr2_blocked == 0) { - /* Reset signal mask back */ - sigprocmask (SIG_SETMASK, &sigusr2block_oldmask, NULL); - } -} - -/* Like fopen with "w" */ -FILE * -gdm_safe_fopen_w (const char *file, - mode_t perm) -{ - int fd; - FILE *ret; - VE_IGNORE_EINTR (g_unlink (file)); - do { - int flags; - - errno = 0; - flags = O_EXCL | O_CREAT | O_TRUNC | O_WRONLY; -#ifdef O_NOCTTY - flags |= O_NOCTTY; -#endif -#ifdef O_NOFOLLOW - flags |= O_NOFOLLOW; -#endif - - fd = g_open (file, flags, perm); - } while (errno == EINTR); - - if (fd < 0) { - return NULL; - } - - ret = fdopen (fd, "w"); - return ret; -} - -/** - * ve_clearenv: - * - * Description: Clears out the environment completely. - * In case there is no native implementation of clearenv, - * this could cause leaks depending on the implementation - * of environment. - * - **/ -void -ve_clearenv (void) -{ -#ifdef HAVE_CLEARENV - clearenv (); -#else - -#ifdef HAVE__NSGETENVIRON -#define environ (*_NSGetEnviron()) -#else - extern char **environ; -#endif - - if (environ != NULL) - environ[0] = NULL; -#endif -} - /* hex conversion adapted from D-Bus */ /** * Appends a two-character hex digit to a string, where the hex digit |