bug-gnulib
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

tempname.c patch from libc


From: Paul Eggert
Subject: tempname.c patch from libc
Date: Wed, 20 Sep 2006 11:39:00 -0700
User-agent: Gnus/5.1008 (Gnus v5.10.8) Emacs/21.4 (gnu/linux)

I installed this:

2006-09-20  Paul Eggert  <address@hidden>

        Import this patch from libc:

        2006-04-07  Ulrich Drepper  <address@hidden>

        * lib/tempname.c (__gen_tempname): Change attempts_min
        into a macro.  Use preprocessor to decide how to initialize
        attempts [Coverity CID 67].

--- lib/tempname.c      13 Sep 2006 22:38:14 -0000      1.20
+++ lib/tempname.c      20 Sep 2006 18:37:27 -0000
@@ -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"))




reply via email to

[Prev in Thread] Current Thread [Next in Thread]