Changeset 1953 for coreutils/trunk/lib

Timestamp:

Jan 27, 2017, 4:40:38 PM (8 years ago)

Author:

Silvan Scherrer

Message:

coreutils: update trunk to version 8.26

Location:

coreutils/trunk

Files:

• . (modified) (1 prop)
• lib/alloca.in.h (modified) (1 diff)
• lib/argmatch.c (modified) (4 diffs)
• lib/backupfile.c (modified) (2 diffs)
• lib/chdir-long.c (modified) (2 diffs)
• lib/error.c (modified) (2 diffs)
• lib/euidaccess.c (modified) (2 diffs)
• lib/flexmember.h (copied) (copied from coreutils/vendor/current/lib/flexmember.h )
• lib/fnmatch.c (modified) (2 diffs)
• lib/fnmatch_loop.c (modified) (2 diffs)
• lib/freopen.c (modified) (3 diffs)
• lib/ftoastr.h (modified) (1 diff)
• lib/fts.c (modified) (5 diffs)
• lib/get-permissions.c (modified) (1 diff)
• lib/getdelim.c (modified) (3 diffs)
• lib/getndelim2.c (modified) (1 diff)
• lib/getprogname.c (copied) (copied from coreutils/vendor/current/lib/getprogname.c )
• lib/getprogname.h (copied) (copied from coreutils/vendor/current/lib/getprogname.h )
• lib/gettext.h (modified) (2 diffs)
• lib/gnulib.mk (modified) (7 diffs)
• lib/group-member.c (modified) (1 diff)
• lib/idcache.c (modified) (6 diffs)
• lib/inet_ntop.c (modified) (1 diff)
• lib/intprops.h (modified) (15 diffs)
• lib/limits.in.h (copied) (copied from coreutils/vendor/current/lib/limits.in.h )
• lib/long-options.c (modified) (1 diff)
• lib/math.in.h (modified) (13 diffs)
• lib/mbrtowc.c (modified) (6 diffs)
• lib/mktime-internal.h (modified) (1 diff)
• lib/mktime.c (modified) (24 diffs)
• lib/mountlist.c (modified) (4 diffs)
• lib/nl_langinfo.c (modified) (8 diffs)
• lib/obstack.c (modified) (1 diff)
• lib/obstack.h (modified) (4 diffs)
• lib/parse-datetime.c (modified) (44 diffs)
• lib/parse-datetime.h (modified) (1 diff)
• lib/parse-datetime.y (modified) (35 diffs)
• lib/quotearg.c (modified) (10 diffs)
• lib/rand-isaac.c (modified) (1 diff)
• lib/randread.c (modified) (1 diff)
• lib/regcomp.c (modified) (40 diffs)
• lib/regex.h (modified) (8 diffs)
• lib/regex_internal.c (modified) (19 diffs)
• lib/regex_internal.h (modified) (2 diffs)
• lib/regexec.c (modified) (53 diffs)
• lib/sched.in.h (modified) (2 diffs)
• lib/secure_getenv.c (modified) (3 diffs)
• lib/set-permissions.c (modified) (1 diff)
• lib/stdalign.in.h (modified) (2 diffs)
• lib/stddef.in.h (modified) (1 diff)
• lib/stdint.in.h (modified) (16 diffs)
• lib/stdlib.in.h (modified) (3 diffs)
• lib/strerror.c (modified) (1 diff)
• lib/strftime.c (modified) (16 diffs)
• lib/string.in.h (modified) (2 diffs)
• lib/strtod.c (modified) (4 diffs)
• lib/strtol.c (modified) (1 diff)
• lib/sys_select.in.h (modified) (3 diffs)
• lib/sys_time.in.h (modified) (1 diff)
• lib/time_rz.c (modified) (5 diffs)
• lib/timegm.c (modified) (2 diffs)
• lib/trim.c (modified) (1 diff)
• lib/unistr.in.h (modified) (1 diff)
• lib/unistr/u8-mbtoucr.c (modified) (2 diffs)
• lib/unistr/u8-uctomb-aux.c (modified) (2 diffs)
• lib/unistr/u8-uctomb.c (modified) (2 diffs)
• lib/utimecmp.c (modified) (3 diffs)
• lib/utimensat.c (modified) (1 diff)
• lib/vasnprintf.c (modified) (2 diffs)
• lib/verify.h (modified) (1 diff)
• lib/wchar.in.h (modified) (2 diffs)
• lib/wctype.in.h (modified) (2 diffs)
• lib/xalloc-oversized.h (modified) (2 diffs)
• lib/xstrtod.c (modified) (2 diffs)
• lib/xstrtol.c (modified) (3 diffs)

coreutils/trunk/lib/alloca.in.h ¶

@@ -52 +52 @@
 #  pragma intrinsic (_alloca)
 #  define alloca _alloca
+# elif defined __MVS__
+#  include <stdlib.h>
 # else
 #  include <stddef.h>

coreutils/trunk/lib/argmatch.c ¶

@@ -36 +36 @@
 #include "quotearg.h"
 #include "quote.h"
+#include "getprogname.h"
 
 #if USE_UNLOCKED_IO
@@ -211 +212 @@
  * Based on "getversion.c" by David MacKenzie <djm@gnu.ai.mit.edu>
  */
-char *program_name;
 
 /* When to make backup files.  */
@@ -255 +255 @@
   enum backup_type backup_type = no_backups;
 
-  program_name = (char *) argv[0];
-
   if (argc > 2)
     {
-      fprintf (stderr, "Usage: %s [VERSION_CONTROL]\n", program_name);
+      fprintf (stderr, "Usage: %s [VERSION_CONTROL]\n", getprogname ());
       exit (1);
     }
@@ -268 +266 @@
 
   if (argc == 2)
-    backup_type = XARGMATCH (program_name, argv[1],
+    backup_type = XARGMATCH (getprogname (), argv[1],
                              backup_args, backup_vals);
 

coreutils/trunk/lib/backupfile.c ¶

@@ -81 +81 @@
 /* The extension added to file names to produce a simple (as opposed
    to numbered) backup file name. */
-char const *simple_backup_suffix = "~";
+char const *simple_backup_suffix = NULL;
 
 
@@ -269 +269 @@
   bool simple = true;
 
+  /* Initialize the default simple backup suffix.  */
+  if (! simple_backup_suffix)
+    {
+      char const *env_suffix = getenv ("SIMPLE_BACKUP_SUFFIX");
+      if (env_suffix && *env_suffix)
+        simple_backup_suffix = env_suffix;
+      else
+        simple_backup_suffix = "~";
+    }
+
   /* Allow room for simple or ".~N~" backups.  The guess must be at
      least sizeof ".~1~", but otherwise will be adjusted as needed.  */

coreutils/trunk/lib/chdir-long.c ¶

@@ -213 +213 @@
 # include "error.h"
 
-char *program_name;
-
 int
 main (int argc, char *argv[])
@@ -222 +220 @@
   int len;
 
-  program_name = argv[0];
   atexit (close_stdout);
 

coreutils/trunk/lib/error.c ¶

@@ -43 +43 @@
 # define _GL_ATTRIBUTE_FORMAT_PRINTF(a, b)
 # define _GL_ARG_NONNULL(a)
+#else
+# include "getprogname.h"
 #endif
 
@@ -114 +116 @@
 # endif
 
-/* The calling program should define program_name and set it to the
-   name of the executing program.  */
-extern char *program_name;
+#define program_name getprogname ()
 
 # if HAVE_STRERROR_R || defined strerror_r

coreutils/trunk/lib/euidaccess.c ¶

@@ -199 +199 @@
 # include <stdlib.h>
 
-char *program_name;
-
 int
 main (int argc, char **argv)
@@ -208 +206 @@
   int err;
 
-  program_name = argv[0];
   if (argc < 3)
     abort ();

coreutils/trunk/lib/fnmatch.c ¶

@@ -23 +23 @@
 #endif
 
-#if ! defined __builtin_expect && __GNUC__ < 3
+#if ! defined __builtin_expect && (!defined __GNUC__ || __GNUC__ < 3)
 # define __builtin_expect(expr, expected) (expr)
 #endif
@@ -67 +67 @@
 # define SIZE_MAX ((size_t) -1)
 #endif
+
+#include "flexmember.h"
 
 /* We often have to test for FNM_FILE_NAME and FNM_PERIOD being both set.  */

coreutils/trunk/lib/fnmatch_loop.c ¶

@@ -1032 +1032 @@
   {
     struct patternlist *next;
-    CHAR str[1];
+    CHAR str[FLEXIBLE_ARRAY_MEMBER];
   } *list = NULL;
   struct patternlist **lastp = &list;
@@ -1084 +1084 @@
                     : p - startp + 1UL);                                      \
             plensize = plen * sizeof (CHAR);                                  \
-            newpsize = offsetof (struct patternlist, str) + plensize;         \
+            newpsize = FLEXSIZEOF (struct patternlist, str, plensize);        \
             if ((size_t) -1 / sizeof (CHAR) < plen                            \
                 || newpsize < offsetof (struct patternlist, str)              \

coreutils/trunk/lib/freopen.c ¶

@@ -20 +20 @@
    the system's <stdio.h> here, so that orig_freopen doesn't recurse to
    rpl_freopen.  */
-#define __need_FILE
+#define _GL_ALREADY_INCLUDING_STDIO_H
 #include <config.h>
 
 /* Get the original definition of freopen.  It might be defined as a macro.  */
 #include <stdio.h>
-#undef __need_FILE
+#undef _GL_ALREADY_INCLUDING_STDIO_H
 
 #include <errno.h>
@@ -40 +40 @@
 #include "stdio.h"
 
+#include <fcntl.h>
 #include <string.h>
+#include <unistd.h>
 
 FILE *
@@ -46 +48 @@
 {
   FILE *result;
-
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-  if (filename != NULL && strcmp (filename, "/dev/null") == 0)
-    filename = "NUL";
+  char const *null_device = "NUL";
+  if (filename && strcmp (filename, "/dev/null") == 0)
+    filename = null_device;
+#else
+  char const *null_device = "/dev/null";
 #endif
 
-  /* Clear errno to check the success of freopen() with it */
+#ifdef __KLIBC__
   errno = 0;
+#endif
 
   result = orig_freopen (filename, mode, stream);
 
+  if (!result)
+    {
 #ifdef __KLIBC__
-  /* On OS/2 kLIBC, freopen() returns NULL even if it is successful
-     if filename is NULL. */
-  if (!filename && !result && !errno)
-    result = stream;
+      /* On OS/2 kLIBC, freopen returns NULL even if it is successful
+         if filename is NULL. */
+      if (!filename && !errno)
+        result = stream;
 #endif
+    }
+  else if (filename)
+    {
+      int fd = fileno (result);
+      if (dup2 (fd, fd) < 0 && errno == EBADF)
+        {
+          int nullfd = open (null_device, O_RDONLY | O_CLOEXEC);
+          int err = 0;
+          if (nullfd != fd)
+            {
+              if (dup2 (nullfd, fd) < 0)
+                err = 1;
+              close (nullfd);
+            }
+          if (!err)
+            result = orig_freopen (filename, mode, result);
+        }
+    }
 
   return result;

coreutils/trunk/lib/ftoastr.h ¶

@@ -89 +89 @@
 #  define _GL_FLOAT_DIG_BITS_BOUND 4
 # else /* no machine is this bad, but let's be complete */
-#  define _GL_FLOAT_DIG_BITS_BOUND (CHAR_BIT * (int) sizeof (int) - 1)
+#  define _GL_FLOAT_DIG_BITS_BOUND ((int) TYPE_WIDTH (int) - 1)
 # endif
 

coreutils/trunk/lib/fts.c ¶

@@ -47 +47 @@
 #include <config.h>
 
-#if defined(LIBC_SCCS) && !defined(lint)
+#if defined LIBC_SCCS && !defined GCC_LINT && !defined lint
 static char sccsid[] = "@(#)fts.c       8.6 (Berkeley) 8/14/94";
-#endif /* LIBC_SCCS and not lint */
+#endif
 
 #include "fts_.h"
@@ -77 +77 @@
    supported.  */
 # include "cloexec.h"
+# include "flexmember.h"
 # include "openat.h"
 # include "same-inode.h"
@@ -1462 +1463 @@
                 bool is_dir;
                 size_t d_namelen;
+                __set_errno (0);
                 struct dirent *dp = readdir(cur->fts_dirp);
-                if (dp == NULL)
+                if (dp == NULL) {
+                        if (errno) {
+                                cur->fts_errno = errno;
+                                /* If we've not read any items yet, treat
+                                   the error as if we can't access the dir.  */
+                                cur->fts_info = (continue_readdir || nitems)
+                                                ? FTS_ERR : FTS_DNR;
+                        }
                         break;
+                }
                 if (!ISSET(FTS_SEEDOT) && ISDOT(dp->d_name))
                         continue;
@@ -1623 +1633 @@
         /* If didn't find anything, return NULL. */
         if (!nitems) {
-                if (type == BREAD)
+                if (type == BREAD
+                    && cur->fts_info != FTS_DNR && cur->fts_info != FTS_ERR)
                         cur->fts_info = FTS_DP;
                 fts_lfree(head);
@@ -1916 +1927 @@
          * structure and the file name in one chunk.
          */
-        len = offsetof(FTSENT, fts_name) + namelen + 1;
-        /* Align the allocation size so that it works for FTSENT,
-           so that trailing padding may be referenced by direct access
-           to the flexible array members, without triggering undefined behavior
-           by accessing bytes beyond the heap allocation.  This implicit access
-           was seen for example with ISDOT() and GCC 5.1.1 at -O2.
-           Do not use alignof (FTSENT) here, since C11 prohibits
-           taking the alignment of a structure containing a flexible
-           array member.  */
-        len += alignof (max_align_t) - 1;
-        len &= ~ (alignof (max_align_t) - 1);
+        len = FLEXSIZEOF(FTSENT, fts_name, namelen + 1);
         if ((p = malloc(len)) == NULL)
                 return (NULL);

coreutils/trunk/lib/get-permissions.c ¶

@@ -103 +103 @@
        pathconf (name, _PC_ACL_ENABLED)
        fpathconf (desc, _PC_ACL_ENABLED)
-     that allows to determine which of the two kinds of ACLs is supported
+     that allows us to determine which of the two kinds of ACLs is supported
      for the given file.  But some file systems may implement this call
      incorrectly, so better not use it.

coreutils/trunk/lib/getdelim.c ¶

@@ -48 +48 @@
 #endif
 
+static void
+alloc_failed (void)
+{
+#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+  /* Avoid errno problem without using the realloc module; see:
+     http://lists.gnu.org/archive/html/bug-gnulib/2016-08/msg00025.html  */
+  errno = ENOMEM;
+#endif
+}
+
 /* Read up to (and including) a DELIMITER from FP into *LINEPTR (and
    NUL-terminate it).  *LINEPTR is a pointer returned from malloc (or
@@ -75 +85 @@
       if (new_lineptr == NULL)
         {
+          alloc_failed ();
           result = -1;
           goto unlock_return;
@@ -112 +123 @@
           if (new_lineptr == NULL)
             {
+              alloc_failed ();
               result = -1;
               goto unlock_return;

coreutils/trunk/lib/getndelim2.c ¶

@@ -53 +53 @@
 
 /* Use this to suppress gcc's "...may be used before initialized" warnings. */
-#ifdef lint
+#if defined GCC_LINT || defined lint
 # define IF_LINT(Code) Code
 #else

coreutils/trunk/lib/gettext.h ¶

@@ -226 +226 @@
 #endif
     {
+      int found_translation;
       memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1);
       msg_ctxt_id[msgctxt_len - 1] = '\004';
       memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len);
       translation = dcgettext (domain, msg_ctxt_id, category);
+      found_translation = (translation != msg_ctxt_id);
 #if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
       if (msg_ctxt_id != buf)
         free (msg_ctxt_id);
 #endif
-      if (translation != msg_ctxt_id)
+      if (found_translation)
         return translation;
     }
@@ -272 +274 @@
 #endif
     {
+      int found_translation;
       memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1);
       msg_ctxt_id[msgctxt_len - 1] = '\004';
       memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len);
       translation = dcngettext (domain, msg_ctxt_id, msgid_plural, n, category);
+      found_translation = !(translation == msg_ctxt_id || translation == msgid_plural);
 #if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
       if (msg_ctxt_id != buf)
         free (msg_ctxt_id);
 #endif
-      if (!(translation == msg_ctxt_id || translation == msgid_plural))
+      if (found_translation)
         return translation;
     }

coreutils/trunk/lib/gnulib.mk ¶

@@ -22 +22 @@
 #
 # Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --local-dir=gl --lib=libcoreutils --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=gnulib-tests --aux-dir=build-aux --with-tests --avoid=canonicalize-lgpl --avoid=dummy --makefile-name=gnulib.mk --no-conditional-dependencies --no-libtool --macro-prefix=gl acl alignof alloca announce-gen areadlink-with-size argmatch argv-iter assert autobuild backupfile base32 base64 buffer-lcm c-strcase c-strtod c-strtold calloc-gnu canon-host canonicalize chown cloexec closein closeout config-h configmake crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 cycle-check d-ino d-type di-set diacrit dirfd dirname do-release-commit-and-tag dtoastr dup2 environ error euidaccess exclude exitfail faccessat fadvise fchdir fchmodat fchownat fclose fcntl fcntl-safer fd-reopen fdatasync fdl fdopen fdutimensat file-has-acl file-type fileblocks filemode filenamecat filevercmp fnmatch-gnu fopen-safer fprintftime freopen freopen-safer fseeko fstatat fsusage fsync ftello ftoastr ftruncate fts full-read full-write getgroups gethrxtime getline getloadavg getlogin getndelim2 getopt-gnu getpagesize getpass-gnu gettext-h gettime gettimeofday getugroups getusershell git-version-gen gitlog-to-changelog gnu-make gnu-web-doc-update gnumakefile gnupload group-member hard-locale hash hash-pjw heap host-os human idcache ignore-value inttostr inttypes isapipe isatty isblank largefile lchmod lchown ldtoastr lib-ignore linebuffer link link-follow linkat long-options lstat maintainer-makefile malloc-gnu manywarnings mbrlen mbrtowc mbsalign mbswidth memcasecmp memchr memcmp2 mempcpy memrchr mgetgroups mkancesdirs mkdir mkdir-p mkfifo mknod mkstemp mktime modechange mountlist mpsort netinet_in non-recursive-gnulib-prefix-hack nproc obstack parse-datetime pathmax perl physmem pipe-posix posix-shell posixtm posixver priv-set progname propername pthread putenv quote quotearg randint randperm read-file readlink readtokens readtokens0 readutmp realloc-gnu regex remove rename rmdir root-dev-ino rpmatch safe-read same save-cwd savedir savewd selinux-at setenv settime sig2str sigaction smack ssize_t stat-macros stat-size stat-time statat stdbool stdlib-safer stpcpy stpncpy strdup-posix strftime strncat strnumcmp strpbrk strsignal strtod strtoimax strtoumax symlink sys_ioctl sys_resource sys_stat sys_wait tempname termios time_rz timer-time timespec tzset uname unicodeio unistd-safer unlink-busy unlinkat unlocked-io unsetenv update-copyright uptime useless-if-before-free userspec utimecmp utimens vasprintf-posix vc-list-files verify verror version-etc-fsf wcswidth wcwidth winsz-ioctl winsz-termios write-any-file xalloc xdectoint xfreopen xfts xgetcwd xgetgroups xgethostname xmemcoll xnanosleep xprintf xprintf-posix xreadlink xstrtod xstrtoimax xstrtol xstrtold xstrtoumax yesno
+# Reproduce by: gnulib-tool --import --local-dir=gl --lib=libcoreutils --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=gnulib-tests --aux-dir=build-aux --with-tests --avoid=canonicalize-lgpl --avoid=dummy --makefile-name=gnulib.mk --no-conditional-dependencies --no-libtool --macro-prefix=gl acl alignof alloca announce-gen areadlink-with-size argmatch argv-iter assert autobuild backupfile base32 base64 buffer-lcm c-strcase c-strtod c-strtold calloc-gnu canon-host canonicalize chown cloexec closein closeout config-h configmake crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 cycle-check d-ino d-type di-set diacrit dirfd dirname do-release-commit-and-tag dtoastr dup2 environ error euidaccess exclude exitfail faccessat fadvise fchdir fchmodat fchownat fclose fcntl fcntl-safer fd-reopen fdatasync fdl fdopen fdutimensat file-has-acl file-type fileblocks filemode filenamecat filevercmp flexmember fnmatch-gnu fopen-safer fprintftime freopen freopen-safer fseeko fstatat fsusage fsync ftello ftoastr ftruncate fts full-read full-write getgroups gethrxtime getline getloadavg getlogin getndelim2 getopt-gnu getpagesize getpass-gnu gettext-h gettime gettimeofday getugroups getusershell git-version-gen gitlog-to-changelog gnu-make gnu-web-doc-update gnumakefile gnupload group-member hard-locale hash hash-pjw heap host-os human idcache ignore-value inttostr inttypes isapipe isatty isblank largefile lchmod lchown ldtoastr lib-ignore linebuffer link link-follow linkat long-options lstat maintainer-makefile malloc-gnu manywarnings mbrlen mbrtowc mbsalign mbswidth memcasecmp memchr memcmp2 mempcpy memrchr mgetgroups mkancesdirs mkdir mkdir-p mkfifo mknod mkstemp mktime modechange mountlist mpsort netinet_in non-recursive-gnulib-prefix-hack nproc obstack parse-datetime pathmax perl physmem pipe-posix posix-shell posixtm posixver priv-set progname propername pthread putenv quote quotearg randint randperm read-file readlink readtokens readtokens0 readutmp realloc-gnu regex remove rename rmdir root-dev-ino rpmatch safe-read same save-cwd savedir savewd selinux-at setenv settime sig2str sigaction smack ssize_t stat-macros stat-size stat-time statat stdbool stdlib-safer stpcpy stpncpy strdup-posix strftime strncat strnumcmp strpbrk strsignal strtod strtoimax strtoumax symlink sys_ioctl sys_resource sys_stat sys_wait tempname termios time_rz timer-time timespec tzset uname unicodeio unistd-safer unlink-busy unlinkat unlocked-io unsetenv update-copyright uptime useless-if-before-free userspec utimecmp utimens vasprintf-posix vc-list-files verify verror version-etc-fsf wcswidth wcwidth winsz-ioctl winsz-termios write-any-file xalloc xdectoint xfreopen xfts xgetcwd xgetgroups xgethostname xmemcoll xnanosleep xprintf xprintf-posix xreadlink xstrtod xstrtoimax xstrtol xstrtold xstrtoumax yesno
 
 
@@ -962 +962 @@
 ## end   gnulib module filevercmp
 
+## begin gnulib module flexmember
+
+
+EXTRA_DIST += lib/flexmember.h
+
+## end   gnulib module flexmember
+
 ## begin gnulib module float
 
@@ -1427 +1434 @@
 
 ## end   gnulib module getpass-gnu
+
+## begin gnulib module getprogname
+
+lib_libcoreutils_a_SOURCES += lib/getprogname.h lib/getprogname.c
+
+## end   gnulib module getprogname
 
 ## begin gnulib module gettext-h
@@ -1864 +1877 @@
 
 ## end   gnulib module ldtoastr
+
+## begin gnulib module limits-h
+
+BUILT_SOURCES += $(LIMITS_H)
+
+# We need the following in order to create <limits.h> when the system
+# doesn't have one that is compatible with GNU.
+if GL_GENERATE_LIMITS_H
+lib/limits.h: lib/limits.in.h $(top_builddir)/config.status
+        $(AM_V_GEN)rm -f $@-t $@ && \
+        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
+          sed -e 's|@''GUARD_PREFIX''@|GL|g' \
+              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+              -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+              -e 's|@''NEXT_LIMITS_H''@|$(NEXT_LIMITS_H)|g' \
+              < $(top_srcdir)/lib/limits.in.h; \
+        } > $@-t && \
+        mv $@-t $@
+else
+lib/limits.h: $(top_builddir)/config.status
+        rm -f $@
+endif
+MOSTLYCLEANFILES += lib/limits.h lib/limits.h-t
+
+EXTRA_DIST += lib/limits.in.h
+
+## end   gnulib module limits-h
 
 ## begin gnulib module linebuffer
@@ -3218 +3259 @@
           sed -e 's|@''GUARD_PREFIX''@|GL|g' \
               -e 's|@''HAVE_SCHED_H''@|$(HAVE_SCHED_H)|g' \
+              -e 's|@''HAVE_SYS_CDEFS_H''@|$(HAVE_SYS_CDEFS_H)|g' \
               -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
               -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
@@ -3695 +3737 @@
               -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
               -e 's|@''NEXT_STDINT_H''@|$(NEXT_STDINT_H)|g' \
+              -e 's/@''HAVE_C99_STDINT_H''@/$(HAVE_C99_STDINT_H)/g' \
               -e 's/@''HAVE_SYS_TYPES_H''@/$(HAVE_SYS_TYPES_H)/g' \
               -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \
@@ -3920 +3963 @@
               -e 's|@''HAVE_PTSNAME''@|$(HAVE_PTSNAME)|g' \
               -e 's|@''HAVE_PTSNAME_R''@|$(HAVE_PTSNAME_R)|g' \
+              -e 's|@''HAVE_QSORT_R''@|$(HAVE_QSORT_R)|g' \
               -e 's|@''HAVE_RANDOM''@|$(HAVE_RANDOM)|g' \
               -e 's|@''HAVE_RANDOM_H''@|$(HAVE_RANDOM_H)|g' \

coreutils/trunk/lib/group-member.c ¶

@@ -98 +98 @@
 #ifdef TEST
 
-char *program_name;
-
 int
 main (int argc, char **argv)
 {
   int i;
-
-  program_name = argv[0];
 
   for (i = 1; i < argc; i++)

coreutils/trunk/lib/idcache.c ¶

@@ -28 +28 @@
 #include <unistd.h>
 
+#include "flexmember.h"
 #include "xalloc.h"
 
@@ -47 +48 @@
 /* FIXME: provide a function to free any malloc'd storage and reset lists,
    so that an application can use code like this just before exiting:
-   #ifdef lint
+   #if defined GCC_LINT || defined lint
      idcache_clear ();
    #endif
@@ -84 +85 @@
       struct passwd *pwent = getpwuid (uid);
       char const *name = pwent ? pwent->pw_name : "";
-      match = xmalloc (offsetof (struct userid, name) + strlen (name) + 1);
+      match = xmalloc (FLEXSIZEOF (struct userid, name, strlen (name) + 1));
       match->id.u = uid;
       strcpy (match->name, name);
@@ -128 +129 @@
 #endif
 
-  tail = xmalloc (offsetof (struct userid, name) + strlen (user) + 1);
+  tail = xmalloc (FLEXSIZEOF (struct userid, name, strlen (user) + 1));
   strcpy (tail->name, user);
 
@@ -166 +167 @@
       struct group *grent = getgrgid (gid);
       char const *name = grent ? grent->gr_name : "";
-      match = xmalloc (offsetof (struct userid, name) + strlen (name) + 1);
+      match = xmalloc (FLEXSIZEOF (struct userid, name, strlen (name) + 1));
       match->id.g = gid;
       strcpy (match->name, name);
@@ -210 +211 @@
 #endif
 
-  tail = xmalloc (offsetof (struct userid, name) + strlen (group) + 1);
+  tail = xmalloc (FLEXSIZEOF (struct userid, name, strlen (group) + 1));
   strcpy (tail->name, group);
 

coreutils/trunk/lib/inet_ntop.c ¶

@@ -41 +41 @@
    Beware: The Code argument must not contain commas.  */
 #ifndef IF_LINT
-# ifdef lint
+# if defined GCC_LINT || defined lint
 #  define IF_LINT(Code) Code
 # else

coreutils/trunk/lib/intprops.h ¶

@@ -1 +1 @@
 /* intprops.h -- properties of integer types
 
-   Copyright (C) 2001-2005, 2009-2016 Free Software Foundation, Inc.
-
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
+   Copyright (C) 2001-2016 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published
+   by the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
@@ -22 +22 @@
 
 #include <limits.h>
+#include <verify.h>
+
+#ifndef __has_builtin
+# define __has_builtin(x) 0
+#endif
 
 /* Return a value with the common real type of E and V and the value of V.  */
@@ -37 +42 @@
 #define TYPE_IS_INTEGER(t) ((t) 1.5 == 1)
 
-/* True if negative values of the signed integer type T use two's
-   complement, ones' complement, or signed magnitude representation,
-   respectively.  Much GNU code assumes two's complement, but some
-   people like to be portable to all possible C hosts.  */
-#define TYPE_TWOS_COMPLEMENT(t) ((t) ~ (t) 0 == (t) -1)
-#define TYPE_ONES_COMPLEMENT(t) ((t) ~ (t) 0 == 0)
-#define TYPE_SIGNED_MAGNITUDE(t) ((t) ~ (t) 0 < (t) -1)
-
-/* True if the signed integer expression E uses two's complement.  */
-#define _GL_INT_TWOS_COMPLEMENT(e) (~ _GL_INT_CONVERT (e, 0) == -1)
-
 /* True if the real type T is signed.  */
 #define TYPE_SIGNED(t) (! ((t) 0 < (t) -1))
@@ -56 +50 @@
 
 
-/* Minimum and maximum values for integer types and expressions.  These
-   macros have undefined behavior if T is signed and has padding bits.
-   If this is a problem for you, please let us know how to fix it for
-   your host.  */
+/* Minimum and maximum values for integer types and expressions.  */
+
+/* The width in bits of the integer type or expression T.
+   Padding bits are not supported; this is checked at compile-time below.  */
+#define TYPE_WIDTH(t) (sizeof (t) * CHAR_BIT)
 
 /* The maximum and minimum values for the integer type T.  */
-#define TYPE_MINIMUM(t)                                                 \
-  ((t) (! TYPE_SIGNED (t)                                               \
-        ? (t) 0                                                         \
-        : TYPE_SIGNED_MAGNITUDE (t)                                     \
-        ? ~ (t) 0                                                       \
-        : ~ TYPE_MAXIMUM (t)))
+#define TYPE_MINIMUM(t) ((t) ~ TYPE_MAXIMUM (t))
 #define TYPE_MAXIMUM(t)                                                 \
   ((t) (! TYPE_SIGNED (t)                                               \
         ? (t) -1                                                        \
-        : ((((t) 1 << (sizeof (t) * CHAR_BIT - 2)) - 1) * 2 + 1)))
+        : ((((t) 1 << (TYPE_WIDTH (t) - 2)) - 1) * 2 + 1)))
 
 /* The maximum and minimum values for the type of the expression E,
@@ -77 +67 @@
 #define _GL_INT_MINIMUM(e)                                              \
   (EXPR_SIGNED (e)                                                      \
-   ? - _GL_INT_TWOS_COMPLEMENT (e) - _GL_SIGNED_INT_MAXIMUM (e)         \
+   ? ~ _GL_SIGNED_INT_MAXIMUM (e)                                       \
    : _GL_INT_CONVERT (e, 0))
 #define _GL_INT_MAXIMUM(e)                                              \
@@ -84 +74 @@
    : _GL_INT_NEGATE_CONVERT (e, 1))
 #define _GL_SIGNED_INT_MAXIMUM(e)                                       \
-  (((_GL_INT_CONVERT (e, 1) << (sizeof ((e) + 0) * CHAR_BIT - 2)) - 1) * 2 + 1)
-
-
-/* Return 1 if the __typeof__ keyword works.  This could be done by
+  (((_GL_INT_CONVERT (e, 1) << (TYPE_WIDTH ((e) + 0) - 2)) - 1) * 2 + 1)
+
+/* Work around OpenVMS incompatibility with C99.  */
+#if !defined LLONG_MAX && defined __INT64_MAX
+# define LLONG_MAX __INT64_MAX
+# define LLONG_MIN __INT64_MIN
+#endif
+
+/* This include file assumes that signed types are two's complement without
+   padding bits; the above macros have undefined behavior otherwise.
+   If this is a problem for you, please let us know how to fix it for your host.
+   As a sanity check, test the assumption for some signed types that
+   <limits.h> bounds.  */
+verify (TYPE_MINIMUM (signed char) == SCHAR_MIN);
+verify (TYPE_MAXIMUM (signed char) == SCHAR_MAX);
+verify (TYPE_MINIMUM (short int) == SHRT_MIN);
+verify (TYPE_MAXIMUM (short int) == SHRT_MAX);
+verify (TYPE_MINIMUM (int) == INT_MIN);
+verify (TYPE_MAXIMUM (int) == INT_MAX);
+verify (TYPE_MINIMUM (long int) == LONG_MIN);
+verify (TYPE_MAXIMUM (long int) == LONG_MAX);
+#ifdef LLONG_MAX
+verify (TYPE_MINIMUM (long long int) == LLONG_MIN);
+verify (TYPE_MAXIMUM (long long int) == LLONG_MAX);
+#endif
+/* Similarly, sanity-check one ISO/IEC TS 18661-1:2014 macro if defined.  */
+#ifdef UINT_WIDTH
+verify (TYPE_WIDTH (unsigned int) == UINT_WIDTH);
+#endif
+
+/* Does the __typeof__ keyword work?  This could be done by
    'configure', but for now it's easier to do it by hand.  */
-#if (2 <= __GNUC__ || defined __IBM__TYPEOF__ \
+#if (2 <= __GNUC__ \
+     || (1210 <= __IBMC__ && defined __IBM__TYPEOF__) \
      || (0x5110 <= __SUNPRO_C && !__STDC__))
 # define _GL_HAVE___TYPEOF__ 1
@@ -118 +136 @@
    applied to unsigned types of size 2, 4, 16, ... bytes.  */
 #define INT_STRLEN_BOUND(t)                                     \
-  (INT_BITS_STRLEN_BOUND (sizeof (t) * CHAR_BIT                 \
-                          - _GL_SIGNED_TYPE_OR_EXPR (t))        \
+  (INT_BITS_STRLEN_BOUND (TYPE_WIDTH (t) - _GL_SIGNED_TYPE_OR_EXPR (t)) \
    + _GL_SIGNED_TYPE_OR_EXPR (t))
 
@@ -224 +241 @@
    : (max) >> (b) < (a))
 
+/* True if __builtin_add_overflow (A, B, P) works when P is non-null.  */
+#define _GL_HAS_BUILTIN_OVERFLOW \
+  (5 <= __GNUC__ || __has_builtin (__builtin_add_overflow))
+
+/* True if __builtin_add_overflow_p (A, B, C) works.  */
+#define _GL_HAS_BUILTIN_OVERFLOW_P \
+  (7 <= __GNUC__ || __has_builtin (__builtin_add_overflow_p))
 
 /* The _GL*_OVERFLOW macros have the same restrictions as the
@@ -229 +253 @@
    (e.g., A and B) have the same type as MIN and MAX.  Instead, they assume
    that the result (e.g., A + B) has that type.  */
-#define _GL_ADD_OVERFLOW(a, b, min, max)                                \
-  ((min) < 0 ? INT_ADD_RANGE_OVERFLOW (a, b, min, max)                  \
-   : (a) < 0 ? (b) <= (a) + (b)                                         \
-   : (b) < 0 ? (a) <= (a) + (b)                                         \
-   : (a) + (b) < (b))
-#define _GL_SUBTRACT_OVERFLOW(a, b, min, max)                           \
-  ((min) < 0 ? INT_SUBTRACT_RANGE_OVERFLOW (a, b, min, max)             \
-   : (a) < 0 ? 1                                                        \
-   : (b) < 0 ? (a) - (b) <= (a)                                         \
-   : (a) < (b))
-#define _GL_MULTIPLY_OVERFLOW(a, b, min, max)                           \
-  (((min) == 0 && (((a) < 0 && 0 < (b)) || ((b) < 0 && 0 < (a))))       \
-   || INT_MULTIPLY_RANGE_OVERFLOW (a, b, min, max))
+#if _GL_HAS_BUILTIN_OVERFLOW_P
+# define _GL_ADD_OVERFLOW(a, b, min, max)                               \
+   __builtin_add_overflow_p (a, b, (__typeof__ ((a) + (b))) 0)
+# define _GL_SUBTRACT_OVERFLOW(a, b, min, max)                          \
+   __builtin_sub_overflow_p (a, b, (__typeof__ ((a) - (b))) 0)
+# define _GL_MULTIPLY_OVERFLOW(a, b, min, max)                          \
+   __builtin_mul_overflow_p (a, b, (__typeof__ ((a) * (b))) 0)
+#else
+# define _GL_ADD_OVERFLOW(a, b, min, max)                                \
+   ((min) < 0 ? INT_ADD_RANGE_OVERFLOW (a, b, min, max)                  \
+    : (a) < 0 ? (b) <= (a) + (b)                                         \
+    : (b) < 0 ? (a) <= (a) + (b)                                         \
+    : (a) + (b) < (b))
+# define _GL_SUBTRACT_OVERFLOW(a, b, min, max)                           \
+   ((min) < 0 ? INT_SUBTRACT_RANGE_OVERFLOW (a, b, min, max)             \
+    : (a) < 0 ? 1                                                        \
+    : (b) < 0 ? (a) - (b) <= (a)                                         \
+    : (a) < (b))
+# define _GL_MULTIPLY_OVERFLOW(a, b, min, max)                           \
+   (((min) == 0 && (((a) < 0 && 0 < (b)) || ((b) < 0 && 0 < (a))))       \
+    || INT_MULTIPLY_RANGE_OVERFLOW (a, b, min, max))
+#endif
 #define _GL_DIVIDE_OVERFLOW(a, b, min, max)                             \
   ((min) < 0 ? (b) == _GL_INT_NEGATE_CONVERT (min, 1) && (a) < - (max)  \
@@ -306 +339 @@
 #define INT_SUBTRACT_OVERFLOW(a, b) \
   _GL_BINARY_OP_OVERFLOW (a, b, _GL_SUBTRACT_OVERFLOW)
-#define INT_NEGATE_OVERFLOW(a) \
-  INT_NEGATE_RANGE_OVERFLOW (a, _GL_INT_MINIMUM (a), _GL_INT_MAXIMUM (a))
+#if _GL_HAS_BUILTIN_OVERFLOW_P
+# define INT_NEGATE_OVERFLOW(a) INT_SUBTRACT_OVERFLOW (0, a)
+#else
+# define INT_NEGATE_OVERFLOW(a) \
+   INT_NEGATE_RANGE_OVERFLOW (a, _GL_INT_MINIMUM (a), _GL_INT_MAXIMUM (a))
+#endif
 #define INT_MULTIPLY_OVERFLOW(a, b) \
   _GL_BINARY_OP_OVERFLOW (a, b, _GL_MULTIPLY_OVERFLOW)
@@ -327 +364 @@
                       _GL_INT_MAXIMUM (0 * (b) + (a)))
 
