[Emacs-diffs] /srv/bzr/emacs/trunk r104687: Merge from gnulib.

[Paul Eggert]

------------------------------------------------------------
revno: 104687 [merge]
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Thu 2011-06-23 01:12:57 -0700
message:
  Merge from gnulib.
modified:
  ChangeLog
  lib/getopt.c
  lib/stat.c
  m4/gl-comp.m4

=== modified file 'ChangeLog'
--- a/ChangeLog 2011-06-22 16:28:41 +0000
+++ b/ChangeLog 2011-06-23 08:10:57 +0000
@@ -1,3 +1,7 @@
+2011-06-23  Paul Eggert  <address@hidden>
+
+       * lib/getopt.c, lib/stat.c, m4/gl-comp.m4: Merge from gnulib.
+
 2011-06-22  Paul Eggert  <address@hidden>
 
        Use gnulib's alloca-opt module.

=== modified file 'lib/getopt.c'
--- a/lib/getopt.c      2011-06-04 16:51:28 +0000
+++ b/lib/getopt.c      2011-06-23 08:10:57 +0000
@@ -829,7 +829,7 @@
         return '?';
       }
     /* Convenience. Treat POSIX -W foo same as long option --foo */
-    if (temp[0] == 'W' && temp[1] == ';')
+    if (temp[0] == 'W' && temp[1] == ';' && longopts)
       {
         char *nameend;
         const struct option *p;

=== modified file 'lib/stat.c'
--- a/lib/stat.c        2011-02-25 20:05:36 +0000
+++ b/lib/stat.c        2011-06-23 08:10:57 +0000
@@ -38,6 +38,7 @@
 #include <stdbool.h>
 #include <string.h>
 #include "dosname.h"
+#include "verify.h"
 
 /* Store information about NAME into ST.  Work around bugs with
    trailing slashes.  Mingw has other bugs (such as st_ino always
@@ -63,6 +64,12 @@
     }
 #endif /* REPLACE_FUNC_STAT_FILE */
 #if REPLACE_FUNC_STAT_DIR
+  /* The only known systems where REPLACE_FUNC_STAT_DIR is needed also
+     have a constant PATH_MAX.  */
+# ifndef PATH_MAX
+#  error "Please port this replacement to your platform"
+# endif
+
   if (result == -1 && errno == ENOENT)
     {
       /* Due to mingw's oddities, there are some directories (like
@@ -77,6 +84,7 @@
       char fixed_name[PATH_MAX + 1] = {0};
       size_t len = strlen (name);
       bool check_dir = false;
+      verify (PATH_MAX <= 4096);
       if (PATH_MAX <= len)
         errno = ENAMETOOLONG;
       else if (len)

=== modified file 'm4/gl-comp.m4'
--- a/m4/gl-comp.m4     2011-06-21 16:15:07 +0000
+++ b/m4/gl-comp.m4     2011-06-23 08:10:57 +0000
@@ -206,6 +206,9 @@
       if $condition; then
         func_gl_gnulib_m4code_dosname
       fi
+      if $condition; then
+        func_gl_gnulib_m4code_verify
+      fi
     fi
   }
   func_gl_gnulib_m4code_strtoull ()