Mercurial > hg > octave-shane > gnulib-hg
changeset 7337:1735329d8bfd
* tempname.c (__gen_tempname): Change attempts_min
into a macro. Use preprocessor to decide how to initialize
attempts [Coverity CID 67].
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Wed, 20 Sep 2006 18:38:14 +0000 |
| parents | fd59b8ebae51 |
| children | 32934cff1706 |
| files | lib/ChangeLog lib/tempname.c |
| diffstat | 2 files changed, 16 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,13 @@ +2006-09-20 Paul Eggert <eggert@cs.ucla.edu> + + Import this patch from libc: + + 2006-04-07 Ulrich Drepper <drepper@redhat.com> + + * tempname.c (__gen_tempname): Change attempts_min + into a macro. Use preprocessor to decide how to initialize + attempts [Coverity CID 67]. + 2006-09-18 Bruno Haible <bruno@clisp.org> * javaversion.c: Include configmake.h.
--- a/lib/tempname.c +++ b/lib/tempname.c @@ -213,11 +213,15 @@ 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; +#define 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; +#if ATTEMPTS_MIN < TMP_MAX + unsigned int attempts = TMP_MAX; +#else + unsigned int attempts = ATTEMPTS_MIN; +#endif len = strlen (tmpl); if (len < 6 || strcmp (&tmpl[len - 6], "XXXXXX"))