-/* Compute A + B, A - B, A * B, respectively, storing the result into *R.
+/* Store the low-order bits of A + B, A - B, A * B, respectively, into *R.
    Return 1 if the result overflows.  See above for restrictions.  */
 #define INT_ADD_WRAPV(a, b, r) \
@@ -335 +372 @@
 #define INT_MULTIPLY_WRAPV(a, b, r) \
   _GL_INT_OP_WRAPV (a, b, r, *, __builtin_mul_overflow, INT_MULTIPLY_OVERFLOW)
-
-#ifndef __has_builtin
-# define __has_builtin(x) 0
-#endif
 
 /* Nonzero if this compiler has GCC bug 68193 or Clang bug 25390.  See:
@@ -352 +385 @@
 #endif
 
-/* Store A <op> B into *R, where OP specifies the operation.
-   BUILTIN is the builtin operation, and OVERFLOW the overflow predicate.
-   See above for restrictions.  */
-#if 5 <= __GNUC__ || __has_builtin (__builtin_add_overflow)
+/* Store the low-order bits of A <op> B into *R, where OP specifies
+   the operation.  BUILTIN is the builtin operation, and OVERFLOW the
+   overflow predicate.  Return 1 if the result overflows.  See above
+   for restrictions.  */
+#if _GL_HAS_BUILTIN_OVERFLOW
 # define _GL_INT_OP_WRAPV(a, b, r, op, builtin, overflow) builtin (a, b, r)
 #elif 201112 <= __STDC_VERSION__ && !_GL__GENERIC_BOGUS
@@ -398 +432 @@
 #  define _GL_INT_OP_WRAPV_LONGISH(a, b, r, op, overflow) \
     _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \
-                     long int, LONG_MIN, LONG_MAX))
+                     long int, LONG_MIN, LONG_MAX)
 # endif
 #endif
@@ -405 +439 @@
    is given by OP.  Use the unsigned type UT for calculation to avoid
    overflow problems.  *R's type is T, with extremal values TMIN and
-   TMAX.  T must be a signed integer type.  */
+   TMAX.  T must be a signed integer type.  Return 1 if the result
+   overflows.  */
 #define _GL_INT_OP_CALC(a, b, r, op, overflow, ut, t, tmin, tmax) \
   (sizeof ((a) op (b)) < sizeof (t) \

coreutils/trunk/lib/long-options.c ¶

@@ -65 +65 @@
         case 'h':
           (*usage_func) (EXIT_SUCCESS);
+          break;
 
         case 'v':

coreutils/trunk/lib/math.in.h ¶

@@ -64 +64 @@
 }
 # define _GL_MATH_CXX_REAL_FLOATING_DECL_2(func) \
+_GL_BEGIN_NAMESPACE                                                 \
 inline int                                                          \
 func (float f)                                                      \
@@ -78 +79 @@
 {                                                                   \
   return _gl_cxx_ ## func ## l (l);                                 \
-}
+}                                                                   \
+_GL_END_NAMESPACE
 #endif
 
@@ -407 +409 @@
 # if @REPLACE_CEIL@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef ceil
 #   define ceil rpl_ceil
 #  endif
@@ -754 +757 @@
 # if @REPLACE_FLOOR@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef floor
 #   define floor rpl_floor
 #  endif
@@ -974 +978 @@
 # if @REPLACE_FREXP@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef frexp
 #   define frexp rpl_frexp
 #  endif
@@ -981 +986 @@
 _GL_CXXALIAS_SYS (frexp, double, (double x, int *expptr));
 # endif
-_GL_CXXALIASWARN (frexp);
+_GL_CXXALIASWARN1 (frexp, double, (double x, int *expptr));
 #elif defined GNULIB_POSIXCHECK
 # undef frexp
@@ -1959 +1964 @@
 # if @REPLACE_TRUNCF@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef truncf
 #   define truncf rpl_truncf
 #  endif
@@ -1981 +1987 @@
 # if @REPLACE_TRUNC@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef trunc
 #   define trunc rpl_trunc
 #  endif
@@ -2040 +2047 @@
 # endif
 # ifdef __cplusplus
-#  ifdef isfinite
+#  if defined isfinite || defined GNULIB_NAMESPACE
 _GL_MATH_CXX_REAL_FLOATING_DECL_1 (isfinite)
 #   undef isfinite
@@ -2067 +2074 @@
 # endif
 # ifdef __cplusplus
-#  ifdef isinf
+#  if defined isinf || defined GNULIB_NAMESPACE
 _GL_MATH_CXX_REAL_FLOATING_DECL_1 (isinf)
 #   undef isinf
@@ -2185 +2192 @@
 # endif
 # ifdef __cplusplus
-#  ifdef isnan
+#  if defined isnan || defined GNULIB_NAMESPACE
 _GL_MATH_CXX_REAL_FLOATING_DECL_1 (isnan)
 #   undef isnan
@@ -2206 +2213 @@
 
 #if @GNULIB_SIGNBIT@
-# if @REPLACE_SIGNBIT_USING_GCC@
+# if (@REPLACE_SIGNBIT_USING_GCC@ \
+      && (!defined __cplusplus || __cplusplus < 201103))
 #  undef signbit
    /* GCC 4.0 and newer provides three built-ins for signbit.  */
@@ -2259 +2267 @@
 # endif
 # ifdef __cplusplus
-#  ifdef signbit
+#  if defined signbit || defined GNULIB_NAMESPACE
 _GL_MATH_CXX_REAL_FLOATING_DECL_1 (signbit)
 #   undef signbit

coreutils/trunk/lib/mbrtowc.c ¶

@@ -20 +20 @@
 /* Specification.  */
 #include <wchar.h>
+
+#if C_LOCALE_MAYBE_EILSEQ
+# include "hard-locale.h"
+# include <locale.h>
+#endif
 
 #if GNULIB_defined_mbstate_t
@@ -329 +334 @@
 rpl_mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
 {
+  size_t ret;
+  wchar_t wc;
+
 # if MBRTOWC_NULL_ARG2_BUG || MBRTOWC_RETVAL_BUG || MBRTOWC_EMPTY_INPUT_BUG
   if (s == NULL)
@@ -343 +351 @@
 # endif
 
+  if (! pwc)
+    pwc = &wc;
+
 # if MBRTOWC_RETVAL_BUG
   {
@@ -358 +369 @@
         for (; n > 0; s++, n--)
           {
-            wchar_t wc;
-            size_t ret = mbrtowc (&wc, s, 1, ps);
+            ret = mbrtowc (&wc, s, 1, ps);
 
             if (ret == (size_t)(-1))
@@ -367 +377 @@
               {
                 /* The multibyte character has been completed.  */
-                if (pwc != NULL)
-                  *pwc = wc;
+                *pwc = wc;
                 return (wc == 0 ? 0 : count);
               }
@@ -377 +386 @@
 # endif
 
+  ret = mbrtowc (pwc, s, n, ps);
+
 # if MBRTOWC_NUL_RETVAL_BUG
-  {
-    wchar_t wc;
-    size_t ret = mbrtowc (&wc, s, n, ps);
-
-    if (ret != (size_t)(-1) && ret != (size_t)(-2))
-      {
-        if (pwc != NULL)
-          *pwc = wc;
-        if (wc == 0)
-          ret = 0;
-      }
-    return ret;
-  }
-# else
-  {
-#   if MBRTOWC_NULL_ARG1_BUG
-    wchar_t dummy;
-
-    if (pwc == NULL)
-      pwc = &dummy;
-#   endif
-
-    return mbrtowc (pwc, s, n, ps);
-  }
-# endif
+  if (ret < (size_t) -2 && !*pwc)
+    return 0;
+# endif
+
+# if C_LOCALE_MAYBE_EILSEQ
+  if ((size_t) -2 <= ret && n != 0 && ! hard_locale (LC_CTYPE))
+    {
+      unsigned char uc = *s;
+      *pwc = uc;
+      return 1;
+    }
+# endif
+
+  return ret;
 }
 

coreutils/trunk/lib/mktime-internal.h ¶

@@ +1 @@
+/* mktime variant that also uses an offset guess
+
+   Copyright 2016 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 3 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public
+   License along with this program; if not, see
+   <http://www.gnu.org/licenses/>.  */
+
 #include <time.h>
+
+/* mktime_offset_t is a signed type wide enough to hold a UTC offset
+   in seconds, and used as part of the type of the offset-guess
+   argument to mktime_internal.  Use time_t on platforms where time_t
+   is signed, to be compatible with platforms like BeOS that export
+   this implementation detail of mktime.  On platforms where time_t is
+   unsigned, GNU and POSIX code can assume 'int' is at least 32 bits
+   which is wide enough for a UTC offset.  */
+
+#if TIME_T_IS_SIGNED
+typedef time_t mktime_offset_t;
+#else
+typedef int mktime_offset_t;
+#endif
+
 time_t mktime_internal (struct tm *,
                         struct tm * (*) (time_t const *, struct tm *),
-                        time_t *);
+                        mktime_offset_t *);

coreutils/trunk/lib/mktime.c ¶

@@ -18 +18 @@
    <http://www.gnu.org/licenses/>.  */
 
-/* Define this to have a standalone program to test this implementation of
+/* Define this to 1 to have a standalone program to test this implementation of
    mktime.  */
-/* #define DEBUG_MKTIME 1 */
-
-#ifndef _LIBC
+#ifndef DEBUG_MKTIME
+# define DEBUG_MKTIME 0
+#endif
+
+#if !defined _LIBC && !DEBUG_MKTIME
 # include <config.h>
 #endif
@@ -36 +38 @@
 
 #include <limits.h>
-
-#include <string.h>             /* For the real memcpy prototype.  */
-
-#if defined DEBUG_MKTIME && DEBUG_MKTIME
+#include <stdbool.h>
+
+#include <intprops.h>
+#include <verify.h>
+
+#if DEBUG_MKTIME
 # include <stdio.h>
 # include <stdlib.h>
+# include <string.h>
 /* Make it work even if the system's libc has its own mktime routine.  */
 # undef mktime
 # define mktime my_mktime
-#endif /* DEBUG_MKTIME */
-
-/* Some of the code in this file assumes that signed integer overflow
-   silently wraps around.  This assumption can't easily be programmed
-   around, nor can it be checked for portably at compile-time or
-   easily eliminated at run-time.
-
-   Define WRAPV to 1 if the assumption is valid and if
-     #pragma GCC optimize ("wrapv")
-   does not trigger GCC bug 51793
-   <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=51793>.
-   Otherwise, define it to 0; this forces the use of slower code that,
-   while not guaranteed by the C Standard, works on all production
-   platforms that we know about.  */
-#ifndef WRAPV
-# if (((__GNUC__ == 4 && 4 <= __GNUC_MINOR__) || 4 < __GNUC__) \
-      && defined __GLIBC__)
-#  pragma GCC optimize ("wrapv")
-#  define WRAPV 1
-# else
-#  define WRAPV 0
-# endif
-#endif
-
-/* Verify a requirement at compile-time (unlike assert, which is runtime).  */
-#define verify(name, assertion) struct name { char a[(assertion) ? 1 : -1]; }
-
-/* A signed type that is at least one bit wider than int.  */
-#if INT_MAX <= LONG_MAX / 2
+#endif
+
+/* A signed type that can represent an integer number of years
+   multiplied by three times the number of seconds in a year.  It is
+   needed when converting a tm_year value times the number of seconds
+   in a year.  The factor of three comes because these products need
+   to be subtracted from each other, and sometimes with an offset
+   added to them, without worrying about overflow.
+
+   Much of the code uses long_int to represent time_t values, to
+   lessen the hassle of dealing with platforms where time_t is
+   unsigned, and because long_int should suffice to represent all
+   time_t values that mktime can generate even on platforms where
+   time_t is excessively wide.  */
+
+#if INT_MAX <= LONG_MAX / 3 / 366 / 24 / 60 / 60
 typedef long int long_int;
 #else
 typedef long long int long_int;
 #endif
-verify (long_int_is_wide_enough, INT_MAX == INT_MAX * (long_int) 2 / 2);
+verify (INT_MAX <= TYPE_MAXIMUM (long_int) / 3 / 366 / 24 / 60 / 60);
 
 /* Shift A right by B bits portably, by dividing A by 2**B and
-   truncating towards minus infinity.  A and B should be free of side
-   effects, and B should be in the range 0 <= B <= INT_BITS - 2, where
-   INT_BITS is the number of useful bits in an int.  GNU code can
-   assume that INT_BITS is at least 32.
+   truncating towards minus infinity.  B should be in the range 0 <= B
+   <= LONG_INT_BITS - 2, where LONG_INT_BITS is the number of useful
+   bits in a long_int.  LONG_INT_BITS is at least 32.
 
    ISO C99 says that A >> B is implementation-defined if A < 0.  Some
@@ -90 +81 @@
    right in the usual way when A < 0, so SHR falls back on division if
    ordinary A >> B doesn't seem to be the usual signed shift.  */
-#define SHR(a, b)                                               \
-  ((-1 >> 1 == -1                                               \
-    && (long_int) -1 >> 1 == -1                                 \
-    && ((time_t) -1 >> 1 == -1 || ! TYPE_SIGNED (time_t)))      \
-   ? (a) >> (b)                                                 \
-   : (a) / (1 << (b)) - ((a) % (1 << (b)) < 0))
-
-/* The extra casts in the following macros work around compiler bugs,
-   e.g., in Cray C 5.0.3.0.  */
-
-/* True if the arithmetic type T is an integer type.  bool counts as
-   an integer.  */
-#define TYPE_IS_INTEGER(t) ((t) 1.5 == 1)
-
-/* True if negative values of the signed integer type T use two's
-   complement, or if T is an unsigned integer type.  */
-#define TYPE_TWOS_COMPLEMENT(t) ((t) ~ (t) 0 == (t) -1)
-
-/* True if the arithmetic type T is signed.  */
-#define TYPE_SIGNED(t) (! ((t) 0 < (t) -1))
-
-/* The maximum and minimum values for the integer type T.  These
-   macros have undefined behavior if T is signed and has padding bits.
-   If this is a problem for you, please let us know how to fix it for
-   your host.  */
-#define TYPE_MINIMUM(t) \
-  ((t) (! TYPE_SIGNED (t) \
-        ? (t) 0 \
-        : ~ TYPE_MAXIMUM (t)))
-#define TYPE_MAXIMUM(t) \
-  ((t) (! TYPE_SIGNED (t) \
-        ? (t) -1 \
-        : ((((t) 1 << (sizeof (t) * CHAR_BIT - 2)) - 1) * 2 + 1)))
-
-#ifndef TIME_T_MIN
-# define TIME_T_MIN TYPE_MINIMUM (time_t)
-#endif
-#ifndef TIME_T_MAX
-# define TIME_T_MAX TYPE_MAXIMUM (time_t)
-#endif
-#define TIME_T_MIDPOINT (SHR (TIME_T_MIN + TIME_T_MAX, 1) + 1)
-
-verify (time_t_is_integer, TYPE_IS_INTEGER (time_t));
-verify (twos_complement_arithmetic,
-        (TYPE_TWOS_COMPLEMENT (int)
-         && TYPE_TWOS_COMPLEMENT (long_int)
-         && TYPE_TWOS_COMPLEMENT (time_t)));
+
+static long_int
+shr (long_int a, int b)
+{
+  long_int one = 1;
+  return (-one >> 1 == -1
+          ? a >> b
+          : a / (one << b) - (a % (one << b) < 0));
+}
+
+/* Bounds for the intersection of time_t and long_int.  */
+
+static long_int const mktime_min
+  = ((TYPE_SIGNED (time_t) && TYPE_MINIMUM (time_t) < TYPE_MINIMUM (long_int))
+     ? TYPE_MINIMUM (long_int) : TYPE_MINIMUM (time_t));
+static long_int const mktime_max
+  = (TYPE_MAXIMUM (long_int) < TYPE_MAXIMUM (time_t)
+     ? TYPE_MAXIMUM (long_int) : TYPE_MAXIMUM (time_t));
+
+verify (TYPE_IS_INTEGER (time_t));
 
 #define EPOCH_YEAR 1970
 #define TM_YEAR_BASE 1900
