Merge from trunk and resolve conflicts.

4 files changed, 79 insertions, 80 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 199d46f4984..6c31841c130 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,27 @@
+2014-09-23  Paul Eggert  <eggert@cs.ucla.edu>
+
+        movemail: don't dump core if the current time is outlandish
+        * movemail.c (popmail): Check for mbx_delimit_begin failure.
+        (mbx_delimit_begin): Fail if the current time is so outlandish
+        that localtime would fail or asctime would have undefined
+        behavior.  Use strftime to avoid asctime undefined behavior.
+
+2014-09-01  Paul Eggert  <eggert@cs.ucla.edu>
+
+        --enable-silent-rules now suppresses more chatter.
+        * Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_CC, am__v_CC_)
+        (am__v_CC_0, am__v_CC_1, AM_V_CCLD, am__v_CCLD_, am__v_CCLD_0)
+        (am__v_CCLD_1): New macros, taken from Automake.
+        (regex.o, etags${EXEEXT}, ctags${EXEEXT}, ebrowse${EXEEXT})
+        (profile${EXEEXT}, make-docfile${EXEEXT}, movemail${EXEEXT})
+        (pop.o, emacsclient${EXEEXT}, emacsclientw${EXEEXT})
+        (emacsclientw${EXEEXT}, ntlib.o, hexl${EXEEXT})
+        (update-game-score${EXEEXT}): Use them.
+
+        * etags.c (emacs_strchr, emacs_strrchr): Remove.
+        All uses replaced by strchr and strrchr, which are on all
+        target platforms now.
+
 2014-07-15  Paul Eggert  <eggert@cs.ucla.edu>
 
         Use "b" flag more consistently; avoid "t" (Bug#18006).
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 7eb13f667ec..fe101047dea 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -45,6 +45,19 @@ UPDATE_MANIFEST = @UPDATE_MANIFEST@
 # Program name transformation.
 TRANSFORM = @program_transform_name@
 
+# 'make' verbosity.
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 =
+
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 =
+
 # ==================== Where To Install Things ====================
 
 # Location to install Emacs.app under GNUstep / Mac OS X.
@@ -311,7 +324,7 @@ TAGS: etags${EXEEXT}
         $(MAKE) -C ../lib libgnu.a
 
 regex.o: $(srcdir)/../src/regex.c $(srcdir)/../src/regex.h $(config_h)
-        ${CC} -c ${CPP_CFLAGS} $<
+        $(AM_V_CC)$(CC) -c $(CPP_CFLAGS) $<
 
 
 etags_deps = ${srcdir}/etags.c regex.o $(NTLIB) $(config_h)
@@ -319,41 +332,41 @@ etags_cflags = -DEMACS_NAME="\"GNU Emacs\"" -DVERSION="\"${version}\"" -o $@
 etags_libs = regex.o $(LOADLIBES) $(NTLIB)
 
 etags${EXEEXT}: ${etags_deps}
-        $(CC) ${ALL_CFLAGS} $(etags_cflags) $< $(etags_libs)
+        $(AM_V_CCLD)$(CC) ${ALL_CFLAGS} $(etags_cflags) $< $(etags_libs)
 
 ## ctags.c is distinct from etags.c so that parallel makes do not write two
 ## etags.o files on top of each other.
 ## FIXME?
 ## Can't we use a wrapper that calls 'etags --ctags'?
 ctags${EXEEXT}: ${srcdir}/ctags.c ${etags_deps}
-        $(CC) ${ALL_CFLAGS} $(etags_cflags) $< $(etags_libs)
+        $(AM_V_CCLD)$(CC) ${ALL_CFLAGS} $(etags_cflags) $< $(etags_libs)
 
 ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ${srcdir}/../lib/min-max.h $(NTLIB) \
                    $(config_h)
-        $(CC) ${ALL_CFLAGS} -DVERSION="\"${version}\"" \
+        $(AM_V_CCLD)$(CC) ${ALL_CFLAGS} -DVERSION="\"${version}\"" \
           $< $(LOADLIBES) $(NTLIB) -o $@
 
 profile${EXEEXT}: ${srcdir}/profile.c $(NTLIB) $(config_h)
-        $(CC) ${ALL_CFLAGS} $< \
+        $(AM_V_CCLD)$(CC) ${ALL_CFLAGS} $< \
           $(LOADLIBES) $(NTLIB) $(LIB_CLOCK_GETTIME) -o $@
 
 make-docfile${EXEEXT}: ${srcdir}/make-docfile.c $(NTLIB) $(config_h)
-        $(CC) ${ALL_CFLAGS} $< $(LOADLIBES) $(NTLIB) -o $@
+        $(AM_V_CCLD)$(CC) ${ALL_CFLAGS} $< $(LOADLIBES) $(NTLIB) -o $@
 
 movemail${EXEEXT}: ${srcdir}/movemail.c pop.o $(NTLIB) $(config_h)
-        $(CC) ${ALL_CFLAGS} ${MOVE_FLAGS} $< pop.o \
+        $(AM_V_CCLD)$(CC) ${ALL_CFLAGS} ${MOVE_FLAGS} $< pop.o \
           $(LOADLIBES) $(NTLIB) $(LIBS_MOVE) -o $@
 
 pop.o: ${srcdir}/pop.c ${srcdir}/pop.h ${srcdir}/../lib/min-max.h $(config_h)
-        $(CC) -c ${CPP_CFLAGS} ${MOVE_FLAGS} $<
+        $(AM_V_CC)$(CC) -c ${CPP_CFLAGS} ${MOVE_FLAGS} $<
 
 emacsclient${EXEEXT}: ${srcdir}/emacsclient.c $(NTLIB) $(config_h)
-        $(CC) ${ALL_CFLAGS} $< \
+        $(AM_V_CCLD)$(CC) ${ALL_CFLAGS} $< \
            -DVERSION="\"${version}\"" $(NTLIB) $(LOADLIBES) $(LIB_FDATASYNC) \
            $(LIB_WSOCK32) $(LIBS_ECLIENT) -o $@
 
 emacsclientw${EXEEXT}: ${srcdir}/emacsclient.c $(NTLIB) $(CLIENTRES) $(config_h)
-        $(CC) ${ALL_CFLAGS} $(CLIENTRES) -mwindows $< \
+        $(AM_V_CCLD)$(CC) ${ALL_CFLAGS} $(CLIENTRES) -mwindows $< \
            -DVERSION="\"${version}\"" $(LOADLIBES) $(LIB_FDATASYNC) \
            $(LIB_WSOCK32) $(LIBS_ECLIENT) -o $@
 
@@ -365,13 +378,14 @@ NTDEPS = $(NTINC)/ms-w32.h $(NTINC)/sys/stat.h $(NTINC)/inttypes.h \
 # The dependency on $(NTDEPS) is a trick intended to cause recompile of
 # programs on MinGW whenever some private header in nt/inc is modified.
 ntlib.o: ${srcdir}/ntlib.c ${srcdir}/ntlib.h $(NTDEPS)
-        $(CC) -c ${CPP_CFLAGS} $<
+        $(AM_V_CC)$(CC) -c ${CPP_CFLAGS} $<
 
 hexl${EXEEXT}: ${srcdir}/hexl.c $(NTLIB) $(config_h)
-        $(CC) ${ALL_CFLAGS} $< $(LOADLIBES) -o $@
+        $(AM_V_CCLD)$(CC) ${ALL_CFLAGS} $< $(LOADLIBES) -o $@
 
 update-game-score${EXEEXT}: ${srcdir}/update-game-score.c $(NTLIB) $(config_h)
-        $(CC) ${ALL_CFLAGS} -DHAVE_SHARED_GAME_DIR="\"$(gamedir)\"" \
+        $(AM_V_CCLD)$(CC) ${ALL_CFLAGS} \
+          -DHAVE_SHARED_GAME_DIR="\"$(gamedir)\"" \
           $< $(LOADLIBES) $(NTLIB) -o $@
 
 emacsclient.res: $(NTINC)/../emacsclient.rc
diff --git a/lib-src/etags.c b/lib-src/etags.c
index ae5491a8204..84ed03e375f 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -339,8 +339,6 @@ static char *skip_non_spaces (char *);
 static char *skip_name (char *);
 static char *savenstr (const char *, int);
 static char *savestr (const char *);
-static char *etags_strchr (const char *, int);
-static char *etags_strrchr (const char *, int);
 static char *etags_getcwd (void);
 static char *relative_filename (char *, char *);
 static char *absolute_filename (char *, char *);
@@ -1334,8 +1332,8 @@ get_compressor_from_suffix (char *file, char **extptr)
 
   /* File has been processed by canonicalize_filename,
      so we don't need to consider backslashes on DOS_NT.  */
-  slash = etags_strrchr (file, '/');
-  suffix = etags_strrchr (file, '.');
+  slash = strrchr (file, '/');
+  suffix = strrchr (file, '.');
   if (suffix == NULL || suffix < slash)
     return NULL;
   if (extptr != NULL)
@@ -1422,7 +1420,7 @@ get_language_from_filename (char *file, int case_sensitive)
           return lang;
 
   /* If not found, try suffix after last dot. */
-  suffix = etags_strrchr (file, '.');
+  suffix = strrchr (file, '.');
   if (suffix == NULL)
     return NULL;
   suffix += 1;
@@ -1699,7 +1697,7 @@ find_entries (FILE *inf)
       /* Set lp to point at the first char after the last slash in the
          line or, if no slashes, at the first nonblank.  Then set cp to
          the first successive blank and terminate the string. */
-      lp = etags_strrchr (lb.buffer+2, '/');
+      lp = strrchr (lb.buffer+2, '/');
       if (lp != NULL)
         lp += 1;
       else
@@ -1884,9 +1882,9 @@ pfnote (char *name, bool is_func, char *linestart, int linelen, int lno,
   /* If ctags mode, change name "main" to M<thisfilename>. */
   if (CTAGS && !cxref_style && streq (name, "main"))
     {
-      register char *fp = etags_strrchr (curfdp->taggedfname, '/');
+      char *fp = strrchr (curfdp->taggedfname, '/');
       np->name = concat ("M", fp == NULL ? curfdp->taggedfname : fp + 1, "");
-      fp = etags_strrchr (np->name, '.');
+      fp = strrchr (np->name, '.');
       if (fp != NULL && fp[1] != '\0' && fp[2] == '\0')
         fp[0] = '\0';
     }
@@ -4116,7 +4114,7 @@ Ada_funcs (FILE *inf)
           /* Skip a string i.e. "abcd". */
           if (inquote || (*dbp == '"'))
             {
-              dbp = etags_strchr (dbp + !inquote, '"');
+              dbp = strchr (dbp + !inquote, '"');
               if (dbp != NULL)
                 {
                   inquote = false;
@@ -4274,7 +4272,7 @@ Perl_functions (FILE *inf)
             cp++;
           if (cp == sp)
             continue;           /* nothing found */
-          if ((pos = etags_strchr (sp, ':')) != NULL
+          if ((pos = strchr (sp, ':')) != NULL
               && pos < cp && pos[1] == ':')
             /* The name is already qualified. */
             make_tag (sp, cp - sp, true,
@@ -5029,7 +5027,7 @@ TEX_decode_env (const char *evarname, const char *defenv)
 
   /* Allocate a token table */
   for (len = 1, p = env; p;)
-    if ((p = etags_strchr (p, ':')) && *++p != '\0')
+    if ((p = strchr (p, ':')) && *++p != '\0')
       len++;
   TEX_toktab = xnew (len, linebuffer);
 
@@ -5037,7 +5035,7 @@ TEX_decode_env (const char *evarname, const char *defenv)
   /* zero-length strings (leading ':', "::" and trailing ':') */
   for (i = 0; *env != '\0';)
     {
-      p = etags_strchr (env, ':');
+      p = strchr (env, ':');
       if (!p)                   /* End of environment string. */
         p = env + strlen (env);
       if (p - env > 0)
@@ -5767,9 +5765,9 @@ substitute (char *in, char *out, struct re_registers *regs)
   /* Pass 1: figure out how much to allocate by finding all \N strings. */
   if (out[size - 1] == '\\')
     fatal ("pattern error in \"%s\"", out);
-  for (t = etags_strchr (out, '\\');
+  for (t = strchr (out, '\\');
        t != NULL;
-       t = etags_strchr (t + 2, '\\'))
+       t = strchr (t + 2, '\\'))
     if (ISDIGIT (t[1]))
       {
         dig = t[1] - '0';
@@ -6051,7 +6049,7 @@ readline (linebuffer *lbp, FILE *stream)
             {
               char *endp = lbp->buffer + start;
 
-              while ((endp = etags_strchr (endp, '"')) != NULL
+              while ((endp = strchr (endp, '"')) != NULL
                      && endp[-1] == '\\')
                 endp++;
               if (endp != NULL)
@@ -6236,43 +6234,6 @@ savenstr (const char *cp, int len)
   return memcpy (dp, cp, len);
 }
 
-/*
- * Return the ptr in sp at which the character c last
- * appears; NULL if not found
- *
- * Identical to POSIX strrchr, included for portability.
- */
-static char *
-etags_strrchr (register const char *sp, register int c)
-{
-  register const char *r;
-
-  r = NULL;
-  do
-    {
-      if (*sp == c)
-        r = sp;
-  } while (*sp++);
-  return (char *)r;
-}
-
-/*
- * Return the ptr in sp at which the character c first
- * appears; NULL if not found
- *
- * Identical to POSIX strchr, included for portability.
- */
-static char *
-etags_strchr (register const char *sp, register int c)
-{
-  do
-    {
-      if (*sp == c)
-        return (char *)sp;
-    } while (*sp++);
-  return NULL;
-}
-
 /* Skip spaces (end of string is not space), return new pointer. */
 static char *
 skip_spaces (char *cp)
@@ -6398,7 +6359,7 @@ relative_filename (char *file, char *dir)
 
   /* Build a sequence of "../" strings for the resulting relative file name. */
   i = 0;
-  while ((dp = etags_strchr (dp + 1, '/')) != NULL)
+  while ((dp = strchr (dp + 1, '/')) != NULL)
     i += 1;
   res = xnew (3*i + strlen (fp + 1) + 1, char);
   res[0] = '\0';
@@ -6431,7 +6392,7 @@ absolute_filename (char *file, char *dir)
     res = concat (dir, file, "");
 
   /* Delete the "/dirname/.." and "/." substrings. */
-  slashp = etags_strchr (res, '/');
+  slashp = strchr (res, '/');
   while (slashp != NULL && slashp[0] != '\0')
     {
       if (slashp[1] == '.')
@@ -6463,7 +6424,7 @@ absolute_filename (char *file, char *dir)
             }
         }
 
-      slashp = etags_strchr (slashp + 1, '/');
+      slashp = strchr (slashp + 1, '/');
     }
 
   if (res[0] == '\0')           /* just a safety net: should never happen */
@@ -6484,7 +6445,7 @@ absolute_dirname (char *file, char *dir)
   char *slashp, *res;
   char save;
 
-  slashp = etags_strrchr (file, '/');
+  slashp = strrchr (file, '/');
   if (slashp == NULL)
     return savestr (dir);
   save = slashp[1];
diff --git a/lib-src/movemail.c b/lib-src/movemail.c
index c600fc0ea53..b0196b309d8 100644
--- a/lib-src/movemail.c
+++ b/lib-src/movemail.c
@@ -714,8 +714,8 @@ popmail (char *mailbox, char *outfile, int preserve, char *password, int reverse
 
   for (i = start; i * increment <= end * increment; i += increment)
     {
-      mbx_delimit_begin (mbf);
-      if (pop_retr (server, i, mbf) != OK)
+      if (mbx_delimit_begin (mbf) != OK
+          || pop_retr (server, i, mbf) != OK)
         {
           error ("%s", Errmsg, 0);
           close (mbfi);
@@ -832,15 +832,15 @@ mbx_write (char *line, int len, FILE *mbf)
 static int
 mbx_delimit_begin (FILE *mbf)
 {
-  time_t now;
-  struct tm *ltime;
-  char fromline[40] = "From movemail ";
-
-  now = time (NULL);
-  ltime = localtime (&now);
-
-  strcat (fromline, asctime (ltime));
-
+  time_t now = time (NULL);
+  struct tm *ltime = localtime (&now);
+  if (!ltime)
+    return NOTOK;
+
+  char fromline[100];
+  if (! strftime (fromline, sizeof fromline,
+                  "From movemail %a %b %e %T %Y\n", ltime))
+    return NOTOK;
   if (fputs (fromline, mbf) == EOF)
     return (NOTOK);
   return (OK);