From c37aeb0991aa834e02da591d401963786f1fdff0 Mon Sep 17 00:00:00 2001 From: Niels De Graef Date: Sun, 24 Jun 2018 21:09:16 +0200 Subject: Remove mkdtemp() and its wrappers. GLib has provided a wrapper for this with g_mkdtemp() since 2.30. --- common/Makefile.am | 9 --- common/gdm-common.c | 10 --- common/gdm-common.h | 2 - common/mkdtemp.c | 201 ---------------------------------------------------- common/mkdtemp.h | 40 ----------- 5 files changed, 262 deletions(-) delete mode 100644 common/mkdtemp.c delete mode 100644 common/mkdtemp.h (limited to 'common') diff --git a/common/Makefile.am b/common/Makefile.am index 8566ccb0..a26b2bde 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -33,12 +33,6 @@ noinst_LTLIBRARIES = \ gdmdir = $(datadir)/gdm gdm_DATA = gdb-cmd -if MKDTEMP_MISSING -MKDTEMP_FILES = mkdtemp.c mkdtemp.h -else -MKDTEMP_FILES = -endif - libgdmcommon_la_SOURCES = \ gdm-address.h \ gdm-address.c \ @@ -59,7 +53,6 @@ libgdmcommon_la_SOURCES = \ gdm-settings-direct.h \ gdm-log.h \ gdm-log.c \ - $(MKDTEMP_FILES) \ $(NULL) libgdmcommon_la_CPPFLAGS = \ @@ -94,7 +87,5 @@ test_log_LDADD = \ $(NULL) EXTRA_DIST = \ - mkdtemp.c \ - mkdtemp.h \ $(gdm_DATA) \ $(NULL) diff --git a/common/gdm-common.c b/common/gdm-common.c index c44fa998..a5b59242 100644 --- a/common/gdm-common.c +++ b/common/gdm-common.c @@ -36,10 +36,6 @@ #include "gdm-common.h" -#ifndef HAVE_MKDTEMP -#include "mkdtemp.h" -#endif - #include #define GDM_DBUS_NAME "org.gnome.DisplayManager" @@ -48,12 +44,6 @@ G_DEFINE_QUARK (gdm-common-error, gdm_common_error); -const char * -gdm_make_temp_dir (char *template) -{ - return mkdtemp (template); -} - gboolean gdm_clear_close_on_exec_flag (int fd) { diff --git a/common/gdm-common.h b/common/gdm-common.h index 8d83a124..e13c3a3d 100644 --- a/common/gdm-common.h +++ b/common/gdm-common.h @@ -49,8 +49,6 @@ gboolean gdm_get_pwent_for_name (const char *name, gboolean gdm_clear_close_on_exec_flag (int fd); -const char * gdm_make_temp_dir (char *template); - char *gdm_generate_random_bytes (gsize size, GError **error); gboolean gdm_goto_login_session (GError **error); diff --git a/common/mkdtemp.c b/common/mkdtemp.c deleted file mode 100644 index f5321c8f..00000000 --- a/common/mkdtemp.c +++ /dev/null @@ -1,201 +0,0 @@ -/* Copyright (C) 1999, 2001-2002 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ - -/* Extracted from misc/mkdtemp.c and sysdeps/posix/tempname.c. */ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -/* Specification. */ -#include "mkdtemp.h" - -#include -#ifndef __set_errno -# define __set_errno(Val) errno = (Val) -#endif - -#include -#include -#include - -#include -#ifndef TMP_MAX -# define TMP_MAX 238328 -#endif - -#if HAVE_STDINT_H_WITH_UINTMAX || _LIBC -# include -#endif - -#if HAVE_INTTYPES_H_WITH_UINTMAX || _LIBC -# include -#endif - -#if HAVE_UNISTD_H || _LIBC -# include -#endif - -#if HAVE_GETTIMEOFDAY || _LIBC -# if HAVE_SYS_TIME_H || _LIBC -# include -# endif -#else -# if HAVE_TIME_H || _LIBC -# include -# endif -#endif - -#include -#if STAT_MACROS_BROKEN -# undef S_ISDIR -#endif -#if !defined S_ISDIR && defined S_IFDIR -# define S_ISDIR(mode) (((mode) & S_IFMT) == S_IFDIR) -#endif -#if !S_IRUSR && S_IREAD -# define S_IRUSR S_IREAD -#endif -#if !S_IRUSR -# define S_IRUSR 00400 -#endif -#if !S_IWUSR && S_IWRITE -# define S_IWUSR S_IWRITE -#endif -#if !S_IWUSR -# define S_IWUSR 00200 -#endif -#if !S_IXUSR && S_IEXEC -# define S_IXUSR S_IEXEC -#endif -#if !S_IXUSR -# define S_IXUSR 00100 -#endif - -#if !_LIBC -# define __getpid getpid -# define __gettimeofday gettimeofday -# define __mkdir mkdir -#endif - -/* Use the widest available unsigned type if uint64_t is not - available. The algorithm below extracts a number less than 62**6 - (approximately 2**35.725) from uint64_t, so ancient hosts where - uintmax_t is only 32 bits lose about 3.725 bits of randomness, - which is better than not having mkstemp at all. */ -#if !defined UINT64_MAX && !defined uint64_t -# define uint64_t uintmax_t -#endif - -/* These are the characters used in temporary filenames. */ -static const char letters[] = -"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; - -/* Generate a temporary file name based on TMPL. TMPL must match the - rules for mk[s]temp (i.e. end in "XXXXXX"). The name constructed - does not exist at the time of the call to __gen_tempname. TMPL is - overwritten with the result. - - KIND is: - __GT_DIR: create a directory, which will be mode 0700. - - We use a clever algorithm to get hard-to-predict names. */ -static int -gen_tempname (tmpl) - char *tmpl; -{ - int len; - char *XXXXXX; - static uint64_t value; - uint64_t random_time_bits; - int count, fd = -1; - int save_errno = errno; - - len = strlen (tmpl); - if (len < 6 || strcmp (&tmpl[len - 6], "XXXXXX")) - { - __set_errno (EINVAL); - return -1; - } - - /* This is where the Xs start. */ - XXXXXX = &tmpl[len - 6]; - - /* Get some more or less random data. */ -#ifdef RANDOM_BITS - RANDOM_BITS (random_time_bits); -#else -# if HAVE_GETTIMEOFDAY || _LIBC - { - struct timeval tv; - __gettimeofday (&tv, NULL); - random_time_bits = ((uint64_t) tv.tv_usec << 16) ^ tv.tv_sec; - } -# else - random_time_bits = time (NULL); -# endif -#endif - value += random_time_bits ^ __getpid (); - - for (count = 0; count < TMP_MAX; value += 7777, ++count) - { - uint64_t v = value; - - /* Fill in the random bits. */ - XXXXXX[0] = letters[v % 62]; - v /= 62; - XXXXXX[1] = letters[v % 62]; - v /= 62; - XXXXXX[2] = letters[v % 62]; - v /= 62; - XXXXXX[3] = letters[v % 62]; - v /= 62; - XXXXXX[4] = letters[v % 62]; - v /= 62; - XXXXXX[5] = letters[v % 62]; - - fd = __mkdir (tmpl, S_IRUSR | S_IWUSR | S_IXUSR); - - if (fd >= 0) - { - __set_errno (save_errno); - return fd; - } - else if (errno != EEXIST) - return -1; - } - - /* We got out of the loop because we ran out of combinations to try. */ - __set_errno (EEXIST); - return -1; -} - -/* Generate a unique temporary directory from TEMPLATE. - The last six characters of TEMPLATE must be "XXXXXX"; - they are replaced with a string that makes the filename unique. - The directory is created, mode 700, and its name is returned. - (This function comes from OpenBSD.) */ -char * -mkdtemp (template) - char *template; -{ - if (gen_tempname (template)) - return NULL; - else - return template; -} diff --git a/common/mkdtemp.h b/common/mkdtemp.h deleted file mode 100644 index a0a336ad..00000000 --- a/common/mkdtemp.h +++ /dev/null @@ -1,40 +0,0 @@ -/* Creating a private temporary directory. - Copyright (C) 2001 Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - -#ifndef PARAMS -# if __STDC__ || defined __GNUC__ || defined __SUNPRO_C || defined __cplusplus || __PROTOTYPES -# define PARAMS(Args) Args -# else -# define PARAMS(Args) () -# endif -#endif - -#if HAVE_MKDTEMP - -/* Get mkdtemp() declaration. */ -#include - -#else - -/* Create a unique temporary directory from TEMPLATE. - The last six characters of TEMPLATE must be "XXXXXX"; - they are replaced with a string that makes the directory name unique. - Returns TEMPLATE, or a null pointer if it cannot get a unique name. - The directory is created mode 700. */ -extern char * mkdtemp PARAMS ((char *template)); - -#endif -- cgit v1.2.1