-verify (base_year_is_a_multiple_of_100, TM_YEAR_BASE % 100 == 0);
-
-/* Return 1 if YEAR + TM_YEAR_BASE is a leap year.  */
-static int
+verify (TM_YEAR_BASE % 100 == 0);
+
+/* Is YEAR + TM_YEAR_BASE a leap year?  */
+static bool
 leapyear (long_int year)
 {
@@ -167 +131 @@
 
 
-#ifndef _LIBC
+#ifdef _LIBC
+typedef time_t mktime_offset_t;
+#else
 /* Portable standalone applications should supply a <time.h> that
    declares a POSIX-compliant localtime_r, for the benefit of older
@@ -178 +144 @@
 #endif
 
-/* Return 1 if the values A and B differ according to the rules for
-   tm_isdst: A and B differ if one is zero and the other positive.  */
-static int
+/* Do the values A and B differ according to the rules for tm_isdst?
+   A and B differ if one is zero and the other positive.  */
+static bool
 isdst_differ (int a, int b)
 {
@@ -191 +157 @@
 
    The YEAR values uses the same numbering as TP->tm_year.  Values
-   need not be in the usual range.  However, YEAR1 must not be less
-   than 2 * INT_MIN or greater than 2 * INT_MAX.
-
-   The result may overflow.  It is the caller's responsibility to
-   detect overflow.  */
-
-static time_t
+   need not be in the usual range.  However, YEAR1 must not overflow
+   when multiplied by three times the number of seconds in a year, and
+   likewise for YDAY1 and three times the number of seconds in a day.  */
+
+static long_int
 ydhms_diff (long_int year1, long_int yday1, int hour1, int min1, int sec1,
             int year0, int yday0, int hour0, int min0, int sec0)
 {
-  verify (C99_integer_division, -1 / 2 == 0);
+  verify (-1 / 2 == 0);
 
   /* Compute intervening leap days correctly even if year is negative.
      Take care to avoid integer overflow here.  */
-  int a4 = SHR (year1, 2) + SHR (TM_YEAR_BASE, 2) - ! (year1 & 3);
-  int b4 = SHR (year0, 2) + SHR (TM_YEAR_BASE, 2) - ! (year0 & 3);
+  int a4 = shr (year1, 2) + shr (TM_YEAR_BASE, 2) - ! (year1 & 3);
+  int b4 = shr (year0, 2) + shr (TM_YEAR_BASE, 2) - ! (year0 & 3);
   int a100 = a4 / 25 - (a4 % 25 < 0);
   int b100 = b4 / 25 - (b4 % 25 < 0);
-  int a400 = SHR (a100, 2);
-  int b400 = SHR (b100, 2);
+  int a400 = shr (a100, 2);
+  int b400 = shr (b100, 2);
   int intervening_leap_days = (a4 - b4) - (a100 - b100) + (a400 - b400);
 
-  /* Compute the desired time in time_t precision.  Overflow might
-     occur here.  */
-  time_t tyear1 = year1;
-  time_t years = tyear1 - year0;
-  time_t days = 365 * years + yday1 - yday0 + intervening_leap_days;
-  time_t hours = 24 * days + hour1 - hour0;
-  time_t minutes = 60 * hours + min1 - min0;
-  time_t seconds = 60 * minutes + sec1 - sec0;
+  /* Compute the desired time without overflowing.  */
+  long_int years = year1 - year0;
+  long_int days = 365 * years + yday1 - yday0 + intervening_leap_days;
+  long_int hours = 24 * days + hour1 - hour0;
+  long_int minutes = 60 * hours + min1 - min0;
+  long_int seconds = 60 * minutes + sec1 - sec0;
   return seconds;
 }
 
-/* Return the average of A and B, even if A + B would overflow.  */
-static time_t
-time_t_avg (time_t a, time_t b)
-{
-  return SHR (a, 1) + SHR (b, 1) + (a & b & 1);
-}
-
-/* Return 1 if A + B does not overflow.  If time_t is unsigned and if
-   B's top bit is set, assume that the sum represents A - -B, and
-   return 1 if the subtraction does not wrap around.  */
-static int
-time_t_add_ok (time_t a, time_t b)
-{
-  if (! TYPE_SIGNED (time_t))
-    {
-      time_t sum = a + b;
-      return (sum < a) == (TIME_T_MIDPOINT <= b);
-    }
-  else if (WRAPV)
-    {
-      time_t sum = a + b;
-      return (sum < a) == (b < 0);
-    }
-  else
-    {
-      time_t avg = time_t_avg (a, b);
-      return TIME_T_MIN / 2 <= avg && avg <= TIME_T_MAX / 2;
-    }
-}
-
-/* Return 1 if A + B does not overflow.  */
-static int
-time_t_int_add_ok (time_t a, int b)
-{
-  verify (int_no_wider_than_time_t, INT_MAX <= TIME_T_MAX);
-  if (WRAPV)
-    {
-      time_t sum = a + b;
-      return (sum < a) == (b < 0);
-    }
-  else
-    {
-      int a_odd = a & 1;
-      time_t avg = SHR (a, 1) + (SHR (b, 1) + (a_odd & b));
-      return TIME_T_MIN / 2 <= avg && avg <= TIME_T_MAX / 2;
-    }
+/* Return the average of A and B, even if A + B would overflow.
+   Round toward positive infinity.  */
+static long_int
+long_int_avg (long_int a, long_int b)
+{
+  return shr (a, 1) + shr (b, 1) + ((a | b) & 1);
 }
 
 /* Return a time_t value corresponding to (YEAR-YDAY HOUR:MIN:SEC),
-   assuming that *T corresponds to *TP and that no clock adjustments
+   assuming that T corresponds to *TP and that no clock adjustments
    occurred between *TP and the desired time.
-   If TP is null, return a value not equal to *T; this avoids false matches.
-   If overflow occurs, yield the minimal or maximal value, except do not
-   yield a value equal to *T.  */
-static time_t
+   Although T and the returned value are of type long_int,
+   they represent time_t values and must be in time_t range.
+   If TP is null, return a value not equal to T; this avoids false matches.
+   YEAR and YDAY must not be so large that multiplying them by three times the
+   number of seconds in a year (or day, respectively) would overflow long_int.
+   If the returned value would be out of range, yield the minimal or
+   maximal in-range value, except do not yield a value equal to T.  */
+static long_int
 guess_time_tm (long_int year, long_int yday, int hour, int min, int sec,
-               const time_t *t, const struct tm *tp)
+               long_int t, const struct tm *tp)
 {
   if (tp)
     {
-      time_t d = ydhms_diff (year, yday, hour, min, sec,
-                             tp->tm_year, tp->tm_yday,
-                             tp->tm_hour, tp->tm_min, tp->tm_sec);
-      if (time_t_add_ok (*t, d))
-        return *t + d;
+      long_int result;
+      long_int d = ydhms_diff (year, yday, hour, min, sec,
+                               tp->tm_year, tp->tm_yday,
+                               tp->tm_hour, tp->tm_min, tp->tm_sec);
+      if (! INT_ADD_WRAPV (t, d, &result))
+        return result;
     }
 
@@ -296 +223 @@
      match; and don't oscillate between two values, as that would
      confuse the spring-forward gap detector.  */
-  return (*t < TIME_T_MIDPOINT
-          ? (*t <= TIME_T_MIN + 1 ? *t + 1 : TIME_T_MIN)
-          : (TIME_T_MAX - 1 <= *t ? *t - 1 : TIME_T_MAX));
+  return (t < long_int_avg (mktime_min, mktime_max)
+          ? (t <= mktime_min + 1 ? t + 1 : mktime_min)
+          : (mktime_max - 1 <= t ? t - 1 : mktime_max));
+}
+
+/* Use CONVERT to convert T to a struct tm value in *TM.  T must be in
+   range for time_t.  Return TM if successful, NULL if T is out of
+   range for CONVERT.  */
+static struct tm *
+convert_time (struct tm *(*convert) (const time_t *, struct tm *),
+              long_int t, struct tm *tm)
+{
+  time_t x = t;
+  return convert (&x, tm);
 }
 
 /* Use CONVERT to convert *T to a broken down time in *TP.
    If *T is out of range for conversion, adjust it so that
-   it is the nearest in-range value and then convert that.  */
+   it is the nearest in-range value and then convert that.
+   A value is in range if it fits in both time_t and long_int.  */
 static struct tm *
 ranged_convert (struct tm *(*convert) (const time_t *, struct tm *),
-                time_t *t, struct tm *tp)
-{
-  struct tm *r = convert (t, tp);
+                long_int *t, struct tm *tp)
+{
+  struct tm *r;
+  if (*t < mktime_min)
+    *t = mktime_min;
+  else if (mktime_max < *t)
+    *t = mktime_max;
+  r = convert_time (convert, *t, tp);
 
   if (!r && *t)
     {
-      time_t bad = *t;
-      time_t ok = 0;
-
-      /* BAD is a known unconvertible time_t, and OK is a known good one.
+      long_int bad = *t;
+      long_int ok = 0;
+
+      /* BAD is a known unconvertible value, and OK is a known good one.
          Use binary search to narrow the range between BAD and OK until
          they differ by 1.  */
-      while (bad != ok + (bad < 0 ? -1 : 1))
+      while (true)
         {
-          time_t mid = *t = time_t_avg (ok, bad);
-          r = convert (t, tp);
+          long_int mid = long_int_avg (ok, bad);
+          if (mid != ok && mid != bad)
+            break;
+          r = convert_time (convert, mid, tp);
           if (r)
             ok = mid;
@@ -332 +278 @@
           /* The last conversion attempt failed;
              revert to the most recent successful attempt.  */
-          *t = ok;
-          r = convert (t, tp);
+          r = convert_time (convert, ok, tp);
         }
     }
@@ -339 +284 @@
   return r;
 }
-
 
 /* Convert *TP to a time_t value, inverting
@@ -350 +294 @@
 __mktime_internal (struct tm *tp,
                    struct tm *(*convert) (const time_t *, struct tm *),
-                   time_t *offset)
-{
-  time_t t, gt, t0, t1, t2;
+                   mktime_offset_t *offset)
+{
+  long_int t, gt, t0, t1, t2, dt;
   struct tm tm;
 
@@ -382 +326 @@
 
   /* The other values need not be in range:
-     the remaining code handles minor overflows correctly,
-     assuming int and time_t arithmetic wraps around.
-     Major overflows are caught at the end.  */
+     the remaining code handles overflows correctly.  */
 
   /* Calculate day of year from year, month, and day of month.
@@ -394 +336 @@
   long_int yday = mon_yday + lmday;
 
-  time_t guessed_offset = *offset;
+  int negative_offset_guess;
 
   int sec_requested = sec;
@@ -411 +353 @@
      time.  */
 
+  INT_SUBTRACT_WRAPV (0, *offset, &negative_offset_guess);
   t0 = ydhms_diff (year, yday, hour, min, sec,
-                   EPOCH_YEAR - TM_YEAR_BASE, 0, 0, 0, - guessed_offset);
-
-  if (TIME_T_MAX / INT_MAX / 366 / 24 / 60 / 60 < 3)
-    {
-      /* time_t isn't large enough to rule out overflows, so check
-         for major overflows.  A gross check suffices, since if t0
-         has overflowed, it is off by a multiple of TIME_T_MAX -
-         TIME_T_MIN + 1.  So ignore any component of the difference
-         that is bounded by a small value.  */
-
-      /* Approximate log base 2 of the number of time units per
-         biennium.  A biennium is 2 years; use this unit instead of
-         years to avoid integer overflow.  For example, 2 average
-         Gregorian years are 2 * 365.2425 * 24 * 60 * 60 seconds,
-         which is 63113904 seconds, and rint (log2 (63113904)) is
-         26.  */
-      int ALOG2_SECONDS_PER_BIENNIUM = 26;
-      int ALOG2_MINUTES_PER_BIENNIUM = 20;
-      int ALOG2_HOURS_PER_BIENNIUM = 14;
-      int ALOG2_DAYS_PER_BIENNIUM = 10;
-      int LOG2_YEARS_PER_BIENNIUM = 1;
-
-      int approx_requested_biennia =
-        (SHR (year_requested, LOG2_YEARS_PER_BIENNIUM)
-         - SHR (EPOCH_YEAR - TM_YEAR_BASE, LOG2_YEARS_PER_BIENNIUM)
-         + SHR (mday, ALOG2_DAYS_PER_BIENNIUM)
-         + SHR (hour, ALOG2_HOURS_PER_BIENNIUM)
-         + SHR (min, ALOG2_MINUTES_PER_BIENNIUM)
-         + (LEAP_SECONDS_POSSIBLE
-            ? 0
-            : SHR (sec, ALOG2_SECONDS_PER_BIENNIUM)));
-
-      int approx_biennia = SHR (t0, ALOG2_SECONDS_PER_BIENNIUM);
-      int diff = approx_biennia - approx_requested_biennia;
-      int approx_abs_diff = diff < 0 ? -1 - diff : diff;
-
-      /* IRIX 4.0.5 cc miscalculates TIME_T_MIN / 3: it erroneously
-         gives a positive value of 715827882.  Setting a variable
-         first then doing math on it seems to work.
-         (ghazi@caip.rutgers.edu) */
-      time_t time_t_max = TIME_T_MAX;
-      time_t time_t_min = TIME_T_MIN;
-      time_t overflow_threshold =
-        (time_t_max / 3 - time_t_min / 3) >> ALOG2_SECONDS_PER_BIENNIUM;
-
-      if (overflow_threshold < approx_abs_diff)
-        {
-          /* Overflow occurred.  Try repairing it; this might work if
-             the time zone offset is enough to undo the overflow.  */
-          time_t repaired_t0 = -1 - t0;
-          approx_biennia = SHR (repaired_t0, ALOG2_SECONDS_PER_BIENNIUM);
-          diff = approx_biennia - approx_requested_biennia;
-          approx_abs_diff = diff < 0 ? -1 - diff : diff;
-          if (overflow_threshold < approx_abs_diff)
-            return -1;
-          guessed_offset += repaired_t0 - t0;
-          t0 = repaired_t0;
-        }
-    }
+                   EPOCH_YEAR - TM_YEAR_BASE, 0, 0, 0, negative_offset_guess);
 
   /* Repeatedly use the error to improve the guess.  */
 
   for (t = t1 = t2 = t0, dst2 = 0;
-       (gt = guess_time_tm (year, yday, hour, min, sec, &t,
+       (gt = guess_time_tm (year, yday, hour, min, sec, t,
                             ranged_convert (convert, &t, &tm)),
         t != gt);
@@ -532 +417 @@
       for (delta = stride; delta < delta_bound; delta += stride)
         for (direction = -1; direction <= 1; direction += 2)
-          if (time_t_int_add_ok (t, delta * direction))
-            {
-              time_t ot = t + delta * direction;
-              struct tm otm;
-              ranged_convert (convert, &ot, &otm);
-              if (! isdst_differ (isdst, otm.tm_isdst))
-                {
-                  /* We found the desired tm_isdst.
-                     Extrapolate back to the desired time.  */
-                  t = guess_time_tm (year, yday, hour, min, sec, &ot, &otm);
-                  ranged_convert (convert, &t, &tm);
-                  goto offset_found;
-                }
-            }
+          {
+            long_int ot;
+            if (! INT_ADD_WRAPV (t, delta * direction, &ot))
+              {
+                struct tm otm;
+                ranged_convert (convert, &ot, &otm);
+                if (! isdst_differ (isdst, otm.tm_isdst))
+                  {
+                    /* We found the desired tm_isdst.
+                       Extrapolate back to the desired time.  */
+                    t = guess_time_tm (year, yday, hour, min, sec, ot, &otm);
+                    ranged_convert (convert, &t, &tm);
+                    goto offset_found;
+                  }
+              }
+          }
     }
 
  offset_found:
-  *offset = guessed_offset + t - t0;
+  /* Set *OFFSET to the low-order bits of T - T0 - NEGATIVE_OFFSET_GUESS.
+     This is just a heuristic to speed up the next mktime call, and
+     correctness is unaffected if integer overflow occurs here.  */
+  INT_SUBTRACT_WRAPV (t, t0, &dt);
+  INT_SUBTRACT_WRAPV (dt, negative_offset_guess, offset);
 
   if (LEAP_SECONDS_POSSIBLE && sec_requested != tm.tm_sec)
@@ -555 +446 @@
       /* Adjust time to reflect the tm_sec requested, not the normalized value.
          Also, repair any damage from a false match due to a leap second.  */
-      int sec_adjustment = (sec == 0 && tm.tm_sec == 60) - sec;
-      if (! time_t_int_add_ok (t, sec_requested))
+      long_int sec_adjustment = sec == 0 && tm.tm_sec == 60;
+      sec_adjustment -= sec;
+      sec_adjustment += sec_requested;
+      if (INT_ADD_WRAPV (t, sec_adjustment, &t)
+          || ! (mktime_min <= t && t <= mktime_max)
+          || ! convert_time (convert, t, &tm))
         return -1;
-      t1 = t + sec_requested;
-      if (! time_t_int_add_ok (t1, sec_adjustment))
-        return -1;
-      t2 = t1 + sec_adjustment;
-      if (! convert (&t2, &tm))
-        return -1;
-      t = t2;
     }
 
@@ -572 +460 @@
 
 
-/* FIXME: This should use a signed type wide enough to hold any UTC
-   offset in seconds.  'int' should be good enough for GNU code.  We
-   can't fix this unilaterally though, as other modules invoke
-   __mktime_internal.  */
-static time_t localtime_offset;
+static mktime_offset_t localtime_offset;
 
 /* Convert *TP to a time_t value.  */
@@ -587 +471 @@
      be set as if the tzset() function had been called.  */
   __tzset ();
+#elif HAVE_TZSET
+  tzset ();
 #endif
 
@@ -602 +488 @@
 
 
-#if defined DEBUG_MKTIME && DEBUG_MKTIME
+#if DEBUG_MKTIME
 
 static int
@@ -654 +540 @@
   char trailer;
 
+  /* Sanity check, plus call tzset.  */
+  tl = 0;
+  if (! localtime (&tl))
+    {
+      printf ("localtime (0) fails\n");
+      status = 1;
+    }
+
   if ((argc == 3 || argc == 4)
       && (sscanf (argv[1], "%d-%d-%d%c",
@@ -667 +561 @@
       tmk = tm;
       tl = mktime (&tmk);
-      lt = localtime (&tl);
-      if (lt)
-        {
-          tml = *lt;
-          lt = &tml;
-        }
+      lt = localtime_r (&tl, &tml);
       printf ("mktime returns %ld == ", (long int) tl);
       print_tm (&tmk);
@@ -687 +576 @@
         for (tl = from; by < 0 ? to <= tl : tl <= to; tl = tl1)
           {
-            lt = localtime (&tl);
+            lt = localtime_r (&tl, &tml);
             if (lt)
               {
-                tmk = tml = *lt;
+                tmk = tml;
                 tk = mktime (&tmk);
                 status |= check_result (tk, tmk, tl, &tml);
@@ -696 +585 @@
             else
               {
-                printf ("localtime (%ld) yields 0\n", (long int) tl);
+                printf ("localtime_r (%ld) yields 0\n", (long int) tl);
                 status = 1;
               }
@@ -707 +596 @@
           {
             /* Null benchmark.  */
-            lt = localtime (&tl);
+            lt = localtime_r (&tl, &tml);
             if (lt)
               {
-                tmk = tml = *lt;
+                tmk = tml;
                 tk = tl;
                 status |= check_result (tk, tmk, tl, &tml);
@@ -716 +605 @@
             else
               {
-                printf ("localtime (%ld) yields 0\n", (long int) tl);
+                printf ("localtime_r (%ld) yields 0\n", (long int) tl);
                 status = 1;
               }

coreutils/trunk/lib/mountlist.c ¶

@@ -36 +36 @@
 #if HAVE_SYS_PARAM_H
 # include <sys/param.h>
+#endif
+
+#if MAJOR_IN_MKDEV
+# include <sys/mkdev.h>
+#elif MAJOR_IN_SYSMACROS
+# include <sys/sysmacros.h>
 #endif
 
@@ -218 +224 @@
 #ifndef ME_REMOTE
 /* A file system is "remote" if its Fs_name contains a ':'
-   or if (it is of type (smbfs or cifs) and its Fs_name starts with '//').  */
+   or if (it is of type (smbfs or cifs) and its Fs_name starts with '//')
+   or Fs_name is equal to "-hosts" (used by autofs to mount remote fs).  */
 # define ME_REMOTE(Fs_name, Fs_type)            \
     (strchr (Fs_name, ':') != NULL              \
@@ -224 +231 @@
          && (Fs_name)[1] == '/'                 \
          && (strcmp (Fs_type, "smbfs") == 0     \
-             || strcmp (Fs_type, "cifs") == 0)))
+             || strcmp (Fs_type, "cifs") == 0)) \
+     || (strcmp("-hosts", Fs_name) == 0))
 #endif
 
@@ -1069 +1077 @@
         struct dirent *result;
 
+        /* FIXME: readdir_r is planned to be withdrawn from POSIX and
+           marked obsolescent in glibc.  Use readdir instead.  */
         if (readdir_r (dirp, &entry, &result) || result == NULL)
           break;

coreutils/trunk/lib/nl_langinfo.c ¶

@@ -35 +35 @@
 {
   static char buf[2 + 10 + 1];
-  size_t buflen = 0;
   char const *locale = setlocale (LC_CTYPE, NULL);
   char *codeset = buf;
@@ -100 +99 @@
 # if GNULIB_defined_T_FMT_AMPM
     case T_FMT_AMPM:
-      return "%I:%M:%S %p";
+      return (char *) "%I:%M:%S %p";
 # endif
 # if GNULIB_defined_ERA
@@ -107 +106 @@
          of the form "direction:offset:start_date:end_date:era_name:era_format"
          with an empty string at the end.  */
-      return "";
+      return (char *) "";
     case ERA_D_FMT:
       /* The %Ex conversion in strftime behaves like %x if the locale does not
@@ -126 +125 @@
       /* The format is not standardized.  In glibc it is a sequence of 10
          strings, appended in memory.  */
-      return "\0\0\0\0\0\0\0\0\0\0";
+      return (char *) "\0\0\0\0\0\0\0\0\0\0";
 # endif
 # if GNULIB_defined_YESEXPR || !FUNC_NL_LANGINFO_YESEXPR_WORKS
     case YESEXPR:
-      return "^[yY]";
+      return (char *) "^[yY]";
     case NOEXPR:
-      return "^[nN]";
+      return (char *) "^[nN]";
 # endif
     default:
@@ -164 +163 @@
       }
 # ifdef __BEOS__
-      return "UTF-8";
+      return (char *) "UTF-8";
 # else
-      return "ISO-8859-1";
+      return (char *) "ISO-8859-1";
 # endif
     /* nl_langinfo items of the LC_NUMERIC category */
@@ -179 +178 @@
     case D_T_FMT:
     case ERA_D_T_FMT:
-      return "%a %b %e %H:%M:%S %Y";
+      return (char *) "%a %b %e %H:%M:%S %Y";
     case D_FMT:
     case ERA_D_FMT:
-      return "%m/%d/%y";
+      return (char *) "%m/%d/%y";
     case T_FMT:
     case ERA_T_FMT:
-      return "%H:%M:%S";
+      return (char *) "%H:%M:%S";
     case T_FMT_AMPM:
-      return "%I:%M:%S %p";
+      return (char *) "%I:%M:%S %p";
     case AM_STR:
       if (!strftime (nlbuf, sizeof nlbuf, "%p", &tmm))
-        return "AM";
+        return (char *) "AM";
       return nlbuf;
     case PM_STR:
       tmm.tm_hour = 12;
       if (!strftime (nlbuf, sizeof nlbuf, "%p", &tmm))
-        return "PM";
+        return (char *) "PM";
       return nlbuf;
     case DAY_1:
@@ -275 +274 @@
       }
     case ERA:
-      return "";
+      return (char *) "";
     case ALT_DIGITS:
-      return "\0\0\0\0\0\0\0\0\0\0";
+      return (char *) "\0\0\0\0\0\0\0\0\0\0";
     /* nl_langinfo items of the LC_MONETARY category.  */
     case CRNCYSTR:
@@ -312 +311 @@
        TODO: Really use the locale. */
     case YESEXPR:
-      return "^[yY]";
+      return (char *) "^[yY]";
     case NOEXPR:
-      return "^[nN]";
+      return (char *) "^[nN]";
     default:
-      return "";
+      return (char *) "";
     }
 }

coreutils/trunk/lib/obstack.c ¶

@@ -349 +349 @@
    variable by default points to the internal function
    'print_and_abort'.  */
-void (*obstack_alloc_failed_handler) (void) = print_and_abort;
+__attribute_noreturn__ void (*obstack_alloc_failed_handler) (void)
+  = print_and_abort;
 # endif /* !_OBSTACK_NO_ERROR_HANDLER */
 #endif /* !_OBSTACK_ELIDE_CODE */

coreutils/trunk/lib/obstack.h ¶

@@ -112 +112 @@
 #include <string.h>             /* For __GNU_LIBRARY__, and memcpy.  */
 
+#if __STDC_VERSION__ < 199901L
+# define __FLEXIBLE_ARRAY_MEMBER 1
+#else
+# define __FLEXIBLE_ARRAY_MEMBER
+#endif
+
 #if _OBSTACK_INTERFACE_VERSION == 1
 /* For binary compatibility with obstack version 1, which used "int"
@@ -146 +152 @@
 #endif
 
+/* Not the same as _Noreturn, since it also works with function pointers.  */
+#ifndef __attribute_noreturn__
+# if 2 < __GNUC__ + (8 <= __GNUC_MINOR__) || 0x5110 <= __SUNPRO_C
+#  define __attribute_noreturn__ __attribute__ ((__noreturn__))
+# else
+#  define __attribute_noreturn__
+# endif
+#endif
+
 #ifdef __cplusplus
 extern "C" {
@@ -154 +169 @@
   char *limit;                  /* 1 past end of this chunk */
   struct _obstack_chunk *prev;  /* address of prior chunk or NULL */
-  char contents[4];             /* objects begin here */
+  char contents[__FLEXIBLE_ARRAY_MEMBER]; /* objects begin here */
 };
 
@@ -213 +228 @@
    should either abort gracefully or use longjump - but shouldn't
    return.  The default action is to print a message and abort.  */
-extern void (*obstack_alloc_failed_handler) (void);
+extern __attribute_noreturn__ void (*obstack_alloc_failed_handler) (void);
 
 /* Exit value used when 'print_and_abort' is used.  */

coreutils/trunk/lib/parse-datetime.c ¶

@@ -103 +103 @@
 #include "timespec.h"
 #include "verify.h"
+#include "strftime.h"
 
 /* There's no need to extend the stack, so there's no need to involve
@@ -125 +126 @@
 #endif
 
+#include <inttypes.h>
 #include <c-ctype.h>
 #include <limits.h>
@@ -131 +133 @@
 #include <string.h>
 
+#include "gettext.h"
 #include "xalloc.h"
+
+#define _(str) gettext (str)
 
 /* Bison's skeleton tests _STDLIB_H, while some stdlib.h headers
@@ -171 +176 @@
 #define HOUR(x) ((x) * 60)
 
+#define STREQ(a, b) (strcmp (a, b) == 0)
+
 /* long_time_t is a signed integer type that contains all time_t values.  */
 verify (TYPE_IS_INTEGER (time_t));
@@ -183 +190 @@
    errors that the cast doesn't.  */
 static unsigned char to_uchar (char ch) { return ch; }
+
+static void
+dbg_printf (const char *msg,...)
+{
+  va_list args;
+  /* TODO: use gnulib's 'program_name' instead? */
+  fputs ("date: ", stderr);
+
+  va_start (args, msg);
+  vfprintf (stderr, msg, args);
+  va_end (args);
+}
+
+
 
 /* Lots of this code assumes time_t and time_t-like values fit into
@@ -274 +295 @@
   size_t times_seen;
   size_t zones_seen;
+
+  /* if true, print debugging output to stderr */
+  bool parse_datetime_debug;
+
+  /* which of the 'seen' parts has been printed when debugging */
+  size_t debug_dates_seen;
+  size_t debug_days_seen;
+  size_t debug_local_zones_seen;
+  size_t debug_dsts_seen;
+  size_t debug_times_seen;
+  size_t debug_zones_seen;
+
+  /* true if the user specified explicit ordinal day value, */
+  bool debug_ordinal_day_seen;
+
+  /* the default input timezone, set by TZ value */
+  long int debug_default_input_timezone;
 
   /* Table of local time zone abbreviations, terminated by a null entry.  */
@@ -348 +386 @@
 }
 
-
-#line 352 "parse-datetime.c" /* yacc.c:339  */
+/* returns a textual representation of the day ordinal/number values
+   in the parser_control struct (e.g. 'last wed', 'this tues', 'thu') */
+static const char*
+str_days (parser_control *pc, char* /*output*/ buffer, size_t n)
+{
+  /* TODO: use the  relative_time_table[] for reverse lookup */
+  static const char* ordinal_values[] = {
+     "last",
+     "this",
+     "next/first",
+     "(SECOND)", /* SECOND is commented out in relative_time_table[] */
+     "third",
+     "fourth",
+     "fifth",
+     "sixth",
+     "seventh",
+     "eight",
+     "ninth",
+     "tenth",
+     "eleventh",
+     "twelfth"};
+
+  static const char* days_values[] = {
+     "Sun",
+     "Mon",
+     "Tue",
+     "Wed",
+     "Thu",
+     "Fri",
+     "Sat"
+    };
+
+  /* don't add an ordinal prefix if the user didn't specify it
+     (e.g., "this wed" vs "wed") */
+  if (pc->debug_ordinal_day_seen)
+    {
+      /* use word description of possible (e.g. -1 = last, 3 = third) */
+      if (pc->day_ordinal>=-1 && pc->day_ordinal <=12)
+        {
+          strncpy (buffer, ordinal_values[ pc->day_ordinal+1 ], n);
+          buffer[n-1]='\0';
+        }
+      else
+        {
+          snprintf (buffer,n,"%ld",pc->day_ordinal);
+        }
+    }
+  else
+    {
+      buffer[0] = '\0';
+    }
+
+  /* Add the day name */
+  if (pc->day_number>=0 && pc->day_number<=6)
+    {
+      size_t l = strlen (buffer);
+      if (l>0)
+        {
+          strncat (buffer," ",n-l);
+          ++l;
+        }
+      strncat (buffer,days_values[pc->day_number],n-l);
+    }
+  else
+    {
+      /* invalid day_number value - should never happen */
+    }
+  return buffer;
+}
+
+/* debugging: print the current time in the parser_control structure.
+   The parser will increment "*_seen" members for those which were parsed.
+   This function will print only newly seen parts. */
+static void
+debug_print_current_time (const char* item, parser_control *pc)
+{
+  char tmp[100] = {0};
+  int space = 0; /* if true, add space delimiter */
+
+  if (!pc->parse_datetime_debug)
+    return;
+
+  /* no newline, more items printed below */
+  dbg_printf (_("parsed %s part: "), item);
+
+  if (pc->dates_seen != pc->debug_dates_seen)
+    {
+      /*TODO: use pc->year.negative? */
+      fprintf (stderr,"(Y-M-D) %04ld-%02ld-%02ld",
+              pc->year.value, pc->month, pc->day);
+      pc->debug_dates_seen = pc->dates_seen;
+      space = 1;
+    }
+
+  if (pc->times_seen != pc->debug_times_seen)
+    {
+      if (space)
+        fputc (' ',stderr);
+      fprintf (stderr,"%02ld:%02ld:%02ld",
+              pc->hour, pc->minutes, pc->seconds.tv_sec);
+      if (pc->seconds.tv_nsec!=0)
+        fprintf (stderr,"%09ld", pc->seconds.tv_nsec);
+      if (pc->meridian==MERpm)
+        fputs ("pm",stderr);
+
+      pc->debug_times_seen = pc->times_seen;
+      space = 1;
+    }
+
+  if (pc->days_seen != pc->debug_days_seen)
+    {
+      if (space)
+        fputc (' ',stderr);
+      fprintf (stderr,_("%s (day ordinal=%ld number=%d)"),
+              str_days (pc,tmp,sizeof (tmp)),
+              pc->day_ordinal, pc->day_number);
+      pc->debug_days_seen = pc->days_seen ;
+      space = 1;
+    }
+
+  if (pc->dsts_seen != pc->debug_dsts_seen)
+    {
+      if (space)
+        fputc (' ',stderr);
+      fprintf (stderr,_("is-dst=%d"), pc->local_isdst);
+      pc->dsts_seen = pc->debug_dsts_seen;
+      space = 1;
+    }
+
+  /* TODO: fix incorrect display of EST=2:08h? */
+  if (pc->zones_seen != pc->debug_zones_seen)
+    {
+      if (space)
+        fputc (' ',stderr);
+      fprintf (stderr,_("TZ=%+03d:%02d"), (int)(pc->time_zone/60),
+              abs ((int)pc->time_zone%60));
+      pc->debug_zones_seen = pc->zones_seen;
+      space = 1;
+    }
+
+  if (pc->local_zones_seen != pc->debug_local_zones_seen)
+    {
+      if (space)
+        fputc (' ',stderr);
+      fprintf (stderr,_("Local-TZ=%+03d:%02d"), (int)(pc->time_zone/60),
+              abs ((int)pc->time_zone%60));
+      pc->debug_local_zones_seen = pc->local_zones_seen;
+      space = 1;
+    }
+
+  if (pc->timespec_seen)
+    {
+      if (space)
+        fputc (' ',stderr);
+      fprintf (stderr,_("number of seconds: %ld"), pc->seconds.tv_sec);
+    }
+
+  fputc ('\n', stderr);
+}
+
+/* debugging: print the current relative values. */
+static void
+debug_print_relative_time (const char* item, const parser_control *pc)
+{
+  int space = 0; /* if true, add space delimiter */
+
+  if (!pc->parse_datetime_debug)
+    return;
+
+  /* no newline, more items printed below */
+  dbg_printf (_("parsed %s part: "), item);
+
+  if (pc->rel.year==0 && pc->rel.month==0 && pc->rel.day==0
+      && pc->rel.hour==0 && pc->rel.minutes==00 && pc->rel.seconds == 0
+      && pc->rel.ns==0)
+    {
+      /* Special case: relative time of this/today/now */
+      fputs (_("today/this/now\n"),stderr);
+      return ;
+    }
+
+#define PRINT_REL_PART(x,name)                          \
+  do {                                                  \
+    if ( (pc->rel.x) != 0 )                             \
+      {                                                 \
+        if (space)                                      \
+          fputc (' ',stderr);                           \
+        fprintf (stderr,"%+ld %s", pc->rel.x, name);    \
+        space = 1;                                      \
+      }                                                 \
+  } while (0)
+
+  PRINT_REL_PART (year,"year(s)");
+  PRINT_REL_PART (month,"month(s)");
+  PRINT_REL_PART (day,"day(s)");
+  PRINT_REL_PART (hour,"hour(s)");
+  PRINT_REL_PART (minutes,"minutes");
+  PRINT_REL_PART (seconds,"seconds");
+  PRINT_REL_PART (ns,"nanoseconds");
+
+  fputc ('\n',stderr);
+}
+
+
+
+
+#line 595 "parse-datetime.c" /* yacc.c:339  */
 
 # ifndef YY_NULLPTR
@@ -430 +673 @@
 union YYSTYPE
 {
-#line 297 "./lib/parse-datetime.y" /* yacc.c:355  */
+#line 540 "./lib/parse-datetime.y" /* yacc.c:355  */
 
   long int intval;
@@ -437 +680 @@
   relative_time rel;
 
-#line 440 "parse-datetime.c" /* yacc.c:355  */
+#line 683 "parse-datetime.c" /* yacc.c:355  */
 };
 
@@ -453 +696 @@
 /* Copy the second part of user declarations.  */
 
-#line 456 "parse-datetime.c" /* yacc.c:358  */
+#line 699 "parse-datetime.c" /* yacc.c:358  */
 
 #ifdef short
@@ -752 +995 @@
 static const yytype_uint16 yyrline[] =
 {
-       0,   324,   324,   325,   329,   336,   338,   342,   344,   346,
-     348,   350,   352,   354,   355,   356,   360,   364,   368,   373,
-     378,   383,   387,   392,   397,   404,   406,   410,   418,   423,
-     433,   435,   437,   440,   443,   445,   447,   452,   457,   462,
-     467,   475,   480,   500,   508,   516,   521,   527,   532,   538,
-     542,   552,   554,   556,   561,   563,   565,   567,   569,   571,
-     573,   575,   577,   579,   581,   583,   585,   587,   589,   591,
-     593,   595,   597,   599,   601,   605,   607,   609,   611,   613,
-     615,   620,   624,   624,   627,   628,   633,   634,   639,   644,
-     655,   656
+       0,   567,   567,   568,   572,   580,   582,   586,   591,   596,
+     601,   606,   611,   616,   620,   624,   631,   635,   639,   644,
+     649,   654,   658,   663,   668,   675,   677,   681,   689,   694,
+     704,   706,   708,   711,   714,   716,   718,   723,   728,   733,
+     739,   748,   753,   781,   789,   797,   802,   808,   813,   819,
+     823,   833,   835,   837,   842,   844,   846,   848,   850,   852,
+     854,   856,   858,   860,   862,   864,   866,   868,   870,   872,
+     874,   876,   878,   880,   882,   886,   888,   890,   892,   894,
+     896,   901,   905,   905,   908,   909,   914,   915,   920,   925,
+     936,   937
 };
 #endif
@@ -1620 +1863 @@
     {
         case 4:
-#line 330 "./lib/parse-datetime.y" /* yacc.c:1646  */
+#line 573 "./lib/parse-datetime.y" /* yacc.c:1646  */
     {
         pc->seconds = (yyvsp[0].timespec);
         pc->timespec_seen = true;
+        debug_print_current_time (_("number of seconds"), pc);
       }
-#line 1628 "parse-datetime.c" /* yacc.c:1646  */
+#line 1872 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 7:
-#line 343 "./lib/parse-datetime.y" /* yacc.c:1646  */
-    { pc->times_seen++; pc->dates_seen++; }
-#line 1634 "parse-datetime.c" /* yacc.c:1646  */
+#line 587 "./lib/parse-datetime.y" /* yacc.c:1646  */
+    {
+        pc->times_seen++; pc->dates_seen++;
+        debug_print_current_time (_("datetime"), pc);
+      }
+#line 1881 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 8:
-#line 345 "./lib/parse-datetime.y" /* yacc.c:1646  */
-    { pc->times_seen++; }
-#line 1640 "parse-datetime.c" /* yacc.c:1646  */
+#line 592 "./lib/parse-datetime.y" /* yacc.c:1646  */
+    {
+        pc->times_seen++;
+        debug_print_current_time (_("time"), pc);
+      }
+#line 1890 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 9:
-#line 347 "./lib/parse-datetime.y" /* yacc.c:1646  */
-    { pc->local_zones_seen++; }
-#line 1646 "parse-datetime.c" /* yacc.c:1646  */
+#line 597 "./lib/parse-datetime.y" /* yacc.c:1646  */
+    {
+        pc->local_zones_seen++;
+        debug_print_current_time (_("local_zone"), pc);
+      }
+#line 1899 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 10:
-#line 349 "./lib/parse-datetime.y" /* yacc.c:1646  */
-    { pc->zones_seen++; }
-#line 1652 "parse-datetime.c" /* yacc.c:1646  */
+#line 602 "./lib/parse-datetime.y" /* yacc.c:1646  */
+    {
+        pc->zones_seen++;
+        debug_print_current_time (_("zone"), pc);
+      }
+#line 1908 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 11:
-#line 351 "./lib/parse-datetime.y" /* yacc.c:1646  */
-    { pc->dates_seen++; }
-#line 1658 "parse-datetime.c" /* yacc.c:1646  */
+#line 607 "./lib/parse-datetime.y" /* yacc.c:1646  */
+    {
+        pc->dates_seen++;
+        debug_print_current_time (_("date"), pc);
+      }
+#line 1917 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 12:
-#line 353 "./lib/parse-datetime.y" /* yacc.c:1646  */
-    { pc->days_seen++; }
-#line 1664 "parse-datetime.c" /* yacc.c:1646  */
+#line 612 "./lib/parse-datetime.y" /* yacc.c:1646  */
+    {
+        pc->days_seen++;
+        debug_print_current_time (_("day"), pc);
+      }
+#line 1926 "parse-datetime.c" /* yacc.c:1646  */
+    break;
+
+  case 13:
+#line 617 "./lib/parse-datetime.y" /* yacc.c:1646  */
+    {
+        debug_print_relative_time (_("relative"), pc);
+      }
+#line 1934 "parse-datetime.c" /* yacc.c:1646  */
+    break;
+
+  case 14:
+#line 621 "./lib/parse-datetime.y" /* yacc.c:1646  */
+    {
+        debug_print_relative_time (_("number"), pc);
+      }
+#line 1942 "parse-datetime.c" /* yacc.c:1646  */
+    break;
+
+  case 15:
+#line 625 "./lib/parse-datetime.y" /* yacc.c:1646  */
+    {
+        debug_print_relative_time (_("hybrid"), pc);
+      }
+#line 1950 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 18:
-#line 369 "./lib/parse-datetime.y" /* yacc.c:1646  */
+#line 640 "./lib/parse-datetime.y" /* yacc.c:1646  */
     {
         set_hhmmss (pc, (yyvsp[-1].textintval).value, 0, 0, 0);
         pc->meridian = (yyvsp[0].intval);
       }
-#line 1673 "parse-datetime.c" /* yacc.c:1646  */
+#line 1959 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 19:
-#line 374 "./lib/parse-datetime.y" /* yacc.c:1646  */
+#line 645 "./lib/parse-datetime.y" /* yacc.c:1646  */
     {
         set_hhmmss (pc, (yyvsp[-3].textintval).value, (yyvsp[-1].textintval).value, 0, 0);
         pc->meridian = (yyvsp[0].intval);
       }
-#line 1682 "parse-datetime.c" /* yacc.c:1646  */
+#line 1968 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 20:
-#line 379 "./lib/parse-datetime.y" /* yacc.c:1646  */
+#line 650 "./lib/parse-datetime.y" /* yacc.c:1646  */
     {
         set_hhmmss (pc, (yyvsp[-5].textintval).value, (yyvsp[-3].textintval).value, (yyvsp[-1].timespec).tv_sec, (yyvsp[-1].timespec).tv_nsec);
         pc->meridian = (yyvsp[0].intval);
       }
-#line 1691 "parse-datetime.c" /* yacc.c:1646  */
+#line 1977 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 22:
-#line 388 "./lib/parse-datetime.y" /* yacc.c:1646  */
+#line 659 "./lib/parse-datetime.y" /* yacc.c:1646  */
     {
         set_hhmmss (pc, (yyvsp[-1].textintval).value, 0, 0, 0);
         pc->meridian = MER24;
       }
-#line 1700 "parse-datetime.c" /* yacc.c:1646  */
+#line 1986 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 23:
-#line 393 "./lib/parse-datetime.y" /* yacc.c:1646  */
+#line 664 "./lib/parse-datetime.y" /* yacc.c:1646  */
     {
         set_hhmmss (pc, (yyvsp[-3].textintval).value, (yyvsp[-1].textintval).value, 0, 0);
         pc->meridian = MER24;
       }
-#line 1709 "parse-datetime.c" /* yacc.c:1646  */
+#line 1995 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 24:
-#line 398 "./lib/parse-datetime.y" /* yacc.c:1646  */
+#line 669 "./lib/parse-datetime.y" /* yacc.c:1646  */
     {
         set_hhmmss (pc, (yyvsp[-5].textintval).value, (yyvsp[-3].textintval).value, (yyvsp[-1].timespec).tv_sec, (yyvsp[-1].timespec).tv_nsec);
         pc->meridian = MER24;
       }
-#line 1718 "parse-datetime.c" /* yacc.c:1646  */
+#line 2004 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 27:
-#line 411 "./lib/parse-datetime.y" /* yacc.c:1646  */
+#line 682 "./lib/parse-datetime.y" /* yacc.c:1646  */
     {
         pc->zones_seen++;
         pc->time_zone = time_zone_hhmm (pc, (yyvsp[-1].textintval), (yyvsp[0].intval));
       }
-#line 1727 "parse-datetime.c" /* yacc.c:1646  */
+#line 2013 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 28:
-#line 419 "./lib/parse-datetime.y" /* yacc.c:1646  */
+#line 690 "./lib/parse-datetime.y" /* yacc.c:1646  */
     {
         pc->local_isdst = (yyvsp[0].intval);
         pc->dsts_seen += (0 < (yyvsp[0].intval));
       }
-#line 1736 "parse-datetime.c" /* yacc.c:1646  */
+#line 2022 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 29:
-#line 424 "./lib/parse-datetime.y" /* yacc.c:1646  */
+#line 695 "./lib/parse-datetime.y" /* yacc.c:1646  */
     {
         pc->local_isdst = 1;
         pc->dsts_seen += (0 < (yyvsp[-1].intval)) + 1;
       }
-#line 1745 "parse-datetime.c" /* yacc.c:1646  */
+#line 2031 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 30:
-#line 434 "./lib/parse-datetime.y" /* yacc.c:1646  */
+#line 705 "./lib/parse-datetime.y" /* yacc.c:1646  */
     { pc->time_zone = (yyvsp[0].intval); }
-#line 1751 "parse-datetime.c" /* yacc.c:1646  */
+#line 2037 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 31:
-#line 436 "./lib/parse-datetime.y" /* yacc.c:1646  */
+#line 707 "./lib/parse-datetime.y" /* yacc.c:1646  */
     { pc->time_zone = HOUR(7); }
-#line 1757 "parse-datetime.c" /* yacc.c:1646  */
+#line 2043 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 32:
-#line 438 "./lib/parse-datetime.y" /* yacc.c:1646  */
+#line 709 "./lib/parse-datetime.y" /* yacc.c:1646  */
     { pc->time_zone = (yyvsp[-1].intval);
         apply_relative_time (pc, (yyvsp[0].rel), 1); }
-#line 1764 "parse-datetime.c" /* yacc.c:1646  */
+#line 2050 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 33:
-#line 441 "./lib/parse-datetime.y" /* yacc.c:1646  */
+#line 712 "./lib/parse-datetime.y" /* yacc.c:1646  */
     { pc->time_zone = HOUR(7);
         apply_relative_time (pc, (yyvsp[0].rel), 1); }
-#line 1771 "parse-datetime.c" /* yacc.c:1646  */
+#line 2057 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 34:
-#line 444 "./lib/parse-datetime.y" /* yacc.c:1646  */
+#line 715 "./lib/parse-datetime.y" /* yacc.c:1646  */
     { pc->time_zone = (yyvsp[-2].intval) + time_zone_hhmm (pc, (yyvsp[-1].textintval), (yyvsp[0].intval)); }
-#line 1777 "parse-datetime.c" /* yacc.c:1646  */
+#line 2063 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 35:
-#line 446 "./lib/parse-datetime.y" /* yacc.c:1646  */
+#line 717 "./lib/parse-datetime.y" /* yacc.c:1646  */
     { pc->time_zone = (yyvsp[0].intval) + 60; }
-#line 1783 "parse-datetime.c" /* yacc.c:1646  */
+#line 2069 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 36:
-#line 448 "./lib/parse-datetime.y" /* yacc.c:1646  */
+#line 719 "./lib/parse-datetime.y" /* yacc.c:1646  */
     { pc->time_zone = (yyvsp[-1].intval) + 60; }
-#line 1789 "parse-datetime.c" /* yacc.c:1646  */
+#line 2075 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 37:
-#line 453 "./lib/parse-datetime.y" /* yacc.c:1646  */
+#line 724 "./lib/parse-datetime.y" /* yacc.c:1646  */
     {
         pc->day_ordinal = 0;
         pc->day_number = (yyvsp[0].intval);
       }
-#line 1798 "parse-datetime.c" /* yacc.c:1646  */
+#line 2084 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 38:
-#line 458 "./lib/parse-datetime.y" /* yacc.c:1646  */
+#line 729 "./lib/parse-datetime.y" /* yacc.c:1646  */
     {
         pc->day_ordinal = 0;
         pc->day_number = (yyvsp[-1].intval);
       }
-#line 1807 "parse-datetime.c" /* yacc.c:1646  */
+#line 2093 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 39:
-#line 463 "./lib/parse-datetime.y" /* yacc.c:1646  */
+#line 734 "./lib/parse-datetime.y" /* yacc.c:1646  */
     {
         pc->day_ordinal = (yyvsp[-1].intval);
         pc->day_number = (yyvsp[0].intval);
+        pc->debug_ordinal_day_seen = true;
       }
-#line 1816 "parse-datetime.c" /* yacc.c:1646  */
+#line 2103 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 40:
-#line 468 "./lib/parse-datetime.y" /* yacc.c:1646  */
+#line 740 "./lib/parse-datetime.y" /* yacc.c:1646  */
     {
         pc->day_ordinal = (yyvsp[-1].textintval).value;
         pc->day_number = (yyvsp[0].intval);
+        pc->debug_ordinal_day_seen = true;
       }
-#line 1825 "parse-datetime.c" /* yacc.c:1646  */
+#line 2113 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 41:
-#line 476 "./lib/parse-datetime.y" /* yacc.c:1646  */
+#line 749 "./lib/parse-datetime.y" /* yacc.c:1646  */
     {
         pc->month = (yyvsp[-2].textintval).value;
         pc->day = (yyvsp[0].textintval).value;
       }
-#line 1834 "parse-datetime.c" /* yacc.c:1646  */
+#line 2122 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 42:
-#line 481 "./lib/parse-datetime.y" /* yacc.c:1646  */
+#line 754 "./lib/parse-datetime.y" /* yacc.c:1646  */
     {
         /* Interpret as YYYY/MM/DD if the first value has 4 or more digits,
@@ -1844 +2132 @@
         if (4 <= (yyvsp[-4].textintval).digits)
           {
+            if (pc->parse_datetime_debug)
+              dbg_printf (_("warning: value %ld has %"PRIuMAX" digits. " \
+                            "Assuming YYYY/MM/DD\n"), (yyvsp[-4].textintval).value, (yyvsp[-4].textintval).digits);
+
             pc->year = (yyvsp[-4].textintval);
             pc->month = (yyvsp[-2].textintval).value;
@@ -1850 +2142 @@
         else
           {
+            if (pc->parse_datetime_debug)
+              dbg_printf (_("warning: value %ld has less than 4 digits. "    \
+                            "Assuming MM/DD/YY[YY]\n"), (yyvsp[-4].textintval).value);
+
             pc->month = (yyvsp[-4].textintval).value;
             pc->day = (yyvsp[-2].textintval).value;
@@ -1855 +2151 @@
           }
       }
-#line 1858 "parse-datetime.c" /* yacc.c:1646  */
+#line 2154 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 43:
-#line 501 "./lib/parse-datetime.y" /* yacc.c:1646  */
+#line 782 "./lib/parse-datetime.y" /* yacc.c:1646  */
     {
         /* e.g. 17-JUN-1992.  */
@@ -1867 +2163 @@
         pc->year.digits = (yyvsp[0].textintval).digits;
       }
-#line 1870 "parse-datetime.c" /* yacc.c:1646  */
+#line 2166 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 44:
-#line 509 "./lib/parse-datetime.y" /* yacc.c:1646  */
+#line 790 "./lib/parse-datetime.y" /* yacc.c:1646  */
     {
         /* e.g. JUN-17-1992.  */
@@ -1879 +2175 @@
         pc->year.digits = (yyvsp[0].textintval).digits;
       }
-#line 1882 "parse-datetime.c" /* yacc.c:1646  */
+#line 2178 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 45:
-#line 517 "./lib/parse-datetime.y" /* yacc.c:1646  */
+#line 798 "./lib/parse-datetime.y" /* yacc.c:1646  */
     {
         pc->month = (yyvsp[-1].intval);
         pc->day = (yyvsp[0].textintval).value;
       }
-#line 1891 "parse-datetime.c" /* yacc.c:1646  */
+#line 2187 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 46:
-#line 522 "./lib/parse-datetime.y" /* yacc.c:1646  */
+#line 803 "./lib/parse-datetime.y" /* yacc.c:1646  */
     {
         pc->month = (yyvsp[-3].intval);
@@ -1898 +2194 @@
         pc->year = (yyvsp[0].textintval);
       }
-#line 1901 "parse-datetime.c" /* yacc.c:1646  */
+#line 2197 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 47:
-#line 528 "./lib/parse-datetime.y" /* yacc.c:1646  */
+#line 809 "./lib/parse-datetime.y" /* yacc.c:1646  */
     {
         pc->day = (yyvsp[-1].textintval).value;
         pc->month = (yyvsp[0].intval);
       }
-#line 1910 "parse-datetime.c" /* yacc.c:1646  */
+#line 2206 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 48:
-#line 533 "./lib/parse-datetime.y" /* yacc.c:1646  */
+#line 814 "./lib/parse-datetime.y" /* yacc.c:1646  */
     {
         pc->day = (yyvsp[-2].textintval).value;
@@ -1917 +2213 @@
         pc->year = (yyvsp[0].textintval);
       }
-#line 1920 "parse-datetime.c" /* yacc.c:1646  */
+#line 2216 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 50:
-#line 543 "./lib/parse-datetime.y" /* yacc.c:1646  */
+#line 824 "./lib/parse-datetime.y" /* yacc.c:1646  */
     {
         /* ISO 8601 format.  YYYY-MM-DD.  */
@@ -1928 +2224 @@
         pc->day = -(yyvsp[0].textintval).value;
       }
-#line 1931 "parse-datetime.c" /* yacc.c:1646  */
+#line 2227 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 51:
-#line 553 "./lib/parse-datetime.y" /* yacc.c:1646  */
+#line 834 "./lib/parse-datetime.y" /* yacc.c:1646  */
     { apply_relative_time (pc, (yyvsp[-1].rel), (yyvsp[0].intval)); }
-#line 1937 "parse-datetime.c" /* yacc.c:1646  */
+#line 2233 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 52:
-#line 555 "./lib/parse-datetime.y" /* yacc.c:1646  */
+#line 836 "./lib/parse-datetime.y" /* yacc.c:1646  */
     { apply_relative_time (pc, (yyvsp[0].rel), 1); }
-#line 1943 "parse-datetime.c" /* yacc.c:1646  */
+#line 2239 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 53:
-#line 557 "./lib/parse-datetime.y" /* yacc.c:1646  */
+#line 838 "./lib/parse-datetime.y" /* yacc.c:1646  */
     { apply_relative_time (pc, (yyvsp[0].rel), 1); }
-#line 1949 "parse-datetime.c" /* yacc.c:1646  */
+#line 2245 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 54:
-#line 562 "./lib/parse-datetime.y" /* yacc.c:1646  */
+#line 843 "./lib/parse-datetime.y" /* yacc.c:1646  */
     { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).year = (yyvsp[-1].intval); }
-#line 1955 "parse-datetime.c" /* yacc.c:1646  */
+#line 2251 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 55:
-#line 564 "./lib/parse-datetime.y" /* yacc.c:1646  */
+#line 845 "./lib/parse-datetime.y" /* yacc.c:1646  */
     { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).year = (yyvsp[-1].textintval).value; }
-#line 1961 "parse-datetime.c" /* yacc.c:1646  */
+#line 2257 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 56:
-#line 566 "./lib/parse-datetime.y" /* yacc.c:1646  */
+#line 847 "./lib/parse-datetime.y" /* yacc.c:1646  */
     { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).year = 1; }
-#line 1967 "parse-datetime.c" /* yacc.c:1646  */
+#line 2263 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 57:
-#line 568 "./lib/parse-datetime.y" /* yacc.c:1646  */
+#line 849 "./lib/parse-datetime.y" /* yacc.c:1646  */
     { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).month = (yyvsp[-1].intval); }
-#line 1973 "parse-datetime.c" /* yacc.c:1646  */
+#line 2269 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 58:
-#line 570 "./lib/parse-datetime.y" /* yacc.c:1646  */
+#line 851 "./lib/parse-datetime.y" /* yacc.c:1646  */
     { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).month = (yyvsp[-1].textintval).value; }
-#line 1979 "parse-datetime.c" /* yacc.c:1646  */
+#line 2275 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 59:
-#line 572 "./lib/parse-datetime.y" /* yacc.c:1646  */
+#line 853 "./lib/parse-datetime.y" /* yacc.c:1646  */
     { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).month = 1; }
-#line 1985 "parse-datetime.c" /* yacc.c:1646  */
+#line 2281 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 60:
-#line 574 "./lib/parse-datetime.y" /* yacc.c:1646  */
+#line 855 "./lib/parse-datetime.y" /* yacc.c:1646  */
     { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).day = (yyvsp[-1].intval) * (yyvsp[0].intval); }
-#line 1991 "parse-datetime.c" /* yacc.c:1646  */
+#line 2287 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 61:
-#line 576 "./lib/parse-datetime.y" /* yacc.c:1646  */
+#line 857 "./lib/parse-datetime.y" /* yacc.c:1646  */
     { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).day = (yyvsp[-1].textintval).value * (yyvsp[0].intval); }
-#line 1997 "parse-datetime.c" /* yacc.c:1646  */
+#line 2293 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 62:
-#line 578 "./lib/parse-datetime.y" /* yacc.c:1646  */
+#line 859 "./lib/parse-datetime.y" /* yacc.c:1646  */
     { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).day = (yyvsp[0].intval); }
-#line 2003 "parse-datetime.c" /* yacc.c:1646  */
+#line 2299 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 63:
-#line 580 "./lib/parse-datetime.y" /* yacc.c:1646  */
+#line 861 "./lib/parse-datetime.y" /* yacc.c:1646  */
     { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).hour = (yyvsp[-1].intval); }
-#line 2009 "parse-datetime.c" /* yacc.c:1646  */
+#line 2305 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 64:
-#line 582 "./lib/parse-datetime.y" /* yacc.c:1646  */
+#line 863 "./lib/parse-datetime.y" /* yacc.c:1646  */
     { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).hour = (yyvsp[-1].textintval).value; }
-#line 2015 "parse-datetime.c" /* yacc.c:1646  */
+#line 2311 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 65:
-#line 584 "./lib/parse-datetime.y" /* yacc.c:1646  */
+#line 865 "./lib/parse-datetime.y" /* yacc.c:1646  */
     { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).hour = 1; }
-#line 2021 "parse-datetime.c" /* yacc.c:1646  */
+#line 2317 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 66:
-#line 586 "./lib/parse-datetime.y" /* yacc.c:1646  */
+#line 867 "./lib/parse-datetime.y" /* yacc.c:1646  */
     { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).minutes = (yyvsp[-1].intval); }
-#line 2027 "parse-datetime.c" /* yacc.c:1646  */
+#line 2323 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 67:
-#line 588 "./lib/parse-datetime.y" /* yacc.c:1646  */
+#line 869 "./lib/parse-datetime.y" /* yacc.c:1646  */
     { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).minutes = (yyvsp[-1].textintval).value; }
-#line 2033 "parse-datetime.c" /* yacc.c:1646  */
+#line 2329 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 68:
-#line 590 "./lib/parse-datetime.y" /* yacc.c:1646  */
+#line 871 "./lib/parse-datetime.y" /* yacc.c:1646  */
     { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).minutes = 1; }
