From 381fb12e1e6c2f028685d102386bc32725d14f48 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Mon, 25 Feb 2002 13:44:43 +0000 Subject: [PATCH] * lib/tempname.c, lib/mkstemp.c, m4/mkstemp.m4: New, stolen from Fileutils 4.1.5. * configure.in: Invoke UTILS_FUNC_MKSTEMP. * src/output.c (output_skeleton): Use mkstemp to create a real temporary file. Move the filling of `skeleton' and its muscle to... (prepare): here. (output): Move the definition of the prologue muscle to... (prepare): here. * src/system.h (DEFAULT_TMPDIR): New. --- ChangeLog | 13 ++ configure.in | 3 +- lib/mkstemp.c | 43 +++++++ lib/tempname.c | 343 +++++++++++++++++++++++++++++++++++++++++++++++++ m4/Makefile.am | 1 + m4/mkstemp.m4 | 46 +++++++ src/output.c | 102 +++++++++------ src/system.h | 29 ++++- 8 files changed, 533 insertions(+), 47 deletions(-) create mode 100644 lib/mkstemp.c create mode 100644 lib/tempname.c create mode 100644 m4/mkstemp.m4 diff --git a/ChangeLog b/ChangeLog index aecd22bb..9689d207 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2002-02-25 Akim Demaille + + * lib/tempname.c, lib/mkstemp.c, m4/mkstemp.m4: New, stolen from + Fileutils 4.1.5. + * configure.in: Invoke UTILS_FUNC_MKSTEMP. + * src/output.c (output_skeleton): Use mkstemp to create a real + temporary file. + Move the filling of `skeleton' and its muscle to... + (prepare): here. + (output): Move the definition of the prologue muscle to... + (prepare): here. + * src/system.h (DEFAULT_TMPDIR): New. + 2002-02-14 Paul Eggert Remove the support for C++ namespace cleanliness; it was diff --git a/configure.in b/configure.in index 9e8d2d5b..2cf4e6ff 100644 --- a/configure.in +++ b/configure.in @@ -89,7 +89,8 @@ AC_FUNC_ALLOCA AC_FUNC_OBSTACK AC_FUNC_ERROR_AT_LINE AC_FUNC_STRNLEN -AC_CHECK_FUNCS(mkstemp setlocale) +UTILS_FUNC_MKSTEMP +AC_CHECK_FUNCS(setlocale) AC_CHECK_DECLS([free, stpcpy, strchr, strspn, strnlen, malloc, memchr, memrchr]) AC_REPLACE_FUNCS(stpcpy strchr strspn memchr memrchr) jm_FUNC_MALLOC diff --git a/lib/mkstemp.c b/lib/mkstemp.c new file mode 100644 index 00000000..9d6c68a9 --- /dev/null +++ b/lib/mkstemp.c @@ -0,0 +1,43 @@ +/* Copyright (C) 1998, 1999, 2001 Free Software Foundation, Inc. + This file is derived from the one in 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., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include + +/* Disable the definition of mkstemp to rpl_mkstemp (from config.h) in this + file. Otherwise, we'd get conflicting prototypes for rpl_mkstemp on + most systems. */ +#undef mkstemp + +#include +#include + +#ifndef __GT_FILE +# define __GT_FILE 0 +#endif + +int __gen_tempname (); + +/* Generate a unique temporary file name from TEMPLATE. + The last six characters of TEMPLATE must be "XXXXXX"; + they are replaced with a string that makes the filename unique. + Then open the file and return a fd. */ +int +rpl_mkstemp (char *template) +{ + return __gen_tempname (template, __GT_FILE); +} diff --git a/lib/tempname.c b/lib/tempname.c new file mode 100644 index 00000000..bf5a15d0 --- /dev/null +++ b/lib/tempname.c @@ -0,0 +1,343 @@ +/* Copyright (C) 1991-1999, 2000, 2001 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 Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#if HAVE_CONFIG_H +# include +#endif + +#include +#include + +#include +#ifndef __set_errno +# define __set_errno(Val) errno = (Val) +#endif + +#include +#ifndef P_tmpdir +# define P_tmpdir "/tmp" +#endif +#ifndef TMP_MAX +# define TMP_MAX 238328 +#endif +#ifndef __GT_FILE +# define __GT_FILE 0 +# define __GT_BIGFILE 1 +# define __GT_DIR 2 +# define __GT_NOCREATE 3 +#endif + +#if STDC_HEADERS || _LIBC +# include +# include +#endif + +#include + +#if HAVE_FCNTL_H || _LIBC +# include +#endif + +#if HAVE_SYS_TIME_H || _LIBC +# include +#endif + +#if HAVE_STDINT_H || _LIBC +# include +#endif + +#if HAVE_UNISTD_H || _LIBC +# include +#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 struct_stat64 struct stat64 +#else +# define struct_stat64 struct stat +# 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) +# define __secure_getenv getenv +#endif + +#ifdef _LIBC +# include +# if HP_TIMING_AVAIL +# define RANDOM_BITS(Var) \ + if (__builtin_expect (value == UINT64_C (0), 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 + +/* 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 + +/* Return nonzero if DIR is an existent directory. */ +static int +direxists (const char *dir) +{ + struct_stat64 buf; + return __xstat64 (_STAT_VER, dir, &buf) == 0 && S_ISDIR (buf.st_mode); +} + +/* Path search algorithm, for tmpnam, tmpfile, etc. If DIR is + non-null and exists, uses it; otherwise uses the first of $TMPDIR, + P_tmpdir, /tmp that exists. Copies into TMPL a template suitable + for use with mk[s]temp. Will fail (-1) if DIR is non-null and + doesn't exist, none of the searched dirs exists, or there's not + enough space in TMPL. */ +int +__path_search (char *tmpl, size_t tmpl_len, const char *dir, const char *pfx, + int try_tmpdir) +{ + const char *d; + size_t dlen, plen; + + if (!pfx || !pfx[0]) + { + pfx = "file"; + plen = 4; + } + else + { + plen = strlen (pfx); + if (plen > 5) + plen = 5; + } + + if (try_tmpdir) + { + d = __secure_getenv ("TMPDIR"); + if (d != NULL && direxists (d)) + dir = d; + else if (dir != NULL && direxists (dir)) + /* nothing */ ; + else + dir = NULL; + } + if (dir == NULL) + { + if (direxists (P_tmpdir)) + dir = P_tmpdir; + else if (strcmp (P_tmpdir, "/tmp") != 0 && direxists ("/tmp")) + dir = "/tmp"; + else + { + __set_errno (ENOENT); + return -1; + } + } + + dlen = strlen (dir); + while (dlen > 1 && dir[dlen - 1] == '/') + dlen--; /* remove trailing slashes */ + + /* check we have room for "${dir}/${pfx}XXXXXX\0" */ + if (tmpl_len < dlen + 1 + plen + 6 + 1) + { + __set_errno (EINVAL); + return -1; + } + + sprintf (tmpl, "%.*s/%.*sXXXXXX", (int) dlen, dir, (int) plen, pfx); + return 0; +} + +/* 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 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_BIGFILE: same as __GT_FILE but use open64(). + __GT_DIR: create a directory, which will be mode 0700. + + We use a clever algorithm to get hard-to-predict names. */ +int +__gen_tempname (char *tmpl, int kind) +{ + int len; + char *XXXXXX; + static uint64_t value; + uint64_t random_time_bits; + unsigned int count; + int fd = -1; + int save_errno = errno; + struct_stat64 st; + + /* 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 + number of names is tried (we define reasonable as 62**3) fail to + give the system administrator the chance to remove the problems. */ + unsigned int attempts_min = 62 * 62 * 62; + + /* The number of times to attempt to generate a temporary file. To + conform to POSIX, this must be no smaller than TMP_MAX. */ + unsigned int attempts = attempts_min < TMP_MAX ? TMP_MAX : attempts_min; + + 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 < attempts; 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]; + + switch (kind) + { + case __GT_FILE: + fd = __open (tmpl, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR); + break; + + case __GT_BIGFILE: + fd = __open64 (tmpl, 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"); + } + + 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; +} diff --git a/m4/Makefile.am b/m4/Makefile.am index 052697d6..1a5d1041 100644 --- a/m4/Makefile.am +++ b/m4/Makefile.am @@ -12,6 +12,7 @@ lcmessage.m4 \ malloc.m4 \ mbrtowc.m4 \ mbstate_t.m4 \ +mkstemp.m4 \ prereq.m4 \ progtest.m4 \ realloc.m4 \ diff --git a/m4/mkstemp.m4 b/m4/mkstemp.m4 new file mode 100644 index 00000000..a5efedeb --- /dev/null +++ b/m4/mkstemp.m4 @@ -0,0 +1,46 @@ +#serial 1 + +# On some systems (e.g., HPUX-10.20, SunOS4.1.4, solaris2.5.1), mkstemp has the +# silly limit that it can create no more than 26 files from a given template. +# Other systems lack mkstemp altogether. On either type of system, arrange +# to use the replacement function. +AC_DEFUN([UTILS_FUNC_MKSTEMP], +[dnl + AC_REPLACE_FUNCS(mkstemp) + if test $ac_cv_func_mkstemp = no; then + utils_cv_func_mkstemp_limitations=yes + else + AC_CACHE_CHECK([for mkstemp limitations], + utils_cv_func_mkstemp_limitations, + [ + AC_TRY_RUN([ +# include + int main () + { + int i; + for (i = 0; i < 30; i++) + { + char template[] = "conftestXXXXXX"; + int fd = mkstemp (template); + if (fd == -1) + exit (1); + close (fd); + } + exit (0); + } + ], + utils_cv_func_mkstemp_limitations=no, + utils_cv_func_mkstemp_limitations=yes, + utils_cv_func_mkstemp_limitations=yes + ) + ] + ) + fi + + if test $utils_cv_func_mkstemp_limitations = yes; then + AC_LIBOBJ(mkstemp) + AC_LIBOBJ(tempname) + AC_DEFINE(mkstemp, rpl_mkstemp, + [Define to rpl_mkstemp if the replacement function should be used.]) + fi +]) diff --git a/src/output.c b/src/output.c index 5f5341f7..171f66cb 100644 --- a/src/output.c +++ b/src/output.c @@ -956,60 +956,71 @@ output_actions (void) static void output_skeleton (void) { - /* Find the right skeleton file. */ - if (!skeleton) - { - if (semantic_parser) - skeleton = "bison.hairy"; - else - skeleton = "bison.simple"; - } - - /* Parse the skeleton file and output the needed parsers. */ - muscle_insert ("skeleton", skeleton); - /* Store the definition of all the muscles. */ - { - FILE *muscles_m4 = xfopen ("/tmp/muscles.m4", "w"); - /* There are no comments, especially not `#': we do want M4 expansion - after `#': think of CPP macros! */ - fprintf (muscles_m4, "m4_changecom()\n"); - fprintf (muscles_m4, "m4_init()\n"); - - fprintf (muscles_m4, "m4_define([b4_actions], \n[["); - actions_output (muscles_m4); - fprintf (muscles_m4, "]])\n\n"); - - fprintf (muscles_m4, "m4_define([b4_guards], \n[["); - guards_output (muscles_m4); - fprintf (muscles_m4, "]])\n\n"); - - fprintf (muscles_m4, "m4_define([b4_tokendef], \n[["); - token_definitions_output (muscles_m4); - fprintf (muscles_m4, "]])\n\n"); + char *tempdir = getenv ("TMPDIR"); + char *tempfile = NULL; + FILE *out = NULL; + ssize_t bytes_read; + int fd; + + if (tempdir == NULL) + tempdir = DEFAULT_TMPDIR; + tempfile = xmalloc (strlen (tempdir) + 11); + sprintf (tempfile, "%s/bsnXXXXXX", tempdir); + fd = mkstemp (tempfile); + if (fd == -1) + error (EXIT_FAILURE, errno, "%s", tempfile); + + out = fdopen (fd, "w"); + if (out == NULL) + error (EXIT_FAILURE, errno, "%s", tempfile); + + /* There are no comments, especially not `#': we do want M4 expansion + after `#': think of CPP macros! */ + fputs ("m4_changecom()\n", out); + fputs ("m4_init()\n", out); + + fputs ("m4_define([b4_actions], \n[[", out); + actions_output (out); + fputs ("]])\n\n", out); + + fputs ("m4_define([b4_guards], \n[[", out); + guards_output (out); + fputs ("]])\n\n", out); + + fputs ("m4_define([b4_tokendef], \n[[", out); + token_definitions_output (out); + fputs ("]])\n\n", out); - muscles_m4_output (muscles_m4); + muscles_m4_output (out); - fprintf (muscles_m4, "m4_wrap([m4_divert_pop(0)])\n"); - fprintf (muscles_m4, "m4_divert_push(0)dnl\n"); - xfclose (muscles_m4); - } + fputs ("m4_wrap([m4_divert_pop(0)])\n", out); + fputs ("m4_divert_push(0)dnl\n", out); + xfclose (out); /* Invoke m4 on the definition of the muscles, and the skeleton. */ { const char *bison_pkgdatadir = getenv ("BISON_PKGDATADIR"); if (!bison_pkgdatadir) bison_pkgdatadir = PKGDATADIR; + if (trace_flag) + fprintf (stderr, + "running: m4 -I %s m4sugar/m4sugar.m4 %s %s\n", + bison_pkgdatadir, tempfile, skeleton); skel_in = readpipe ("m4", "-I", bison_pkgdatadir, "m4sugar/m4sugar.m4", - "/tmp/muscles.m4", + tempfile, skeleton, NULL); if (!skel_in) error (EXIT_FAILURE, errno, "cannot run m4"); skel_lex (); + + /* If `debugging', keep this file alive. */ + if (!trace_flag) + unlink (tempfile); } } @@ -1040,6 +1051,22 @@ prepare (void) MUSCLE_INSERT_INT ("locations_flag", locations_flag); MUSCLE_INSERT_INT ("defines_flag", defines_flag); + + /* Copy definitions in directive. */ + obstack_1grow (&attrs_obstack, 0); + muscle_insert ("prologue", obstack_finish (&attrs_obstack)); + + /* Find the right skeleton file. */ + if (!skeleton) + { + if (semantic_parser) + skeleton = "bison.hairy"; + else + skeleton = "bison.simple"; + } + + /* Parse the skeleton file and output the needed parsers. */ + muscle_insert ("skeleton", skeleton); } /*-------------------------. @@ -1122,9 +1149,6 @@ output (void) output_actions (); prepare (); - /* Copy definitions in directive. */ - obstack_1grow (&attrs_obstack, 0); - muscle_insert ("prologue", obstack_finish (&attrs_obstack)); /* Process the selected skeleton file. */ output_skeleton (); diff --git a/src/system.h b/src/system.h index 392f4eec..4f95e205 100644 --- a/src/system.h +++ b/src/system.h @@ -1,5 +1,5 @@ /* system-dependent definitions for Bison. - Copyright 2000, 2001 Free Software Foundation, Inc. + Copyright 2000, 2001, 2002 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 @@ -249,7 +249,9 @@ do { \ #define BITISSET(x, i) (((x)[(i)/BITS_PER_WORD] & (1<<((i) % BITS_PER_WORD))) != 0) -/* Extensions to use for the output files. */ +/*-----------------------------------------. +| Extensions to use for the output files. | +`-----------------------------------------*/ #ifdef VMS /* VMS. */ @@ -273,11 +275,23 @@ do { \ # endif /* ! MSDOS */ #endif /* ! VMS */ -/* As memcpy, but for shorts. */ +#ifndef DEFAULT_TMPDIR +# define DEFAULT_TMPDIR "/tmp" +#endif + + + +/*----------------------------. +| As memcpy, but for shorts. | +`----------------------------*/ + #define shortcpy(Dest, Src, Num) \ memcpy (Dest, Src, Num * sizeof (short)) -/* Free a linked list. */ +/*---------------------. +| Free a linked list. | +`---------------------*/ + #define LIST_FREE(Type, List) \ do { \ Type *_node, *_next; \ @@ -288,9 +302,10 @@ do { \ } \ } while (0) -/*---------------------------------. -| Debugging the memory allocator. | -`---------------------------------*/ + +/*---------------------------------------------. +| Debugging memory allocation (must be last). | +`---------------------------------------------*/ # if WITH_DMALLOC # define DMALLOC_FUNC_CHECK -- 2.47.2