From patchwork Tue Jun 24 15:15:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Newton X-Patchwork-Id: 32428 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f198.google.com (mail-pd0-f198.google.com [209.85.192.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id DBF8E203AC for ; Tue, 24 Jun 2014 15:16:39 +0000 (UTC) Received: by mail-pd0-f198.google.com with SMTP id y10sf1413355pdj.1 for ; Tue, 24 Jun 2014 08:16:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:mailing-list :precedence:list-id:list-unsubscribe:list-subscribe:list-archive :list-post:list-help:sender:delivered-to:from:to:subject:date :message-id:x-original-sender:x-original-authentication-results; bh=8dUQfKBpVp5Enlg5UKi5nt14wYAnKJrLbH/WwSaVT+k=; b=a2F3NeIuOx98P+YtVfR64ypTstXclLTBV/2mUJznfDViTzPxvkfcIl9TajqGOtsW3A +fwxfmyUcPFEm5AEehsvh/sc5vdPsDqCAnPZISHsmAWYLwtL6GobPigv81p39VlZdC0y 5VNakLu542+EDm7cO/deQZoBDijb/iHvh8H3YkgV53UOIqvycDpdSxvk7RmWUhqtq9/Q dT5/QoDRK8vqeuvfsLA3ZIHxSrtMIqFba35MBVVmQqlWIGOmHlVLGlon0RzG+bK/++Ad oHoq3D3DTaqyCgaY/5xhf8UIXtvOpZj6G1IyBSEyHoKu2qgNoU9pokO0mBNgrnYkuSTS t8yw== X-Gm-Message-State: ALoCoQkxGjB2l+lNeSZzs9u3/rqJOZZSGjoxsvKklKXcrOuctL9X2TwrNBbkbDeRLtOflB5LtALO X-Received: by 10.66.218.105 with SMTP id pf9mr754998pac.36.1403622999155; Tue, 24 Jun 2014 08:16:39 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.95.179 with SMTP id i48ls2305576qge.82.gmail; Tue, 24 Jun 2014 08:16:39 -0700 (PDT) X-Received: by 10.52.232.133 with SMTP id to5mr1121591vdc.16.1403622999013; Tue, 24 Jun 2014 08:16:39 -0700 (PDT) Received: from mail-vc0-x22c.google.com (mail-vc0-x22c.google.com [2607:f8b0:400c:c03::22c]) by mx.google.com with ESMTPS id c10si369521vdg.83.2014.06.24.08.16.38 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 24 Jun 2014 08:16:38 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2607:f8b0:400c:c03::22c as permitted sender) client-ip=2607:f8b0:400c:c03::22c; Received: by mail-vc0-f172.google.com with SMTP id hy10so467847vcb.31 for ; Tue, 24 Jun 2014 08:16:38 -0700 (PDT) X-Received: by 10.58.182.234 with SMTP id eh10mr1240366vec.41.1403622998845; Tue, 24 Jun 2014 08:16:38 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp218937vcb; Tue, 24 Jun 2014 08:16:38 -0700 (PDT) X-Received: by 10.66.161.199 with SMTP id xu7mr2313058pab.89.1403622998029; Tue, 24 Jun 2014 08:16:38 -0700 (PDT) Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id em3si805854pbb.194.2014.06.24.08.16.37 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Jun 2014 08:16:37 -0700 (PDT) Received-SPF: pass (google.com: domain of libc-alpha-return-51126-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Received: (qmail 7583 invoked by alias); 24 Jun 2014 15:16:26 -0000 Mailing-List: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org Precedence: list 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 7529 invoked by uid 89); 24 Jun 2014 15:16:25 -0000 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-we0-f181.google.com X-Received: by 10.180.82.228 with SMTP id l4mr111618wiy.78.1403622951294; Tue, 24 Jun 2014 08:15:51 -0700 (PDT) From: Will Newton To: libc-alpha@sourceware.org Subject: [PATCH] sysdeps/posix/tempname.c: Merge from gnulib Date: Tue, 24 Jun 2014 16:15:44 +0100 Message-Id: <1403622944-13488-1-git-send-email-will.newton@linaro.org> X-Original-Sender: will.newton@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2607:f8b0:400c:c03::22c as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org; dkim=pass header.i=@sourceware.org X-Google-Group-Id: 836684582541 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 and a #define of __secure_getenv. The majority of the patch is whitespace and 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 whitespace and 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 | 220 +++++++++++++++++++---------------------------- 1 file changed, 90 insertions(+), 130 deletions(-) diff --git a/sysdeps/posix/tempname.c b/sysdeps/posix/tempname.c index d21c0cc..62192bf 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 @@ -35,95 +36,55 @@ # define TMP_MAX 238328 #endif #ifndef __GT_FILE -# define __GT_FILE 0 -# define __GT_DIR 1 -# define __GT_NOCREATE 2 +# define __GT_FILE 0 +# 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 # include # if HP_TIMING_AVAIL # define RANDOM_BITS(Var) \ - if (__glibc_unlikely (value == UINT64_C (0))) \ - { \ - /* If this is the first time this function is used initialize \ - the variable we accumulate the value in to some somewhat \ - random value. If we'd not do this programs at startup time \ - might have a reduced set of possible names, at least on slow \ - machines. */ \ - struct timeval tv; \ - __gettimeofday (&tv, NULL); \ - value = ((uint64_t) tv.tv_usec << 16) ^ tv.tv_sec; \ - } \ + if (__glibc_unlikely (value == UINT64_C (0))) \ + { \ + /* If this is the first time this function is used initialize \ + the variable we accumulate the value in to some somewhat \ + random value. If we'd not do this programs at startup time \ + might have a reduced set of possible names, at least on slow \ + machines. */ \ + struct timeval tv; \ + __gettimeofday (&tv, NULL); \ + value = ((uint64_t) tv.tv_usec << 16) ^ tv.tv_sec; \ + } \ HP_TIMING_NOW (Var) # endif #endif @@ -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) @@ -153,7 +115,7 @@ direxists (const char *dir) enough space in TMPL. */ int __path_search (char *tmpl, size_t tmpl_len, const char *dir, const char *pfx, - int try_tmpdir) + int try_tmpdir) { const char *d; size_t dlen, plen; @@ -167,35 +129,35 @@ __path_search (char *tmpl, size_t tmpl_len, const char *dir, const char *pfx, { plen = strlen (pfx); if (plen > 5) - plen = 5; + plen = 5; } if (try_tmpdir) { - d = __libc_secure_getenv ("TMPDIR"); + d = __secure_getenv ("TMPDIR"); if (d != NULL && direxists (d)) - dir = d; + dir = d; else if (dir != NULL && direxists (dir)) - /* nothing */ ; + /* nothing */ ; else - dir = NULL; + dir = NULL; } if (dir == NULL) { if (direxists (P_tmpdir)) - dir = P_tmpdir; + dir = P_tmpdir; else if (strcmp (P_tmpdir, "/tmp") != 0 && direxists ("/tmp")) - dir = "/tmp"; + dir = "/tmp"; else - { - __set_errno (ENOENT); - return -1; - } + { + __set_errno (ENOENT); + return -1; + } } dlen = strlen (dir); while (dlen > 1 && dir[dlen - 1] == '/') - dlen--; /* remove trailing slashes */ + dlen--; /* remove trailing slashes */ /* check we have room for "${dir}/${pfx}XXXXXX\0" */ if (tmpl_len < dlen + 1 + plen + 6 + 1) @@ -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"; @@ -218,11 +181,11 @@ static const char letters[] = __gen_tempname. TMPL is overwritten with the result. KIND may be one of: - __GT_NOCREATE: simply verify that the name does not exist - at the time of the call. - __GT_FILE: create the file using open(O_CREAT|O_EXCL) - and return a read-write fd. The file is mode 0600. - __GT_DIR: create a directory, which will be mode 0700. + __GT_NOCREATE: simply verify that the name does not exist + at the time of the call. + __GT_FILE: create the file using open(O_CREAT|O_EXCL) + and return a read-write fd. The file is mode 0600. + __GT_DIR: create a directory, which will be mode 0700. We use a clever algorithm to get hard-to-predict names. */ int @@ -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 (); @@ -297,46 +256,47 @@ __gen_tempname (char *tmpl, int suffixlen, int flags, int kind) XXXXXX[5] = letters[v % 62]; switch (kind) - { - case __GT_FILE: - fd = __open (tmpl, - (flags & ~O_ACCMODE) - | O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR); - break; - - case __GT_DIR: - fd = __mkdir (tmpl, S_IRUSR | S_IWUSR | S_IXUSR); - break; - - case __GT_NOCREATE: - /* This case is backward from the other three. __gen_tempname - succeeds if __xstat fails because the name does not exist. - Note the continue to bypass the common logic at the bottom - of the loop. */ - if (__lxstat64 (_STAT_VER, tmpl, &st) < 0) - { - if (errno == ENOENT) - { - __set_errno (save_errno); - return 0; - } - else - /* Give up now. */ - return -1; - } - continue; - - default: - assert (! "invalid KIND in __gen_tempname"); - } + { + case __GT_FILE: + fd = __open (tmpl, + (flags & ~O_ACCMODE) + | O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR); + break; + + case __GT_DIR: + fd = __mkdir (tmpl, S_IRUSR | S_IWUSR | S_IXUSR); + break; + + case __GT_NOCREATE: + /* This case is backward from the other three. __gen_tempname + succeeds if __xstat fails because the name does not exist. + Note the continue to bypass the common logic at the bottom + of the loop. */ + if (__lxstat64 (_STAT_VER, tmpl, &st) < 0) + { + if (errno == ENOENT) + { + __set_errno (save_errno); + return 0; + } + else + /* Give up now. */ + return -1; + } + continue; + + default: + assert (! "invalid KIND in __gen_tempname"); + abort (); + } if (fd >= 0) - { - __set_errno (save_errno); - return fd; - } + { + __set_errno (save_errno); + return fd; + } else if (errno != EEXIST) - return -1; + return -1; } /* We got out of the loop because we ran out of combinations to try. */