-#line 2039 "parse-datetime.c" /* yacc.c:1646  */
+#line 2335 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 69:
-#line 592 "./lib/parse-datetime.y" /* yacc.c:1646  */
+#line 873 "./lib/parse-datetime.y" /* yacc.c:1646  */
     { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds = (yyvsp[-1].intval); }
-#line 2045 "parse-datetime.c" /* yacc.c:1646  */
+#line 2341 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 70:
-#line 594 "./lib/parse-datetime.y" /* yacc.c:1646  */
+#line 875 "./lib/parse-datetime.y" /* yacc.c:1646  */
     { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds = (yyvsp[-1].textintval).value; }
-#line 2051 "parse-datetime.c" /* yacc.c:1646  */
+#line 2347 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 71:
-#line 596 "./lib/parse-datetime.y" /* yacc.c:1646  */
+#line 877 "./lib/parse-datetime.y" /* yacc.c:1646  */
     { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds = (yyvsp[-1].timespec).tv_sec; (yyval.rel).ns = (yyvsp[-1].timespec).tv_nsec; }
-#line 2057 "parse-datetime.c" /* yacc.c:1646  */
+#line 2353 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 72:
-#line 598 "./lib/parse-datetime.y" /* yacc.c:1646  */
+#line 879 "./lib/parse-datetime.y" /* yacc.c:1646  */
     { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds = (yyvsp[-1].timespec).tv_sec; (yyval.rel).ns = (yyvsp[-1].timespec).tv_nsec; }
-#line 2063 "parse-datetime.c" /* yacc.c:1646  */
+#line 2359 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 73:
-#line 600 "./lib/parse-datetime.y" /* yacc.c:1646  */
+#line 881 "./lib/parse-datetime.y" /* yacc.c:1646  */
     { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds = 1; }
-#line 2069 "parse-datetime.c" /* yacc.c:1646  */
+#line 2365 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 75:
-#line 606 "./lib/parse-datetime.y" /* yacc.c:1646  */
+#line 887 "./lib/parse-datetime.y" /* yacc.c:1646  */
     { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).year = (yyvsp[-1].textintval).value; }
-#line 2075 "parse-datetime.c" /* yacc.c:1646  */
+#line 2371 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 76:
-#line 608 "./lib/parse-datetime.y" /* yacc.c:1646  */
+#line 889 "./lib/parse-datetime.y" /* yacc.c:1646  */
     { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).month = (yyvsp[-1].textintval).value; }
-#line 2081 "parse-datetime.c" /* yacc.c:1646  */
+#line 2377 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 77:
-#line 610 "./lib/parse-datetime.y" /* yacc.c:1646  */
+#line 891 "./lib/parse-datetime.y" /* yacc.c:1646  */
     { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).day = (yyvsp[-1].textintval).value * (yyvsp[0].intval); }
-#line 2087 "parse-datetime.c" /* yacc.c:1646  */
+#line 2383 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 78:
-#line 612 "./lib/parse-datetime.y" /* yacc.c:1646  */
+#line 893 "./lib/parse-datetime.y" /* yacc.c:1646  */
     { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).hour = (yyvsp[-1].textintval).value; }
-#line 2093 "parse-datetime.c" /* yacc.c:1646  */
+#line 2389 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 79:
-#line 614 "./lib/parse-datetime.y" /* yacc.c:1646  */
+#line 895 "./lib/parse-datetime.y" /* yacc.c:1646  */
     { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).minutes = (yyvsp[-1].textintval).value; }
-#line 2099 "parse-datetime.c" /* yacc.c:1646  */
+#line 2395 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 80:
-#line 616 "./lib/parse-datetime.y" /* yacc.c:1646  */
+#line 897 "./lib/parse-datetime.y" /* yacc.c:1646  */
     { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds = (yyvsp[-1].textintval).value; }
-#line 2105 "parse-datetime.c" /* yacc.c:1646  */
+#line 2401 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 81:
-#line 621 "./lib/parse-datetime.y" /* yacc.c:1646  */
+#line 902 "./lib/parse-datetime.y" /* yacc.c:1646  */
     { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).day = (yyvsp[0].intval); }
-#line 2111 "parse-datetime.c" /* yacc.c:1646  */
+#line 2407 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 85:
-#line 629 "./lib/parse-datetime.y" /* yacc.c:1646  */
+#line 910 "./lib/parse-datetime.y" /* yacc.c:1646  */
     { (yyval.timespec).tv_sec = (yyvsp[0].textintval).value; (yyval.timespec).tv_nsec = 0; }
-#line 2117 "parse-datetime.c" /* yacc.c:1646  */
+#line 2413 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 87:
-#line 635 "./lib/parse-datetime.y" /* yacc.c:1646  */
+#line 916 "./lib/parse-datetime.y" /* yacc.c:1646  */
     { (yyval.timespec).tv_sec = (yyvsp[0].textintval).value; (yyval.timespec).tv_nsec = 0; }
-#line 2123 "parse-datetime.c" /* yacc.c:1646  */
+#line 2419 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 88:
-#line 640 "./lib/parse-datetime.y" /* yacc.c:1646  */
+#line 921 "./lib/parse-datetime.y" /* yacc.c:1646  */
     { digits_to_date_time (pc, (yyvsp[0].textintval)); }
-#line 2129 "parse-datetime.c" /* yacc.c:1646  */
+#line 2425 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 89:
-#line 645 "./lib/parse-datetime.y" /* yacc.c:1646  */
+#line 926 "./lib/parse-datetime.y" /* yacc.c:1646  */
     {
         /* Hybrid all-digit and relative offset, so that we accept e.g.,
@@ -2137 +2433 @@
         apply_relative_time (pc, (yyvsp[0].rel), 1);
       }
-#line 2140 "parse-datetime.c" /* yacc.c:1646  */
+#line 2436 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 90:
-#line 655 "./lib/parse-datetime.y" /* yacc.c:1646  */
+#line 936 "./lib/parse-datetime.y" /* yacc.c:1646  */
     { (yyval.intval) = -1; }
-#line 2146 "parse-datetime.c" /* yacc.c:1646  */
+#line 2442 "parse-datetime.c" /* yacc.c:1646  */
     break;
 
   case 91:
-#line 657 "./lib/parse-datetime.y" /* yacc.c:1646  */
+#line 938 "./lib/parse-datetime.y" /* yacc.c:1646  */
     { (yyval.intval) = (yyvsp[0].textintval).value; }
-#line 2152 "parse-datetime.c" /* yacc.c:1646  */
-    break;
-
-
-#line 2156 "parse-datetime.c" /* yacc.c:1646  */
+#line 2448 "parse-datetime.c" /* yacc.c:1646  */
+    break;
+
+
+#line 2452 "parse-datetime.c" /* yacc.c:1646  */
       default: break;
     }
@@ -2381 +2677 @@
   return yyresult;
 }
-#line 660 "./lib/parse-datetime.y" /* yacc.c:1906  */
+#line 941 "./lib/parse-datetime.y" /* yacc.c:1906  */
 
 
@@ -2621 +2917 @@
 
 static long int
-to_year (textint textyear)
+to_year (textint textyear, bool debug)
 {
   long int year = textyear.value;
@@ -2631 +2927 @@
      years 69-99 map to 1969-1999.  */
   else if (textyear.digits == 2)
-    year += year < 69 ? 2000 : 1900;
+    {
+      year += year < 69 ? 2000 : 1900;
+      if (debug)
+        dbg_printf (_("warning: adjusting year value %ld to %ld\n"),
+                    textyear.value, year);
+    }
 
   return year;
@@ -2896 +3197 @@
           tp = lookup_word (pc, buff);
           if (! tp)
-            return '?';
+            {
+              if (pc->parse_datetime_debug)
+                dbg_printf (_("error: unknown word '%s'\n"), buff);
+              return '?';
+            }
           lvalp->intval = tp->value;
           return tp->type;
@@ -2956 +3261 @@
 enum { TZBUFSIZE = 100 };
 
+/* A reasonable upper bound for the buffer used in debug print outs.
+   see days_to_name(), debug_strftime() and debug_mktime_not_ok() */
+enum { DBGBUFSIZE = 100 };
+
 /* Return a copy of TZ, stored in TZBUF if it fits, and heap-allocated
    otherwise.  */
@@ -2970 +3279 @@
     }
   return tz;
+}
+
+/* debugging: format a 'struct tm' into a buffer, taking the parser's
+   timezone information into account (if pc!=NULL). */
+static const char*
+debug_strfdatetime (const struct tm *tm, const parser_control *pc,
+                    char* /*output*/ buf, size_t n)
+{
+  /* TODO:
+     1. find an optimal way to print date string in a clear and unambiguous
+        format. Currently, always add '(Y-M-D)' prefix.
+        Consider '2016y01m10d'  or 'year(2016) month(01) day(10)'.
+
+        If the user needs debug printing, it means he/she already having
+        issues with the parsing - better to avoid formats that could
+        be mis-interpreted (e.g. just YYYY-MM-DD).
+
+     2. Can strftime be used instead?
+        depends if it is portable and can print invalid dates on all systems.
+
+     3. Print timezone information ?
+
+     4. Print DST information ?
+
+     5. Print nanosecond information ?
+
+     NOTE:
+     Printed date/time values might not be valid, e.g. '2016-02-31'
+     or '2016-19-2016' .  These are the values as parsed from the user
+     string, before validation.
+  */
+  int m = nstrftime (buf, n, "(Y-M-D) %Y-%m-%d %H:%M:%S", tm, 0, 0);
+
+  /* if parser_control information was provided (for timezone),
+     and there's enough space in the buffer - add timezone info */
+  if (pc != NULL && ((n-m)>0))
+    {
+      const long int tz = (pc->zones_seen || pc->local_zones_seen)
+                          ? pc->time_zone
+                          : pc->debug_default_input_timezone;
+      snprintf (&buf[m],n-m," TZ=%+03d:%02d", (int)(tz/60), abs ((int)tz)%60);
+    }
+  return buf;
+}
+
+static const char*
+debug_strfdate (const struct tm *tm, char* /*output*/ buf, size_t n)
+{
+  snprintf (buf,n,"(Y-M-D) %04d-%02d-%02d",
+            tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday);
+  return buf;
+}
+
+static const char*
+debug_strftime (const struct tm *tm, char* /*output*/ buf, size_t n)
+{
+  snprintf (buf,n,"%02d:%02d:%02d", tm->tm_hour, tm->tm_min, tm->tm_sec);
+  return buf;
+}
+
+/* If 'mktime_ok()' failed, display the failed time values,
+   and provide possible hints. Example output:
+
+    date: error: invalid date/time value:
+    date:     user provided time: '(Y-M-D) 2006-04-02 02:45:00'
+    date:        normalized time: '(Y-M-D) 2006-04-02 03:45:00'
+    date:                                             __
+    date:      possible reasons:
+    date:        non-existing due to daylight-saving time;
+    date:        numeric values overflow;
+    date:        missing timezone;
+ */
+static void
+debug_mktime_not_ok (struct tm const *tm0, struct tm const *tm1,
+                     const parser_control *pc,  bool time_zone_seen)
+{
+  /* TODO: handle t==-1 (as in 'mktime_ok') */
+  char tmp[DBGBUFSIZE];
+  int i;
+  const bool eq_sec   = (tm0->tm_sec  == tm1->tm_sec);
+  const bool eq_min   = (tm0->tm_min  == tm1->tm_min);
+  const bool eq_hour  = (tm0->tm_hour == tm1->tm_hour);
+  const bool eq_mday  = (tm0->tm_mday == tm1->tm_mday);
+  const bool eq_month = (tm0->tm_mon  == tm1->tm_mon);
+  const bool eq_year  = (tm0->tm_year == tm1->tm_year);
+
+  const bool dst_shift = eq_sec && eq_min && !eq_hour
+                         && eq_mday && eq_month && eq_year;
+
+  if (!pc->parse_datetime_debug)
+    return;
+
+  dbg_printf (_("error: invalid date/time value:\n"));
+  dbg_printf (_("    user provided time: '%s'\n"),
+              debug_strfdatetime (tm0, pc, tmp, sizeof (tmp)));
+  dbg_printf (_("       normalized time: '%s'\n"),
+              debug_strfdatetime (tm1, pc, tmp, sizeof (tmp)));
+  /* NOTEs: the format must be aligned with debug_strfdatetime() and the two
+            DEBUG statements above. this string is not translated. */
+  i = snprintf (tmp, sizeof(tmp),
+                "                                 %4s %2s %2s %2s %2s %2s",
+                eq_year?"":"----", eq_month?"":"--", eq_mday?"":"--",
+                eq_hour?"":"--", eq_min?"":"--", eq_sec?"":"--");
+  /* Trim trailing whitespace */
+  if ((i>0) && (i<sizeof(tmp)))
+    {
+      while ((i>0) && (tmp[i-1]==' '))
+        --i;
+      tmp[i] = '\0';
+    }
+  dbg_printf ("%s\n", tmp);
+
+  dbg_printf (_("     possible reasons:\n"));
+  if (dst_shift)
+    dbg_printf (_("       non-existing due to daylight-saving time;\n"));
+  if (!eq_mday && !eq_month)
+    dbg_printf (_("       invalid day/month combination;\n"));
+  dbg_printf (_("       numeric values overflow;\n"));
+  dbg_printf ("       %s\n",time_zone_seen?_("incorrect timezone")
+                                          :_("missing timezone"));
+}
+
+
+/* Returns the effective local timezone, in minutes. */
+static long int
+get_effective_timezone (void)
+{
+  /* TODO: check for failures */
+  const time_t z = 0;
+  time_t lz ;
+  struct tm *ltm;
+  ltm = localtime (&z);
+  lz = timegm (ltm)/60;
+  return (long int)lz;
+}
+
+/* The original interface: run with debug=false */
+bool
+parse_datetime (struct timespec *result, char const *p,
+                struct timespec const *now)
+{
+  return parse_datetime2 (result, p, now, 0);
 }
 
@@ -2977 +3428 @@
    *NOW as the basis for the returned time.  */
 bool
-parse_datetime (struct timespec *result, char const *p,
-                struct timespec const *now)
+parse_datetime2 (struct timespec *result, char const *p,
+                 struct timespec const *now, unsigned int flags)
 {
   time_t Start;
@@ -2992 +3443 @@
   char tz0buf[TZBUFSIZE];
   bool ok = true;
+  char dbg_ord[DBGBUFSIZE];
+  char dbg_tm[DBGBUFSIZE];
+  char const *input_sentinel = p + strlen (p);
 
   if (! now)
@@ -3077 +3531 @@
   pc.dsts_seen = 0;
   pc.zones_seen = 0;
+  pc.parse_datetime_debug = (flags & PARSE_DATETIME_DEBUG)!=0;
+  pc.debug_dates_seen = 0;
+  pc.debug_days_seen = 0;
+  pc.debug_times_seen = 0;
+  pc.debug_local_zones_seen = 0;
+  pc.debug_dsts_seen = 0;
+  pc.debug_zones_seen = 0;
+  pc.debug_ordinal_day_seen = false;
+  pc.debug_default_input_timezone = 0;
 
 #if HAVE_STRUCT_TM_TM_ZONE
@@ -3136 +3599 @@
     }
 
+  pc.debug_default_input_timezone = get_effective_timezone ();
+
   if (yyparse (&pc) != 0)
-    goto fail;
+    {
+      if (pc.parse_datetime_debug)
+        {
+          if (input_sentinel <= pc.input)
+            dbg_printf (_("error: parsing failed\n"), pc.input);
+          else
+            {
+              dbg_printf (_("error: parsing failed, stopped at '%s'\n"),
+                          pc.input);
+            }
+         }
+      goto fail;
+    }
+
+  /* determine effective timezone source */
+  if (pc.parse_datetime_debug)
+    {
+      long int tz = pc.debug_default_input_timezone;
+      const char* tz_env;
+      const char* tz_src;
+
+      if (pc.timespec_seen)
+        {
+          tz = 0 ;
+          tz_src = _("'@timespec' - always UTC0");
+        }
+      else if (pc.local_zones_seen || pc.zones_seen)
+        {
+          tz = pc.time_zone;
+          tz_src = _("parsed date/time string");
+        }
+      else if ((tz_env = getenv("TZ")))
+        {
+          if (tz_was_altered)
+            {
+              snprintf (dbg_tm, sizeof(dbg_tm), _("TZ=\"%s\" in date string"),
+                        tz_env);
+              tz_src = dbg_tm;
+            }
+          else if (STREQ(tz_env,"UTC0"))
+            {
+              /* Special case: using 'date -u' simply set TZ=UTC0 */
+              tz_src = _("TZ=UTC0 environment value or -u");
+            }
+          else
+            {
+              snprintf (dbg_tm, sizeof(dbg_tm),
+                        _("TZ=\"%s\" environment value"), tz_env);
+              tz_src = dbg_tm;
+            }
+        }
+      else
+        {
+          tz_src = _("system default");
+        }
+
+      if (pc.parse_datetime_debug)
+        dbg_printf (_("input timezone: %+03d:%02d (set from %s)\n"),
+                    (int)(tz/60), abs ((int)tz)%60, tz_src);
+
+    }
 
   if (pc.timespec_seen)
@@ -3145 +3670 @@
       if (1 < (pc.times_seen | pc.dates_seen | pc.days_seen | pc.dsts_seen
                | (pc.local_zones_seen + pc.zones_seen)))
-        goto fail;
-
-      tm.tm_year = to_year (pc.year) - TM_YEAR_BASE;
+        {
+          if (pc.parse_datetime_debug)
+            {
+              if (pc.times_seen > 1)
+                dbg_printf ("error: seen multiple time parts\n");
+              if (pc.dates_seen > 1)
+                dbg_printf ("error: seen multiple date parts\n");
+              if (pc.days_seen > 1)
+                dbg_printf ("error: seen multiple days parts\n");
+              if (pc.dsts_seen > 1)
+                dbg_printf ("error: seen multiple daylight-saving parts\n");
+              if ( (pc.local_zones_seen + pc.zones_seen) > 1)
+                dbg_printf ("error: seen multiple time-zone parts\n");
+            }
+          goto fail;
+        }
+
+      tm.tm_year = to_year (pc.year, pc.parse_datetime_debug) - TM_YEAR_BASE;
       tm.tm_mon = pc.month - 1;
       tm.tm_mday = pc.day;
@@ -3154 +3694 @@
           tm.tm_hour = to_hour (pc.hour, pc.meridian);
           if (tm.tm_hour < 0)
-            goto fail;
+            {
+              const char* mrd = (pc.meridian==MERam)?"am":
+                                  (pc.meridian==MERpm)?"pm":"";
+              if (pc.parse_datetime_debug)
+                dbg_printf (_("error: invalid hour %ld%s\n"), pc.hour, mrd);
+
+              goto fail;
+            }
           tm.tm_min = pc.minutes;
           tm.tm_sec = pc.seconds.tv_sec;
+          if (pc.parse_datetime_debug)
+            dbg_printf (_("using %s time as starting value: '%s'\n"),
+                        (pc.times_seen)?_("specified"):_("current"),
+                        debug_strftime (&tm,dbg_tm,sizeof (dbg_tm)));
         }
       else
@@ -3162 +3713 @@
           tm.tm_hour = tm.tm_min = tm.tm_sec = 0;
           pc.seconds.tv_nsec = 0;
+          if (pc.parse_datetime_debug)
+            dbg_printf ("warning: using midnight as starting time: 00:00:00\n");
         }
 
@@ -3180 +3733 @@
         {
           if (! pc.zones_seen)
-            goto fail;
+            {
+              debug_mktime_not_ok (&tm0, &tm, &pc, pc.zones_seen);
+
+              goto fail;
+            }
           else
             {
@@ -3197 +3754 @@
               long int abs_time_zone_hour = abs_time_zone / 60;
               int abs_time_zone_min = abs_time_zone % 60;
-              char tz1buf[sizeof "XXX+0:00"
-                          + sizeof pc.time_zone * CHAR_BIT / 3];
+              char tz1buf[sizeof "XXX+0:00" + TYPE_WIDTH (pc.time_zone) / 3];
               if (!tz_was_altered)
                 tz0 = get_tz (tz0buf);
@@ -3204 +3760 @@
                        abs_time_zone_hour, abs_time_zone_min);
               if (setenv ("TZ", tz1buf, 1) != 0)
-                goto fail;
+                {
+                  /* TODO: was warn () + print errno? */
+                  if (pc.parse_datetime_debug)
+                    dbg_printf (_("error: setenv('TZ','%s') failed\n"), tz1buf);
+
+                  goto fail;
+                }
               tz_was_altered = true;
               tm = tm0;
               Start = mktime (&tm);
               if (! mktime_ok (&tm0, &tm, Start))
-                goto fail;
+                {
+                  debug_mktime_not_ok (&tm0, &tm, &pc, pc.zones_seen);
+
+                  goto fail;
+                }
             }
         }
@@ -3222 +3788 @@
           Start = mktime (&tm);
           if (Start == (time_t) -1)
-            goto fail;
+            {
+              if (pc.parse_datetime_debug)
+                dbg_printf (_("error: day '%s' (day ordinal=%ld number=%d) "   \
+                              "resulted in an invalid date: '%s'\n"),
+                            str_days (&pc,dbg_ord,sizeof (dbg_ord)),
+                            pc.day_ordinal,pc.day_number,
+                            debug_strfdatetime (&tm, &pc, dbg_tm,
+                                                sizeof (dbg_tm)));
+
+              goto fail;
+            }
+
+          if (pc.parse_datetime_debug)
+            dbg_printf (_("new start date: '%s' is '%s'\n"),
+                        str_days (&pc,dbg_ord,sizeof (dbg_ord)),
+                        debug_strfdatetime (&tm, &pc, dbg_tm,sizeof (dbg_tm)));
+
+        }
+
+      if (pc.parse_datetime_debug)
+        {
+          if (!pc.dates_seen && !pc.days_seen)
+            dbg_printf (_("using current date as starting value: '%s'\n"),
+                        debug_strfdate (&tm,dbg_tm,sizeof (dbg_tm)));
+
+          if (pc.days_seen && pc.dates_seen)
+            dbg_printf (_("warning: day (%s) ignored when explicit dates " \
+                          "are given\n"),
+                        str_days (&pc,dbg_ord,sizeof (dbg_ord)));
+
+          dbg_printf (_("starting date/time: '%s'\n"),
+                      debug_strfdatetime (&tm, &pc, dbg_tm,sizeof (dbg_tm)));
         }
 
@@ -3228 +3825 @@
       if (pc.rel.year | pc.rel.month | pc.rel.day)
         {
+          if (pc.parse_datetime_debug)
+            {
+              if ((pc.rel.year != 0 || pc.rel.month !=0) && tm.tm_mday==1)
+                dbg_printf (_("warning: when adding relative months/years, " \
+                              "it is recommended to specify the 15th of the " \
+                              "months\n"));
+
+              if (pc.rel.day != 0 && tm.tm_hour==0)
+                dbg_printf (_("warning: when adding relative days, "    \
+                              "it is recommended to specify 12:00pm\n"));
+            }
+
           int year = tm.tm_year + pc.rel.year;
           int month = tm.tm_mon + pc.rel.month;
@@ -3234 +3843 @@
               | ((month < tm.tm_mon) ^ (pc.rel.month < 0))
               | ((day < tm.tm_mday) ^ (pc.rel.day < 0)))
-            goto fail;
+            {
+              /* TODO: what is the actual error? int-value wrap-around? */
+              if (pc.parse_datetime_debug)
+                dbg_printf (_("error: %s:%d\n"), __FILE__,__LINE__);
+
+              goto fail;
+            }
           tm.tm_year = year;
           tm.tm_mon = month;
@@ -3244 +3859 @@
           Start = mktime (&tm);
           if (Start == (time_t) -1)
-            goto fail;
+            {
+              if (pc.parse_datetime_debug)
+                dbg_printf(_("error: adding relative date resulted " \
+                             "in an invalid date: '%s'\n"),
+                           debug_strfdatetime (&tm, &pc, dbg_tm,
+                                               sizeof (dbg_tm)));
+
+              goto fail;
+            }
+
+          if (pc.parse_datetime_debug)
+            {
+              dbg_printf (_("after date adjustment "                    \
+                            "(%+ld years, %+ld months, %+ld days),\n"),
+                          pc.rel.year, pc.rel.month, pc.rel.day);
+              dbg_printf (_("    new date/time = '%s'\n"),
+                          debug_strfdatetime (&tm, &pc, dbg_tm,
+                                              sizeof (dbg_tm)));
+            }
+
         }
 
@@ -3259 +3893 @@
           struct tm const *gmt = gmtime (&t);
           if (! gmt)
-            goto fail;
+            {
+              /* TODO: use 'warn(3)' + print errno ? */
+              if (pc.parse_datetime_debug)
+                dbg_printf (_("error: gmtime failed for t=%ld\n"),t);
+
+              goto fail;
+            }
           delta -= tm_diff (&tm, gmt);
 #endif
           t1 = Start - delta;
           if ((Start < t1) != (delta < 0))
-            goto fail;  /* time_t overflow */
+            {
+              if (pc.parse_datetime_debug)
+                dbg_printf (_("error: timezone %ld caused time_t overflow\n"),
+                            pc.time_zone);
+
+              goto fail;  /* time_t overflow */
+            }
           Start = t1;
         }
+
+      if (pc.parse_datetime_debug)
+        dbg_printf (_("'%s' = %ld epoch-seconds\n"),
+                    debug_strfdatetime (&tm, &pc, dbg_tm, sizeof (dbg_tm)),
+                    Start);
 
       /* Add relative hours, minutes, and seconds.  On hosts that support
@@ -3296 +3947 @@
             | ((t4 < t3) ^ (d4 < 0))
             | (t5 != t4))
-          goto fail;
+            {
+              if (pc.parse_datetime_debug)
+                dbg_printf (_("error: adding relative time caused an " \
+                              "overflow\n"));
+
+              goto fail;
+            }
+
+          if (pc.parse_datetime_debug
+              && (pc.rel.hour | pc.rel.minutes | pc.rel.seconds | pc.rel.ns))
+            {
+              dbg_printf (_("after time adjustment (%+ld hours, " \
+                            "%+ld minutes, %+ld seconds, %+ld ns),\n"),
+                          pc.rel.hour,pc.rel.minutes,pc.rel.seconds,pc.rel.ns);
+              dbg_printf (_("    new time = %ld epoch-seconds\n"),t5);
+            }
 
         result->tv_sec = t5;
@@ -3312 +3978 @@
   if (tz0 != tz0buf)
     free (tz0);
+
+  if (ok && pc.parse_datetime_debug)
+    {
+      /* print local timezone AFTER restoring TZ (if tz_was_altered)*/
+      const long int otz = get_effective_timezone ();
+      const char* tz_src;
+      const char* tz_env;
+
+      if ((tz_env = getenv("TZ")))
+        {
+          /* Special case: using 'date -u' simply set TZ=UTC0 */
+          if (STREQ(tz_env,"UTC0"))
+            {
+              tz_src = _("TZ=UTC0 environment value or -u");
+            }
+          else
+            {
+              snprintf (dbg_tm, sizeof(dbg_tm),
+                        _("TZ=\"%s\" environment value"), tz_env);
+              tz_src = dbg_tm;
+            }
+        }
+      else
+        {
+          tz_src = _("system default");
+        }
+
+      if (pc.parse_datetime_debug)
+        {
+          dbg_printf (_("output timezone: %+03d:%02d (set from %s)\n"),
+                      (int)(otz/60), abs ((int)otz)%60, tz_src);
+
+
+          dbg_printf (_("final: %ld.%09ld (epoch-seconds)\n"),
+                      result->tv_sec,result->tv_nsec);
+
+          struct tm const *gmt = gmtime (&result->tv_sec);
+          dbg_printf (_("final: %s (UTC0)\n"),
+                      debug_strfdatetime (gmt, NULL, dbg_tm, sizeof (dbg_tm)));
+          struct tm const *lmt = localtime (&result->tv_sec);
+          dbg_printf (_("final: %s (output timezone TZ=%+03d:%02d)\n"),
+                      debug_strfdatetime (lmt, NULL, dbg_tm, sizeof (dbg_tm)),
+                      (int)(otz/60), abs ((int)otz)%60);
+        }
+    }
+
   return ok;
 }

coreutils/trunk/lib/parse-datetime.h ¶

@@ -21 +21 @@
 
 bool parse_datetime (struct timespec *, char const *, struct timespec const *);
+
+/* parse_datetime2 flag: if set, print debug/progress information to STDERR */
+#define PARSE_DATETIME_DEBUG 1
+
+/* same as above, supporting additional flags */
+bool parse_datetime2 (struct timespec *, char const *, struct timespec const *,
+                      unsigned int flags);

coreutils/trunk/lib/parse-datetime.y ¶

@@ -38 +38 @@
 #include "timespec.h"
 #include "verify.h"
+#include "strftime.h"
 
 /* There's no need to extend the stack, so there's no need to involve
@@ -60 +61 @@
 #endif
 
+#include <inttypes.h>
 #include <c-ctype.h>
 #include <limits.h>
@@ -66 +68 @@
 #include <string.h>
 
+#include "gettext.h"
 #include "xalloc.h"
+
+#define _(str) gettext (str)
 
 /* Bison's skeleton tests _STDLIB_H, while some stdlib.h headers
@@ -106 +111 @@
 #define HOUR(x) ((x) * 60)
 
+#define STREQ(a, b) (strcmp (a, b) == 0)
+
 /* long_time_t is a signed integer type that contains all time_t values.  */
 verify (TYPE_IS_INTEGER (time_t));
@@ -118 +125 @@
    errors that the cast doesn't.  */
 static unsigned char to_uchar (char ch) { return ch; }
+
+static void
+dbg_printf (const char *msg,...)
+{
+  va_list args;
+  /* TODO: use gnulib's 'program_name' instead? */
+  fputs ("date: ", stderr);
+
+  va_start (args, msg);
+  vfprintf (stderr, msg, args);
+  va_end (args);
+}
+
+
 
 /* Lots of this code assumes time_t and time_t-like values fit into
@@ -210 +231 @@
   size_t zones_seen;
 
+  /* if true, print debugging output to stderr */
+  bool parse_datetime_debug;
+
+  /* which of the 'seen' parts has been printed when debugging */
+  size_t debug_dates_seen;
+  size_t debug_days_seen;
+  size_t debug_local_zones_seen;
+  size_t debug_dsts_seen;
+  size_t debug_times_seen;
+  size_t debug_zones_seen;
+
+  /* true if the user specified explicit ordinal day value, */
+  bool debug_ordinal_day_seen;
+
+  /* the default input timezone, set by TZ value */
+  long int debug_default_input_timezone;
+
   /* Table of local time zone abbreviations, terminated by a null entry.  */
   table local_time_zone_table[3];
@@ -283 +321 @@
 }
 
+/* returns a textual representation of the day ordinal/number values
+   in the parser_control struct (e.g. 'last wed', 'this tues', 'thu') */
+static const char*
+str_days (parser_control *pc, char* /*output*/ buffer, size_t n)
+{
+  /* TODO: use the  relative_time_table[] for reverse lookup */
+  static const char* ordinal_values[] = {
+     "last",
+     "this",
+     "next/first",
+     "(SECOND)", /* SECOND is commented out in relative_time_table[] */
+     "third",
+     "fourth",
+     "fifth",
+     "sixth",
+     "seventh",
+     "eight",
+     "ninth",
+     "tenth",
+     "eleventh",
+     "twelfth"};
+
+  static const char* days_values[] = {
+     "Sun",
+     "Mon",
+     "Tue",
+     "Wed",
+     "Thu",
+     "Fri",
+     "Sat"
+    };
+
+  /* don't add an ordinal prefix if the user didn't specify it
+     (e.g., "this wed" vs "wed") */
+  if (pc->debug_ordinal_day_seen)
+    {
+      /* use word description of possible (e.g. -1 = last, 3 = third) */
+      if (pc->day_ordinal>=-1 && pc->day_ordinal <=12)
+        {
+          strncpy (buffer, ordinal_values[ pc->day_ordinal+1 ], n);
+          buffer[n-1]='\0';
+        }
+      else
+        {
+          snprintf (buffer,n,"%ld",pc->day_ordinal);
+        }
+    }
+  else
+    {
+      buffer[0] = '\0';
+    }
+
+  /* Add the day name */
+  if (pc->day_number>=0 && pc->day_number<=6)
+    {
+      size_t l = strlen (buffer);
+      if (l>0)
+        {
+          strncat (buffer," ",n-l);
+          ++l;
+        }
+      strncat (buffer,days_values[pc->day_number],n-l);
+    }
+  else
+    {
+      /* invalid day_number value - should never happen */
+    }
+  return buffer;
+}
+
+/* debugging: print the current time in the parser_control structure.
+   The parser will increment "*_seen" members for those which were parsed.
+   This function will print only newly seen parts. */
+static void
+debug_print_current_time (const char* item, parser_control *pc)
+{
+  char tmp[100] = {0};
+  int space = 0; /* if true, add space delimiter */
+
+  if (!pc->parse_datetime_debug)
+    return;
+
+  /* no newline, more items printed below */
+  dbg_printf (_("parsed %s part: "), item);
+
+  if (pc->dates_seen != pc->debug_dates_seen)
+    {
+      /*TODO: use pc->year.negative? */
+      fprintf (stderr,"(Y-M-D) %04ld-%02ld-%02ld",
+              pc->year.value, pc->month, pc->day);
+      pc->debug_dates_seen = pc->dates_seen;
+      space = 1;
+    }
+
+  if (pc->times_seen != pc->debug_times_seen)
+    {
+      if (space)
+        fputc (' ',stderr);
+      fprintf (stderr,"%02ld:%02ld:%02ld",
+              pc->hour, pc->minutes, pc->seconds.tv_sec);
+      if (pc->seconds.tv_nsec!=0)
+        fprintf (stderr,"%09ld", pc->seconds.tv_nsec);
+      if (pc->meridian==MERpm)
+        fputs ("pm",stderr);
+
+      pc->debug_times_seen = pc->times_seen;
+      space = 1;
+    }
+
+  if (pc->days_seen != pc->debug_days_seen)
+    {
+      if (space)
+        fputc (' ',stderr);
+      fprintf (stderr,_("%s (day ordinal=%ld number=%d)"),
+              str_days (pc,tmp,sizeof (tmp)),
+              pc->day_ordinal, pc->day_number);
+      pc->debug_days_seen = pc->days_seen ;
+      space = 1;
+    }
+
+  if (pc->dsts_seen != pc->debug_dsts_seen)
+    {
+      if (space)
+        fputc (' ',stderr);
+      fprintf (stderr,_("is-dst=%d"), pc->local_isdst);
+      pc->dsts_seen = pc->debug_dsts_seen;
+      space = 1;
+    }
+
+  /* TODO: fix incorrect display of EST=2:08h? */
+  if (pc->zones_seen != pc->debug_zones_seen)
+    {
+      if (space)
+        fputc (' ',stderr);
+      fprintf (stderr,_("TZ=%+03d:%02d"), (int)(pc->time_zone/60),
+              abs ((int)pc->time_zone%60));
+      pc->debug_zones_seen = pc->zones_seen;
+      space = 1;
+    }
+
+  if (pc->local_zones_seen != pc->debug_local_zones_seen)
+    {
+      if (space)
+        fputc (' ',stderr);
+      fprintf (stderr,_("Local-TZ=%+03d:%02d"), (int)(pc->time_zone/60),
+              abs ((int)pc->time_zone%60));
+      pc->debug_local_zones_seen = pc->local_zones_seen;
+      space = 1;
+    }
+
+  if (pc->timespec_seen)
+    {
+      if (space)
+        fputc (' ',stderr);
+      fprintf (stderr,_("number of seconds: %ld"), pc->seconds.tv_sec);
+    }
+
+  fputc ('\n', stderr);
+}
+
+/* debugging: print the current relative values. */
+static void
+debug_print_relative_time (const char* item, const parser_control *pc)
+{
+  int space = 0; /* if true, add space delimiter */
+
+  if (!pc->parse_datetime_debug)
+    return;
+
+  /* no newline, more items printed below */
+  dbg_printf (_("parsed %s part: "), item);
+
+  if (pc->rel.year==0 && pc->rel.month==0 && pc->rel.day==0
+      && pc->rel.hour==0 && pc->rel.minutes==00 && pc->rel.seconds == 0
+      && pc->rel.ns==0)
+    {
+      /* Special case: relative time of this/today/now */
+      fputs (_("today/this/now\n"),stderr);
+      return ;
+    }
+
+#define PRINT_REL_PART(x,name)                          \
+  do {                                                  \
+    if ( (pc->rel.x) != 0 )                             \
+      {                                                 \
+        if (space)                                      \
+          fputc (' ',stderr);                           \
+        fprintf (stderr,"%+ld %s", pc->rel.x, name);    \
+        space = 1;                                      \
+      }                                                 \
+  } while (0)
+
+  PRINT_REL_PART (year,"year(s)");
+  PRINT_REL_PART (month,"month(s)");
+  PRINT_REL_PART (day,"day(s)");
+  PRINT_REL_PART (hour,"hour(s)");
+  PRINT_REL_PART (minutes,"minutes");
+  PRINT_REL_PART (seconds,"seconds");
+  PRINT_REL_PART (ns,"nanoseconds");
+
+  fputc ('\n',stderr);
+}
+
+
+
 %}
 
@@ -331 +574 @@
         pc->seconds = $2;
         pc->timespec_seen = true;
+        debug_print_current_time (_("number of seconds"), pc);
       }
   ;
@@ -341 +585 @@
 item:
     datetime
-      { pc->times_seen++; pc->dates_seen++; }
+      {
+        pc->times_seen++; pc->dates_seen++;
+        debug_print_current_time (_("datetime"), pc);
+      }
   | time
-      { pc->times_seen++; }
+      {
+        pc->times_seen++;
+        debug_print_current_time (_("time"), pc);
+      }
   | local_zone
-      { pc->local_zones_seen++; }
+      {
+        pc->local_zones_seen++;
+        debug_print_current_time (_("local_zone"), pc);
+      }
   | zone
-      { pc->zones_seen++; }
+      {
+        pc->zones_seen++;
+        debug_print_current_time (_("zone"), pc);
+      }
   | date
