Changes to m4/modules/m4.c,v

[Eric Blake]

CVSROOT:        /sources/m4
Module name:    m4
Changes by:     Eric Blake <ericb>      06/10/27 15:16:31

Index: modules/m4.c
===================================================================
RCS file: /sources/m4/m4/modules/m4.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -b -r1.87 -r1.88
--- modules/m4.c        25 Oct 2006 23:19:19 -0000      1.87
+++ modules/m4.c        27 Oct 2006 15:16:31 -0000      1.88
@@ -23,6 +23,7 @@
 #include <errno.h>
 
 #include "stdlib--.h"
+#include "tempname.h"
 #include "unistd--.h"
 
 #if HAVE_SYS_WAIT_H
@@ -708,18 +709,15 @@
 
   /* Make the temporary object.  */
   errno = 0;
-  if (dir)
-    fd = mkdtemp (obstack_base (obs)) ? 0 : -1;
-  else
-    fd = mkstemp_safer (obstack_base (obs));
+  fd = gen_tempname (obstack_base (obs), dir ? GT_DIR : GT_FILE);
   if (fd < 0)
     {
       /* This use of _() will need to change if xgettext ever changes
         its undocumented behavior of parsing both string options.  */
 
       m4_error (context, 0, errno,
-               _(dir ? "%s: cannot create directory `%s'"
-                 : "%s: cannot create file `%s'"),
+               _(dir ? "%s: cannot create directory from template `%s'"
+                 : "%s: cannot create file from template `%s'"),
                macro, name);
       obstack_free (obs, obstack_finish (obs));
     }