From patchwork Tue Jun 24 15:48:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Newton X-Patchwork-Id: 1691 Received: (qmail 1811 invoked by alias); 24 Jun 2014 15:48:19 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 1800 invoked by uid 89); 24 Jun 2014 15:48:19 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.1 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-wg0-f51.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id; bh=RRgd3ygkrZOoemR9hI3pt0Qia/s+1CQu0Chb10UDMmc=; b=PFmPFS2WTEZ5fl75FplWpqqOKDtODZeJBpMuzcOJa5I1pSOIHcxJYMgeovYjWVgjm6 IKQ6C7hqLeyedUy739x1XN1uZsKQznWPCTReCkk0s/tCoZFv3E5TalkFLRzDktuSSLq0 fwA2vdUMPt1m8aL7jtjbtWeog0yVQjfWolFgjYJWOeY+mwf68eLS4eRDsKDBWbVwyeRT lMJzfssqo7xBbsz1j1RW+33C7C9AggWsnz4gAzIODg9f8csw4AliKNP1eDoSgDUulDCW TXhH0tcdfSlJC8Z/cr5rYpwnwZy96Kj0YDULU6jjH+rRyJWfls2IXpRQfDof5nLb3EO7 C8kg== X-Gm-Message-State: ALoCoQlvtJnq7sJs49BBLH0Xsu0nhiE3blH2XdkachBD+yT5kE/uiIXpC699h347OLvaJtDhOI9l X-Received: by 10.180.189.210 with SMTP id gk18mr281469wic.66.1403624889173; Tue, 24 Jun 2014 08:48:09 -0700 (PDT) From: Will Newton To: libc-alpha@sourceware.org Subject: [PATCH v2] sysdeps/posix/tempname.c: Merge from gnulib Date: Tue, 24 Jun 2014 16:48:00 +0100 Message-Id: <1403624880-15091-1-git-send-email-will.newton@linaro.org> Partial merge from gnulib which fixes a number of -Wundef warnings. The parts that differ from gnulib are the header comment, use of __glibc_unlikely, a #define of __secure_getenv and the use of tabs. The majority of the patch is cosmetic comment changes, the only runtime change is an abort if an unknown kind is passed to __gen_tempname. ChangeLog: 2014-06-24 Will Newton * sysdeps/posix/tempname.c: Merge from gnulib, cosmetic comment changes throughout the file. Remove checks for HAVE_*_H definitions that are not required. (__gen_tempname): Call abort if an unknown kind value is passed. --- sysdeps/posix/tempname.c | 84 +++++++++++++----------------------------------- 1 file changed, 22 insertions(+), 62 deletions(-) Changes in v2: - Drop whitespace changes that conflict with glibc coding style diff --git a/sysdeps/posix/tempname.c b/sysdeps/posix/tempname.c index d21c0cc..3aa11b0 100644 --- a/sysdeps/posix/tempname.c +++ b/sysdeps/posix/tempname.c @@ -15,8 +15,9 @@ License along with the GNU C Library; if not, see . */ -#if HAVE_CONFIG_H +#if !_LIBC # include +# include "tempname.h" #endif #include @@ -39,74 +40,34 @@ # define __GT_DIR 1 # define __GT_NOCREATE 2 #endif - -#if STDC_HEADERS || _LIBC -# include -# include -# include -#endif - -#if HAVE_FCNTL_H || _LIBC -# include -#endif - -#if HAVE_SYS_TIME_H || _LIBC -# include +#if !_LIBC && (GT_FILE != __GT_FILE || GT_DIR != __GT_DIR \ + || GT_NOCREATE != __GT_NOCREATE) +# error report this to bug-gnulib@gnu.org #endif -#if HAVE_STDINT_H || _LIBC -# include -#endif +#include +#include +#include -#if HAVE_UNISTD_H || _LIBC -# include -#endif +#include +#include +#include +#include #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 struct_stat64 struct stat64 +# define __secure_getenv __libc_secure_getenv #else # define struct_stat64 struct stat +# define __gen_tempname gen_tempname # define __getpid getpid # define __gettimeofday gettimeofday # define __mkdir mkdir # define __open open -# define __open64 open -# define __lxstat64(version, path, buf) lstat (path, buf) -# define __xstat64(version, path, buf) stat (path, buf) -#endif - -#if ! (HAVE_SECURE_GETENV || _LIBC) -# ifdef HAVE___SECURE_GETENV -# define __libc_secure_getenv __secure_getenv -# else -# define __libc_secure_getenv getenv -# endif +# define __lxstat64(version, file, buf) lstat (file, buf) +# define __secure_getenv secure_getenv #endif #ifdef _LIBC @@ -137,6 +98,7 @@ # define uint64_t uintmax_t #endif +#if _LIBC /* Return nonzero if DIR is an existent directory. */ static int direxists (const char *dir) @@ -172,7 +134,7 @@ __path_search (char *tmpl, size_t tmpl_len, const char *dir, const char *pfx, if (try_tmpdir) { - d = __libc_secure_getenv ("TMPDIR"); + d = __secure_getenv ("TMPDIR"); if (d != NULL && direxists (d)) dir = d; else if (dir != NULL && direxists (dir)) @@ -207,8 +169,9 @@ __path_search (char *tmpl, size_t tmpl_len, const char *dir, const char *pfx, sprintf (tmpl, "%.*s/%.*sXXXXXX", (int) dlen, dir, (int) plen, pfx); return 0; } +#endif /* _LIBC */ -/* These are the characters used in temporary filenames. */ +/* These are the characters used in temporary file names. */ static const char letters[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; @@ -240,7 +203,7 @@ __gen_tempname (char *tmpl, int suffixlen, int flags, int kind) /* A lower bound on the number of temporary files to attempt to generate. The maximum total number of temporary file names that can exist for a given template is 62**6. It should never be - necessary to try all these combinations. Instead if a reasonable + necessary to try all of these combinations. Instead if a reasonable number of names is tried (we define reasonable as 62**3) fail to give the system administrator the chance to remove the problems. */ #define ATTEMPTS_MIN (62 * 62 * 62) @@ -267,15 +230,11 @@ __gen_tempname (char *tmpl, int suffixlen, int flags, int kind) #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 (); @@ -328,6 +287,7 @@ __gen_tempname (char *tmpl, int suffixlen, int flags, int kind) default: assert (! "invalid KIND in __gen_tempname"); + abort (); } if (fd >= 0)