-      { pc->dates_seen++; }
+      {
+        pc->dates_seen++;
+        debug_print_current_time (_("date"), pc);
+      }
   | day
-      { pc->days_seen++; }
+      {
+        pc->days_seen++;
+        debug_print_current_time (_("day"), pc);
+      }
   | rel
+      {
+        debug_print_relative_time (_("relative"), pc);
+      }
   | number
+      {
+        debug_print_relative_time (_("number"), pc);
+      }
   | hybrid
+      {
+        debug_print_relative_time (_("hybrid"), pc);
+      }
   ;
 
@@ -464 +735 @@
         pc->day_ordinal = $1;
         pc->day_number = $2;
+        pc->debug_ordinal_day_seen = true;
       }
   | tUNUMBER tDAY
@@ -469 +741 @@
         pc->day_ordinal = $1.value;
         pc->day_number = $2;
+        pc->debug_ordinal_day_seen = true;
       }
   ;
@@ -487 +760 @@
         if (4 <= $1.digits)
           {
+            if (pc->parse_datetime_debug)
+              dbg_printf (_("warning: value %ld has %"PRIuMAX" digits. " \
+                            "Assuming YYYY/MM/DD\n"), $1.value, $1.digits);
+
             pc->year = $1;
             pc->month = $3.value;
@@ -493 +770 @@
         else
           {
+            if (pc->parse_datetime_debug)
+              dbg_printf (_("warning: value %ld has less than 4 digits. "    \
+                            "Assuming MM/DD/YY[YY]\n"), $1.value);
+
             pc->month = $1.value;
             pc->day = $3.value;
@@ -897 +1178 @@
 
 static long int
-to_year (textint textyear)
+to_year (textint textyear, bool debug)
 {
   long int year = textyear.value;
@@ -907 +1188 @@
      years 69-99 map to 1969-1999.  */
   else if (textyear.digits == 2)
-    year += year < 69 ? 2000 : 1900;
+    {
+      year += year < 69 ? 2000 : 1900;
+      if (debug)
+        dbg_printf (_("warning: adjusting year value %ld to %ld\n"),
+                    textyear.value, year);
+    }
 
   return year;
@@ -1172 +1458 @@
           tp = lookup_word (pc, buff);
           if (! tp)
-            return '?';
+            {
+              if (pc->parse_datetime_debug)
+                dbg_printf (_("error: unknown word '%s'\n"), buff);
+              return '?';
+            }
           lvalp->intval = tp->value;
           return tp->type;
@@ -1232 +1522 @@
 enum { TZBUFSIZE = 100 };
 
+/* A reasonable upper bound for the buffer used in debug print outs.
+   see days_to_name(), debug_strftime() and debug_mktime_not_ok() */
+enum { DBGBUFSIZE = 100 };
+
 /* Return a copy of TZ, stored in TZBUF if it fits, and heap-allocated
    otherwise.  */
@@ -1246 +1540 @@
     }
   return tz;
+}
+
+/* debugging: format a 'struct tm' into a buffer, taking the parser's
+   timezone information into account (if pc!=NULL). */
+static const char*
+debug_strfdatetime (const struct tm *tm, const parser_control *pc,
+                    char* /*output*/ buf, size_t n)
+{
+  /* TODO:
+     1. find an optimal way to print date string in a clear and unambiguous
+        format. Currently, always add '(Y-M-D)' prefix.
+        Consider '2016y01m10d'  or 'year(2016) month(01) day(10)'.
+
+        If the user needs debug printing, it means he/she already having
+        issues with the parsing - better to avoid formats that could
+        be mis-interpreted (e.g. just YYYY-MM-DD).
+
+     2. Can strftime be used instead?
+        depends if it is portable and can print invalid dates on all systems.
+
+     3. Print timezone information ?
+
+     4. Print DST information ?
+
+     5. Print nanosecond information ?
+
+     NOTE:
+     Printed date/time values might not be valid, e.g. '2016-02-31'
+     or '2016-19-2016' .  These are the values as parsed from the user
+     string, before validation.
+  */
+  int m = nstrftime (buf, n, "(Y-M-D) %Y-%m-%d %H:%M:%S", tm, 0, 0);
+
+  /* if parser_control information was provided (for timezone),
+     and there's enough space in the buffer - add timezone info */
+  if (pc != NULL && ((n-m)>0))
+    {
+      const long int tz = (pc->zones_seen || pc->local_zones_seen)
+                          ? pc->time_zone
+                          : pc->debug_default_input_timezone;
+      snprintf (&buf[m],n-m," TZ=%+03d:%02d", (int)(tz/60), abs ((int)tz)%60);
+    }
+  return buf;
+}
+
+static const char*
+debug_strfdate (const struct tm *tm, char* /*output*/ buf, size_t n)
+{
+  snprintf (buf,n,"(Y-M-D) %04d-%02d-%02d",
+            tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday);
+  return buf;
+}
+
+static const char*
+debug_strftime (const struct tm *tm, char* /*output*/ buf, size_t n)
+{
+  snprintf (buf,n,"%02d:%02d:%02d", tm->tm_hour, tm->tm_min, tm->tm_sec);
+  return buf;
+}
+
+/* If 'mktime_ok()' failed, display the failed time values,
+   and provide possible hints. Example output:
+
+    date: error: invalid date/time value:
+    date:     user provided time: '(Y-M-D) 2006-04-02 02:45:00'
+    date:        normalized time: '(Y-M-D) 2006-04-02 03:45:00'
+    date:                                             __
+    date:      possible reasons:
+    date:        non-existing due to daylight-saving time;
+    date:        numeric values overflow;
+    date:        missing timezone;
+ */
+static void
+debug_mktime_not_ok (struct tm const *tm0, struct tm const *tm1,
+                     const parser_control *pc,  bool time_zone_seen)
+{
+  /* TODO: handle t==-1 (as in 'mktime_ok') */
+  char tmp[DBGBUFSIZE];
+  int i;
+  const bool eq_sec   = (tm0->tm_sec  == tm1->tm_sec);
+  const bool eq_min   = (tm0->tm_min  == tm1->tm_min);
+  const bool eq_hour  = (tm0->tm_hour == tm1->tm_hour);
+  const bool eq_mday  = (tm0->tm_mday == tm1->tm_mday);
+  const bool eq_month = (tm0->tm_mon  == tm1->tm_mon);
+  const bool eq_year  = (tm0->tm_year == tm1->tm_year);
+
+  const bool dst_shift = eq_sec && eq_min && !eq_hour
+                         && eq_mday && eq_month && eq_year;
+
+  if (!pc->parse_datetime_debug)
+    return;
+
+  dbg_printf (_("error: invalid date/time value:\n"));
+  dbg_printf (_("    user provided time: '%s'\n"),
+              debug_strfdatetime (tm0, pc, tmp, sizeof (tmp)));
+  dbg_printf (_("       normalized time: '%s'\n"),
+              debug_strfdatetime (tm1, pc, tmp, sizeof (tmp)));
+  /* NOTEs: the format must be aligned with debug_strfdatetime() and the two
+            DEBUG statements above. this string is not translated. */
+  i = snprintf (tmp, sizeof(tmp),
+                "                                 %4s %2s %2s %2s %2s %2s",
+                eq_year?"":"----", eq_month?"":"--", eq_mday?"":"--",
+                eq_hour?"":"--", eq_min?"":"--", eq_sec?"":"--");
+  /* Trim trailing whitespace */
+  if ((i>0) && (i<sizeof(tmp)))
+    {
+      while ((i>0) && (tmp[i-1]==' '))
+        --i;
+      tmp[i] = '\0';
+    }
+  dbg_printf ("%s\n", tmp);
+
+  dbg_printf (_("     possible reasons:\n"));
+  if (dst_shift)
+    dbg_printf (_("       non-existing due to daylight-saving time;\n"));
+  if (!eq_mday && !eq_month)
+    dbg_printf (_("       invalid day/month combination;\n"));
+  dbg_printf (_("       numeric values overflow;\n"));
+  dbg_printf ("       %s\n",time_zone_seen?_("incorrect timezone")
+                                          :_("missing timezone"));
+}
+
+
+/* Returns the effective local timezone, in minutes. */
+static long int
+get_effective_timezone (void)
+{
+  /* TODO: check for failures */
+  const time_t z = 0;
+  time_t lz ;
+  struct tm *ltm;
+  ltm = localtime (&z);
+  lz = timegm (ltm)/60;
+  return (long int)lz;
+}
+
+/* The original interface: run with debug=false */
+bool
+parse_datetime (struct timespec *result, char const *p,
+                struct timespec const *now)
+{
+  return parse_datetime2 (result, p, now, 0);
 }
 
@@ -1253 +1689 @@
    *NOW as the basis for the returned time.  */
 bool
-parse_datetime (struct timespec *result, char const *p,
-                struct timespec const *now)
+parse_datetime2 (struct timespec *result, char const *p,
+                 struct timespec const *now, unsigned int flags)
 {
   time_t Start;
@@ -1268 +1704 @@
   char tz0buf[TZBUFSIZE];
   bool ok = true;
+  char dbg_ord[DBGBUFSIZE];
+  char dbg_tm[DBGBUFSIZE];
+  char const *input_sentinel = p + strlen (p);
 
   if (! now)
@@ -1353 +1792 @@
   pc.dsts_seen = 0;
   pc.zones_seen = 0;
+  pc.parse_datetime_debug = (flags & PARSE_DATETIME_DEBUG)!=0;
+  pc.debug_dates_seen = 0;
+  pc.debug_days_seen = 0;
+  pc.debug_times_seen = 0;
+  pc.debug_local_zones_seen = 0;
+  pc.debug_dsts_seen = 0;
+  pc.debug_zones_seen = 0;
+  pc.debug_ordinal_day_seen = false;
+  pc.debug_default_input_timezone = 0;
 
 #if HAVE_STRUCT_TM_TM_ZONE
@@ -1412 +1860 @@
     }
 
+  pc.debug_default_input_timezone = get_effective_timezone ();
+
   if (yyparse (&pc) != 0)
-    goto fail;
+    {
+      if (pc.parse_datetime_debug)
+        {
+          if (input_sentinel <= pc.input)
+            dbg_printf (_("error: parsing failed\n"), pc.input);
+          else
+            {
+              dbg_printf (_("error: parsing failed, stopped at '%s'\n"),
+                          pc.input);
+            }
+         }
+      goto fail;
+    }
+
+  /* determine effective timezone source */
+  if (pc.parse_datetime_debug)
+    {
+      long int tz = pc.debug_default_input_timezone;
+      const char* tz_env;
+      const char* tz_src;
+
+      if (pc.timespec_seen)
+        {
+          tz = 0 ;
+          tz_src = _("'@timespec' - always UTC0");
+        }
+      else if (pc.local_zones_seen || pc.zones_seen)
+        {
+          tz = pc.time_zone;
+          tz_src = _("parsed date/time string");
+        }
+      else if ((tz_env = getenv("TZ")))
+        {
+          if (tz_was_altered)
+            {
+              snprintf (dbg_tm, sizeof(dbg_tm), _("TZ=\"%s\" in date string"),
+                        tz_env);
+              tz_src = dbg_tm;
+            }
+          else if (STREQ(tz_env,"UTC0"))
+            {
+              /* Special case: using 'date -u' simply set TZ=UTC0 */
+              tz_src = _("TZ=UTC0 environment value or -u");
+            }
+          else
+            {
+              snprintf (dbg_tm, sizeof(dbg_tm),
+                        _("TZ=\"%s\" environment value"), tz_env);
+              tz_src = dbg_tm;
+            }
+        }
+      else
+        {
+          tz_src = _("system default");
+        }
+
+      if (pc.parse_datetime_debug)
+        dbg_printf (_("input timezone: %+03d:%02d (set from %s)\n"),
+                    (int)(tz/60), abs ((int)tz)%60, tz_src);
+
+    }
 
   if (pc.timespec_seen)
@@ -1421 +1931 @@
       if (1 < (pc.times_seen | pc.dates_seen | pc.days_seen | pc.dsts_seen
                | (pc.local_zones_seen + pc.zones_seen)))
-        goto fail;
-
-      tm.tm_year = to_year (pc.year) - TM_YEAR_BASE;
+        {
+          if (pc.parse_datetime_debug)
+            {
+              if (pc.times_seen > 1)
+                dbg_printf ("error: seen multiple time parts\n");
+              if (pc.dates_seen > 1)
+                dbg_printf ("error: seen multiple date parts\n");
+              if (pc.days_seen > 1)
+                dbg_printf ("error: seen multiple days parts\n");
+              if (pc.dsts_seen > 1)
+                dbg_printf ("error: seen multiple daylight-saving parts\n");
+              if ( (pc.local_zones_seen + pc.zones_seen) > 1)
+                dbg_printf ("error: seen multiple time-zone parts\n");
+            }
+          goto fail;
+        }
+
+      tm.tm_year = to_year (pc.year, pc.parse_datetime_debug) - TM_YEAR_BASE;
       tm.tm_mon = pc.month - 1;
       tm.tm_mday = pc.day;
@@ -1430 +1955 @@
           tm.tm_hour = to_hour (pc.hour, pc.meridian);
           if (tm.tm_hour < 0)
-            goto fail;
+            {
+              const char* mrd = (pc.meridian==MERam)?"am":
+                                  (pc.meridian==MERpm)?"pm":"";
+              if (pc.parse_datetime_debug)
+                dbg_printf (_("error: invalid hour %ld%s\n"), pc.hour, mrd);
+
+              goto fail;
+            }
           tm.tm_min = pc.minutes;
           tm.tm_sec = pc.seconds.tv_sec;
+          if (pc.parse_datetime_debug)
+            dbg_printf (_("using %s time as starting value: '%s'\n"),
+                        (pc.times_seen)?_("specified"):_("current"),
+                        debug_strftime (&tm,dbg_tm,sizeof (dbg_tm)));
         }
       else
@@ -1438 +1974 @@
           tm.tm_hour = tm.tm_min = tm.tm_sec = 0;
           pc.seconds.tv_nsec = 0;
+          if (pc.parse_datetime_debug)
+            dbg_printf ("warning: using midnight as starting time: 00:00:00\n");
         }
 
@@ -1456 +1994 @@
         {
           if (! pc.zones_seen)
-            goto fail;
+            {
+              debug_mktime_not_ok (&tm0, &tm, &pc, pc.zones_seen);
+
+              goto fail;
+            }
           else
             {
@@ -1473 +2015 @@
               long int abs_time_zone_hour = abs_time_zone / 60;
               int abs_time_zone_min = abs_time_zone % 60;
-              char tz1buf[sizeof "XXX+0:00"
-                          + sizeof pc.time_zone * CHAR_BIT / 3];
+              char tz1buf[sizeof "XXX+0:00" + TYPE_WIDTH (pc.time_zone) / 3];
               if (!tz_was_altered)
                 tz0 = get_tz (tz0buf);
@@ -1480 +2021 @@
                        abs_time_zone_hour, abs_time_zone_min);
               if (setenv ("TZ", tz1buf, 1) != 0)
-                goto fail;
+                {
+                  /* TODO: was warn () + print errno? */
+                  if (pc.parse_datetime_debug)
+                    dbg_printf (_("error: setenv('TZ','%s') failed\n"), tz1buf);
+
+                  goto fail;
+                }
               tz_was_altered = true;
               tm = tm0;
               Start = mktime (&tm);
               if (! mktime_ok (&tm0, &tm, Start))
-                goto fail;
+                {
+                  debug_mktime_not_ok (&tm0, &tm, &pc, pc.zones_seen);
+
+                  goto fail;
+                }
             }
         }
@@ -1498 +2049 @@
           Start = mktime (&tm);
           if (Start == (time_t) -1)
-            goto fail;
+            {
+              if (pc.parse_datetime_debug)
+                dbg_printf (_("error: day '%s' (day ordinal=%ld number=%d) "   \
+                              "resulted in an invalid date: '%s'\n"),
+                            str_days (&pc,dbg_ord,sizeof (dbg_ord)),
+                            pc.day_ordinal,pc.day_number,
+                            debug_strfdatetime (&tm, &pc, dbg_tm,
+                                                sizeof (dbg_tm)));
+
+              goto fail;
+            }
+
+          if (pc.parse_datetime_debug)
+            dbg_printf (_("new start date: '%s' is '%s'\n"),
+                        str_days (&pc,dbg_ord,sizeof (dbg_ord)),
+                        debug_strfdatetime (&tm, &pc, dbg_tm,sizeof (dbg_tm)));
+
+        }
+
+      if (pc.parse_datetime_debug)
+        {
+          if (!pc.dates_seen && !pc.days_seen)
+            dbg_printf (_("using current date as starting value: '%s'\n"),
+                        debug_strfdate (&tm,dbg_tm,sizeof (dbg_tm)));
+
+          if (pc.days_seen && pc.dates_seen)
+            dbg_printf (_("warning: day (%s) ignored when explicit dates " \
+                          "are given\n"),
+                        str_days (&pc,dbg_ord,sizeof (dbg_ord)));
+
+          dbg_printf (_("starting date/time: '%s'\n"),
+                      debug_strfdatetime (&tm, &pc, dbg_tm,sizeof (dbg_tm)));
         }
 
@@ -1504 +2086 @@
       if (pc.rel.year | pc.rel.month | pc.rel.day)
         {
+          if (pc.parse_datetime_debug)
+            {
+              if ((pc.rel.year != 0 || pc.rel.month !=0) && tm.tm_mday==1)
+                dbg_printf (_("warning: when adding relative months/years, " \
+                              "it is recommended to specify the 15th of the " \
+                              "months\n"));
+
+              if (pc.rel.day != 0 && tm.tm_hour==0)
+                dbg_printf (_("warning: when adding relative days, "    \
+                              "it is recommended to specify 12:00pm\n"));
+            }
+
           int year = tm.tm_year + pc.rel.year;
           int month = tm.tm_mon + pc.rel.month;
@@ -1510 +2104 @@
               | ((month < tm.tm_mon) ^ (pc.rel.month < 0))
               | ((day < tm.tm_mday) ^ (pc.rel.day < 0)))
-            goto fail;
+            {
+              /* TODO: what is the actual error? int-value wrap-around? */
+              if (pc.parse_datetime_debug)
+                dbg_printf (_("error: %s:%d\n"), __FILE__,__LINE__);
+
+              goto fail;
+            }
           tm.tm_year = year;
           tm.tm_mon = month;
@@ -1520 +2120 @@
           Start = mktime (&tm);
           if (Start == (time_t) -1)
-            goto fail;
+            {
+              if (pc.parse_datetime_debug)
+                dbg_printf(_("error: adding relative date resulted " \
+                             "in an invalid date: '%s'\n"),
+                           debug_strfdatetime (&tm, &pc, dbg_tm,
+                                               sizeof (dbg_tm)));
+
+              goto fail;
+            }
+
+          if (pc.parse_datetime_debug)
+            {
+              dbg_printf (_("after date adjustment "                    \
+                            "(%+ld years, %+ld months, %+ld days),\n"),
+                          pc.rel.year, pc.rel.month, pc.rel.day);
+              dbg_printf (_("    new date/time = '%s'\n"),
+                          debug_strfdatetime (&tm, &pc, dbg_tm,
+                                              sizeof (dbg_tm)));
+            }
+
         }
 
@@ -1535 +2154 @@
           struct tm const *gmt = gmtime (&t);
           if (! gmt)
-            goto fail;
+            {
+              /* TODO: use 'warn(3)' + print errno ? */
+              if (pc.parse_datetime_debug)
+                dbg_printf (_("error: gmtime failed for t=%ld\n"),t);
+
+              goto fail;
+            }
           delta -= tm_diff (&tm, gmt);
 #endif
           t1 = Start - delta;
           if ((Start < t1) != (delta < 0))
-            goto fail;  /* time_t overflow */
+            {
+              if (pc.parse_datetime_debug)
+                dbg_printf (_("error: timezone %ld caused time_t overflow\n"),
+                            pc.time_zone);
+
+              goto fail;  /* time_t overflow */
+            }
           Start = t1;
         }
+
+      if (pc.parse_datetime_debug)
+        dbg_printf (_("'%s' = %ld epoch-seconds\n"),
+                    debug_strfdatetime (&tm, &pc, dbg_tm, sizeof (dbg_tm)),
+                    Start);
 
       /* Add relative hours, minutes, and seconds.  On hosts that support
@@ -1572 +2208 @@
             | ((t4 < t3) ^ (d4 < 0))
             | (t5 != t4))
-          goto fail;
+            {
+              if (pc.parse_datetime_debug)
+                dbg_printf (_("error: adding relative time caused an " \
+                              "overflow\n"));
+
+              goto fail;
+            }
+
+          if (pc.parse_datetime_debug
+              && (pc.rel.hour | pc.rel.minutes | pc.rel.seconds | pc.rel.ns))
+            {
+              dbg_printf (_("after time adjustment (%+ld hours, " \
+                            "%+ld minutes, %+ld seconds, %+ld ns),\n"),
+                          pc.rel.hour,pc.rel.minutes,pc.rel.seconds,pc.rel.ns);
+              dbg_printf (_("    new time = %ld epoch-seconds\n"),t5);
+            }
 
         result->tv_sec = t5;
@@ -1588 +2239 @@
   if (tz0 != tz0buf)
     free (tz0);
+
+  if (ok && pc.parse_datetime_debug)
+    {
+      /* print local timezone AFTER restoring TZ (if tz_was_altered)*/
+      const long int otz = get_effective_timezone ();
+      const char* tz_src;
+      const char* tz_env;
+
+      if ((tz_env = getenv("TZ")))
+        {
+          /* Special case: using 'date -u' simply set TZ=UTC0 */
+          if (STREQ(tz_env,"UTC0"))
+            {
+              tz_src = _("TZ=UTC0 environment value or -u");
+            }
+          else
+            {
+              snprintf (dbg_tm, sizeof(dbg_tm),
+                        _("TZ=\"%s\" environment value"), tz_env);
+              tz_src = dbg_tm;
+            }
+        }
+      else
+        {
+          tz_src = _("system default");
+        }
+
+      if (pc.parse_datetime_debug)
+        {
+          dbg_printf (_("output timezone: %+03d:%02d (set from %s)\n"),
+                      (int)(otz/60), abs ((int)otz)%60, tz_src);
+
+
+          dbg_printf (_("final: %ld.%09ld (epoch-seconds)\n"),
+                      result->tv_sec,result->tv_nsec);
+
+          struct tm const *gmt = gmtime (&result->tv_sec);
+          dbg_printf (_("final: %s (UTC0)\n"),
+                      debug_strfdatetime (gmt, NULL, dbg_tm, sizeof (dbg_tm)));
+          struct tm const *lmt = localtime (&result->tv_sec);
+          dbg_printf (_("final: %s (output timezone TZ=%+03d:%02d)\n"),
+                      debug_strfdatetime (lmt, NULL, dbg_tm, sizeof (dbg_tm)),
+                      (int)(otz/60), abs ((int)otz)%60);
+        }
+    }
+
   return ok;
 }

coreutils/trunk/lib/quotearg.c ¶

@@ -253 +253 @@
   size_t i;
   size_t len = 0;
+  size_t orig_buffersize = 0;
   char const *quote_string = 0;
   size_t quote_string_len = 0;
@@ -259 +260 @@
   bool elide_outer_quotes = (flags & QA_ELIDE_OUTER_QUOTES) != 0;
   bool pending_shell_escape_end = false;
+  bool encountered_single_quote = false;
+  bool all_c_and_shell_quote_compat = true;
 
 #define STORE(c) \
@@ -299 +302 @@
     while (0)
 
+ process_input:
+
   switch (quoting_style)
     {
@@ -389 +394 @@
       bool is_right_quote = false;
       bool escaping = false;
+      bool c_and_shell_quote_compat = false;
 
       if (backslash_escapes
@@ -516 +522 @@
           /* Fall through.  */
         case ' ':
+          c_and_shell_quote_compat = true;
+          /* Fall through.  */
         case '!': /* special in bash */
         case '"': case '$': case '&':
@@ -534 +542 @@
 
         case '\'':
+          encountered_single_quote = true;
+          c_and_shell_quote_compat = true;
           if (quoting_style == shell_always_quoting_style)
             {
               if (elide_outer_quotes)
                 goto force_outer_quoting_style;
+
+              if (buffersize && ! orig_buffersize)
+                {
+                  /* Just scan string to see if supports a more concise
+                     representation, rather than writing a longer string
+                     but returning the length of the more concise form.  */
+                  orig_buffersize = buffersize;
+                  buffersize = 0;
+                }
+
               STORE ('\'');
               STORE ('\\');
@@ -567 +587 @@
              trouble if it appeared in quote_these_too, but that's also
              documented as not accepting them.  */
+          c_and_shell_quote_compat = true;
           break;
 
@@ -645 +666 @@
               }
 
+            c_and_shell_quote_compat = printable;
+
             if (1 < m || (backslash_escapes && ! printable))
               {
@@ -690 +713 @@
       END_ESC ();
       STORE (c);
+
+      if (! c_and_shell_quote_compat)
+        all_c_and_shell_quote_compat = false;
     }
 
@@ -695 +721 @@
       && elide_outer_quotes)
     goto force_outer_quoting_style;
+
+  /* Single shell quotes (') are commonly enough used as an apostrophe,
+     that we attempt to minimize the quoting in this case.  Note itÊŒs
+     better to use the apostrophe modifier "\u02BC" if possible, as that
+     renders better and works with the word match regex \W+ etc.  */
+  if (quoting_style == shell_always_quoting_style && ! elide_outer_quotes
+      && encountered_single_quote)
+    {
+      if (all_c_and_shell_quote_compat)
+        return quotearg_buffer_restyled (buffer, orig_buffersize, arg, argsize,
+                                         c_quoting_style,
+                                         flags, quote_these_too,
+                                         left_quote, right_quote);
+      else if (! buffersize && orig_buffersize)
+        {
+          /* Disable read-only scan, and reprocess to write quoted string.  */
+          buffersize = orig_buffersize;
+          len = 0;
+          goto process_input;
+        }
+    }
 
   if (quote_string && !elide_outer_quotes)

coreutils/trunk/lib/rand-isaac.c ¶

@@ -41 +41 @@
    then don't have -fsanitize=undefined warn about it.  */
 #undef ATTRIBUTE_NO_WARN_SANITIZE_UNDEFINED
-#if !_STRING_ARCH_unaligned \
+#if !(_STRING_ARCH_unaligned || _STRING_INLINE_unaligned) \
     || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 9)
 # define ATTRIBUTE_NO_WARN_SANITIZE_UNDEFINED /* empty */

coreutils/trunk/lib/randread.c ¶

@@ -61 +61 @@
 #endif
 
-#if _STRING_ARCH_unaligned
+#if _STRING_ARCH_unaligned || _STRING_INLINE_unaligned
 # define ALIGNED_POINTER(ptr, type) true
 #else

coreutils/trunk/lib/regcomp.c ¶

@@ -155 +155 @@
     "\0"
 #define REG_EBRACK_IDX  (REG_ESUBREG_IDX + sizeof "Invalid back reference")
-    gettext_noop ("Unmatched [ or [^")  /* REG_EBRACK */
+    gettext_noop ("Unmatched [, [^, [:, [., or [=")     /* REG_EBRACK */
     "\0"
-#define REG_EPAREN_IDX  (REG_EBRACK_IDX + sizeof "Unmatched [ or [^")
+#define REG_EPAREN_IDX  (REG_EBRACK_IDX + sizeof "Unmatched [, [^, [:, [., or [=")
     gettext_noop ("Unmatched ( or \\(") /* REG_EPAREN */
     "\0"
@@ -216 +216 @@
    are set in BUFP on entry.  */
 
-#ifdef _LIBC
-const char *
-re_compile_pattern (pattern, length, bufp)
-    const char *pattern;
-    size_t length;
-    struct re_pattern_buffer *bufp;
-#else /* size_t might promote */
 const char *
 re_compile_pattern (const char *pattern, size_t length,
                     struct re_pattern_buffer *bufp)
