From: John Darrington <john@darrington.wattle.id.au>
Date: Thu, 3 Dec 2009 20:50:15 +0000 (+0100)
Subject: Update to reflect latest copy of Gnulib
X-Git-Tag: fc11-i386-build56~1
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a04fda196e392d456f034e1fc2ad744a20d22b4;p=pspp-builds.git

Update to reflect latest copy of Gnulib

Conflicts:

	README.Git
	src/data/make-file.c
---

diff --git a/Smake b/Smake
index 29f93365..b63e7021 100644
--- a/Smake
+++ b/Smake
@@ -9,6 +9,7 @@ GNULIB_MODULES = \
 	byteswap \
 	c-ctype \
 	c-strtod \
+	canonicalize \
 	close \
 	crypto/md4 \
 	dirname \
diff --git a/src/data/make-file.c b/src/data/make-file.c
index 2162741a..e4c92340 100644
--- a/src/data/make-file.c
+++ b/src/data/make-file.c
@@ -177,7 +177,7 @@ replace_file_start (const char *file_name, const char *mode,
     {
       /* Generate unique temporary file name. */
       rf->tmp_name = xasprintf ("%s.tmpXXXXXX", file_name);
-      if (gen_tempname (rf->tmp_name, GT_NOCREATE) < 0)
+      if (gen_tempname (rf->tmp_name, 0, 0600, GT_NOCREATE) < 0)
         {
           msg (ME, _("Creating temporary file to replace %s: %s."),
                rf->file_name, strerror (errno));