merge from trunk

Conflicts:
	src/Makefile.in

8 files changed, 164 insertions, 47 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index f41c23df5d2..53d66ba1e37 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,46 @@
+2013-08-10  Eli Zaretskii  <eliz@gnu.org>
+
+        * update-game-score.exe.manifest: New file.
+
+        * Makefile.in (UPDATE_MANIFEST): New variable.
+        (SCRIPTS): Add $(UPDATE_MANIFEST).
+
+2013-08-05  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * makefile.w32-in (lisp2): Add nadvice.elc.
+
+2013-08-05  Eli Zaretskii  <eliz@gnu.org>
+
+        * update-game-score.c (read_score): Try reading a character before
+        probing the stream for EOF.  Initialize score->score to zero,
+        before reading and accumulating the score.
+        (read_scores): Fix logic that determines which value to return.
+        Close the input stream when finished reading the scores (avoids
+        failures in overwriting the file with a new one on MS-Windows,
+        since a file that is open cannot be deleted).
+
+        * ntlib.h (rename): Don't undefine.
+
+        * ntlib.c (sys_rename): New function, needed for
+        update-game-score.
+
+2013-08-04  Eli Zaretskii  <eliz@gnu.org>
+
+        * ntlib.h: Include fcntl.h.
+        (mkostemp): Declare prototype.
+        (mktemp): Don't redefine.
+
+        * ntlib.c (mkostemp): New function.  (Bug#15015)
+
+2013-08-04  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Fix some minor races in hosts lacking mkostemp (Bug#15015).
+        * movemail.c (main):
+        * update-game-score.c (write_scores):
+        Use mkostemp (which now works on all platforms, due to changes
+        in the portability layer) rather than mktemp (which has a race)
+        or mkstemp (which we no longer bother with).
+
 2013-07-10  Paul Eggert  <eggert@cs.ucla.edu>
 
         Port to C89.
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 2e0e2818767..fe1900a2a40 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -1,6 +1,7 @@
-# Makefile for lib-src subdirectory in GNU Emacs.
-# Copyright (C) 1985, 1987-1988, 1993-1994, 2001-2013 Free Software
-# Foundation, Inc.
+### @configure_input@
+
+# Copyright (C) 1985, 1987-1988, 1993-1994, 2001-2013
+#   Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -39,6 +40,7 @@ C_SWITCH_MACHINE=@C_SWITCH_MACHINE@
 PROFILING_CFLAGS = @PROFILING_CFLAGS@
 WARN_CFLAGS = @WARN_CFLAGS@
 WERROR_CFLAGS = @WERROR_CFLAGS@
+UPDATE_MANIFEST = @UPDATE_MANIFEST@
 
 # Program name transformation.
 TRANSFORM = @program_transform_name@
@@ -131,7 +133,7 @@ DONT_INSTALL= test-distrib${EXEEXT} make-docfile${EXEEXT}
 
 # Like UTILITIES, but they're not system-dependent, and should not be
 #  deleted by the distclean target.
-SCRIPTS= rcs2log
+SCRIPTS= rcs2log $(UPDATE_MANIFEST)
 
 # All files that are created by the linker, i.e., whose names end in ${EXEEXT}.
 EXE_FILES = ${INSTALLABLES} ${UTILITIES} ${DONT_INSTALL}
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 9656a3badec..dee80c4b560 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -251,6 +251,7 @@ lisp2 = \
         $(lispsource)register.elc \
         $(lispsource)replace.elc \
         $(lispsource)simple.elc \
+        $(lispsource)emacs-lisp/nadvice.elc \
         $(lispsource)minibuffer.elc \
         $(lispsource)startup.elc \
         $(lispsource)subr.elc \
diff --git a/lib-src/movemail.c b/lib-src/movemail.c
index 81ac8aa187c..9434782cb17 100644
--- a/lib-src/movemail.c
+++ b/lib-src/movemail.c
@@ -304,24 +304,13 @@ main (int argc, char **argv)
 
           memcpy (tempname, inname, inname_dirlen);
           strcpy (tempname + inname_dirlen, "EXXXXXX");
-#ifdef HAVE_MKSTEMP
-          desc = mkstemp (tempname);
-#else
-          mktemp (tempname);
-          if (!*tempname)
-            desc = -1;
-          else
-            {
-              unlink (tempname);
-              desc = open (tempname, O_WRONLY | O_CREAT | O_EXCL, 0600);
-            }
-#endif
+          desc = mkostemp (tempname, 0);
           if (desc < 0)
             {
-              int mkstemp_errno = errno;
+              int mkostemp_errno = errno;
               error ("error while creating what would become the lock file",
                      0, 0);
-              errno = mkstemp_errno;
+              errno = mkostemp_errno;
               pfatal_with_name (tempname);
             }
           close (desc);
diff --git a/lib-src/ntlib.c b/lib-src/ntlib.c
index 41b4e3a0cbc..ab7d8b590df 100644
--- a/lib-src/ntlib.c
+++ b/lib-src/ntlib.c
@@ -422,3 +422,72 @@ lstat (const char * path, struct stat * buf)
 {
   return stat (path, buf);
 }
+
+/* Implementation of mkostemp for MS-Windows, to avoid race conditions
+   when using mktemp.  Copied from w32.c.
+
+   This is used only in update-game-score.c.  It is overkill for that
+   use case, since update-game-score renames the temporary file into
+   the game score file, which isn't atomic on MS-Windows anyway, when
+   the game score already existed before running the program, which it
+   almost always does.  But using a simpler implementation just to
+   make a point is uneconomical...  */
+
+int
+mkostemp (char * template, int flags)
+{
+  char * p;
+  int i, fd = -1;
+  unsigned uid = GetCurrentThreadId ();
+  int save_errno = errno;
+  static char first_char[] = "abcdefghijklmnopqrstuvwyz0123456789!%-_@#";
+
+  errno = EINVAL;
+  if (template == NULL)
+    return -1;
+
+  p = template + strlen (template);
+  i = 5;
+  /* replace up to the last 5 X's with uid in decimal */
+  while (--p >= template && p[0] == 'X' && --i >= 0)
+    {
+      p[0] = '0' + uid % 10;
+      uid /= 10;
+    }
+
+  if (i < 0 && p[0] == 'X')
+    {
+      i = 0;
+      do
+        {
+          p[0] = first_char[i];
+          if ((fd = open (template,
+                          flags | _O_CREAT | _O_EXCL | _O_RDWR,
+                          S_IRUSR | S_IWUSR)) >= 0
+              || errno != EEXIST)
+            {
+              if (fd >= 0)
+                errno = save_errno;
+              return fd;
+            }
+        }
+      while (++i < sizeof (first_char));
+    }
+
+  /* Template is badly formed or else we can't generate a unique name.  */
+  return -1;
+}
+
+/* On Windows, you cannot rename into an existing file.  */
+int
+sys_rename (const char *from, const char *to)
+{
+  int retval = rename (from, to);
+
+  if (retval < 0 && errno == EEXIST)
+    {
+      if (unlink (to) == 0)
+        retval = rename (from, to);
+    }
+  return retval;
+}
diff --git a/lib-src/ntlib.h b/lib-src/ntlib.h
index 3e48d2997e0..ab5f5ea3b89 100644
--- a/lib-src/ntlib.h
+++ b/lib-src/ntlib.h
@@ -22,6 +22,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Include these headers now so we don't have to worry about include
    order dependencies in common source files.  */
 #include <direct.h>
+#include <fcntl.h>
 #include <io.h>
 #include <stdio.h>
 
@@ -41,6 +42,7 @@ int setuid (unsigned uid);
 int setregid (unsigned rgid, unsigned gid);
 char * getpass (const char * prompt);
 int fchown (int fd, unsigned uid, unsigned gid);
+int mkostemp (char * template, int flags);
 
 /* redirect or undo interceptions created by config.h */
 #undef access
@@ -61,15 +63,12 @@ int fchown (int fd, unsigned uid, unsigned gid);
 #undef fopen
 #undef mkdir
 #define mkdir   _mkdir
-#undef mktemp
-#define mktemp  _mktemp
 #undef open
 #define open    _open
 #undef pipe
 #define pipe    _pipe
 #undef read
 #define read    _read
-#undef rename
 #undef rmdir
 #define rmdir   _rmdir
 #undef unlink
diff --git a/lib-src/update-game-score.c b/lib-src/update-game-score.c
index ec8b4317770..92c1663f658 100644
--- a/lib-src/update-game-score.c
+++ b/lib-src/update-game-score.c
@@ -228,10 +228,11 @@ static int
 read_score (FILE *f, struct score_entry *score)
 {
   int c;
+  if ((c = getc (f)) != EOF)
+    ungetc (c, f);
   if (feof (f))
     return 1;
-  while ((c = getc (f)) != EOF
-         && isdigit (c))
+  for (score->score = 0; (c = getc (f)) != EOF && isdigit (c); )
     {
       score->score *= 10;
       score->score += (c-48);
@@ -311,34 +312,38 @@ read_score (FILE *f, struct score_entry *score)
 static int
 read_scores (const char *filename, struct score_entry **scores, int *count)
 {
-  int readval, scorecount, cursize;
+  int readval = -1, scorecount, cursize;
   struct score_entry *ret;
   FILE *f = fopen (filename, "r");
+  int retval = -1;
   if (!f)
     return -1;
   scorecount = 0;
   cursize = 16;
   ret = (struct score_entry *) malloc (sizeof (struct score_entry) * cursize);
-  if (!ret)
-    return -1;
-  while ((readval = read_score (f, &ret[scorecount])) == 0)
+  if (ret)
     {
-      /* We encountered an error.  */
-      if (readval < 0)
-        return -1;
-      scorecount++;
-      if (scorecount >= cursize)
+      while ((readval = read_score (f, &ret[scorecount])) == 0)
         {
-          cursize *= 2;
-          ret = (struct score_entry *)
-            realloc (ret, (sizeof (struct score_entry) * cursize));
-          if (!ret)
-            return -1;
+          scorecount++;
+          if (scorecount >= cursize)
+            {
+              cursize *= 2;
+              ret = (struct score_entry *)
+                realloc (ret, (sizeof (struct score_entry) * cursize));
+              if (!ret)
+                break;
+            }
         }
     }
-  *count = scorecount;
-  *scores = ret;
-  return 0;
+  if (readval > 0)
+    {
+      *count = scorecount;
+      *scores = ret;
+      retval = 0;
+    }
+  fclose (f);
+  return retval;
 }
 
 static int
@@ -383,6 +388,7 @@ sort_scores (struct score_entry *scores, int count, int reverse)
 static int
 write_scores (const char *filename, const struct score_entry *scores, int count)
 {
+  int fd;
   FILE *f;
   int i;
   char *tempfile = malloc (strlen (filename) + strlen (".tempXXXXXX") + 1);
@@ -390,12 +396,11 @@ write_scores (const char *filename, const struct score_entry *scores, int count)
     return -1;
   strcpy (tempfile, filename);
   strcat (tempfile, ".tempXXXXXX");
-#ifdef HAVE_MKSTEMP
-  if (mkstemp (tempfile) < 0
-#else
-  if (mktemp (tempfile) != tempfile
-#endif
-      || !(f = fopen (tempfile, "w")))
+  fd = mkostemp (tempfile, 0);
+  if (fd < 0)
+    return -1;
+  f = fdopen (fd, "w");
+  if (! f)
     return -1;
   for (i = 0; i < count; i++)
     if (fprintf (f, "%ld %s %s\n", scores[i].score, scores[i].username,
@@ -461,5 +466,4 @@ unlock_file (const char *filename, void *state)
   return ret;
 }
 
-
 /* update-game-score.c ends here */
diff --git a/lib-src/update-game-score.exe.manifest b/lib-src/update-game-score.exe.manifest
new file mode 100644
index 00000000000..1db836bec6b
--- /dev/null
+++ b/lib-src/update-game-score.exe.manifest
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>

+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">

+  <v3:trustInfo xmlns:v3="urn:schemas-microsoft-com:asm.v3">

+    <v3:security>

+      <v3:requestedPrivileges>

+        <v3:requestedExecutionLevel level="asInvoker" />

+      </v3:requestedPrivileges>

+    </v3:security>

+  </v3:trustInfo>

+</assembly>