-#endif
 {
   reg_errcode_t ret;
@@ -264 +256 @@
 
 reg_syntax_t
-re_set_syntax (syntax)
-    reg_syntax_t syntax;
+re_set_syntax (reg_syntax_t syntax)
 {
   reg_syntax_t ret = re_syntax_options;
@@ -277 +268 @@
 
 int
-re_compile_fastmap (bufp)
-    struct re_pattern_buffer *bufp;
+re_compile_fastmap (struct re_pattern_buffer *bufp)
 {
   re_dfa_t *dfa = bufp->buffer;
@@ -478 +468 @@
 
 int
-regcomp (preg, pattern, cflags)
-    regex_t *_Restrict_ preg;
-    const char *_Restrict_ pattern;
-    int cflags;
+regcomp (regex_t *_Restrict_ preg, const char *_Restrict_ pattern, int cflags)
 {
   reg_errcode_t ret;
@@ -539 +526 @@
    from either regcomp or regexec.   We don't use PREG here.  */
 
-#ifdef _LIBC
 size_t
-regerror (errcode, preg, errbuf, errbuf_size)
-    int errcode;
-    const regex_t *_Restrict_ preg;
-    char *_Restrict_ errbuf;
-    size_t errbuf_size;
-#else /* size_t might promote */
-size_t
-regerror (int errcode, const regex_t *_Restrict_ preg _UNUSED_PARAMETER_,
-          char *_Restrict_ errbuf, size_t errbuf_size)
-#endif
+regerror (int errcode, const regex_t *_Restrict_ preg, char *_Restrict_ errbuf,
+          size_t errbuf_size)
 {
   const char *msg;
@@ -666 +644 @@
 
 void
-regfree (preg)
-    regex_t *preg;
+regfree (regex_t *preg)
 {
   re_dfa_t *dfa = preg->buffer;
@@ -704 +681 @@
 weak_function
 # endif
-re_comp (s)
-     const char *s;
+re_comp (const char *s)
 {
   reg_errcode_t ret;
@@ -1429 +1405 @@
       node->first = node;
       node->node_idx = re_dfa_add_node (dfa, node->token);
-      if (BE (node->node_idx == REG_MISSING, 0))
+      if (BE (node->node_idx == -1, 0))
         return REG_ESPACE;
       if (node->token.type == ANCHOR)
@@ -1439 +1415 @@
 /* Pass 2: compute NEXT on the tree.  Preorder visit.  */
 static reg_errcode_t
-calc_next (void *extra _UNUSED_PARAMETER_, bin_tree_t *node)
+calc_next (void *extra, bin_tree_t *node)
 {
   switch (node->token.type)
@@ -1490 +1466 @@
         else
           right = node->next->node_idx;
-        assert (REG_VALID_INDEX (left));
-        assert (REG_VALID_INDEX (right));
+        assert (left > -1);
+        assert (right > -1);
         err = re_node_set_init_2 (dfa->edests + idx, left, right);
       }
@@ -1541 +1517 @@
           re_node_set_empty (dfa->edests + clone_node);
           clone_dest = duplicate_node (dfa, org_dest, constraint);
-          if (BE (clone_dest == REG_MISSING, 0))
+          if (BE (clone_dest == -1, 0))
             return REG_ESPACE;
           dfa->nexts[clone_node] = dfa->nexts[org_node];
@@ -1574 +1550 @@
           constraint |= dfa->nodes[org_node].constraint;
           clone_dest = duplicate_node (dfa, org_dest, constraint);
-          if (BE (clone_dest == REG_MISSING, 0))
+          if (BE (clone_dest == -1, 0))
             return REG_ESPACE;
           ok = re_node_set_insert (dfa->edests + clone_node, clone_dest);
@@ -1588 +1564 @@
           /* Search for a duplicated node which satisfies the constraint.  */
           clone_dest = search_duplicated_node (dfa, org_dest, constraint);
-          if (clone_dest == REG_MISSING)
+          if (clone_dest == -1)
             {
               /* There is no such duplicated node, create a new one.  */
               reg_errcode_t err;
               clone_dest = duplicate_node (dfa, org_dest, constraint);
-              if (BE (clone_dest == REG_MISSING, 0))
+              if (BE (clone_dest == -1, 0))
                 return REG_ESPACE;
               ok = re_node_set_insert (dfa->edests + clone_node, clone_dest);
@@ -1614 +1590 @@
           org_dest = dfa->edests[org_node].elems[1];
           clone_dest = duplicate_node (dfa, org_dest, constraint);
-          if (BE (clone_dest == REG_MISSING, 0))
+          if (BE (clone_dest == -1, 0))
             return REG_ESPACE;
           ok = re_node_set_insert (dfa->edests + clone_node, clone_dest);
@@ -1640 +1616 @@
         return idx; /* Found.  */
     }
-  return REG_MISSING; /* Not found.  */
+  return -1; /* Not found.  */
 }
 
 /* Duplicate the node whose index is ORG_IDX and set the constraint CONSTRAINT.
-   Return the index of the new node, or REG_MISSING if insufficient storage is
+   Return the index of the new node, or -1 if insufficient storage is
    available.  */
 
@@ -1651 +1627 @@
 {
   Idx dup_idx = re_dfa_add_node (dfa, dfa->nodes[org_idx]);
-  if (BE (dup_idx != REG_MISSING, 1))
+  if (BE (dup_idx != -1, 1))
     {
       dfa->nodes[dup_idx].constraint = constraint;
@@ -1710 +1686 @@
 
 #ifdef DEBUG
-      assert (dfa->eclosures[node_idx].nelem != REG_MISSING);
+      assert (dfa->eclosures[node_idx].nelem != -1);
 #endif
 
@@ -1746 +1722 @@
   /* This indicates that we are calculating this node now.
      We reference this value to avoid infinite loop.  */
-  dfa->eclosures[node].nelem = REG_MISSING;
+  dfa->eclosures[node].nelem = -1;
 
   /* If the current node has constraints, duplicate all nodes
@@ -1768 +1744 @@
         /* If calculating the epsilon closure of 'edest' is in progress,
            return intermediate result.  */
-        if (dfa->eclosures[edest].nelem == REG_MISSING)
+        if (dfa->eclosures[edest].nelem == -1)
           {
             incomplete = true;
@@ -2567 +2543 @@
       end = 0;
       start = fetch_number (regexp, token, syntax);
-      if (start == REG_MISSING)
+      if (start == -1)
         {
           if (token->type == CHARACTER && token->opr.c == ',')
@@ -2577 +2553 @@
             }
         }
-      if (BE (start != REG_ERROR, 1))
+      if (BE (start != -2, 1))
         {
           /* We treat "{n}" as "{n,n}".  */
           end = ((token->type == OP_CLOSE_DUP_NUM) ? start
                  : ((token->type == CHARACTER && token->opr.c == ',')
-                    ? fetch_number (regexp, token, syntax) : REG_ERROR));
-        }
-      if (BE (start == REG_ERROR || end == REG_ERROR, 0))
+                    ? fetch_number (regexp, token, syntax) : -2));
+        }
+      if (BE (start == -2 || end == -2, 0))
         {
           /* Invalid sequence.  */
@@ -2606 +2582 @@
         }
 
-      if (BE ((end != REG_MISSING && start > end)
+      if (BE ((end != -1 && start > end)
               || token->type != OP_CLOSE_DUP_NUM, 0))
         {
@@ -2614 +2590 @@
         }
 
-      if (BE (RE_DUP_MAX < (end == REG_MISSING ? start : end), 0))
+      if (BE (RE_DUP_MAX < (end == -1 ? start : end), 0))
         {
           *err = REG_ESIZE;
@@ -2623 +2599 @@
     {
       start = (token->type == OP_DUP_PLUS) ? 1 : 0;
-      end = (token->type == OP_DUP_QUESTION) ? 1 : REG_MISSING;
+      end = (token->type == OP_DUP_QUESTION) ? 1 : -1;
     }
 
@@ -2667 +2643 @@
 
   tree = create_tree (dfa, elem, NULL,
-                      (end == REG_MISSING ? OP_DUP_ASTERISK : OP_ALT));
+                      (end == -1 ? OP_DUP_ASTERISK : OP_ALT));
   if (BE (tree == NULL, 0))
     goto parse_dup_op_espace;
@@ -2675 +2651 @@
 #define TYPE_SIGNED(t) (! ((t) 0 < (t) -1))
 
-  /* This loop is actually executed only when end != REG_MISSING,
+  /* This loop is actually executed only when end != -1,
      to rewrite <re>{0,n} as (<re>(<re>...<re>?)?)?...  We have
      already created the start+1-th copy.  */
-  if (TYPE_SIGNED (Idx) || end != REG_MISSING)
+  if (TYPE_SIGNED (Idx) || end != -1)
     for (i = start + 2; i <= end; ++i)
       {
@@ -2706 +2682 @@
 
 #ifndef _LIBC
+
+# ifdef RE_ENABLE_I18N
+/* Convert the byte B to the corresponding wide character.  In a
+   unibyte locale, treat B as itself if it is an encoding error.
+   In a multibyte locale, return WEOF if B is an encoding error.  */
+static wint_t
+parse_byte (unsigned char b, re_charset_t *mbcset)
+{
+  wint_t wc = __btowc (b);
+  return wc == WEOF && !mbcset ? b : wc;
+}
+#endif
+
   /* Local function for parse_bracket_exp only used in case of NOT _LIBC.
      Build the range expression which starts from START_ELEM, and ends
@@ -2757 +2746 @@
                  : 0));
     start_wc = ((start_elem->type == SB_CHAR || start_elem->type == COLL_SYM)
-                ? __btowc (start_ch) : start_elem->opr.wch);
+                ? parse_byte (start_ch, mbcset) : start_elem->opr.wch);
     end_wc = ((end_elem->type == SB_CHAR || end_elem->type == COLL_SYM)
-              ? __btowc (end_ch) : end_elem->opr.wch);
+              ? parse_byte (end_ch, mbcset) : end_elem->opr.wch);
     if (start_wc == WEOF || end_wc == WEOF)
       return REG_ECOLLATE;
@@ -2789 +2778 @@
 
             if (BE (new_array_start == NULL || new_array_end == NULL, 0))
-              return REG_ESPACE;
+              {
+                re_free (new_array_start);
+                re_free (new_array_end);
+                return REG_ESPACE;
+              }
 
             mbcset->range_starts = new_array_start;
@@ -2838 +2831 @@
 internal_function
 # ifdef RE_ENABLE_I18N
-build_collating_symbol (bitset_t sbcset,
-                        re_charset_t *mbcset _UNUSED_PARAMETER_,
-                        Idx *coll_sym_alloc _UNUSED_PARAMETER_,
-                        const unsigned char *name)
+build_collating_symbol (bitset_t sbcset, re_charset_t *mbcset,
+                        Idx *coll_sym_alloc, const unsigned char *name)
 # else /* not RE_ENABLE_I18N */
 build_collating_symbol (bitset_t sbcset, const unsigned char *name)
@@ -3411 +3402 @@
 static reg_errcode_t
 parse_bracket_element (bracket_elem_t *elem, re_string_t *regexp,
-                       re_token_t *token, int token_len,
-                       re_dfa_t *dfa _UNUSED_PARAMETER_,
+                       re_token_t *token, int token_len, re_dfa_t *dfa,
                        reg_syntax_t syntax, bool accept_hyphen)
 {
@@ -3499 +3489 @@
 static reg_errcode_t
 #ifdef RE_ENABLE_I18N
-build_equiv_class (bitset_t sbcset,
-                   re_charset_t *mbcset _UNUSED_PARAMETER_,
-                   Idx *equiv_class_alloc _UNUSED_PARAMETER_,
-                   const unsigned char *name)
+build_equiv_class (bitset_t sbcset, re_charset_t *mbcset,
+                   Idx *equiv_class_alloc, const unsigned char *name)
 #else /* not RE_ENABLE_I18N */
 build_equiv_class (bitset_t sbcset, const unsigned char *name)
@@ -3691 +3679 @@
 
   sbcset = (re_bitset_ptr_t) calloc (sizeof (bitset_t), 1);
-#ifdef RE_ENABLE_I18N
-  mbcset = (re_charset_t *) calloc (sizeof (re_charset_t), 1);
-#endif /* RE_ENABLE_I18N */
-
-#ifdef RE_ENABLE_I18N
-  if (BE (sbcset == NULL || mbcset == NULL, 0))
-#else /* not RE_ENABLE_I18N */
   if (BE (sbcset == NULL, 0))
-#endif /* not RE_ENABLE_I18N */
     {
       *err = REG_ESPACE;
       return NULL;
     }
-
-  if (non_match)
-    {
-#ifdef RE_ENABLE_I18N
-      mbcset->non_match = 1;
-#endif /* not RE_ENABLE_I18N */
-    }
+#ifdef RE_ENABLE_I18N
+  mbcset = (re_charset_t *) calloc (sizeof (re_charset_t), 1);
+  if (BE (mbcset == NULL, 0))
+    {
+      re_free (sbcset);
+      *err = REG_ESPACE;
+      return NULL;
+    }
+  mbcset->non_match = non_match;
+#endif /* RE_ENABLE_I18N */
 
   /* We don't care the syntax in this case.  */
@@ -3743 +3726 @@
 
   /* Build a tree for simple bracket.  */
+#if defined GCC_LINT || defined lint
+  memset (&br_token, 0, sizeof br_token);
+#endif
   br_token.type = SIMPLE_BRACKET;
   br_token.opr.sbcset = sbcset;
@@ -3785 +3771 @@
 /* This is intended for the expressions like "a{1,3}".
    Fetch a number from 'input', and return the number.
-   Return REG_MISSING if the number field is empty like "{,1}".
+   Return -1 if the number field is empty like "{,1}".
    Return RE_DUP_MAX + 1 if the number field is too large.
-   Return REG_ERROR if an error occurred.  */
+   Return -2 if an error occurred.  */
 
 static Idx
 fetch_number (re_string_t *input, re_token_t *token, reg_syntax_t syntax)
 {
-  Idx num = REG_MISSING;
+  Idx num = -1;
   unsigned char c;
   while (1)
@@ -3799 +3785 @@
       c = token->opr.c;
       if (BE (token->type == END_OF_RE, 0))
-        return REG_ERROR;
+        return -2;
       if (token->type == OP_CLOSE_DUP_NUM || c == ',')
         break;
-      num = ((token->type != CHARACTER || c < '0' || '9' < c
-              || num == REG_ERROR)
-             ? REG_ERROR
-             : num == REG_MISSING
+      num = ((token->type != CHARACTER || c < '0' || '9' < c || num == -2)
+             ? -2
+             : num == -1
              ? c - '0'
              : MIN (RE_DUP_MAX + 1, num * 10 + c - '0'));
@@ -3839 +3824 @@
 {
   re_token_t t;
+#if defined GCC_LINT || defined lint
+  memset (&t, 0, sizeof t);
+#endif
   t.type = type;
   return create_token_tree (dfa, left, right, &t);
@@ -3868 +3856 @@
   tree->first = NULL;
   tree->next = NULL;
-  tree->node_idx = REG_MISSING;
+  tree->node_idx = -1;
 
   if (left != NULL)
@@ -3908 +3896 @@
 
 static reg_errcode_t
-free_tree (void *extra _UNUSED_PARAMETER_, bin_tree_t *node)
+free_tree (void *extra, bin_tree_t *node)
 {
   free_token (&node->token);

coreutils/trunk/lib/regex.h ¶

@@ -43 +43 @@
    _REGEX_LARGE_OFFSETS.  */
 
-/* The type of nonnegative object indexes.  Traditionally, GNU regex
-   uses 'int' for these.  Code that uses __re_idx_t should work
-   regardless of whether the type is signed.  */
-typedef size_t __re_idx_t;
-
 /* The type of object sizes.  */
 typedef size_t __re_size_t;
@@ -59 +54 @@
 /* The traditional GNU regex implementation mishandles strings longer
    than INT_MAX.  */
-typedef int __re_idx_t;
 typedef unsigned int __re_size_t;
 typedef unsigned long int __re_long_size_t;
@@ -492 +486 @@
 /* POSIX 1003.1-2008 requires that regoff_t be at least as wide as
    ptrdiff_t and ssize_t.  We don't know of any hosts where ptrdiff_t
-   is wider than ssize_t, so ssize_t is safe.  */
+   is wider than ssize_t, so ssize_t is safe.  ptrdiff_t is not
+   visible here, so use ssize_t.  */
 typedef ssize_t regoff_t;
 #else
@@ -543 +538 @@
 
    To free the allocated storage, you must call 'regfree' on BUFFER.
-   Note that the translate table must either have been initialised by
+   Note that the translate table must either have been initialized by
    'regcomp', with a malloc'ed value, or set to NULL before calling
    'regfree'.  */
@@ -562 +557 @@
    information in REGS (if REGS and BUFFER->no_sub are nonzero).  */
 extern regoff_t re_search (struct re_pattern_buffer *__buffer,
-                           const char *__string, __re_idx_t __length,
-                           __re_idx_t __start, regoff_t __range,
+                           const char *__String, regoff_t __length,
+                           regoff_t __start, regoff_t __range,
                            struct re_registers *__regs);
 
@@ -570 +565 @@
    STRING2.  Also, stop searching at index START + STOP.  */
 extern regoff_t re_search_2 (struct re_pattern_buffer *__buffer,
-                             const char *__string1, __re_idx_t __length1,
-                             const char *__string2, __re_idx_t __length2,
-                             __re_idx_t __start, regoff_t __range,
+                             const char *__string1, regoff_t __length1,
+                             const char *__string2, regoff_t __length2,
+                             regoff_t __start, regoff_t __range,
                              struct re_registers *__regs,
-                             __re_idx_t __stop);
+                             regoff_t __stop);
 
 
@@ -580 +575 @@
    in BUFFER matched, starting at position START.  */
 extern regoff_t re_match (struct re_pattern_buffer *__buffer,
-                          const char *__string, __re_idx_t __length,
-                          __re_idx_t __start, struct re_registers *__regs);
+                          const char *__String, regoff_t __length,
+                          regoff_t __start, struct re_registers *__regs);
 
 
 /* Relates to 're_match' as 're_search_2' relates to 're_search'.  */
 extern regoff_t re_match_2 (struct re_pattern_buffer *__buffer,
-                            const char *__string1, __re_idx_t __length1,
-                            const char *__string2, __re_idx_t __length2,
-                            __re_idx_t __start, struct re_registers *__regs,
-                            __re_idx_t __stop);
+                            const char *__string1, regoff_t __length1,
+                            const char *__string2, regoff_t __length2,
+                            regoff_t __start, struct re_registers *__regs,
+                            regoff_t __stop);
 
 
@@ -652 +647 @@
 
 extern int regexec (const regex_t *_Restrict_ __preg,
-                    const char *_Restrict_ __string, size_t __nmatch,
+                    const char *_Restrict_ __String, size_t __nmatch,
                     regmatch_t __pmatch[_Restrict_arr_],
                     int __eflags);

coreutils/trunk/lib/regex_internal.c ¶

@@ -18 +18 @@
    <http://www.gnu.org/licenses/>.  */
 
-#include "verify.h"
-#include "intprops.h"
 static void re_string_construct_common (const char *str, Idx len,
                                         re_string_t *pstr,
@@ -926 +924 @@
 {
   int c;
-  if (BE (! REG_VALID_INDEX (idx), 0))
+  if (BE (idx < 0, 0))
     /* In this case, we use the value stored in input->tip_context,
        since we can't know the character in input->mbs[-1] here.  */
@@ -942 +940 @@
 #if defined DEBUG && DEBUG
           /* It must not happen.  */
-          assert (REG_VALID_INDEX (wc_idx));
+          assert (wc_idx >= 0);
 #endif
           --wc_idx;
-          if (! REG_VALID_INDEX (wc_idx))
+          if (wc_idx < 0)
             return input->tip_context;
         }
@@ -1082 +1080 @@
         {
           /* Try to find the item in DEST.  Maybe we could binary search?  */
-          while (REG_VALID_INDEX (id) && dest->elems[id] > src1->elems[i1])
+          while (id >= 0 && dest->elems[id] > src1->elems[i1])
             --id;
 
-          if (! REG_VALID_INDEX (id) || dest->elems[id] != src1->elems[i1])
+          if (id < 0 || dest->elems[id] != src1->elems[i1])
             dest->elems[--sbase] = src1->elems[i1];
 
-          if (! REG_VALID_INDEX (--i1) || ! REG_VALID_INDEX (--i2))
+          if (--i1 < 0 || --i2 < 0)
             break;
         }
@@ -1095 +1093 @@
       else if (src1->elems[i1] < src2->elems[i2])
         {
-          if (! REG_VALID_INDEX (--i2))
+          if (--i2 < 0)
             break;
         }
       else
         {
-          if (! REG_VALID_INDEX (--i1))
+          if (--i1 < 0)
             break;
         }
@@ -1113 +1111 @@
      less the same loop that is in re_node_set_merge.  */
   dest->nelem += delta;
-  if (delta > 0 && REG_VALID_INDEX (id))
+  if (delta > 0 && id >= 0)
     for (;;)
       {
@@ -1127 +1125 @@
             /* Slide from the bottom.  */
             dest->elems[id + delta] = dest->elems[id];
-            if (! REG_VALID_INDEX (--id))
+            if (--id < 0)
               break;
           }
@@ -1221 +1219 @@
      found in DEST.  Maybe we could binary search in DEST?  */
   for (sbase = dest->nelem + 2 * src->nelem,
-       is = src->nelem - 1, id = dest->nelem - 1;
-       REG_VALID_INDEX (is) && REG_VALID_INDEX (id); )
+       is = src->nelem - 1, id = dest->nelem - 1; is >= 0 && id >= 0; )
     {
       if (dest->elems[id] == src->elems[is])
@@ -1232 +1229 @@
     }
 
-  if (REG_VALID_INDEX (is))
+  if (is >= 0)
     {
       /* If DEST is exhausted, the remaining items of SRC must be unique.  */
@@ -1261 +1258 @@
           /* Slide from the bottom.  */
           dest->elems[id + delta] = dest->elems[id];
-          if (! REG_VALID_INDEX (--id))
+          if (--id < 0)
             {
               /* Copy remaining SRC elements.  */
@@ -1360 +1357 @@
   if (set1 == NULL || set2 == NULL || set1->nelem != set2->nelem)
     return false;
-  for (i = set1->nelem ; REG_VALID_INDEX (--i) ; )
+  for (i = set1->nelem ; --i >= 0 ; )
     if (set1->elems[i] != set2->elems[i])
       return false;
@@ -1373 +1370 @@
 {
   __re_size_t idx, right, mid;
-  if (! REG_VALID_NONZERO_INDEX (set->nelem))
+  if (set->nelem <= 0)
     return 0;
 
@@ -1394 +1391 @@
 re_node_set_remove_at (re_node_set *set, Idx idx)
 {
-  verify (! TYPE_SIGNED (Idx));
-  /* if (idx < 0)
-     return; */
-  if (idx >= set->nelem)
+  if (idx < 0 || idx >= set->nelem)
     return;
   --set->nelem;
@@ -1407 +1401 @@
 
 /* Add the token TOKEN to dfa->nodes, and return the index of the token.
-   Or return REG_MISSING if an error occurred.  */
+   Or return -1 if an error occurred.  */
 
 static Idx
@@ -1425 +1419 @@
                                                sizeof (Idx)));
       if (BE (MIN (IDX_MAX, SIZE_MAX / max_object_size) < new_nodes_alloc, 0))
-        return REG_MISSING;
+        return -1;
 
       new_nodes = re_realloc (dfa->nodes, re_token_t, new_nodes_alloc);
       if (BE (new_nodes == NULL, 0))
-        return REG_MISSING;
+        return -1;
       dfa->nodes = new_nodes;
       new_nexts = re_realloc (dfa->nexts, Idx, new_nodes_alloc);
@@ -1437 +1431 @@
       if (BE (new_nexts == NULL || new_indices == NULL
               || new_edests == NULL || new_eclosures == NULL, 0))
-        return REG_MISSING;
+        {
+           re_free (new_nexts);
+           re_free (new_indices);
+           re_free (new_edests);
+           re_free (new_eclosures);
+           return -1;
+        }
       dfa->nexts = new_nexts;
       dfa->org_indices = new_indices;
@@ -1451 +1451 @@
      || token.type == COMPLEX_BRACKET);
 #endif
-  dfa->nexts[dfa->nodes_len] = REG_MISSING;
+  dfa->nexts[dfa->nodes_len] = -1;
   re_node_set_init_empty (dfa->edests + dfa->nodes_len);
   re_node_set_init_empty (dfa->eclosures + dfa->nodes_len);
@@ -1486 +1486 @@
   struct re_state_table_entry *spot;
   Idx i;
-#ifdef lint
+#if defined GCC_LINT || defined lint
   /* Suppress bogus uninitialized-variable warnings.  */
   *err = REG_NOERROR;
@@ -1534 +1534 @@
   struct re_state_table_entry *spot;
   Idx i;
-#ifdef lint
+#if defined GCC_LINT || defined lint
   /* Suppress bogus uninitialized-variable warnings.  */
   *err = REG_NOERROR;

coreutils/trunk/lib/regex_internal.h ¶

@@ -152 +152 @@
 #endif
 
-typedef __re_idx_t Idx;
+#ifndef SSIZE_MAX
+# define SSIZE_MAX ((ssize_t) (SIZE_MAX / 2))
+#endif
+
+/* The type of indexes into strings.  This is signed, not size_t,
+   since the API requires indexes to fit in regoff_t anyway, and using
+   signed integers makes the code a bit smaller and presumably faster.
+   The traditional GNU regex implementation uses int for indexes.
+   The POSIX-compatible implementation uses a possibly-wider type.
+   The name 'Idx' is three letters to minimize the hassle of
+   reindenting a lot of regex code that formerly used 'int'.  */
+typedef regoff_t Idx;
 #ifdef _REGEX_LARGE_OFFSETS
-# define IDX_MAX (SIZE_MAX - 2)
+# define IDX_MAX SSIZE_MAX
 #else
 # define IDX_MAX INT_MAX
-#endif
-
-/* Special return value for failure to match.  */
-#define REG_MISSING ((Idx) -1)
-
-/* Special return value for internal error.  */
-#define REG_ERROR ((Idx) -2)
-
-/* Test whether N is a valid index, and is not one of the above.  */
-#ifdef _REGEX_LARGE_OFFSETS
-# define REG_VALID_INDEX(n) ((Idx) (n) < REG_ERROR)
-#else
-# define REG_VALID_INDEX(n) (0 <= (n))
-#endif
-
-/* Test whether N is a valid nonzero index.  */
-#ifdef _REGEX_LARGE_OFFSETS
-# define REG_VALID_NONZERO_INDEX(n) ((Idx) ((n) - 1) < (Idx) (REG_ERROR - 1))
-#else
-# define REG_VALID_NONZERO_INDEX(n) (0 < (n))
 #endif
 
@@ -870 +861 @@
 static int
 internal_function __attribute__ ((pure, unused))
-re_string_elem_size_at (const re_string_t *pstr _UNUSED_PARAMETER_,
-                        Idx idx _UNUSED_PARAMETER_)
+re_string_elem_size_at (const re_string_t *pstr, Idx idx)
 {
 # ifdef _LIBC

coreutils/trunk/lib/regexec.c ¶

@@ -18 +18 @@
    <http://www.gnu.org/licenses/>.  */
 
-#include "verify.h"
-#include "intprops.h"
 static reg_errcode_t match_ctx_init (re_match_context_t *cache, int eflags,
                                      Idx n) internal_function;
@@ -223 +221 @@
 
 int
-regexec (preg, string, nmatch, pmatch, eflags)
-    const regex_t *_Restrict_ preg;
-    const char *_Restrict_ string;
-    size_t nmatch;
-    regmatch_t pmatch[_Restrict_arr_];
-    int eflags;
+regexec (const regex_t *_Restrict_ preg, const char *_Restrict_ string,
+         size_t nmatch, regmatch_t pmatch[], int eflags)
 {
   reg_errcode_t err;
@@ -309 +303 @@
 
 regoff_t
-re_match (bufp, string, length, start, regs)
-    struct re_pattern_buffer *bufp;
-    const char *string;
-    Idx length, start;
-    struct re_registers *regs;
+re_match (struct re_pattern_buffer *bufp, const char *string, Idx length,
+          Idx start, struct re_registers *regs)
 {
   return re_search_stub (bufp, string, length, start, 0, length, regs, true);
@@ -322 +313 @@
 
 regoff_t
-re_search (bufp, string, length, start, range, regs)
-    struct re_pattern_buffer *bufp;
-    const char *string;
-    Idx length, start;
-    regoff_t range;
-    struct re_registers *regs;
+re_search (struct re_pattern_buffer *bufp, const char *string, Idx length,
+           Idx start, regoff_t range, struct re_registers *regs)
 {
   return re_search_stub (bufp, string, length, start, range, length, regs,
@@ -337 +324 @@
 
 regoff_t
-re_match_2 (bufp, string1, length1, string2, length2, start, regs, stop)
-    struct re_pattern_buffer *bufp;
-    const char *string1, *string2;
-    Idx length1, length2, start, stop;
-    struct re_registers *regs;
+re_match_2 (struct re_pattern_buffer *bufp, const char *string1, Idx length1,
+            const char *string2, Idx length2, Idx start,
+            struct re_registers *regs, Idx stop)
 {
   return re_search_2_stub (bufp, string1, length1, string2, length2,
@@ -351 +336 @@
 
 regoff_t
-re_search_2 (bufp, string1, length1, string2, length2, start, range, regs, stop)
-    struct re_pattern_buffer *bufp;
-    const char *string1, *string2;
-    Idx length1, length2, start, stop;
-    regoff_t range;
-    struct re_registers *regs;
+re_search_2 (struct re_pattern_buffer *bufp, const char *string1, Idx length1,
+             const char *string2, Idx length2, Idx start, regoff_t range,
+             struct re_registers *regs, Idx stop)
 {
   return re_search_2_stub (bufp, string1, length1, string2, length2,
@@ -366 +348 @@
 
 static regoff_t
-re_search_2_stub (struct re_pattern_buffer *bufp,
-                  const char *string1, Idx length1,
-                  const char *string2, Idx length2,
-                  Idx start, regoff_t range, struct re_registers *regs,
+internal_function
+re_search_2_stub (struct re_pattern_buffer *bufp, const char *string1,
+                  Idx length1, const char *string2, Idx length2, Idx start,
+                  regoff_t range, struct re_registers *regs,
                   Idx stop, bool ret_len)
 {
@@ -377 +359 @@
   char *s = NULL;
 
-  verify (! TYPE_SIGNED (Idx));
-  if (BE (len < length1, 0))
-     return -2;
-  /* if (BE (length1 < 0 || length2 < 0 || stop < 0, 0))
-     return -2; */
+  if (BE (length1 < 0 || length2 < 0 || stop < 0 || len < length1, 0))
+    return -2;
 
   /* Concatenate the strings.  */
@@ -416 +395 @@
 
 static regoff_t
-re_search_stub (struct re_pattern_buffer *bufp,
-                const char *string, Idx length,
+internal_function
+re_search_stub (struct re_pattern_buffer *bufp, const char *string, Idx length,
                 Idx start, regoff_t range, Idx stop, struct re_registers *regs,
                 bool ret_len)
@@ -430 +409 @@
 
   /* Check for out-of-range.  */
-  verify (! TYPE_SIGNED (Idx));
-  /* if (BE (start < 0, 0))
-     return -1; */
-  if (BE (start > length, 0))
-     return -1;
+  if (BE (start < 0 || start > length, 0))
+    return -1;
   if (BE (length < last_start || (0 <= range && last_start < start), 0))
     last_start = length;
-  else if (BE (/* last_start < 0 || */ (range < 0 && start <= last_start), 0))
+  else if (BE (last_start < 0 || (range < 0 && start <= last_start), 0))
     last_start = 0;
 
@@ -509 +485 @@
 
 static unsigned
+internal_function
 re_copy_regs (struct re_registers *regs, regmatch_t *pmatch, Idx nregs,
               int regs_allocated)
@@ -587 +564 @@
 
 void
-re_set_registers (bufp, regs, num_regs, starts, ends)
-    struct re_pattern_buffer *bufp;
-    struct re_registers *regs;
-    __re_size_t num_regs;
-    regoff_t *starts, *ends;
+re_set_registers (struct re_pattern_buffer *bufp, struct re_registers *regs,
+                  __re_size_t num_regs, regoff_t *starts, regoff_t *ends)
 {
   if (num_regs)
@@ -620 +594 @@
 weak_function
 # endif
-re_exec (s)
-     const char *s;
+re_exec (const char *s)
 {
   return 0 == regexec (&re_comp_buf, s, 0, NULL, 0);
@@ -640 +613 @@
 
 static reg_errcode_t
-__attribute_warn_unused_result__
-re_search_internal (const regex_t *preg,
-                    const char *string, Idx length,
-                    Idx start, Idx last_start, Idx stop,
-                    size_t nmatch, regmatch_t pmatch[],
-                    int eflags)
+__attribute_warn_unused_result__ internal_function
+re_search_internal (const regex_t *preg, const char *string, Idx length,
+                    Idx start, Idx last_start, Idx stop, size_t nmatch,
+                    regmatch_t pmatch[], int eflags)
 {
   reg_errcode_t err;
@@ -654 +625 @@
   int match_kind;
   Idx match_first;
-  Idx match_last = REG_MISSING;
+  Idx match_last = -1;
   Idx extra_nmatch;
   bool sb;
@@ -863 +834 @@
       match_last = check_matching (&mctx, fl_longest_match,
                                    start <= last_start ? &match_first : NULL);
-      if (match_last != REG_MISSING)
-        {
-          if (BE (match_last == REG_ERROR, 0))
+      if (match_last != -1)
+        {
+          if (BE (match_last == -2, 0))
             {
               err = REG_ESPACE;
@@ -887 +858 @@
                   if (BE (err != REG_NOMATCH, 0))
                     goto free_return;
-                  match_last = REG_MISSING;
+                  match_last = -1;
                 }
               else
@@ -898 +869 @@
 
 #ifdef DEBUG
-  assert (match_last != REG_MISSING);
+  assert (match_last != -1);
   assert (err == REG_NOERROR);
 #endif
@@ -976 +947 @@
 
 static reg_errcode_t
-__attribute_warn_unused_result__
+internal_function __attribute_warn_unused_result__
 prune_impossible_nodes (re_match_context_t *mctx)
 {
@@ -1024 +995 @@
             {
               --match_last;
-              if (! REG_VALID_INDEX (match_last))
+              if (match_last < 0)
                 {
                   ret = REG_NOMATCH;
@@ -1105 +1076 @@
 
 /* Check whether the regular expression match input string INPUT or not,
-   and return the index where the matching end.  Return REG_MISSING if
-   there is no match, and return REG_ERROR in case of an error.
+   and return the index where the matching end.  Return -1 if
+   there is no match, and return -2 in case of an error.
    FL_LONGEST_MATCH means we want the POSIX longest matching.
    If P_MATCH_FIRST is not NULL, and the match fails, it is set to the
@@ -1121 +1092 @@
   reg_errcode_t err;
   Idx match = 0;
-  Idx match_last = REG_MISSING;
+  Idx match_last = -1;
   Idx cur_str_idx = re_string_cur_idx (&mctx->input);
   re_dfastate_t *cur_state;
@@ -1133 +1104 @@
     {
       assert (err == REG_ESPACE);
-      return REG_ERROR;
+      return -2;
     }
 
@@ -1188 +1159 @@
             {
               assert (err == REG_ESPACE);
-              return REG_ERROR;
+              return -2;
             }
         }
@@ -1202 +1173 @@
              already found a valid (even if not the longest) match.  */
           if (BE (err != REG_NOERROR, 0))
-            return REG_ERROR;
+            return -2;
 
           if (mctx->state_log == NULL
@@ -1285 +1256 @@
    corresponding to the DFA).
    Return the destination node, and update EPS_VIA_NODES;
-   return REG_MISSING in case of errors.  */
+   return -1 in case of errors.  */
 
 static Idx
@@ -1303 +1274 @@
       ok = re_node_set_insert (eps_via_nodes, node);
       if (BE (! ok, 0))
-        return REG_ERROR;
-      /* Pick up a valid destination, or return REG_MISSING if none
+        return -2;
+      /* Pick up a valid destination, or return -1 if none
          is found.  */
-      for (dest_node = REG_MISSING, i = 0; i < edests->nelem; ++i)
+      for (dest_node = -1, i = 0; i < edests->nelem; ++i)
         {
           Idx candidate = edests->elems[i];
           if (!re_node_set_contains (cur_nodes, candidate))
             continue;
-          if (dest_node == REG_MISSING)
+          if (dest_node == -1)
             dest_node = candidate;
 
@@ -1325 +1296 @@
                        && push_fail_stack (fs, *pidx, candidate, nregs, regs,
                                            eps_via_nodes))
-                return REG_ERROR;
+                return -2;
 
               /* We know we are going to exit.  */
@@ -1350 +1321 @@
             {
               if (regs[subexp_idx].rm_so == -1 || regs[subexp_idx].rm_eo == -1)
-                return REG_MISSING;
+                return -1;
               else if (naccepted)
                 {
@@ -1356 +1327 @@
                   if (memcmp (buf + regs[subexp_idx].rm_so, buf + *pidx,
                               naccepted) != 0)
-                    return REG_MISSING;
+                    return -1;
                 }
             }
@@ -1365 +1336 @@
               ok = re_node_set_insert (eps_via_nodes, node);
               if (BE (! ok, 0))
-                return REG_ERROR;
+                return -2;
               dest_node = dfa->edests[node].elems[0];
               if (re_node_set_contains (&mctx->state_log[*pidx]->nodes,
@@ -1381 +1352 @@
                      || !re_node_set_contains (&mctx->state_log[*pidx]->nodes,
                                                dest_node)))
-            return REG_MISSING;
+            return -1;
           re_node_set_empty (eps_via_nodes);
           return dest_node;
         }
     }
-  return REG_MISSING;
+  return -1;
 }
 
@@ -1422 +1393 @@
 {
   Idx num = --fs->num;
-  assert (REG_VALID_INDEX (num));
+  assert (num >= 0);
   *pidx = fs->stack[num].idx;
   memcpy (regs, fs->stack[num].regs, sizeof (regmatch_t) * nregs);
@@ -1515 +1486 @@
                                     &eps_via_nodes, fs);
 
-      if (BE (! REG_VALID_INDEX (cur_node), 0))
-        {
-          if (BE (cur_node == REG_ERROR, 0))
+      if (BE (cur_node < 0, 0))
+        {
+          if (BE (cur_node == -2, 0))
             {
               re_node_set_free (&eps_via_nodes);
@@ -1901 +1872 @@
             Idx edst1 = dfa->edests[cur_node].elems[0];
             Idx edst2 = ((dfa->edests[cur_node].nelem > 1)
-                         ? dfa->edests[cur_node].elems[1] : REG_MISSING);
+                         ? dfa->edests[cur_node].elems[1] : -1);
             if ((!re_node_set_contains (inv_eclosure, edst1)
                  && re_node_set_contains (dest_nodes, edst1))
-                || (REG_VALID_NONZERO_INDEX (edst2)
+                || (edst2 > 0
                     && !re_node_set_contains (inv_eclosure, edst2)
                     && re_node_set_contains (dest_nodes, edst2)))
@@ -1984 +1955 @@
         {
         case OP_BACK_REF:
-          if (bkref_idx != REG_MISSING)
+          if (bkref_idx != -1)
             {
               struct re_backref_cache_entry *ent = mctx->bkref_ents + bkref_idx;
@@ -2100 +2071 @@
       if (ent->subexp_to == str_idx)
         {
-          Idx ops_node = REG_MISSING;
-          Idx cls_node = REG_MISSING;
+          Idx ops_node = -1;
+          Idx cls_node = -1;
           for (node_idx = 0; node_idx < dest_nodes->nelem; ++node_idx)
             {
@@ -2116 +2087 @@
           /* Check the limitation of the open subexpression.  */
           /* Note that (ent->subexp_to = str_idx != ent->subexp_from).  */
-          if (REG_VALID_INDEX (ops_node))
+          if (ops_node >= 0)
             {
               err = sub_epsilon_src_nodes (dfa, ops_node, dest_nodes,
@@ -2125 +2096 @@
 
           /* Check the limitation of the close subexpression.  */
-          if (REG_VALID_INDEX (cls_node))
+          if (cls_node >= 0)
             for (node_idx = 0; node_idx < dest_nodes->nelem; ++node_idx)
               {
@@ -2178 +2149 @@
   Idx first_idx = search_cur_bkref_entry (mctx, str_idx);
 
-  if (first_idx == REG_MISSING)
+  if (first_idx == -1)
     return REG_NOERROR;
 
@@ -2583 +2554 @@
         return err;
 #ifdef DEBUG
-      assert (dfa->nexts[cur_node_idx] != REG_MISSING);
+      assert (dfa->nexts[cur_node_idx] != -1);
 #endif
       new_nodes = dfa->eclosures + dfa->nexts[cur_node_idx];
@@ -2649 +2620 @@
          the backreference to appropriate state_log.  */
 #ifdef DEBUG
-      assert (dfa->nexts[node_idx] != REG_MISSING);
+      assert (dfa->nexts[node_idx] != -1);
 #endif
       for (; bkc_idx < mctx->nbkref_ents; ++bkc_idx)
@@ -2733 +2704 @@
   /* Return if we have already checked BKREF_NODE at BKREF_STR_IDX.  */
   Idx cache_idx = search_cur_bkref_entry (mctx, bkref_str_idx);
-  if (cache_idx != REG_MISSING)
+  if (cache_idx != -1)
     {
       const struct re_backref_cache_entry *entry
@@ -2838 +2809 @@
           cls_node = find_subexp_node (dfa, nodes, subexp_num,
                                        OP_CLOSE_SUBEXP);
-          if (cls_node == REG_MISSING)
+          if (cls_node == -1)
             continue; /* No.  */
           if (sub_top->path == NULL)
@@ -2917 +2888 @@
         return cls_node;
     }
-  return REG_MISSING;
+  return -1;
 }
 
@@ -3193 +3164 @@
       const re_node_set *eclosure = dfa->eclosures + cur_node;
       outside_node = find_subexp_node (dfa, eclosure, ex_subexp, type);
-      if (outside_node == REG_MISSING)
+      if (outside_node == -1)
         {
           /* There are no problematic nodes, just merge them.  */
@@ -3279 +3250 @@
   struct re_backref_cache_entry *ent;
 
-  if (cache_idx_start == REG_MISSING)
+  if (cache_idx_start == -1)
     return REG_NOERROR;
 
@@ -3404 +3375 @@
      destinations.  */
   ndests = group_nodes_into_DFAstates (dfa, state, dests_node, dests_ch);
-  if (BE (! REG_VALID_NONZERO_INDEX (ndests), 0))
+  if (BE (ndests <= 0, 0))
     {
       if (dests_node_malloced)
@@ -3466 +3437 @@
         {
           next_node = dfa->nexts[dests_node[i].elems[j]];
-          if (next_node != REG_MISSING)
+          if (next_node != -1)
             {
               err = re_node_set_merge (&follows, dfa->eclosures + next_node);
@@ -3777 +3748 @@
   for (j = 0; j < ndests; ++j)
     re_node_set_free (dests_node + j);
-  return REG_MISSING;
+  return -1;
 }
 
@@ -4209 +4180 @@
 {
   mctx->eflags = eflags;
-  mctx->match_last = REG_MISSING;
+  mctx->match_last = -1;
   if (n > 0)
     {
@@ -4330 +4301 @@
 }
 
-/* Return the first entry with the same str_idx, or REG_MISSING if none is
+/* Return the first entry with the same str_idx, or -1 if none is
    found.  Note that MCTX->BKREF_ENTS is already sorted by MCTX->STR_IDX.  */
 
@@ -4350 +4321 @@
     return left;
   else
-    return REG_MISSING;
+    return -1;
 }
 

coreutils/trunk/lib/sched.in.h ¶

@@ -1 @@
-/* Replacement <sched.h> for platforms that lack it.
+/* A GNU-like <sched.h>.
    Copyright (C) 2008-2016 Free Software Foundation, Inc.
 
@@ -24 +24 @@
 /* The include_next requires a split double-inclusion guard.  */
 #if @HAVE_SCHED_H@
+# if @HAVE_SYS_CDEFS_H@
+#  include <sys/cdefs.h>
+# endif
 # @INCLUDE_NEXT@ @NEXT_SCHED_H@
 #endif

coreutils/trunk/lib/secure_getenv.c ¶

@@ -1 @@
-/* Look up an environment variable more securely.
+/* Look up an environment variable, returning NULL in insecure situations.
 
    Copyright 2013-2016 Free Software Foundation, Inc.
@@ -21 +21 @@
 
 #if !HAVE___SECURE_GETENV
-# if HAVE_ISSETUGID
+# if HAVE_ISSETUGID || (HAVE_GETUID && HAVE_GETEUID && HAVE_GETGID && HAVE_GETEGID)
 #  include <unistd.h>
-# else
-#  undef issetugid
-#  define issetugid() 1
 # endif
 #endif
@@ -32 +29 @@
 secure_getenv (char const *name)
 {
-#if HAVE___SECURE_GETENV
+#if HAVE___SECURE_GETENV /* glibc */
   return __secure_getenv (name);
+#elif HAVE_ISSETUGID /* OS X, FreeBSD, NetBSD, OpenBSD */
+  if (issetugid ())
+    return NULL;
+  return getenv (name);
+#elif HAVE_GETUID && HAVE_GETEUID && HAVE_GETGID && HAVE_GETEGID /* other Unix */
+  if (geteuid () != getuid () || getegid () != getgid ())
+    return NULL;
+  return getenv (name);
+#elif (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ /* native Windows */
+  /* On native Windows, there is no such concept as setuid or setgid binaries.
+     - Programs launched as system services have high privileges, but they don't
+       inherit environment variables from a user.
+     - Programs launched by a user with "Run as Administrator" have high
+       privileges and use the environment variables, but the user has been asked
+       whether he agrees.
+     - Programs launched by a user without "Run as Administrator" cannot gain
+       high privileges, therefore there is no risk. */
+  return getenv (name);
 #else
-  if (issetugid ())
-    return 0;
-  return getenv (name);
+  return NULL;
 #endif
 }

coreutils/trunk/lib/set-permissions.c ¶

@@ -270 +270 @@
         return -1;
       }
+    return 0;
   }
 }

coreutils/trunk/lib/stdalign.in.h ¶

@@ -104 +104 @@
          ? 4 < __GNUC__ + (1 <= __GNUC_MINOR__)                 \
          : __GNUC__)                                            \
-        || __HP_cc || __HP_aCC || __IBMC__ || __IBMCPP__        \
-        || __ICC || 0x590 <= __SUNPRO_C)
+        || 061200 <= __HP_cc || 061200 <= __HP_aCC                \
+        || __ICC || 0x590 <= __SUNPRO_C || 0x0600 <= __xlC__)
 #  define _Alignas(a) __attribute__ ((__aligned__ (a)))
 # elif 1300 <= _MSC_VER
@@ -112 +112 @@
 #endif
 #if ((defined _Alignas && ! (defined __cplusplus && 201103 <= __cplusplus)) \
-     || (defined __STDC_VERSION && 201112 <= __STDC_VERSION__))
+     || (defined __STDC_VERSION__ && 201112 <= __STDC_VERSION__))
 # define alignas _Alignas
 #endif

coreutils/trunk/lib/stddef.in.h ¶

@@ -82 +82 @@
 #endif
 
-/* Some platforms lack max_align_t.  */
-#if !@HAVE_MAX_ALIGN_T@
+/* Some platforms lack max_align_t.  The check for _GCC_MAX_ALIGN_T is
+   a hack in case the configure-time test was done with g++ even though
+   we are currently compiling with gcc.  */
+#if ! (@HAVE_MAX_ALIGN_T@ || defined _GCC_MAX_ALIGN_T)
 /* On the x86, the maximum storage alignment of double, long, etc. is 4,
    but GCC's C11 ABI for x86 says that max_align_t has an alignment of 8,

coreutils/trunk/lib/stdint.in.h ¶

@@ -80 +80 @@
 #define _@GUARD_PREFIX@_STDINT_H
 
+/* Get SCHAR_MIN, SCHAR_MAX, UCHAR_MAX, INT_MIN, INT_MAX,
+   LONG_MIN, LONG_MAX, ULONG_MAX, _GL_INTEGER_WIDTH.  */
+#include <limits.h>
+
+#if ! @HAVE_C99_STDINT_H@
+
 /* <sys/types.h> defines some of the stdint.h types as well, on glibc,
    IRIX 6.5, and OpenBSD 3.8 (via <machine/types.h>).
@@ -86 +92 @@
    relies on the system <stdint.h> definitions, so include
    <sys/types.h> after @NEXT_STDINT_H@.  */
-#if @HAVE_SYS_TYPES_H@ && ! defined _AIX
-# include <sys/types.h>
-#endif
-
-/* Get SCHAR_MIN, SCHAR_MAX, UCHAR_MAX, INT_MIN, INT_MAX,
-   LONG_MIN, LONG_MAX, ULONG_MAX.  */
-#include <limits.h>
-
-#if @HAVE_INTTYPES_H@
+# if @HAVE_SYS_TYPES_H@ && ! defined _AIX
+#  include <sys/types.h>
+# endif
+
+# if @HAVE_INTTYPES_H@
   /* In OpenBSD 3.8, <inttypes.h> includes <machine/types.h>, which defines
      int{8,16,32,64}_t, uint{8,16,32,64}_t and __BIT_TYPES_DEFINED__.
      <inttypes.h> also defines intptr_t and uintptr_t.  */
-# include <inttypes.h>
-#elif @HAVE_SYS_INTTYPES_H@
+#  include <inttypes.h>
+# elif @HAVE_SYS_INTTYPES_H@
   /* Solaris 7 <sys/inttypes.h> has the types except the *_fast*_t types, and
      the macros except for *_FAST*_*, INTPTR_MIN, PTRDIFF_MIN, PTRDIFF_MAX.  */
-# include <sys/inttypes.h>
-#endif
-
-#if @HAVE_SYS_BITYPES_H@ && ! defined __BIT_TYPES_DEFINED__
+#  include <sys/inttypes.h>
+# endif
+
+# if @HAVE_SYS_BITYPES_H@ && ! defined __BIT_TYPES_DEFINED__
   /* Linux libc4 >= 4.6.7 and libc5 have a <sys/bitypes.h> that defines
      int{8,16,32,64}_t and __BIT_TYPES_DEFINED__.  In libc5 >= 5.2.2 it is
      included by <sys/types.h>.  */
-# include <sys/bitypes.h>
-#endif
-
-#undef _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H
+#  include <sys/bitypes.h>
+# endif
+
+# undef _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H
 
 /* Minimum and maximum values for an integer type under the usual assumption.
@@ -118 +120 @@
    picky compilers.  */
 
-#define _STDINT_MIN(signed, bits, zero) \
-  ((signed) ? (- ((zero) + 1) << ((bits) ? (bits) - 1 : 0)) : (zero))
-
-#define _STDINT_MAX(signed, bits, zero) \
-  ((signed) \
-   ? ~ _STDINT_MIN (signed, bits, zero) \
-   : /* The expression for the unsigned case.  The subtraction of (signed) \
-        is a nop in the unsigned case and avoids "signed integer overflow" \
-        warnings in the signed case.  */ \
-     ((((zero) + 1) << ((bits) ? (bits) - 1 - (signed) : 0)) - 1) * 2 + 1)
+# define _STDINT_MIN(signed, bits, zero) \
+    ((signed) ? ~ _STDINT_MAX (signed, bits, zero) : (zero))
+
+# define _STDINT_MAX(signed, bits, zero) \
+    (((((zero) + 1) << ((bits) ? (bits) - 1 - (signed) : 0)) - 1) * 2 + 1)
 
 #if !GNULIB_defined_stdint_types
@@ -136 +133 @@
    types have 8, 16, 32, optionally 64 bits.  */
 
-#undef int8_t
-#undef uint8_t
+# undef int8_t
+# undef uint8_t
 typedef signed char gl_int8_t;
 typedef unsigned char gl_uint8_t;
-#define int8_t gl_int8_t
-#define uint8_t gl_uint8_t
-
-#undef int16_t
-#undef uint16_t
+# define int8_t gl_int8_t
+# define uint8_t gl_uint8_t
+
+# undef int16_t
+# undef uint16_t
 typedef short int gl_int16_t;
 typedef unsigned short int gl_uint16_t;
-#define int16_t gl_int16_t
-#define uint16_t gl_uint16_t
-
-#undef int32_t
-#undef uint32_t
+# define int16_t gl_int16_t
+# define uint16_t gl_uint16_t
+
+# undef int32_t
+# undef uint32_t
 typedef int gl_int32_t;
 typedef unsigned int gl_uint32_t;
-#define int32_t gl_int32_t
-#define uint32_t gl_uint32_t
+# define int32_t gl_int32_t
+# define uint32_t gl_uint32_t
 
 /* If the system defines INT64_MAX, assume int64_t works.  That way,
@@ -163 +160 @@
    rather than #if, to avoid an error with HP-UX 10.20 cc.  */
 
-#ifdef INT64_MAX
-# define GL_INT64_T
-#else
+# ifdef INT64_MAX
+#  define GL_INT64_T
+# else
 /* Do not undefine int64_t if gnulib is not being used with 64-bit
    types, since otherwise it breaks platforms like Tandem/NSK.  */
-# if LONG_MAX >> 31 >> 31 == 1
-#  undef int64_t
+#  if LONG_MAX >> 31 >> 31 == 1
+#   undef int64_t
 typedef long int gl_int64_t;
-#  define int64_t gl_int64_t
-#  define GL_INT64_T
-# elif defined _MSC_VER
-#  undef int64_t
+#   define int64_t gl_int64_t
+#   define GL_INT64_T
+#  elif defined _MSC_VER
+#   undef int64_t
 typedef __int64 gl_int64_t;
-#  define int64_t gl_int64_t
-#  define GL_INT64_T
-# elif @HAVE_LONG_LONG_INT@
-#  undef int64_t
+#   define int64_t gl_int64_t
+#   define GL_INT64_T
+#  elif @HAVE_LONG_LONG_INT@
+#   undef int64_t
 typedef long long int gl_int64_t;
-#  define int64_t gl_int64_t
-#  define GL_INT64_T
-# endif
-#endif
-
-#ifdef UINT64_MAX
-# define GL_UINT64_T
-#else
-# if ULONG_MAX >> 31 >> 31 >> 1 == 1
-#  undef uint64_t
+#   define int64_t gl_int64_t
+#   define GL_INT64_T
+#  endif
+# endif
+
+# ifdef UINT64_MAX
+#  define GL_UINT64_T
+# else
+#  if ULONG_MAX >> 31 >> 31 >> 1 == 1
+#   undef uint64_t
 typedef unsigned long int gl_uint64_t;
-#  define uint64_t gl_uint64_t
-#  define GL_UINT64_T
-# elif defined _MSC_VER
-#  undef uint64_t
+#   define uint64_t gl_uint64_t
+#   define GL_UINT64_T
+#  elif defined _MSC_VER
+#   undef uint64_t
 typedef unsigned __int64 gl_uint64_t;
-#  define uint64_t gl_uint64_t
-#  define GL_UINT64_T
-# elif @HAVE_UNSIGNED_LONG_LONG_INT@
-#  undef uint64_t
+#   define uint64_t gl_uint64_t
+#   define GL_UINT64_T
+#  elif @HAVE_UNSIGNED_LONG_LONG_INT@
+#   undef uint64_t
 typedef unsigned long long int gl_uint64_t;
-#  define uint64_t gl_uint64_t
-#  define GL_UINT64_T
-# endif
-#endif
+#   define uint64_t gl_uint64_t
+#   define GL_UINT64_T
+#  endif
+# endif
 
 /* Avoid collision with Solaris 2.5.1 <pthread.h> etc.  */
-#define _UINT8_T
-#define _UINT32_T
-#define _UINT64_T
+# define _UINT8_T
+# define _UINT32_T
+# define _UINT64_T
 
 
@@ -219 +216 @@
    are the same as the corresponding N_t types.  */
 
-#undef int_least8_t
-#undef uint_least8_t
-#undef int_least16_t
-#undef uint_least16_t
-#undef int_least32_t
-#undef uint_least32_t
-#undef int_least64_t
-#undef uint_least64_t
-#define int_least8_t int8_t
-#define uint_least8_t uint8_t
-#define int_least16_t int16_t
-#define uint_least16_t uint16_t
-#define int_least32_t int32_t
-#define uint_least32_t uint32_t
-#ifdef GL_INT64_T
-# define int_least64_t int64_t
-#endif
-#ifdef GL_UINT64_T
-# define uint_least64_t uint64_t
-#endif
+# undef int_least8_t
+# undef uint_least8_t
+# undef int_least16_t
+# undef uint_least16_t
+# undef int_least32_t
+# undef uint_least32_t
+# undef int_least64_t
+# undef uint_least64_t
+# define int_least8_t int8_t
+# define uint_least8_t uint8_t
+# define int_least16_t int16_t
+# define uint_least16_t uint16_t
+# define int_least32_t int32_t
+# define uint_least32_t uint32_t
+# ifdef GL_INT64_T
+#  define int_least64_t int64_t
+# endif
+# ifdef GL_UINT64_T
+#  define uint_least64_t uint64_t
+# endif
 
 /* 7.18.1.3. Fastest minimum-width integer types */
@@ -251 +248 @@
    incompatibility with older GNU hosts.  */
 
-#undef int_fast8_t
-#undef uint_fast8_t
-#undef int_fast16_t
-#undef uint_fast16_t
-#undef int_fast32_t
-#undef uint_fast32_t
-#undef int_fast64_t
-#undef uint_fast64_t
+# undef int_fast8_t
+# undef uint_fast8_t
+# undef int_fast16_t
+# undef uint_fast16_t
+# undef int_fast32_t
+# undef uint_fast32_t
+# undef int_fast64_t
+# undef uint_fast64_t
 typedef signed char gl_int_fast8_t;
 typedef unsigned char gl_uint_fast8_t;
 
-#ifdef __sun
+# ifdef __sun
 /* Define types compatible with SunOS 5.10, so that code compiled under
    earlier SunOS versions works with code compiled under SunOS 5.10.  */
 typedef int gl_int_fast32_t;
 typedef unsigned int gl_uint_fast32_t;
-#else
+# else
 typedef long int gl_int_fast32_t;
 typedef unsigned long int gl_uint_fast32_t;
-#endif
+# endif
 typedef gl_int_fast32_t gl_int_fast16_t;
 typedef gl_uint_fast32_t gl_uint_fast16_t;
 
-#define int_fast8_t gl_int_fast8_t
-#define uint_fast8_t gl_uint_fast8_t
-#define int_fast16_t gl_int_fast16_t
-#define uint_fast16_t gl_uint_fast16_t
-#define int_fast32_t gl_int_fast32_t
-#define uint_fast32_t gl_uint_fast32_t
-#ifdef GL_INT64_T
-# define int_fast64_t int64_t
-#endif
-#ifdef GL_UINT64_T
-# define uint_fast64_t uint64_t
-#endif
+# define int_fast8_t gl_int_fast8_t
+# define uint_fast8_t gl_uint_fast8_t
+# define int_fast16_t gl_int_fast16_t
+# define uint_fast16_t gl_uint_fast16_t
+# define int_fast32_t gl_int_fast32_t
+# define uint_fast32_t gl_uint_fast32_t
+# ifdef GL_INT64_T
+#  define int_fast64_t int64_t
+# endif
+# ifdef GL_UINT64_T
+#  define uint_fast64_t uint64_t
+# endif
 
 /* 7.18.1.4. Integer types capable of holding object pointers */
@@ -292 +289 @@
    definitions of intptr_t and uintptr_t (which use int and unsigned)
    to avoid clashes with declarations of system functions like sbrk.  */
-#ifndef _INTPTR_T_DECLARED
-#undef intptr_t
-#undef uintptr_t
+# ifndef _INTPTR_T_DECLARED
+# undef intptr_t
+# undef uintptr_t
 typedef long int gl_intptr_t;
 typedef unsigned long int gl_uintptr_t;
-#define intptr_t gl_intptr_t
-#define uintptr_t gl_uintptr_t
-#endif
+# define intptr_t gl_intptr_t
+# define uintptr_t gl_uintptr_t
+# endif
 
 /* 7.18.1.5. Greatest-width integer types */
@@ -310 +307 @@
    assuming one type where another is used by the system.  */
 
-#ifndef INTMAX_MAX
-# undef INTMAX_C
-# undef intmax_t
-# if @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1
+# ifndef INTMAX_MAX
+#  undef INTMAX_C
+#  undef intmax_t
+#  if @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1
 typedef long long int gl_intmax_t;
-#  define intmax_t gl_intmax_t
-# elif defined GL_INT64_T
-#  define intmax_t int64_t
-# else
+#   define intmax_t gl_intmax_t
+#  elif defined GL_INT64_T
+#   define intmax_t int64_t
+#  else
 typedef long int gl_intmax_t;
-#  define intmax_t gl_intmax_t
-# endif
-#endif
-
-#ifndef UINTMAX_MAX
-# undef UINTMAX_C
-# undef uintmax_t
-# if @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1
+#   define intmax_t gl_intmax_t
+#  endif
+# endif
+
+# ifndef UINTMAX_MAX
+#  undef UINTMAX_C
+#  undef uintmax_t
+#  if @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1
 typedef unsigned long long int gl_uintmax_t;
-#  define uintmax_t gl_uintmax_t
-# elif defined GL_UINT64_T
-#  define uintmax_t uint64_t
-# else
+#   define uintmax_t gl_uintmax_t
+#  elif defined GL_UINT64_T
+#   define uintmax_t uint64_t
+#  else
 typedef unsigned long int gl_uintmax_t;
-#  define uintmax_t gl_uintmax_t
-# endif
-#endif
+#   define uintmax_t gl_uintmax_t
+#  endif
+# endif
 
 /* Verify that intmax_t and uintmax_t have the same size.  Too much code
@@ -344 +341 @@
                                 ? 1 : -1];
 
-#define GNULIB_defined_stdint_types 1
-#endif /* !GNULIB_defined_stdint_types */
+# define GNULIB_defined_stdint_types 1
+# endif /* !GNULIB_defined_stdint_types */
 
 /* 7.18.2. Limits of specified-width integer types */
@@ -354 +351 @@
    types have 8, 16, 32, optionally 64 bits.  */
 
-#undef INT8_MIN
-#undef INT8_MAX
-#undef UINT8_MAX
-#define INT8_MIN  (~ INT8_MAX)
-#define INT8_MAX  127
-#define UINT8_MAX  255
-
-#undef INT16_MIN
-#undef INT16_MAX
-#undef UINT16_MAX
-#define INT16_MIN  (~ INT16_MAX)
-#define INT16_MAX  32767
-#define UINT16_MAX  65535
-
-#undef INT32_MIN
-#undef INT32_MAX
-#undef UINT32_MAX
-#define INT32_MIN  (~ INT32_MAX)
-#define INT32_MAX  2147483647
-#define UINT32_MAX  4294967295U
-
-#if defined GL_INT64_T && ! defined INT64_MAX
+# undef INT8_MIN
+# undef INT8_MAX
+# undef UINT8_MAX
+# define INT8_MIN  (~ INT8_MAX)
+# define INT8_MAX  127
+# define UINT8_MAX  255
+
+# undef INT16_MIN
+# undef INT16_MAX
+# undef UINT16_MAX
+# define INT16_MIN  (~ INT16_MAX)
+# define INT16_MAX  32767
+# define UINT16_MAX  65535
+
+# undef INT32_MIN
+# undef INT32_MAX
+# undef UINT32_MAX
+# define INT32_MIN  (~ INT32_MAX)
+# define INT32_MAX  2147483647
+# define UINT32_MAX  4294967295U
+
+# if defined GL_INT64_T && ! defined INT64_MAX
 /* Prefer (- INTMAX_C (1) << 63) over (~ INT64_MAX) because SunPRO C 5.0
    evaluates the latter incorrectly in preprocessor expressions.  */
-# define INT64_MIN  (- INTMAX_C (1) << 63)
-# define INT64_MAX  INTMAX_C (9223372036854775807)
-#endif
-
-#if defined GL_UINT64_T && ! defined UINT64_MAX
-# define UINT64_MAX  UINTMAX_C (18446744073709551615)
-#endif
+#  define INT64_MIN  (- INTMAX_C (1) << 63)
+#  define INT64_MAX  INTMAX_C (9223372036854775807)
+# endif
+
+# if defined GL_UINT64_T && ! defined UINT64_MAX
+#  define UINT64_MAX  UINTMAX_C (18446744073709551615)
+# endif
 
 /* 7.18.2.2. Limits of minimum-width integer types */
@@ -392 +389 @@
    are the same as the corresponding N_t types.  */
 
-#undef INT_LEAST8_MIN
-#undef INT_LEAST8_MAX
-#undef UINT_LEAST8_MAX
-#define INT_LEAST8_MIN  INT8_MIN
-#define INT_LEAST8_MAX  INT8_MAX
-#define UINT_LEAST8_MAX  UINT8_MAX
-
-#undef INT_LEAST16_MIN
-#undef INT_LEAST16_MAX
-#undef UINT_LEAST16_MAX
-#define INT_LEAST16_MIN  INT16_MIN
-#define INT_LEAST16_MAX  INT16_MAX
-#define UINT_LEAST16_MAX  UINT16_MAX
-
-#undef INT_LEAST32_MIN
-#undef INT_LEAST32_MAX
-#undef UINT_LEAST32_MAX
-#define INT_LEAST32_MIN  INT32_MIN
-#define INT_LEAST32_MAX  INT32_MAX
-#define UINT_LEAST32_MAX  UINT32_MAX
-
-#undef INT_LEAST64_MIN
-#undef INT_LEAST64_MAX
-#ifdef GL_INT64_T
-# define INT_LEAST64_MIN  INT64_MIN
-# define INT_LEAST64_MAX  INT64_MAX
-#endif
-
-#undef UINT_LEAST64_MAX
-#ifdef GL_UINT64_T
-# define UINT_LEAST64_MAX  UINT64_MAX
-#endif
+# undef INT_LEAST8_MIN
+# undef INT_LEAST8_MAX
+# undef UINT_LEAST8_MAX
+# define INT_LEAST8_MIN  INT8_MIN
+# define INT_LEAST8_MAX  INT8_MAX
+# define UINT_LEAST8_MAX  UINT8_MAX
+
+# undef INT_LEAST16_MIN
+# undef INT_LEAST16_MAX
+# undef UINT_LEAST16_MAX
+# define INT_LEAST16_MIN  INT16_MIN
+# define INT_LEAST16_MAX  INT16_MAX
+# define UINT_LEAST16_MAX  UINT16_MAX
+
+# undef INT_LEAST32_MIN
+# undef INT_LEAST32_MAX
+# undef UINT_LEAST32_MAX
+# define INT_LEAST32_MIN  INT32_MIN
+# define INT_LEAST32_MAX  INT32_MAX
+# define UINT_LEAST32_MAX  UINT32_MAX
+
+# undef INT_LEAST64_MIN
+# undef INT_LEAST64_MAX
+# ifdef GL_INT64_T
+#  define INT_LEAST64_MIN  INT64_MIN
+#  define INT_LEAST64_MAX  INT64_MAX
+# endif
+
+# undef UINT_LEAST64_MAX
+# ifdef GL_UINT64_T
+#  define UINT_LEAST64_MAX  UINT64_MAX
+# endif
 
 /* 7.18.2.3. Limits of fastest minimum-width integer types */
@@ -431 +428 @@
    are taken from the same list of types.  */
 
-#undef INT_FAST8_MIN
-#undef INT_FAST8_MAX
-#undef UINT_FAST8_MAX
-#define INT_FAST8_MIN  SCHAR_MIN
-#define INT_FAST8_MAX  SCHAR_MAX
-#define UINT_FAST8_MAX  UCHAR_MAX
-
-#undef INT_FAST16_MIN
-#undef INT_FAST16_MAX
-#undef UINT_FAST16_MAX
-#define INT_FAST16_MIN  INT_FAST32_MIN
-#define INT_FAST16_MAX  INT_FAST32_MAX
-#define UINT_FAST16_MAX  UINT_FAST32_MAX
-
-#undef INT_FAST32_MIN
-#undef INT_FAST32_MAX
-#undef UINT_FAST32_MAX
-#ifdef __sun
-# define INT_FAST32_MIN  INT_MIN
-# define INT_FAST32_MAX  INT_MAX
-# define UINT_FAST32_MAX  UINT_MAX
-#else
-# define INT_FAST32_MIN  LONG_MIN
-# define INT_FAST32_MAX  LONG_MAX
-# define UINT_FAST32_MAX  ULONG_MAX
-#endif
-
-#undef INT_FAST64_MIN
-#undef INT_FAST64_MAX
-#ifdef GL_INT64_T
-# define INT_FAST64_MIN  INT64_MIN
-# define INT_FAST64_MAX  INT64_MAX
-#endif
-
-#undef UINT_FAST64_MAX
-#ifdef GL_UINT64_T
-# define UINT_FAST64_MAX  UINT64_MAX
-#endif
+# undef INT_FAST8_MIN
+# undef INT_FAST8_MAX
+# undef UINT_FAST8_MAX
+# define INT_FAST8_MIN  SCHAR_MIN
+# define INT_FAST8_MAX  SCHAR_MAX
+# define UINT_FAST8_MAX  UCHAR_MAX
+
+# undef INT_FAST16_MIN
+# undef INT_FAST16_MAX
+# undef UINT_FAST16_MAX
+# define INT_FAST16_MIN  INT_FAST32_MIN
+# define INT_FAST16_MAX  INT_FAST32_MAX
+# define UINT_FAST16_MAX  UINT_FAST32_MAX
+
+# undef INT_FAST32_MIN
+# undef INT_FAST32_MAX
+# undef UINT_FAST32_MAX
+# ifdef __sun
+#  define INT_FAST32_MIN  INT_MIN
+#  define INT_FAST32_MAX  INT_MAX
+#  define UINT_FAST32_MAX  UINT_MAX
+# else
+#  define INT_FAST32_MIN  LONG_MIN
+#  define INT_FAST32_MAX  LONG_MAX
+#  define UINT_FAST32_MAX  ULONG_MAX
+# endif
+
+# undef INT_FAST64_MIN
+# undef INT_FAST64_MAX
+# ifdef GL_INT64_T
+#  define INT_FAST64_MIN  INT64_MIN
+#  define INT_FAST64_MAX  INT64_MAX
+# endif
+
+# undef UINT_FAST64_MAX
+# ifdef GL_UINT64_T
+#  define UINT_FAST64_MAX  UINT64_MAX
+# endif
 
 /* 7.18.2.4. Limits of integer types capable of holding object pointers */
 
-#undef INTPTR_MIN
-#undef INTPTR_MAX
-#undef UINTPTR_MAX
-#define INTPTR_MIN  LONG_MIN
-#define INTPTR_MAX  LONG_MAX
-#define UINTPTR_MAX  ULONG_MAX
+# undef INTPTR_MIN
+# undef INTPTR_MAX
+# undef UINTPTR_MAX
+# define INTPTR_MIN  LONG_MIN
+# define INTPTR_MAX  LONG_MAX
+# define UINTPTR_MAX  ULONG_MAX
 
 /* 7.18.2.5. Limits of greatest-width integer types */
 
-#ifndef INTMAX_MAX
-# undef INTMAX_MIN
-# ifdef INT64_MAX
-#  define INTMAX_MIN  INT64_MIN
-#  define INTMAX_MAX  INT64_MAX
+# ifndef INTMAX_MAX
+#  undef INTMAX_MIN
+#  ifdef INT64_MAX
+#   define INTMAX_MIN  INT64_MIN
+#   define INTMAX_MAX  INT64_MAX
+#  else
+#   define INTMAX_MIN  INT32_MIN
+#   define INTMAX_MAX  INT32_MAX
+#  endif
+# endif
+
+# ifndef UINTMAX_MAX
+#  ifdef UINT64_MAX
+#   define UINTMAX_MAX  UINT64_MAX
+#  else
+#   define UINTMAX_MAX  UINT32_MAX
+#  endif
+# endif
+
+/* 7.18.3. Limits of other integer types */
+
+/* ptrdiff_t limits */
+# undef PTRDIFF_MIN
+# undef PTRDIFF_MAX
+# if @APPLE_UNIVERSAL_BUILD@
+#  ifdef _LP64
+#   define PTRDIFF_MIN  _STDINT_MIN (1, 64, 0l)
+#   define PTRDIFF_MAX  _STDINT_MAX (1, 64, 0l)
+#  else
+#   define PTRDIFF_MIN  _STDINT_MIN (1, 32, 0)
+#   define PTRDIFF_MAX  _STDINT_MAX (1, 32, 0)
+#  endif
 # else
-#  define INTMAX_MIN  INT32_MIN
-#  define INTMAX_MAX  INT32_MAX
-# endif
-#endif
-
-#ifndef UINTMAX_MAX
-# ifdef UINT64_MAX
-#  define UINTMAX_MAX  UINT64_MAX
-# else
-#  define UINTMAX_MAX  UINT32_MAX
-# endif
-#endif
-
-/* 7.18.3. Limits of other integer types */
-
-/* ptrdiff_t limits */
-#undef PTRDIFF_MIN
-#undef PTRDIFF_MAX
-#if @APPLE_UNIVERSAL_BUILD@
-# ifdef _LP64
-#  define PTRDIFF_MIN  _STDINT_MIN (1, 64, 0l)
-#  define PTRDIFF_MAX  _STDINT_MAX (1, 64, 0l)
-# else
-#  define PTRDIFF_MIN  _STDINT_MIN (1, 32, 0)
-#  define PTRDIFF_MAX  _STDINT_MAX (1, 32, 0)
-# endif
-#else
-# define PTRDIFF_MIN  \
+#  define PTRDIFF_MIN  \
     _STDINT_MIN (1, @BITSIZEOF_PTRDIFF_T@, 0@PTRDIFF_T_SUFFIX@)
-# define PTRDIFF_MAX  \
+#  define PTRDIFF_MAX  \
     _STDINT_MAX (1, @BITSIZEOF_PTRDIFF_T@, 0@PTRDIFF_T_SUFFIX@)
-#endif
+# endif
 
 /* sig_atomic_t limits */
-#undef SIG_ATOMIC_MIN
-#undef SIG_ATOMIC_MAX
-#define SIG_ATOMIC_MIN  \
+# undef SIG_ATOMIC_MIN
+# undef SIG_ATOMIC_MAX
+# define SIG_ATOMIC_MIN  \
    _STDINT_MIN (@HAVE_SIGNED_SIG_ATOMIC_T@, @BITSIZEOF_SIG_ATOMIC_T@, \
                 0@SIG_ATOMIC_T_SUFFIX@)
-#define SIG_ATOMIC_MAX  \
+# define SIG_ATOMIC_MAX  \
    _STDINT_MAX (@HAVE_SIGNED_SIG_ATOMIC_T@, @BITSIZEOF_SIG_ATOMIC_T@, \
                 0@SIG_ATOMIC_T_SUFFIX@)
@@ -532 +529 @@
 
 /* size_t limit */
-#undef SIZE_MAX
-#if @APPLE_UNIVERSAL_BUILD@
-# ifdef _LP64
-#  define SIZE_MAX  _STDINT_MAX (0, 64, 0ul)
+# undef SIZE_MAX
+# if @APPLE_UNIVERSAL_BUILD@
+#  ifdef _LP64
+#   define SIZE_MAX  _STDINT_MAX (0, 64, 0ul)
+#  else
+#   define SIZE_MAX  _STDINT_MAX (0, 32, 0ul)
+#  endif
 # else
-#  define SIZE_MAX  _STDINT_MAX (0, 32, 0ul)
-# endif
-#else
-# define SIZE_MAX  _STDINT_MAX (0, @BITSIZEOF_SIZE_T@, 0@SIZE_T_SUFFIX@)
-#endif
+#  define SIZE_MAX  _STDINT_MAX (0, @BITSIZEOF_SIZE_T@, 0@SIZE_T_SUFFIX@)
+# endif
 
 /* wchar_t limits */
@@ -549 +546 @@
    <wchar.h> -> <stdio.h> -> <getopt.h> -> <stdlib.h>, and the latter includes
    <stdint.h> and assumes its types are already defined.  */
-#if @HAVE_WCHAR_H@ && ! (defined WCHAR_MIN && defined WCHAR_MAX)
+# if @HAVE_WCHAR_H@ && ! (defined WCHAR_MIN && defined WCHAR_MAX)
   /* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
      included before <wchar.h>.  */
-# include <stddef.h>
-# include <stdio.h>
-# include <time.h>
-# define _GL_JUST_INCLUDE_SYSTEM_WCHAR_H
-# include <wchar.h>
-# undef _GL_JUST_INCLUDE_SYSTEM_WCHAR_H
-#endif
-#undef WCHAR_MIN
-#undef WCHAR_MAX
-#define WCHAR_MIN  \
+#  include <stddef.h>
+#  include <stdio.h>
+#  include <time.h>
+#  define _GL_JUST_INCLUDE_SYSTEM_WCHAR_H
+#  include <wchar.h>
+#  undef _GL_JUST_INCLUDE_SYSTEM_WCHAR_H
+# endif
+# undef WCHAR_MIN
+# undef WCHAR_MAX
+# define WCHAR_MIN  \
    _STDINT_MIN (@HAVE_SIGNED_WCHAR_T@, @BITSIZEOF_WCHAR_T@, 0@WCHAR_T_SUFFIX@)
-#define WCHAR_MAX  \
+# define WCHAR_MAX  \
    _STDINT_MAX (@HAVE_SIGNED_WCHAR_T@, @BITSIZEOF_WCHAR_T@, 0@WCHAR_T_SUFFIX@)
 
 /* wint_t limits */
-#undef WINT_MIN
-#undef WINT_MAX
-#define WINT_MIN  \
+# undef WINT_MIN
+# undef WINT_MAX
+# define WINT_MIN  \
    _STDINT_MIN (@HAVE_SIGNED_WINT_T@, @BITSIZEOF_WINT_T@, 0@WINT_T_SUFFIX@)
-#define WINT_MAX  \
+# define WINT_MAX  \
    _STDINT_MAX (@HAVE_SIGNED_WINT_T@, @BITSIZEOF_WINT_T@, 0@WINT_T_SUFFIX@)
 
@@ -582 +579 @@
    types have 8, 16, 32, optionally 64 bits, and int is 32 bits.  */
 
-#undef INT8_C
-#undef UINT8_C
-#define INT8_C(x) x
-#define UINT8_C(x) x
-
-#undef INT16_C
-#undef UINT16_C
-#define INT16_C(x) x
-#define UINT16_C(x) x
-
-#undef INT32_C
-#undef UINT32_C
-#define INT32_C(x) x
-#define UINT32_C(x) x ## U
-
-#undef INT64_C
-#undef UINT64_C
-#if LONG_MAX >> 31 >> 31 == 1
-# define INT64_C(x) x##L
-#elif defined _MSC_VER
-# define INT64_C(x) x##i64
-#elif @HAVE_LONG_LONG_INT@
-# define INT64_C(x) x##LL
-#endif
-#if ULONG_MAX >> 31 >> 31 >> 1 == 1
-# define UINT64_C(x) x##UL
-#elif defined _MSC_VER
-# define UINT64_C(x) x##ui64
-#elif @HAVE_UNSIGNED_LONG_LONG_INT@
-# define UINT64_C(x) x##ULL
-#endif
+# undef INT8_C
+# undef UINT8_C
+# define INT8_C(x) x
+# define UINT8_C(x) x
+
+# undef INT16_C
+# undef UINT16_C
+# define INT16_C(x) x
+# define UINT16_C(x) x
+
+# undef INT32_C
+# undef UINT32_C
+# define INT32_C(x) x
+# define UINT32_C(x) x ## U
+
+# undef INT64_C
+# undef UINT64_C
+# if LONG_MAX >> 31 >> 31 == 1
+#  define INT64_C(x) x##L
+# elif defined _MSC_VER
+#  define INT64_C(x) x##i64
+# elif @HAVE_LONG_LONG_INT@
+#  define INT64_C(x) x##LL
+# endif
+# if ULONG_MAX >> 31 >> 31 >> 1 == 1
+#  define UINT64_C(x) x##UL
+# elif defined _MSC_VER
+#  define UINT64_C(x) x##ui64
+# elif @HAVE_UNSIGNED_LONG_LONG_INT@
+#  define UINT64_C(x) x##ULL
+# endif
 
 /* 7.18.4.2. Macros for greatest-width integer constants */
 
-#ifndef INTMAX_C
-# if @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1
-#  define INTMAX_C(x)   x##LL
-# elif defined GL_INT64_T
-#  define INTMAX_C(x)   INT64_C(x)
-# else
-#  define INTMAX_C(x)   x##L
-# endif
-#endif
-
-#ifndef UINTMAX_C
-# if @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1
-#  define UINTMAX_C(x)  x##ULL
-# elif defined GL_UINT64_T
-#  define UINTMAX_C(x)  UINT64_C(x)
-# else
-#  define UINTMAX_C(x)  x##UL
-# endif
-#endif
+# ifndef INTMAX_C
+#  if @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1
+#   define INTMAX_C(x)   x##LL
+#  elif defined GL_INT64_T
+#   define INTMAX_C(x)   INT64_C(x)
+#  else
+#   define INTMAX_C(x)   x##L
+#  endif
+# endif
+
+# ifndef UINTMAX_C
+#  if @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1
+#   define UINTMAX_C(x)  x##ULL
+#  elif defined GL_UINT64_T
+#   define UINTMAX_C(x)  UINT64_C(x)
+#  else
+#   define UINTMAX_C(x)  x##UL
+#  endif
+# endif
+
+#endif /* !@HAVE_C99_STDINT_H@ */
+
+/* Macros specified by ISO/IEC TS 18661-1:2014.  */
+
+#if (!defined UINTMAX_WIDTH \
+     && (defined _GNU_SOURCE || defined __STDC_WANT_IEC_60559_BFP_EXT__))
+# ifdef INT8_MAX
+#  define INT8_WIDTH _GL_INTEGER_WIDTH (INT8_MIN, INT8_MAX)
+# endif
+# ifdef UINT8_MAX
+#  define UINT8_WIDTH _GL_INTEGER_WIDTH (0, UINT8_MAX)
+# endif
+# ifdef INT16_MAX
+#  define INT16_WIDTH _GL_INTEGER_WIDTH (INT16_MIN, INT16_MAX)
+# endif
+# ifdef UINT16_MAX
+#  define UINT16_WIDTH _GL_INTEGER_WIDTH (0, UINT16_MAX)
+# endif
+# ifdef INT32_MAX
+#  define INT32_WIDTH _GL_INTEGER_WIDTH (INT32_MIN, INT32_MAX)
+# endif
+# ifdef UINT32_MAX
+#  define UINT32_WIDTH _GL_INTEGER_WIDTH (0, UINT32_MAX)
+# endif
+# ifdef INT64_MAX
+#  define INT64_WIDTH _GL_INTEGER_WIDTH (INT64_MIN, INT64_MAX)
+# endif
+# ifdef UINT64_MAX
+#  define UINT64_WIDTH _GL_INTEGER_WIDTH (0, UINT64_MAX)
+# endif
+# define INT_LEAST8_WIDTH _GL_INTEGER_WIDTH (INT_LEAST8_MIN, INT_LEAST8_MAX)
+# define UINT_LEAST8_WIDTH _GL_INTEGER_WIDTH (0, UINT_LEAST8_MAX)
+# define INT_LEAST16_WIDTH _GL_INTEGER_WIDTH (INT_LEAST16_MIN, INT_LEAST16_MAX)
+# define UINT_LEAST16_WIDTH _GL_INTEGER_WIDTH (0, UINT_LEAST16_MAX)
+# define INT_LEAST32_WIDTH _GL_INTEGER_WIDTH (INT_LEAST32_MIN, INT_LEAST32_MAX)
+# define UINT_LEAST32_WIDTH _GL_INTEGER_WIDTH (0, UINT_LEAST32_MAX)
+# define INT_LEAST64_WIDTH _GL_INTEGER_WIDTH (INT_LEAST64_MIN, INT_LEAST64_MAX)
+# define UINT_LEAST64_WIDTH _GL_INTEGER_WIDTH (0, UINT_LEAST64_MAX)
+# define INT_FAST8_WIDTH _GL_INTEGER_WIDTH (INT_FAST8_MIN, INT_FAST8_MAX)
+# define UINT_FAST8_WIDTH _GL_INTEGER_WIDTH (0, UINT_FAST8_MAX)
+# define INT_FAST16_WIDTH _GL_INTEGER_WIDTH (INT_FAST16_MIN, INT_FAST16_MAX)
+# define UINT_FAST16_WIDTH _GL_INTEGER_WIDTH (0, UINT_FAST16_MAX)
+# define INT_FAST32_WIDTH _GL_INTEGER_WIDTH (INT_FAST32_MIN, INT_FAST32_MAX)
+# define UINT_FAST32_WIDTH _GL_INTEGER_WIDTH (0, UINT_FAST32_MAX)
+# define INT_FAST64_WIDTH _GL_INTEGER_WIDTH (INT_FAST64_MIN, INT_FAST64_MAX)
+# define UINT_FAST64_WIDTH _GL_INTEGER_WIDTH (0, UINT_FAST64_MAX)
+# define INTPTR_WIDTH _GL_INTEGER_WIDTH (INTPTR_MIN, INTPTR_MAX)
+# define UINTPTR_WIDTH _GL_INTEGER_WIDTH (0, UINTPTR_MAX)
+# define INTMAX_WIDTH _GL_INTEGER_WIDTH (INTMAX_MIN, INTMAX_MAX)
+# define UINTMAX_WIDTH _GL_INTEGER_WIDTH (0, UINTMAX_MAX)
+# define PTRDIFF_WIDTH _GL_INTEGER_WIDTH (PTRDIFF_MIN, PTRDIFF_MAX)
+# define SIZE_WIDTH _GL_INTEGER_WIDTH (0, SIZE_MAX)
+# define WCHAR_WIDTH _GL_INTEGER_WIDTH (WCHAR_MIN, WCHAR_MAX)
+# ifdef WINT_MAX
+#  define WINT_WIDTH _GL_INTEGER_WIDTH (WINT_MIN, WINT_MAX)
+# endif
+# ifdef SIG_ATOMIC_MAX
+#  define SIG_ATOMIC_WIDTH _GL_INTEGER_WIDTH (SIG_ATOMIC_MIN, SIG_ATOMIC_MAX)
+# endif
+#endif /* !WINT_WIDTH && (_GNU_SOURCE || __STDC_WANT_IEC_60559_BFP_EXT__) */
 
 #endif /* _@GUARD_PREFIX@_STDINT_H */

coreutils/trunk/lib/stdlib.in.h ¶

@@ -522 +522 @@
 
 #if @GNULIB_QSORT_R@
+/* Sort an array of NMEMB elements, starting at address BASE, each element
+   occupying SIZE bytes, in ascending order according to the comparison
+   function COMPARE.  */
 # if @REPLACE_QSORT_R@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
@@ -536 +539 @@
                                   void *arg));
 # else
+#  if !@HAVE_QSORT_R@
+_GL_FUNCDECL_SYS (qsort_r, void, (void *base, size_t nmemb, size_t size,
+                                  int (*compare) (void const *, void const *,
+                                                  void *),
+                                  void *arg) _GL_ARG_NONNULL ((1, 4)));
+#  endif
 _GL_CXXALIAS_SYS (qsort_r, void, (void *base, size_t nmemb, size_t size,
                                   int (*compare) (void const *, void const *,
@@ -542 +551 @@
 # endif
 _GL_CXXALIASWARN (qsort_r);
+#elif defined GNULIB_POSIXCHECK
+# undef qsort_r
+# if HAVE_RAW_DECL_QSORT_R
+_GL_WARN_ON_USE (qsort_r, "qsort_r is not portable - "
+                 "use gnulib module qsort_r for portability");
+# endif
 #endif
 

coreutils/trunk/lib/strerror.c ¶

@@ -67 +67 @@
     abort ();
 
-  return memcpy (buf, msg, len + 1);
+  memcpy (buf, msg, len + 1);
+  return buf;
 }

coreutils/trunk/lib/strftime.c ¶

@@ -1 @@
-/* Copyright (C) 1991-2001, 2003-2007, 2009-2016 Free Software Foundation, Inc.
-
-   NOTE: The canonical source of this file is maintained with the GNU C Library.
-   Bugs can be reported to bug-glibc@prep.ai.mit.edu.
-
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
+/* Copyright (C) 1991-2016 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 3 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #ifdef _LIBC
+# define USE_IN_EXTENDED_LOCALE_MODEL 1
 # define HAVE_STRUCT_ERA_ENTRY 1
 # define HAVE_TM_GMTOFF 1
@@ -64 +64 @@
 
 #include <limits.h>
-#include <stdbool.h>
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
+#include <stdbool.h>
 
 #ifdef COMPILE_WIDE
@@ -248 +248 @@
 # define _NL_CURRENT(category, item) \
   (current->values[_NL_ITEM_INDEX (item)].string)
+# define LOCALE_PARAM , __locale_t loc
 # define LOCALE_ARG , loc
-# define LOCALE_PARAM_PROTO , __locale_t loc
 # define HELPER_LOCALE_ARG  , current
 #else
-# define LOCALE_PARAM_PROTO
+# define LOCALE_PARAM
 # define LOCALE_ARG
 # ifdef _LIBC
@@ -305 +305 @@
 }
 #else
+static CHAR_T *memcpy_lowcase (CHAR_T *dest, const CHAR_T *src,
+                               size_t len LOCALE_PARAM);
+
 static CHAR_T *
-memcpy_lowcase (CHAR_T *dest, const CHAR_T *src,
-                size_t len LOCALE_PARAM_PROTO)
+memcpy_lowcase (CHAR_T *dest, const CHAR_T *src, size_t len LOCALE_PARAM)
 {
   while (len-- > 0)
@@ -314 +316 @@
 }
 
+static CHAR_T *memcpy_uppcase (CHAR_T *dest, const CHAR_T *src,
+                               size_t len LOCALE_PARAM);
+
 static CHAR_T *
-memcpy_uppcase (CHAR_T *dest, const CHAR_T *src,
-                size_t len LOCALE_PARAM_PROTO)
+memcpy_uppcase (CHAR_T *dest, const CHAR_T *src, size_t len LOCALE_PARAM)
 {
   while (len-- > 0)
@@ -329 +333 @@
    measured in seconds, ignoring leap seconds.  */
 # define tm_diff ftime_tm_diff
+static int tm_diff (const struct tm *, const struct tm *);
 static int
 tm_diff (const struct tm *a, const struct tm *b)
@@ -360 +365 @@
 #define ISO_WEEK1_WDAY 4 /* Thursday */
 #define YDAY_MINIMUM (-366)
+static int iso_week_days (int, int);
 #ifdef __GNUC__
 __inline__
@@ -402 +408 @@
 #endif
 
-
-/* Just like my_strftime, below, but with one more parameter, UPCASE,
-   to indicate that the result should be converted to upper case.  */
+static size_t __strftime_internal (STREAM_OR_CHAR_T *, STRFTIME_ARG (size_t)
+                                   const CHAR_T *, const struct tm *,
+                                   bool, bool *
+                                   extra_args_spec LOCALE_PARAM);
+
+/* Write information from TP into S according to the format
+   string FORMAT, writing no more that MAXSIZE characters
+   (including the terminating '\0') and returning number of
+   characters written.  If S is NULL, nothing will be written
+   anywhere, so to determine how many characters would be
+   written, use NULL for S and (size_t) -1 for MAXSIZE.  */
+size_t
+my_strftime (STREAM_OR_CHAR_T *s, STRFTIME_ARG (size_t maxsize)
+             const CHAR_T *format,
+             const struct tm *tp extra_args_spec LOCALE_PARAM)
+{
+  bool tzset_called = false;
+  return __strftime_internal (s, STRFTIME_ARG (maxsize) format, tp,
+                              false, &tzset_called extra_args LOCALE_ARG);
+}
+#if defined _LIBC && ! FPRINTFTIME
+libc_hidden_def (my_strftime)
+#endif
+
+/* Just like my_strftime, above, but with two more parameters.
+   UPCASE indicate that the result should be converted to upper case,
+   and *TZSET_CALLED indicates whether tzset has been called here.  */
 static size_t
-strftime_case_ (bool upcase, STREAM_OR_CHAR_T *s,
-                STRFTIME_ARG (size_t maxsize)
-                const CHAR_T *format,
-                const struct tm *tp extra_args_spec LOCALE_PARAM_PROTO)
+__strftime_internal (STREAM_OR_CHAR_T *s, STRFTIME_ARG (size_t maxsize)
+                     const CHAR_T *format,
+                     const struct tm *tp, bool upcase, bool *tzset_called
+                     extra_args_spec LOCALE_PARAM)
 {
 #if defined _LIBC && defined USE_IN_EXTENDED_LOCALE_MODEL
-  struct locale_data *const current = loc->__locales[LC_TIME];
+  struct __locale_data *const current = loc->__locales[LC_TIME];
 #endif
 #if FPRINTFTIME
@@ -427 +457 @@
      requires this.  Then it is ok to fail if the pointers are invalid.  */
 # define a_wkday \
-  ((const CHAR_T *) _NL_CURRENT (LC_TIME, NLW(ABDAY_1) + tp->tm_wday))
+  ((const CHAR_T *) (tp->tm_wday < 0 || tp->tm_wday > 6                      \
+                     ? "?" : _NL_CURRENT (LC_TIME, NLW(ABDAY_1) + tp->tm_wday)))
 # define f_wkday \
-  ((const CHAR_T *) _NL_CURRENT (LC_TIME, NLW(DAY_1) + tp->tm_wday))
+  ((const CHAR_T *) (tp->tm_wday < 0 || tp->tm_wday > 6                      \
+                     ? "?" : _NL_CURRENT (LC_TIME, NLW(DAY_1) + tp->tm_wday)))
 # define a_month \
-  ((const CHAR_T *) _NL_CURRENT (LC_TIME, NLW(ABMON_1) + tp->tm_mon))
+  ((const CHAR_T *) (tp->tm_mon < 0 || tp->tm_mon > 11                       \
+                     ? "?" : _NL_CURRENT (LC_TIME, NLW(ABMON_1) + tp->tm_mon)))
 # define f_month \
-  ((const CHAR_T *) _NL_CURRENT (LC_TIME, NLW(MON_1) + tp->tm_mon))
+  ((const CHAR_T *) (tp->tm_mon < 0 || tp->tm_mon > 11                       \
+                     ? "?" : _NL_CURRENT (LC_TIME, NLW(MON_1) + tp->tm_mon)))
 # define ampm \
   ((const CHAR_T *) _NL_CURRENT (LC_TIME, tp->tm_hour > 11                    \
@@ -484 +518 @@
       tzname_vec = tz->tzname_copy;
 # endif
+    }
+  /* The tzset() call might have changed the value.  */
+  if (!(zone && *zone) && tp->tm_isdst >= 0)
+    {
       /* POSIX.1 requires that local time zone information be used as
          though strftime called tzset.  */
 # if HAVE_TZSET
-      tzset ();
+      if (!*tzset_called)
+        {
+          tzset ();
+          *tzset_called = true;
+        }
 # endif
+      zone = tzname_vec[tp->tm_isdst != 0];
     }
-  /* The tzset() call might have changed the value.  */
-  if (!(zone && *zone) && tp->tm_isdst >= 0)
-    zone = tzname_vec[tp->tm_isdst != 0];
 #endif
   if (! zone)
@@ -642 +682 @@
         }
 
-      /* As a GNU extension we allow to specify the field width.  */
+      /* As a GNU extension we allow the field width to be specified.  */
       if (ISDIGIT (*f))
         {
@@ -802 +842 @@
         subformat:
           {
-            size_t len = strftime_case_ (to_uppcase,
-                                         NULL, STRFTIME_ARG ((size_t) -1)
-                                         subfmt,
-                                         tp extra_args LOCALE_ARG);
-            add (len, strftime_case_ (to_uppcase, p,
-                                      STRFTIME_ARG (maxsize - i)
-                                      subfmt,
-                                      tp extra_args LOCALE_ARG));
+            size_t len = __strftime_internal (NULL, STRFTIME_ARG ((size_t) -1)
+                                              subfmt,
+                                              tp, to_uppcase, tzset_called
+                                              extra_args LOCALE_ARG);
+            add (len, __strftime_internal (p,
+                                           STRFTIME_ARG (maxsize - i)
+                                           subfmt,
+                                           tp, to_uppcase, tzset_called
+                                           extra_args LOCALE_ARG));
           }
           break;
@@ -846 +887 @@
 
         case L_('C'):
-          if (modifier == L_('O'))
-            goto bad_format;
           if (modifier == L_('E'))
             {
@@ -1115 +1154 @@
           goto underlying_strftime;
 #endif
+
+        case L_('q'):           /* GNU extension.  */
+          DO_SIGNED_NUMBER (1, false, ((tp->tm_mon * 11) >> 5) + 1);
+          break;
 
         case L_('R'):
@@ -1365 +1408 @@
                 time_t lt;
 
+                /* POSIX.1 requires that local time zone information be used as
+                   though strftime called tzset.  */
+# if HAVE_TZSET
+                if (!*tzset_called)
+                  {
+                    tzset ();
+                    *tzset_called = true;
+                  }
+# endif
+
                 ltm = *tp;
                 lt = mktime_z (tz, &ltm);
@@ -1445 +1498 @@
   return i;
 }
-
-/* Write information from TP into S according to the format
-   string FORMAT, writing no more that MAXSIZE characters
-   (including the terminating '\0') and returning number of
-   characters written.  If S is NULL, nothing will be written
-   anywhere, so to determine how many characters would be
-   written, use NULL for S and (size_t) -1 for MAXSIZE.  */
-size_t
-my_strftime (STREAM_OR_CHAR_T *s, STRFTIME_ARG (size_t maxsize)
-             const CHAR_T *format,
-             const struct tm *tp extra_args_spec LOCALE_PARAM_PROTO)
-{
-  return strftime_case_ (false, s, STRFTIME_ARG (maxsize)
-                         format, tp extra_args LOCALE_ARG);
-}
-
-#if defined _LIBC && ! FPRINTFTIME
-libc_hidden_def (my_strftime)
-#endif

coreutils/trunk/lib/string.in.h ¶

@@ -417 +417 @@
 #   define strndup rpl_strndup
 #  endif
-_GL_FUNCDECL_RPL (strndup, char *, (char const *__string, size_t __n)
+_GL_FUNCDECL_RPL (strndup, char *, (char const *__s, size_t __n)
                                    _GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL (strndup, char *, (char const *__string, size_t __n));
+_GL_CXXALIAS_RPL (strndup, char *, (char const *__s, size_t __n));
 # else
 #  if ! @HAVE_DECL_STRNDUP@
-_GL_FUNCDECL_SYS (strndup, char *, (char const *__string, size_t __n)
+_GL_FUNCDECL_SYS (strndup, char *, (char const *__s, size_t __n)
                                    _GL_ARG_NONNULL ((1)));
 #  endif
-_GL_CXXALIAS_SYS (strndup, char *, (char const *__string, size_t __n));
+_GL_CXXALIAS_SYS (strndup, char *, (char const *__s, size_t __n));
 # endif
 _GL_CXXALIASWARN (strndup);
@@ -445 +445 @@
 #   define strnlen rpl_strnlen
 #  endif
-_GL_FUNCDECL_RPL (strnlen, size_t, (char const *__string, size_t __maxlen)
+_GL_FUNCDECL_RPL (strnlen, size_t, (char const *__s, size_t __maxlen)
                                    _GL_ATTRIBUTE_PURE
                                    _GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL (strnlen, size_t, (char const *__string, size_t __maxlen));
+_GL_CXXALIAS_RPL (strnlen, size_t, (char const *__s, size_t __maxlen));
 # else
 #  if ! @HAVE_DECL_STRNLEN@
-_GL_FUNCDECL_SYS (strnlen, size_t, (char const *__string, size_t __maxlen)
+_GL_FUNCDECL_SYS (strnlen, size_t, (char const *__s, size_t __maxlen)
                                    _GL_ATTRIBUTE_PURE
                                    _GL_ARG_NONNULL ((1)));
 #  endif
-_GL_CXXALIAS_SYS (strnlen, size_t, (char const *__string, size_t __maxlen));
+_GL_CXXALIAS_SYS (strnlen, size_t, (char const *__s, size_t __maxlen));
 # endif
 _GL_CXXALIASWARN (strnlen);

coreutils/trunk/lib/strtod.c ¶

@@ -216 +216 @@
   const char *end;
   char *endbuf;
-  int saved_errno;
+  int saved_errno = errno;
 
   /* Eat whitespace.  */
@@ -227 +227 @@
     ++s;
 
-  saved_errno = errno;
   num = underlying_strtod (s, &endbuf);
   end = endbuf;
@@ -240 +239 @@
         {
           if (! c_isxdigit (s[2 + (s[2] == '.')]))
-            end = s + 1;
+            {
+              end = s + 1;
+
+              /* strtod() on z/OS returns ERANGE for "0x".  */
+              errno = saved_errno;
+            }
           else if (end <= s + 2)
             {
@@ -322 +326 @@
          nice implementation populates the bits of the NaN according
          to interpreting n-char-sequence as a hexadecimal number.  */
-      if (s != end)
+      if (s != end || num == num)
         num = NAN;
       errno = saved_errno;

coreutils/trunk/lib/strtol.c ¶

@@ -122 +122 @@
    e.g., in Cray C 5.0.3.0.  */
 
-/* True if negative values of the signed integer type T use two's
-   complement, ones' complement, or signed magnitude representation,
-   respectively.  Much GNU code assumes two's complement, but some
-   people like to be portable to all possible C hosts.  */
-# define TYPE_TWOS_COMPLEMENT(t) ((t) ~ (t) 0 == (t) -1)
-# define TYPE_ONES_COMPLEMENT(t) ((t) ~ (t) 0 == 0)
-# define TYPE_SIGNED_MAGNITUDE(t) ((t) ~ (t) 0 < (t) -1)
-
 /* True if the arithmetic type T is signed.  */
 # define TYPE_SIGNED(t) (! ((t) 0 < (t) -1))
 
-/* The maximum and minimum values for the integer type T.  These
-   macros have undefined behavior if T is signed and has padding bits.
-   If this is a problem for you, please let us know how to fix it for
-   your host.  */
-# define TYPE_MINIMUM(t) \
-   ((t) (! TYPE_SIGNED (t) \
-         ? (t) 0 \
-         : TYPE_SIGNED_MAGNITUDE (t) \
-         ? ~ (t) 0 \
-         : ~ TYPE_MAXIMUM (t)))
-# define TYPE_MAXIMUM(t) \
-   ((t) (! TYPE_SIGNED (t) \
-         ? (t) -1 \
+/* Minimum and maximum values for integer types.
+   These macros have undefined behavior for signed types that either
+   have padding bits or do not use two's complement.  If this is a
+   problem for you, please let us know how to fix it for your host.  */
+
+/* The maximum and minimum values for the integer type T.  */
+# define TYPE_MINIMUM(t) ((t) ~ TYPE_MAXIMUM (t))
+# define TYPE_MAXIMUM(t)                                                 \
+   ((t) (! TYPE_SIGNED (t)                                               \
+         ? (t) -1                                                        \
          : ((((t) 1 << (sizeof (t) * CHAR_BIT - 2)) - 1) * 2 + 1)))
 

coreutils/trunk/lib/sys_select.in.h ¶

@@ -82 +82 @@
    Also, Mac OS X, AIX, HP-UX, IRIX, Solaris, Interix declare select()
    in <sys/time.h>.
-   But avoid namespace pollution on glibc systems.  */
-# ifndef __GLIBC__
+   But avoid namespace pollution on glibc systems and "unknown type
+   name" problems on Cygwin.  */
+# if !(defined __GLIBC__ || defined __CYGWIN__)
 #  include <sys/time.h>
 # endif
@@ -101 +102 @@
 
 /* Get definition of 'sigset_t'.
-   But avoid namespace pollution on glibc systems.
+   But avoid namespace pollution on glibc systems and "unknown type
+   name" problems on Cygwin.
    Do this after the include_next (for the sake of OpenBSD 5.0) but before
    the split double-inclusion guard (for the sake of Solaris).  */
-#if !(defined __GLIBC__ && !defined __UCLIBC__)
+#if !((defined __GLIBC__ || defined __CYGWIN__) && !defined __UCLIBC__)
 # include <signal.h>
 #endif
@@ -290 +292 @@
 #  endif
 _GL_FUNCDECL_RPL (select, int,
-                  (int, fd_set *, fd_set *, fd_set *, struct timeval *));
+                  (int, fd_set *restrict, fd_set *restrict, fd_set *restrict,
+                   struct timeval *restrict));
 _GL_CXXALIAS_RPL (select, int,
-                  (int, fd_set *, fd_set *, fd_set *, struct timeval *));
+                  (int, fd_set *restrict, fd_set *restrict, fd_set *restrict,
+                   struct timeval *restrict));
 # else
 _GL_CXXALIAS_SYS (select, int,
-                  (int, fd_set *, fd_set *, fd_set *, struct timeval *));
+                  (int, fd_set *restrict, fd_set *restrict, fd_set *restrict,
+                   struct timeval *restrict));
 # endif
 _GL_CXXALIASWARN (select);

coreutils/trunk/lib/sys_time.in.h ¶

@@ -110 +110 @@
 # endif
 _GL_CXXALIASWARN (gettimeofday);
+# if defined __cplusplus && defined GNULIB_NAMESPACE
+namespace GNULIB_NAMESPACE {
+  typedef ::timeval
+#undef timeval
+    timeval;
+}
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef gettimeofday

coreutils/trunk/lib/time_rz.c ¶

@@ -33 +33 @@
 #include <string.h>
 
+#include "flexmember.h"
 #include "time-internal.h"
 
@@ -47 +48 @@
    used.  */
 enum { ABBR_SIZE_MIN = DEFAULT_MXFAST - offsetof (struct tm_zone, abbrs) };
-
-static char const TZ[] = "TZ";
 
 /* Magic cookie timezone_t value, for local time.  It differs from
@@ -97 +96 @@
   size_t name_size = name ? strlen (name) + 1 : 0;
   size_t abbr_size = name_size < ABBR_SIZE_MIN ? ABBR_SIZE_MIN : name_size + 1;
-  timezone_t tz = malloc (offsetof (struct tm_zone, abbrs) + abbr_size);
+  timezone_t tz = malloc (FLEXSIZEOF (struct tm_zone, abbrs, abbr_size));
   if (tz)
     {
@@ -206 +205 @@
 getenv_TZ (void)
 {
-  return getenv (TZ);
+  return getenv ("TZ");
 }
 #endif
@@ -214 +213 @@
 setenv_TZ (char const *tz)
 {
-  return tz ? setenv (TZ, tz, 1) : unsetenv (TZ);
+  return tz ? setenv ("TZ", tz, 1) : unsetenv ("TZ");
 }
 #endif

coreutils/trunk/lib/timegm.c ¶

@@ -23 +23 @@
 #include <time.h>
 
-#ifndef _LIBC
+#ifdef _LIBC
+typedef time_t mktime_offset_t;
+#else
 # undef __gmtime_r
 # define __gmtime_r gmtime_r
@@ -33 +35 @@
 timegm (struct tm *tmp)
 {
-  static time_t gmtime_offset;
+  static mktime_offset_t gmtime_offset;
   tmp->tm_isdst = 0;
   return __mktime_internal (tmp, __gmtime_r, &gmtime_offset);

coreutils/trunk/lib/trim.c ¶

@@ -32 +32 @@
 
 /* Use this to suppress gcc's "...may be used before initialized" warnings. */
-#ifdef lint
+#if defined GCC_LINT || defined lint
 # define IF_LINT(Code) Code
 #else

coreutils/trunk/lib/unistr.in.h ¶

@@ -198 +198 @@
   uint32_t c = *s;
 
-#  if CONFIG_UNICODE_SAFETY
   if (c < 0xd800 || (c >= 0xe000 && c < 0x110000))
-#  endif
     *puc = c;
-#  if CONFIG_UNICODE_SAFETY
   else
     /* invalid multibyte character */
     *puc = 0xfffd;
-#  endif
   return 1;
 }

coreutils/trunk/lib/unistr/u8-mbtoucr.c ¶

@@ -93 +93 @@
               if ((s[1] ^ 0x80) < 0x40
                   && (c >= 0xf1 || s[1] >= 0x90)
-#if 1
-                  && (c < 0xf4 || (c == 0xf4 && s[1] < 0x90))
-#endif
-                 )
+                  && (c < 0xf4 || (c == 0xf4 && s[1] < 0x90)))
                 {
                   if (n >= 3)
@@ -139 +136 @@
             }
         }
-#if 0
-      else if (c < 0xfc)
-        {
-          if (n >= 2)
-            {
-              if ((s[1] ^ 0x80) < 0x40
-                  && (c >= 0xf9 || s[1] >= 0x88))
-                {
-                  if (n >= 3)
-                    {
-                      if ((s[2] ^ 0x80) < 0x40)
-                        {
-                          if (n >= 4)
-                            {
-                              if ((s[3] ^ 0x80) < 0x40)
-                                {
-                                  if (n >= 5)
-                                    {
-                                      if ((s[4] ^ 0x80) < 0x40)
-                                        {
-                                          *puc = ((unsigned int) (c & 0x03) << 24)
-                                                 | ((unsigned int) (s[1] ^ 0x80) << 18)
-                                                 | ((unsigned int) (s[2] ^ 0x80) << 12)
-                                                 | ((unsigned int) (s[3] ^ 0x80) << 6)
-                                                 | (unsigned int) (s[4] ^ 0x80);
-                                          return 5;
-                                        }
-                                      /* invalid multibyte character */
-                                    }
-                                  else
-                                    {
-                                      /* incomplete multibyte character */
-                                      *puc = 0xfffd;
-                                      return -2;
-                                    }
-                                }
-                              /* invalid multibyte character */
-                            }
-                          else
-                            {
-                              /* incomplete multibyte character */
-                              *puc = 0xfffd;
-                              return -2;
-                            }
-                        }
-                      /* invalid multibyte character */
-                    }
-                  else
-                    {
-                      /* incomplete multibyte character */
-                      *puc = 0xfffd;
-                      return -2;
-                    }
-                }
-              /* invalid multibyte character */
-            }
-          else
-            {
-              /* incomplete multibyte character */
-              *puc = 0xfffd;
-              return -2;
-            }
-        }
-      else if (c < 0xfe)
-        {
-          if (n >= 2)
-            {
-              if ((s[1] ^ 0x80) < 0x40
-                  && (c >= 0xfd || s[1] >= 0x84))
-                {
-                  if (n >= 3)
-                    {
-                      if ((s[2] ^ 0x80) < 0x40)
-                        {
-                          if (n >= 4)
-                            {
-                              if ((s[3] ^ 0x80) < 0x40)
-                                {
-                                  if (n >= 5)
-                                    {
-                                      if ((s[4] ^ 0x80) < 0x40)
-                                        {
-                                          if (n >= 6)
-                                            {
-                                              if ((s[5] ^ 0x80) < 0x40)
-                                                {
-                                                  *puc = ((unsigned int) (c & 0x01) << 30)
-                                                         | ((unsigned int) (s[1] ^ 0x80) << 24)
-                                                         | ((unsigned int) (s[2] ^ 0x80) << 18)
-                                                         | ((unsigned int) (s[3] ^ 0x80) << 12)
-                                                         | ((unsigned int) (s[4] ^ 0x80) << 6)
-                                                         | (unsigned int) (s[5] ^ 0x80);
-                                                  return 6;
-                                                }
-                                              /* invalid multibyte character */
-                                            }
-                                          else
-                                            {
-                                              /* incomplete multibyte character */
-                                              *puc = 0xfffd;
-                                              return -2;
-                                            }
-                                        }
-                                      /* invalid multibyte character */
-                                    }
-                                  else
-                                    {
-                                      /* incomplete multibyte character */
-                                      *puc = 0xfffd;
-                                      return -2;
-                                    }
-                                }
-                              /* invalid multibyte character */
-                            }
-                          else
-                            {
-                              /* incomplete multibyte character */
-                              *puc = 0xfffd;
-                              return -2;
-                            }
-                        }
-                      /* invalid multibyte character */
-                    }
-                  else
-                    {
-                      /* incomplete multibyte character */
-                      *puc = 0xfffd;
-                      return -2;
-                    }
-                }
-              /* invalid multibyte character */
-            }
-          else
-            {
-              /* incomplete multibyte character */
-              *puc = 0xfffd;
-              return -2;
-            }
-        }
-#endif
     }
   /* invalid multibyte character */

coreutils/trunk/lib/unistr/u8-uctomb-aux.c ¶

@@ -38 +38 @@
         return -1;
     }
-#if 0
-  else if (uc < 0x200000)
-    count = 4;
-  else if (uc < 0x4000000)
-    count = 5;
-  else if (uc <= 0x7fffffff)
-    count = 6;
-#else
   else if (uc < 0x110000)
     count = 4;
-#endif
   else
     return -1;
@@ -57 +48 @@
   switch (count) /* note: code falls through cases! */
     {
-#if 0
-    case 6: s[5] = 0x80 | (uc & 0x3f); uc = uc >> 6; uc |= 0x4000000;
-    case 5: s[4] = 0x80 | (uc & 0x3f); uc = uc >> 6; uc |= 0x200000;
-#endif
     case 4: s[3] = 0x80 | (uc & 0x3f); uc = uc >> 6; uc |= 0x10000;
+      /* fallthrough */
     case 3: s[2] = 0x80 | (uc & 0x3f); uc = uc >> 6; uc |= 0x800;
+      /* fallthrough */
     case 2: s[1] = 0x80 | (uc & 0x3f); uc = uc >> 6; uc |= 0xc0;
   /*case 1:*/ s[0] = uc;

coreutils/trunk/lib/unistr/u8-uctomb.c ¶

@@ -53 +53 @@
             return -1;
         }
-#if 0
-      else if (uc < 0x200000)
-        count = 4;
-      else if (uc < 0x4000000)
-        count = 5;
-      else if (uc <= 0x7fffffff)
-        count = 6;
-#else
       else if (uc < 0x110000)
         count = 4;
-#endif
       else
         return -1;
@@ -71 +62 @@
           switch (count) /* note: code falls through cases! */
             {
-#if 0
-            case 6: s[5] = 0x80 | (uc & 0x3f); uc = uc >> 6; uc |= 0x4000000;
-            case 5: s[4] = 0x80 | (uc & 0x3f); uc = uc >> 6; uc |= 0x200000;
-#endif
             case 4: s[3] = 0x80 | (uc & 0x3f); uc = uc >> 6; uc |= 0x10000;
             case 3: s[2] = 0x80 | (uc & 0x3f); uc = uc >> 6; uc |= 0x800;

coreutils/trunk/lib/utimecmp.c ¶

@@ -133 +133 @@
 
   verify (TYPE_IS_INTEGER (time_t));
-  verify (TYPE_TWOS_COMPLEMENT (int));
 
   /* Destination and source time stamps.  */
@@ -290 +289 @@
                  stamp resolution; return the answer directly.  */
               {
-                time_t s = src_s & ~ (res == 2 * BILLION);
+                time_t s = src_s & ~ (res == 2 * BILLION ? 1 : 0);
                 if (src_s < dst_s || (src_s == dst_s && src_ns <= dst_ns))
                   return 1;
@@ -369 +368 @@
 
       /* Truncate the source's time stamp according to the resolution.  */
-      src_s &= ~ (res == 2 * BILLION);
+      src_s &= ~ (res == 2 * BILLION ? 1 : 0);
       src_ns -= src_ns % res;
     }

coreutils/trunk/lib/utimensat.c ¶

@@ -70 +70 @@
          The same bug occurs in Solaris 11.1 (Apr 2013).
 
-         FIXME: Simplify this for Linux in 2016 and for Solaris in
-         2024, when file system bugs are no longer common.  */
+         FIXME: Simplify this in 2024, when these file system bugs are
+         no longer common on Gnulib target platforms.  */
       if (times && (times[0].tv_nsec == UTIME_OMIT
                     || times[1].tv_nsec == UTIME_OMIT))

coreutils/trunk/lib/vasnprintf.c ¶

@@ -196 +196 @@
 /* GCC >= 4.0 with -Wall emits unjustified "... may be used uninitialized"
    warnings in this file.  Use -Dlint to suppress them.  */
-#ifdef lint
+#if defined GCC_LINT || defined lint
 # define IF_LINT(Code) Code
 #else
@@ -4833 +4833 @@
 # else
                     *fbp++ = 'l';
+# endif
+#endif
                     /*FALLTHROUGH*/
-# endif
-#endif
                   case TYPE_LONGINT:
                   case TYPE_ULONGINT:

coreutils/trunk/lib/verify.h ¶

@@ -264 +264 @@
 #elif 1200 <= _MSC_VER
 # define assume(R) __assume (R)
-#elif (defined lint \
+#elif ((defined GCC_LINT || defined lint) \
        && (__has_builtin (__builtin_trap) \
            || 3 < __GNUC__ + (3 < __GNUC_MINOR__ + (4 <= __GNUC_PATCHLEVEL__))))

coreutils/trunk/lib/wchar.in.h ¶

@@ -36 +36 @@
          && ((defined _INTTYPES_INCLUDED && !defined strtoimax)         \
              || defined _GL_JUST_INCLUDE_SYSTEM_WCHAR_H))               \
+     || (defined __MINGW32__ && defined __STRING_H_SOURCED__)           \
      || defined _GL_ALREADY_INCLUDING_WCHAR_H)
 /* Special invocation convention:
@@ -45 +46 @@
      therefore we cannot provide the function overrides; instead include only
      the system's <wchar.h>.
+   - With MinGW 3.22, when <string.h> includes <wchar.h>, only some part of
+     <wchar.h> is actually processed, and that doesn't include 'mbstate_t'.
    - On IRIX 6.5, similarly, we have an include <wchar.h> -> <wctype.h>, and
      the latter includes <wchar.h>.  But here, we have no way to detect whether

coreutils/trunk/lib/wctype.in.h ¶

@@ -26 +26 @@
  */
 
-#ifndef _@GUARD_PREFIX@_WCTYPE_H
-
 #if __GNUC__ >= 3
 @PRAGMA_SYSTEM_HEADER@
 #endif
 @PRAGMA_COLUMNS@
+
+#if (defined __MINGW32__ && defined __CTYPE_H_SOURCED__)
+
+/* Special invocation convention:
+   - With MinGW 3.22, when <ctype.h> includes <wctype.h>, only some part of
+     <wctype.h> is being processed, which doesn't include the idempotency
+     guard.   */
+
+#@INCLUDE_NEXT@ @NEXT_WCTYPE_H@
+
+#else
+/* Normal invocation convention.  */
+
+#ifndef _@GUARD_PREFIX@_WCTYPE_H
 
 #if @HAVE_WINT_T@
@@ -513 +525 @@
 #endif /* _@GUARD_PREFIX@_WCTYPE_H */
 #endif /* _@GUARD_PREFIX@_WCTYPE_H */
+#endif

coreutils/trunk/lib/xalloc-oversized.h ¶

@@ -21 +21 @@
 #include <stddef.h>
 
+/* Default for (non-Clang) compilers that lack __has_builtin.  */
 #ifndef __has_builtin
 # define __has_builtin(x) 0
 #endif
 
-/* Return 1 if an array of N objects, each of size S, cannot exist due
-   to size arithmetic overflow.  S must be positive and N must be
-   nonnegative.  This is a macro, not a function, so that it
-   works correctly even when SIZE_MAX < N.
-
+/* True if N * S would overflow in a size calculation.
+   This expands to a constant expression if N and S are both constants.
    By gnulib convention, SIZE_MAX represents overflow in size
    calculations, so the conservative dividend to use here is
@@ -37 +35 @@
    exactly-SIZE_MAX allocations on such hosts; this avoids a test and
    branch when S is known to be 1.  */
-#if 5 <= __GNUC__ || __has_builtin (__builtin_mul_overflow)
+#define __xalloc_oversized(n, s) \
+    ((size_t) (sizeof (ptrdiff_t) <= sizeof (size_t) ? -1 : -2) / (s) < (n))
+
+
+/* Return 1 if an array of N objects, each of size S, cannot exist due
+   to size arithmetic overflow.  S must be positive and N must be
+   nonnegative.  This is a macro, not a function, so that it
+   works correctly even when SIZE_MAX < N.  */
+
+#if 7 <= __GNUC__ || __has_builtin (__builtin_add_overflow_p)
+# define xalloc_oversized(n, s) __builtin_mul_overflow_p (n, s, (size_t) 1)
+#elif ((5 <= __GNUC__ \
+        || (__has_builtin (__builtin_mul_overflow) \
+            && __has_builtin (__builtin_constant_p))) \
+       && !__STRICT_ANSI__)
 # define xalloc_oversized(n, s) \
-    ({ size_t __xalloc_size; __builtin_mul_overflow (n, s, &__xalloc_size); })
+   (__builtin_constant_p (n) && __builtin_constant_p (s) \
+    ? __xalloc_oversized (n, s) \
+    : ({ size_t __xalloc_size; __builtin_mul_overflow (n, s, &__xalloc_size); }))
+
+/* Other compilers use integer division; this may be slower but is
+   more portable.  */
 #else
-# define xalloc_oversized(n, s) \
-    ((size_t) (sizeof (ptrdiff_t) <= sizeof (size_t) ? -1 : -2) / (s) < (n))
+# define xalloc_oversized(n, s) __xalloc_oversized (n, s)
 #endif
 

coreutils/trunk/lib/xstrtod.c ¶

@@ -37 +37 @@
 /* An interface to a string-to-floating-point conversion function that
    encapsulates all the error checking one should usually perform.
-   Like strtod/strtold, but upon successful
-   conversion put the result in *RESULT and return true.  Return
-   false and don't modify *RESULT upon any failure.  CONVERT
-   specifies the conversion function, e.g., strtod itself.  */
+   Like strtod/strtold, but stores the conversion in *RESULT,
+   and returns true upon successful conversion.
+   CONVERT specifies the conversion function, e.g., strtod itself.  */
 
 bool
@@ -59 +58 @@
     {
       /* Allow underflow (in which case CONVERT returns zero),
-         but flag overflow as an error. */
+         but flag overflow as an error.  The user can decide
+         to use the limits in RESULT upon ERANGE.  */
       if (val != 0 && errno == ERANGE)
         ok = false;

coreutils/trunk/lib/xstrtol.c ¶

@@ -149 +149 @@
         }
 
-      if (strchr (valid_suffixes, '0'))
+      switch (**p)
         {
+        case 'E': case 'G': case 'g': case 'k': case 'K': case 'M': case 'm':
+        case 'P': case 'T': case 't': case 'Y': case 'Z':
+
           /* The "valid suffix" '0' is a special flag meaning that
              an optional second suffix is allowed, which can change
@@ -158 +161 @@
              power-of-1024.  */
 
-          switch (p[0][1])
-            {
-            case 'i':
-              if (p[0][2] == 'B')
-                suffixes += 2;
-              break;
-
-            case 'B':
-            case 'D': /* 'D' is obsolescent */
-              base = 1000;
-              suffixes++;
-              break;
-            }
+          if (strchr (valid_suffixes, '0'))
+            switch (p[0][1])
+              {
+              case 'i':
+                if (p[0][2] == 'B')
+                  suffixes += 2;
+                break;
+
+              case 'B':
+              case 'D': /* 'D' is obsolescent */
+                base = 1000;
+                suffixes++;
+                break;
+              }
         }
 
@@ -180 +184 @@
 
         case 'B':
+          /* This obsolescent first suffix is distinct from the 'B'
+             second suffix above.  E.g., 'tar -L 1000B' means change
+             the tape after writing 1000 KiB of data.  */
           overflow = bkm_scale (&tmp, 1024);
           break;