upstream

12 files changed, 471 insertions, 426 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 68a8c37c2fb..4f4d2b50a00 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,159 @@
+2012-07-12  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * movemail.c: Add missing 'defined'.
+        Suggested by Sven Joachim in
+        <http://lists.gnu.org/archive/html/emacs-devel/2012-07/msg00218.html>.
+
+2012-07-11  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Port 'movemail' again to Solaris and similar hosts.
+        See Susan Cragin's report in
+        <http://lists.gnu.org/archive/html/emacs-devel/2012-07/msg00199.html>.
+        * movemail.c (xmalloc): Also define if !DISABLE_DIRECT_ACCESS &&
+        !MAIL_USE_MMDF && !MAIL_USE_SYSTEM_LOCK.  Move up, so it doesn't
+        need a forward declaration.
+        (main): Rewrite to avoid no-longer-present function 'concat', if
+        !DISABLE_DIRECT_ACCESS && !MAIL_USE_MMDF && !MAIL_USE_SYSTEM_LOCK.
+
+        Assume strerror.
+        * emacsclient.c, movemail.c, update-game-score.c (strerror)
+        [!HAVE_STRERROR]: Remove.
+
+2012-07-10  Paul Eggert  <eggert@cs.ucla.edu>
+
+        EMACS_TIME simplification (Bug#11875).
+        * profile.c (TV2): Remove no-longer-needed static var.
+
+        Simplify by avoiding confusing use of strncpy etc.
+        * etags.c (write_classname, C_entries):
+        Use sprintf rather than strncpy or strncat.
+        * etags.c (consider_token, C_entries, HTML_labels, Prolog_functions)
+        (Erlang_functions, substitute, readline_internal, savenstr):
+        * movemail.c (mail_spool_name):
+        Use memcpy rather than strncpy or strncat when either will do.
+        * make-docfile.c (write_c_args):
+        Use memcmp rather than strncmp when either will do.
+        * movemail.c (pop_retr):
+        * pop.c (pop_stat, pop_list, pop_multi_first, pop_last)
+        (socket_connection, pop_getline, sendline, getok):
+        Use snprintf rather than strncpy or strncat.
+        * movemail.c (concat): Remove; no longer needed.
+        (xmalloc): Define only if needed, now that concat has gone away.
+        Return void *.  All uses changed.
+
+2012-07-09  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Add GCC-style 'const' attribute to functions that can use it.
+        * etags.c (number_len): Add ATTRIBUTE_CONST.
+
+2012-07-09  Juanma Barranquero  <lekktu@gmail.com>
+
+        * emacsclient.c (w32_execvp): Declare execvp to silence the compiler.
+
+2012-07-09  Juanma Barranquero  <lekktu@gmail.com>
+
+        * makefile.w32-in ($(BLD)/test-distrib.exe): Use LIB_SRC, not SRC.
+        (LIB_SRC, NT_INC, GNU_LIB, MS_W32_H, CONFIG_H, INTTYPES_H, NTLIB_H)
+        (SYSTIME_H): New macros.
+        (SRC): Redefine to point to src/, not current directory.
+        ($(BLD)/ctags.$(O), $(BLD)/ebrowse.$(O), $(BLD)/emacsclient.$(O))
+        ($(BLD)/etags.$(O), $(BLD)/hexl.$(O), $(BLD)/make-docfile.$(O))
+        ($(BLD)/movemail.$(O), $(BLD)/ntlib.$(O), $(BLD)/pop.$(O))
+        ($(BLD)/profile.$(O), $(BLD)/test-distrib.$(O)): Update dependencies.
+        ($(BLD)/regex.$(O)): New dependency.
+
+2012-07-09  Juanma Barranquero  <lekktu@gmail.com>
+
+        * makefile.w32-in (ALL): Add profile.exe.
+        (PROFILEOBJS): New macro.
+        ($(BLD)/profile.exe): New target.
+        (install): Copy profile.exe.
+        ($(BLD)/alloca.$(O), $(BLD)/tcp.$(O)): Remove, obsolete.
+
+2012-07-07  Juanma Barranquero  <lekktu@gmail.com>
+
+        * makefile.w32-in ($(BLD)/ctags.$(O), $(BLD)/etags.$(O)):
+        Update dependencies.
+
+2012-07-06  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Use c_strcasecmp for ASCII case-insensitive comparison (Bug#11786).
+        * etags.c: Include c-strcase.h.
+        (etags_strcasecmp, etags_strncasecmp): Remove.
+        All uses replaced with c_strcasecmp and c_strncasecmp.
+
+2012-07-06  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * make-docfile.c (write_globals): Warn about duplicate function
+        definitions with differing signatures.
+
+2012-07-03  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * make-docfile.c (scan_c_file): Suppress GCC warning.
+
+2012-06-29  Tom Tromey  <tromey@redhat.com>
+
+        * make-docfile.c (enum global_type) <FUNCTION>: New constant.
+        (struct global) <value>: New field.
+        (add_global): Add 'value' argument.
+        (compare_globals): Sort functions at the end.
+        (close_emacs_globals): New function.
+        (write_globals): Handle functions.
+        (scan_c_file): Call add_global for DEFUN.
+
+2012-06-30  Juanma Barranquero  <lekktu@gmail.com>
+
+        * makefile.w32-in (CTAGS_CFLAGS): Remove EMACS_NAME;
+        already defined in ETAGS_CFLAGS.
+
+2012-06-27  Glenn Morris  <rgm@gnu.org>
+
+        * makefile.w32-in (lisp2): Remove paths.el.
+
+2012-06-26  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Clean out last vestiges of the old HAVE_CONFIG_H stuff.
+        * Makefile.in (BASE_CFLAGS):
+        * makefile.w32-in (LOCAL_FLAGS): Remove -DHAVE_CONFIG_H.
+        * etags.c, hexl.c, pop.c: Include <config.h> unconditionally.
+        * etags.c (DOS_NT):
+        * pop.c (MAIL_USE_POP, h_errno):
+        Remove code that was conditioned on !HAVE_CONFIG_H.
+
+2012-06-25  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * etags.c (etags_strcasecmp, etags_strncasecmp): Define to
+        library functions strcasecmp and strncasecmp if available.
+
+2012-06-24  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Switch from NO_RETURN to C11's _Noreturn (Bug#11750).
+        * ebrowse.c (usage, version):
+        * emacsclient.c (print_help_and_exit, fail):
+        * etags.c (suggest_asking_for_help, fatal, pfatal):
+        * hexl.c (usage):
+        * make-docfile.c (fatal):
+        * movemail.c (fatal, pfatal_with_name, pfatal_and_delete):
+        * update-game-score.c (usage):
+        * ebrowse.c (usage, version):
+        * emacsclient.c (print_help_and_exit, fail):
+        Use _Noreturn rather than NO_RETURN.
+        No need for separate decl merely because of _Noreturn.
+
+2012-06-24  Samuel Bronson  <naesten@gmail.com>  (tiny change)
+
+        * emacsclient.c (set_local_socket): Fix compiler warning (Bug#7838).
+
+2012-06-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Support higher-resolution time stamps (Bug#9000).
+        * Makefile.in (LIB_CLOCK_GETTIME): New macro.
+        (profile${EXEEXT}): Use it.
+        * profile.c: Include inttypes.h, intprops.h.
+        (time_string): Size conservatively; do not guess size.
+        (get_time): Now prints nanoseconds.
+        (gettimeofday): Remove replacement function; gnulib now does this.
+
 2012-06-08  Andreas Schwab  <schwab@linux-m68k.org>
 
         * make-docfile.c (search_lisp_doc_at_eol): Unget last read
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 2df22d9f7d8..fe727c65730 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -159,6 +159,8 @@ LIBHESIOD=@LIBHESIOD@
 LIBRESOLV=@LIBRESOLV@
 ## -llockfile if HAVE_LIBLOCKFILE or -lmail if HAVE_LIBMAIL
 LIBS_MAIL=@LIBS_MAIL@
+## empty or -lrt or -lposix4 if HAVE_CLOCK_GETTIME
+LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@
 
 ## Extra libraries to use when linking movemail.
 LIBS_MOVE = $(LIBS_MAIL) $(KRB4LIB) $(DESLIB) $(KRB5LIB) $(CRYPTOLIB) \
@@ -167,12 +169,9 @@ LIBS_MOVE = $(LIBS_MAIL) $(KRB4LIB) $(DESLIB) $(KRB5LIB) $(CRYPTOLIB) \
 ## Some systems define this to request special libraries.
 LIBS_SYSTEM = @LIBS_SYSTEM@
 
-# Those files shared with other GNU utilities need HAVE_CONFIG_H
-# defined before they know they can take advantage of the information
-# in ../src/config.h.
 BASE_CFLAGS = $(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) \
               $(WARN_CFLAGS) $(WERROR_CFLAGS) \
-              -DHAVE_CONFIG_H -I. -I../src -I../lib \
+              -I. -I../src -I../lib \
               -I${srcdir} -I${srcdir}/../src -I${srcdir}/../lib
 
 ALL_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${LDFLAGS} ${CPPFLAGS} ${CFLAGS}
@@ -309,7 +308,8 @@ ctags${EXEEXT}: etags${EXEEXT}
           regex.o $(LOADLIBES) -o ctags
 
 profile${EXEEXT}: ${srcdir}/profile.c ../src/config.h
-        $(CC) ${ALL_CFLAGS} ${srcdir}/profile.c $(LOADLIBES) -o profile
+        $(CC) ${ALL_CFLAGS} ${srcdir}/profile.c \
+          $(LOADLIBES) $(LIB_CLOCK_GETTIME) -o profile
 
 make-docfile${EXEEXT}: ${srcdir}/make-docfile.c ../src/config.h
         $(CC) ${ALL_CFLAGS} ${srcdir}/make-docfile.c $(LOADLIBES) \
diff --git a/lib-src/ebrowse.c b/lib-src/ebrowse.c
index a1fe10b863a..1c43bc6a4f1 100644
--- a/lib-src/ebrowse.c
+++ b/lib-src/ebrowse.c
@@ -463,10 +463,6 @@ static struct member *add_member (struct sym *, char *, int, int, unsigned);
 static void class_definition (struct sym *, int, int, int);
 static char *operator_name (int *);
 static void parse_qualified_param_ident_or_type (char **);
-static void usage (int) NO_RETURN;
-static void version (void) NO_RETURN;
-
-
 
 /***********************************************************************
                               Utilities
@@ -3507,7 +3503,7 @@ Usage: ebrowse [options] {files}\n\
       --version                 display version info\n\
 "
 
-static void
+static _Noreturn void
 usage (int error)
 {
   puts (USAGE);
@@ -3522,7 +3518,7 @@ usage (int error)
 # define VERSION "21"
 #endif
 
-static void
+static _Noreturn void
 version (void)
 {
   /* Makes it easier to update automatically. */
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 29504445407..0ba6535b79d 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -21,7 +21,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifdef WINDOWSNT
 
-/* config.h defines these, which disables sockets altogether! */
+/* ms-w32.h defines these, which disables sockets altogether!  */
 # undef _WINSOCKAPI_
 # undef _WINSOCK_H
 
@@ -169,8 +169,7 @@ int emacs_pid = 0;
    be used for the new frame */
 const char *frame_parameters = NULL;
 
-static void print_help_and_exit (void) NO_RETURN;
-static void fail (void) NO_RETURN;
+static _Noreturn void print_help_and_exit (void);
 
 
 struct option longopts[] =
@@ -452,19 +451,19 @@ w32_window_app (void)
   return window_app;
 }
 
-/*
-  execvp wrapper for Windows.  Quotes arguments with embedded spaces.
+/* execvp wrapper for Windows.  Quotes arguments with embedded spaces.
 
   This is necessary due to the broken implementation of exec* routines in
   the Microsoft libraries: they concatenate the arguments together without
   quoting special characters, and pass the result to CreateProcess, with
   predictably bad results.  By contrast, POSIX execvp passes the arguments
-  directly into the argv array of the child process.
-*/
+  directly into the argv array of the child process.  */
+
 int
 w32_execvp (const char *path, char **argv)
 {
   int i;
+  extern int execvp (const char*, char **);
 
   /* Required to allow a .BAT script as alternate editor.  */
   argv[0] = (char *) alternate_editor;
@@ -670,7 +669,7 @@ an empty string");
 }
 
 
-static void
+static _Noreturn void
 print_help_and_exit (void)
 {
   /* Spaces and tabs are significant in this message; they're chosen so the
@@ -713,12 +712,11 @@ Report bugs with M-x report-emacs-bug.\n", progname);
   exit (EXIT_SUCCESS);
 }
 
-/*
-  Try to run a different command, or --if no alternate editor is
-  defined-- exit with an errorcode.
-  Uses argv, but gets it from the global variable main_argv.
-*/
-static void
+/* Try to run a different command, or --if no alternate editor is
+   defined-- exit with an errorcode.
+   Uses argv, but gets it from the global variable main_argv.  */
+
+static _Noreturn void
 fail (void)
 {
   if (alternate_editor)
@@ -751,16 +749,15 @@ main (int argc, char **argv)
 #define AUTH_KEY_LENGTH      64
 #define SEND_BUFFER_SIZE   4096
 
-extern char *strerror (int);
-
 /* Buffer to accumulate data to send in TCP connections.  */
 char send_buffer[SEND_BUFFER_SIZE + 1];
 int sblen = 0;  /* Fill pointer for the send buffer.  */
 /* Socket used to communicate with the Emacs server process.  */
 HSOCKET emacs_socket = 0;
 
-/* On Windows, the socket library was historically separate from the standard
-   C library, so errors are handled differently.  */
+/* On Windows, the socket library was historically separate from the
+   standard C library, so errors are handled differently.  */
+
 static void
 sock_err_message (const char *function_name)
 {
@@ -865,7 +862,7 @@ quote_argument (HSOCKET s, const char *str)
 
 
 /* The inverse of quote_argument.  Removes quoting in string STR by
-   modifying the string in place.   Returns STR. */
+   modifying the string in place.   Returns STR.  */
 
 static char *
 unquote_argument (char *str)
@@ -948,10 +945,9 @@ initialize_sockets (void)
 #endif /* WINDOWSNT */
 
 
-/*
- * Read the information needed to set up a TCP comm channel with
- * the Emacs server: host, port, and authentication string.
- */
+/* Read the information needed to set up a TCP comm channel with
+   the Emacs server: host, port, and authentication string.  */
+
 static int
 get_server_config (const char *config_file, struct sockaddr_in *server,
                    char *authentication)
@@ -1032,18 +1028,14 @@ set_tcp_socket (const char *local_server_file)
     message (FALSE, "%s: connected to remote socket at %s\n",
              progname, inet_ntoa (server.sin_addr));
 
-  /*
-   * Open up an AF_INET socket
-   */
+  /* Open up an AF_INET socket.  */
   if ((s = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0)
     {
       sock_err_message ("socket");
       return INVALID_SOCKET;
     }
 
-  /*
-   * Set up the socket
-   */
+  /* Set up the socket.  */
   if (connect (s, (struct sockaddr *) &server, sizeof server) < 0)
     {
       sock_err_message ("connect");
@@ -1052,9 +1044,7 @@ set_tcp_socket (const char *local_server_file)
 
   setsockopt (s, SOL_SOCKET, SO_LINGER, (char *) &l_arg, sizeof l_arg);
 
-  /*
-   * Send the authentication
-   */
+  /* Send the authentication.  */
   auth_string[AUTH_KEY_LENGTH] = '\0';
 
   send_to_emacs (s, "-auth ");
@@ -1188,7 +1178,7 @@ handle_sigcont (int signalnum)
    going to sleep.  Normally the suspend is initiated by Emacs via
    server-handle-suspend-tty, but if the server gets out of sync with
    reality, we may get a SIGTSTP on C-z.  Handling this signal and
-   notifying Emacs about it should get things under control again. */
+   notifying Emacs about it should get things under control again.  */
 
 static void
 handle_sigtstp (int signalnum)
@@ -1240,10 +1230,7 @@ set_local_socket (const char *local_socket_name)
   HSOCKET s;
   struct sockaddr_un server;
 
-  /*
-   * Open up an AF_UNIX socket in this person's home directory
-   */
-
+  /* Open up an AF_UNIX socket in this person's home directory.  */
   if ((s = socket (AF_UNIX, SOCK_STREAM, 0)) < 0)
     {
       message (TRUE, "%s: socket: %s\n", progname, strerror (errno));
@@ -1278,7 +1265,7 @@ set_local_socket (const char *local_socket_name)
             if (n > 0)
               {
                 tmpdir = tmpdir_storage = xmalloc (n);
-                confstr (_CS_DARWIN_USER_TEMP_DIR, tmpdir, n);
+                confstr (_CS_DARWIN_USER_TEMP_DIR, tmpdir_storage, n);
               }
             else
 #endif
@@ -1477,10 +1464,9 @@ w32_find_emacs_process (HWND hWnd, LPARAM lParam)
   return FALSE;
 }
 
-/*
- * Search for a window of class "Emacs" and owned by a process with
- * process id = emacs_pid.  If found, allow it to grab the focus.
- */
+/* Search for a window of class "Emacs" and owned by a process with
+   process id = emacs_pid.  If found, allow it to grab the focus.  */
+
 void
 w32_give_focus (void)
 {
@@ -1862,22 +1848,3 @@ main (int argc, char **argv)
 }
 
 #endif /* HAVE_SOCKETS && HAVE_INET_SOCKETS */
-
-
-#ifndef HAVE_STRERROR
-char *
-strerror (errnum)
-     int errnum;
-{
-  extern char *sys_errlist[];
-  extern int sys_nerr;
-
-  if (errnum >= 0 && errnum < sys_nerr)
-    return sys_errlist[errnum];
-  return (char *) "Unknown error";
-}
-
-#endif /* ! HAVE_STRERROR */
-
-
-/* emacsclient.c ends here */
diff --git a/lib-src/etags.c b/lib-src/etags.c
index 7d2a5a90999..69200b790fb 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -91,9 +91,7 @@ char pot_etags_version[] = "@(#) pot revision number is 17.38.1.4";
 #  define NDEBUG                /* disable assert */
 #endif
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif /* !HAVE_CONFIG_H */
+#include <config.h>
 
 #ifndef _GNU_SOURCE
 # define _GNU_SOURCE 1          /* enables some compiler checks on GNU */
@@ -113,10 +111,6 @@ char pot_etags_version[] = "@(#) pot revision number is 17.38.1.4";
 # include <fcntl.h>
 # include <sys/param.h>
 # include <io.h>
-# ifndef HAVE_CONFIG_H
-#   define DOS_NT
-#   include <sys/config.h>
-# endif
 #else
 # define MSDOS FALSE
 #endif /* MSDOS */
@@ -150,6 +144,7 @@ char pot_etags_version[] = "@(#) pot revision number is 17.38.1.4";
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <c-strcase.h>
 
 #include <assert.h>
 #ifdef NDEBUG
@@ -167,14 +162,6 @@ char pot_etags_version[] = "@(#) pot revision number is 17.38.1.4";
 # include <getopt.h>
 #endif /* NO_LONG_OPTIONS */
 
-#ifndef HAVE_CONFIG_H           /* this is a standalone compilation */
-# ifdef __CYGWIN__              /* compiling on Cygwin */
-                             !!! NOTICE !!!
- the regex.h distributed with Cygwin is not compatible with etags, alas!
-If you want regular expression support, you should delete this notice and
-              arrange to use the GNU regex.h and regex.c.
-# endif
-#endif
 #include <regex.h>
 
 /* Define CTAGS to make the program "ctags" compatible with the usual one.
@@ -188,9 +175,9 @@ If you want regular expression support, you should delete this notice and
 #endif
 
 #define streq(s,t)      (assert ((s)!=NULL || (t)!=NULL), !strcmp (s, t))
-#define strcaseeq(s,t)  (assert ((s)!=NULL && (t)!=NULL), !etags_strcasecmp (s, t))
+#define strcaseeq(s,t)  (assert ((s)!=NULL && (t)!=NULL), !c_strcasecmp (s, t))
 #define strneq(s,t,n)   (assert ((s)!=NULL || (t)!=NULL), !strncmp (s, t, n))
-#define strncaseeq(s,t,n) (assert ((s)!=NULL && (t)!=NULL), !etags_strncasecmp (s, t, n))
+#define strncaseeq(s,t,n) (assert ((s)!=NULL && (t)!=NULL), !c_strncasecmp (s, t, n))
 
 #define CHARS 256               /* 2^sizeof(char) */
 #define CHAR(x)         ((unsigned int)(x) & (CHARS - 1))
@@ -366,9 +353,9 @@ static void analyse_regex (char *);
 static void free_regexps (void);
 static void regex_tag_multiline (void);
 static void error (const char *, ...) ATTRIBUTE_FORMAT_PRINTF (1, 2);
-static void suggest_asking_for_help (void) NO_RETURN;
-void fatal (const char *, const char *) NO_RETURN;
-static void pfatal (const char *) NO_RETURN;
+static _Noreturn void suggest_asking_for_help (void);
+_Noreturn void fatal (const char *, const char *);
+static _Noreturn void pfatal (const char *);
 static void add_node (node *, node **);
 
 static void init (void);
@@ -389,8 +376,6 @@ 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 int etags_strcasecmp (const char *, const char *);
-static int etags_strncasecmp (const char *, const char *, int);
 static char *etags_getcwd (void);
 static char *relative_filename (char *, char *);
 static char *absolute_filename (char *, char *);
@@ -2138,7 +2123,7 @@ invalidate_nodes (fdesc *badfdp, node **npp)
 
 
 static int total_size_of_entries (node *);
-static int number_len (long);
+static int number_len (long) ATTRIBUTE_CONST;
 
 /* Length of a non-negative number's decimal representation. */
 static int
@@ -2657,17 +2642,11 @@ write_classname (linebuffer *cn, const char *qualifier)
     }
   for (i = 1; i < cstack.nl; i++)
     {
-      char *s;
-      int slen;
-
-      s = cstack.cname[i];
+      char *s = cstack.cname[i];
       if (s == NULL)
         continue;
-      slen = strlen (s);
-      len += slen + qlen;
-      linebuffer_setlen (cn, len);
-      strncat (cn->buffer, qualifier, qlen);
-      strncat (cn->buffer, s, slen);
+      linebuffer_setlen (cn, len + qlen + strlen (s));
+      len += sprintf (cn->buffer + len, "%s%s", qualifier, s);
     }
 }
 
@@ -2882,7 +2861,7 @@ consider_token (register char *str, register int len, register int c, int *c_ext
            fvdef = fvnone;
            objdef = omethodtag;
            linebuffer_setlen (&token_name, len);
-           strncpy (token_name.buffer, str, len);
+           memcpy (token_name.buffer, str, len);
            token_name.buffer[len] = '\0';
            return TRUE;
          }
@@ -2894,10 +2873,11 @@ consider_token (register char *str, register int len, register int c, int *c_ext
      case omethodparm:
        if (parlev == 0)
          {
+           int oldlen = token_name.len;
            fvdef = fvnone;
            objdef = omethodtag;
-           linebuffer_setlen (&token_name, token_name.len + len);
-           strncat (token_name.buffer, str, len);
+           linebuffer_setlen (&token_name, oldlen + len);
+           memcpy (token_name.buffer + oldlen, str, len);
            return TRUE;
          }
        return FALSE;
@@ -3326,12 +3306,12 @@ C_entries (int c_ext, FILE *inf)
                               && nestlev > 0 && definedef == dnone)
                             /* in struct body */
                             {
+                              int len;
                               write_classname (&token_name, qualifier);
-                              linebuffer_setlen (&token_name,
-                                                 token_name.len+qlen+toklen);
-                              strcat (token_name.buffer, qualifier);
-                              strncat (token_name.buffer,
-                                       newlb.buffer + tokoff, toklen);
+                              len = token_name.len;
+                              linebuffer_setlen (&token_name, len+qlen+toklen);
+                              sprintf (token_name.buffer + len, "%s%.*s",
+                                       qualifier, toklen, newlb.buffer + tokoff);
                               token.named = TRUE;
                             }
                           else if (objdef == ocatseen)
@@ -3339,11 +3319,8 @@ C_entries (int c_ext, FILE *inf)
                             {
                               int len = strlen (objtag) + 2 + toklen;
                               linebuffer_setlen (&token_name, len);
-                              strcpy (token_name.buffer, objtag);
-                              strcat (token_name.buffer, "(");
-                              strncat (token_name.buffer,
-                                       newlb.buffer + tokoff, toklen);
-                              strcat (token_name.buffer, ")");
+                              sprintf (token_name.buffer, "%s(%.*s)",
+                                       objtag, toklen, newlb.buffer + tokoff);
                               token.named = TRUE;
                             }
                           else if (objdef == omethodtag
@@ -3367,8 +3344,8 @@ C_entries (int c_ext, FILE *inf)
                                   len -= 1;
                                 }
                               linebuffer_setlen (&token_name, len);
-                              strncpy (token_name.buffer,
-                                       newlb.buffer + off, len);
+                              memcpy (token_name.buffer,
+                                      newlb.buffer + off, len);
                               token_name.buffer[len] = '\0';
                               if (defun)
                                 while (--len >= 0)
@@ -3379,8 +3356,8 @@ C_entries (int c_ext, FILE *inf)
                           else
                             {
                               linebuffer_setlen (&token_name, toklen);
-                              strncpy (token_name.buffer,
-                                       newlb.buffer + tokoff, toklen);
+                              memcpy (token_name.buffer,
+                                      newlb.buffer + tokoff, toklen);
                               token_name.buffer[toklen] = '\0';
                               /* Name macros and members. */
                               token.named = (structdef == stagseen
@@ -5176,7 +5153,7 @@ HTML_labels (FILE *inf)
                   for (end = dbp; *end != '\0' && intoken (*end); end++)
                     continue;
                 linebuffer_setlen (&token_name, end - dbp);
-                strncpy (token_name.buffer, dbp, end - dbp);
+                memcpy (token_name.buffer, dbp, end - dbp);
                 token_name.buffer[end - dbp] = '\0';
 
                 dbp = end;
@@ -5276,7 +5253,7 @@ Prolog_functions (FILE *inf)
           else if (len + 1 > allocated)
             xrnew (last, len + 1, char);
           allocated = len + 1;
-          strncpy (last, cp, len);
+          memcpy (last, cp, len);
           last[len] = '\0';
         }
     }
@@ -5449,7 +5426,7 @@ Erlang_functions (FILE *inf)
           else if (len + 1 > allocated)
             xrnew (last, len + 1, char);
           allocated = len + 1;
-          strncpy (last, cp, len);
+          memcpy (last, cp, len);
           last[len] = '\0';
         }
     }
@@ -5832,7 +5809,7 @@ substitute (char *in, char *out, struct re_registers *regs)
       {
         dig = *out - '0';
         diglen = regs->end[dig] - regs->start[dig];
-        strncpy (t, in + regs->start[dig], diglen);
+        memcpy (t, in + regs->start[dig], diglen);
         t += diglen;
       }
     else
@@ -6055,7 +6032,7 @@ readline_internal (linebuffer *lbp, register FILE *stream)
           filebuf.size *= 2;
           xrnew (filebuf.buffer, filebuf.size, char);
         }
-      strncpy (filebuf.buffer + filebuf.len, lbp->buffer, lbp->len);
+      memcpy (filebuf.buffer + filebuf.len, lbp->buffer, lbp->len);
       filebuf.len += lbp->len;
       filebuf.buffer[filebuf.len++] = '\n';
       filebuf.buffer[filebuf.len] = '\0';
@@ -6278,7 +6255,7 @@ savenstr (const char *cp, int len)
   register char *dp;
 
   dp = xnew (len + 1, char);
-  strncpy (dp, cp, len);
+  memcpy (dp, cp, len);
   dp[len] = '\0';
   return dp;
 }
@@ -6320,48 +6297,6 @@ etags_strchr (register const char *sp, register int c)
   return NULL;
 }
 
-/*
- * Compare two strings, ignoring case for alphabetic characters.
- *
- * Same as BSD's strcasecmp, included for portability.
- */
-static int
-etags_strcasecmp (register const char *s1, register const char *s2)
-{
-  while (*s1 != '\0'
-         && (ISALPHA (*s1) && ISALPHA (*s2)
-             ? lowcase (*s1) == lowcase (*s2)
-             : *s1 == *s2))
-    s1++, s2++;
-
-  return (ISALPHA (*s1) && ISALPHA (*s2)
-          ? lowcase (*s1) - lowcase (*s2)
-          : *s1 - *s2);
-}
-
-/*
- * Compare two strings, ignoring case for alphabetic characters.
- * Stop after a given number of characters
- *
- * Same as BSD's strncasecmp, included for portability.
- */
-static int
-etags_strncasecmp (register const char *s1, register const char *s2, register int n)
-{
-  while (*s1 != '\0' && n-- > 0
-         && (ISALPHA (*s1) && ISALPHA (*s2)
-             ? lowcase (*s1) == lowcase (*s2)
-             : *s1 == *s2))
-    s1++, s2++;
-
-  if (n < 0)
-    return 0;
-  else
-    return (ISALPHA (*s1) && ISALPHA (*s2)
-            ? lowcase (*s1) - lowcase (*s2)
-            : *s1 - *s2);
-}
-
 /* Skip spaces (end of string is not space), return new pointer. */
 static char *
 skip_spaces (char *cp)
diff --git a/lib-src/hexl.c b/lib-src/hexl.c
index f8fb11f8218..08da0075269 100644
--- a/lib-src/hexl.c
+++ b/lib-src/hexl.c
@@ -20,9 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <stdio.h>
 #include <ctype.h>
@@ -48,7 +46,7 @@ int base = DEFAULT_BASE, un_flag = FALSE, iso_flag = FALSE, endian = 1;
 int group_by = DEFAULT_GROUPING;
 char *progname;
 
-void usage (void) NO_RETURN;
+_Noreturn void usage (void);
 
 int
 main (int argc, char **argv)
diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index 4f68fdb78c9..bd87b5b6524 100644
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -76,7 +76,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 static int scan_file (char *filename);
 static int scan_lisp_file (const char *filename, const char *mode);
 static int scan_c_file (char *filename, const char *mode);
-static void fatal (const char *s1, const char *s2) NO_RETURN;
 static void start_globals (void);
 static void write_globals (void);
 
@@ -111,7 +110,7 @@ error (const char *s1, const char *s2)
 /* Print error message and exit.  */
 
 /* VARARGS1 */
-static void
+static _Noreturn void
 fatal (const char *s1, const char *s2)
 {
   error (s1, s2);
@@ -542,7 +541,7 @@ write_c_args (FILE *out, char *func, char *buf, int minargs, int maxargs)
 
           /* In C code, `default' is a reserved word, so we spell it
              `defalt'; demangle that here.  */
-          if (ident_length == 6 && strncmp (ident_start, "defalt", 6) == 0)
+          if (ident_length == 6 && memcmp (ident_start, "defalt", 6) == 0)
             fprintf (out, "DEFAULT");
           else
             while (ident_length-- > 0)
@@ -565,6 +564,7 @@ write_c_args (FILE *out, char *func, char *buf, int minargs, int maxargs)
 /* The types of globals.  */
 enum global_type
 {
+  FUNCTION,
   EMACS_INTEGER,
   BOOLEAN,
   LISP_OBJECT,
@@ -576,6 +576,7 @@ struct global
 {
   enum global_type type;
   char *name;
+  int value;
 };
 
 /* All the variable names we saw while scanning C sources in `-g'
@@ -585,7 +586,7 @@ int num_globals_allocated;
 struct global *globals;
 
 static void
-add_global (enum global_type type, char *name)
+add_global (enum global_type type, char *name, int value)
 {
   /* Ignore the one non-symbol that can occur.  */
   if (strcmp (name, "..."))
@@ -606,6 +607,7 @@ add_global (enum global_type type, char *name)
 
       globals[num_globals - 1].type = type;
       globals[num_globals - 1].name = name;
+      globals[num_globals - 1].value = value;
     }
 }
 
@@ -614,13 +616,29 @@ compare_globals (const void *a, const void *b)
 {
   const struct global *ga = a;
   const struct global *gb = b;
+
+  if (ga->type == FUNCTION)
+    {
+      if (gb->type != FUNCTION)
+        return 1;
+    }
+  else if (gb->type == FUNCTION)
+    return -1;
+
   return strcmp (ga->name, gb->name);
 }
 
 static void
+close_emacs_globals (void)
+{
+  fprintf (outfile, "};\n");
+  fprintf (outfile, "extern struct emacs_globals globals;\n");
+}
+
+static void
 write_globals (void)
 {
-  int i;
+  int i, seen_defun = 0;
   qsort (globals, num_globals, sizeof (struct global), compare_globals);
   for (i = 0; i < num_globals; ++i)
     {
@@ -637,20 +655,55 @@ write_globals (void)
         case LISP_OBJECT:
           type = "Lisp_Object";
           break;
+        case FUNCTION:
+          if (!seen_defun)
+            {
+              close_emacs_globals ();
+              fprintf (outfile, "\n");
+              seen_defun = 1;
+            }
+          break;
         default:
           fatal ("not a recognized DEFVAR_", 0);
         }
 
-      fprintf (outfile, "  %s f_%s;\n", type, globals[i].name);
-      fprintf (outfile, "#define %s globals.f_%s\n",
-               globals[i].name, globals[i].name);
+      if (globals[i].type != FUNCTION)
+        {
+          fprintf (outfile, "  %s f_%s;\n", type, globals[i].name);
+          fprintf (outfile, "#define %s globals.f_%s\n",
+                   globals[i].name, globals[i].name);
+        }
+      else
+        {
+          /* It would be nice to have a cleaner way to deal with these
+             special hacks.  */
+          if (strcmp (globals[i].name, "Fthrow") == 0
+              || strcmp (globals[i].name, "Ftop_level") == 0
+              || strcmp (globals[i].name, "Fkill_emacs") == 0)
+            fprintf (outfile, "_Noreturn ");
+          fprintf (outfile, "EXFUN (%s, ", globals[i].name);
+          if (globals[i].value == -1)
+            fprintf (outfile, "MANY");
+          else if (globals[i].value == -2)
+            fprintf (outfile, "UNEVALLED");
+          else
+            fprintf (outfile, "%d", globals[i].value);
+          fprintf (outfile, ");\n");
+        }
+
       while (i + 1 < num_globals
              && !strcmp (globals[i].name, globals[i + 1].name))
-        ++i;
+        {
+          if (globals[i].type == FUNCTION
+              && globals[i].value != globals[i + 1].value)
+            error ("function '%s' defined twice with differing signatures",
+                   globals[i].name);
+          ++i;
+        }
     }
 
-  fprintf (outfile, "};\n");
-  fprintf (outfile, "extern struct emacs_globals globals;\n");
+  if (!seen_defun)
+    close_emacs_globals ();
 }
 
 
@@ -700,6 +753,7 @@ scan_c_file (char *filename, const char *mode)
       int defvarperbufferflag = 0;
       int defvarflag = 0;
       enum global_type type = INVALID;
+      char *name IF_LINT (= 0);
 
       if (c != '\n' && c != '\r')
         {
@@ -765,8 +819,9 @@ scan_c_file (char *filename, const char *mode)
         }
       else continue;
 
-      if (generate_globals && (!defvarflag || defvarperbufferflag
-                               || type == INVALID))
+      if (generate_globals
+          && (!defvarflag || defvarperbufferflag || type == INVALID)
+          && !defunflag)
         continue;
 
       while (c != '(')
@@ -785,7 +840,6 @@ scan_c_file (char *filename, const char *mode)
       if (generate_globals)
         {
           int i = 0;
-          char *name;
 
           /* Skip "," and whitespace.  */
           do
@@ -806,8 +860,12 @@ scan_c_file (char *filename, const char *mode)
 
           name = xmalloc (i + 1);
           memcpy (name, input_buffer, i + 1);
-          add_global (type, name);
-          continue;
+
+          if (!defunflag)
+            {
+              add_global (type, name, 0);
+              continue;
+            }
         }
 
       /* DEFVAR_LISP ("name", addr, "doc")
@@ -815,7 +873,7 @@ scan_c_file (char *filename, const char *mode)
          DEFVAR_LISP ("name", addr, doc: /\* doc *\/)  */
 
       if (defunflag)
-        commas = 5;
+        commas = generate_globals ? 4 : 5;
       else if (defvarperbufferflag)
         commas = 3;
       else if (defvarflag)
@@ -842,7 +900,12 @@ scan_c_file (char *filename, const char *mode)
                     scanned = fscanf (infile, "%d", &minargs);
                   else /* Pick up maxargs.  */
                     if (c == 'M' || c == 'U') /* MANY || UNEVALLED */
-                      maxargs = -1;
+                      {
+                        if (generate_globals)
+                          maxargs = (c == 'M') ? -1 : -2;
+                        else
+                          maxargs = -1;
+                      }
                     else
                       scanned = fscanf (infile, "%d", &maxargs);
                   if (scanned < 0)
@@ -855,6 +918,12 @@ scan_c_file (char *filename, const char *mode)
           c = getc (infile);
         }
 
+      if (generate_globals)
+        {
+          add_global (FUNCTION, name, maxargs);
+          continue;
+        }
+
       while (c == ' ' || c == '\n' || c == '\r' || c == '\t')
         c = getc (infile);
 
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index fea1d29592e..4b2b523ea34 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -19,12 +19,12 @@
 
 ALL = $(BLD)/test-distrib.exe $(BLD)/make-docfile.exe $(BLD)/hexl.exe\
  $(BLD)/ctags.exe $(BLD)/etags.exe $(BLD)/movemail.exe $(BLD)/ebrowse.exe\
- $(BLD)/emacsclient.exe $(BLD)/emacsclientw.exe
+ $(BLD)/emacsclient.exe $(BLD)/emacsclientw.exe $(BLD)/profile.exe
 
 .PHONY: make-docfile
 
 LOCAL_FLAGS     = -DWINDOWSNT -DDOS_NT -DNO_LDAV=1 \
-                  -DNO_ARCHIVES=1 -DHAVE_CONFIG_H=1 -I../lib \
+                  -DNO_ARCHIVES=1 -I../lib \
                   -I../nt/inc -I../src $(EMACS_EXTRA_C_FLAGS)
 
 LIBS            = $(BASE_LIBS) $(ADVAPI32)
@@ -38,7 +38,7 @@ $(BLD)/hexl.exe:		$(BLD)/hexl.$(O)
                 $(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(BLD)/hexl.$(O) $(LIBS)
 $(BLD)/test-distrib.exe: $(BLD)/test-distrib.$(O)
                 $(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(BLD)/test-distrib.$(O) $(LIBS)
-                "$(BLD)/test-distrib.exe" "$(SRC)/testfile"
+                "$(BLD)/test-distrib.exe" "$(LIB_SRC)/testfile"
 
 MOVEMAILOBJS =  $(BLD)/movemail.$(O) \
                 $(BLD)/pop.$(O) \
@@ -106,10 +106,16 @@ ctags.c:	etags.c
                 - $(DEL) ctags.c
                 $(CP) etags.c ctags.c
 
-CTAGS_CFLAGS  = -DCTAGS $(ETAGS_CFLAGS) -DEMACS_NAME="\"GNU Emacs\""
+CTAGS_CFLAGS  = -DCTAGS $(ETAGS_CFLAGS)
 $(BLD)/ctags.$(O): ctags.c
                 $(CC) $(CFLAGS) $(CTAGS_CFLAGS) $(CC_OUT)$@ ctags.c
 
+PROFILEOBJS     = $(BLD)/profile.$(O) \
+                  ../lib/$(BLD)/libgnu.$(A) \
+                  $(BLD)/ntlib.$(O)
+$(BLD)/profile.exe:     $(PROFILEOBJS)
+                $(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(PROFILEOBJS) $(LIBS)
+
 #
 # From ..\src\Makefile.in
 # It doesn't matter if the real name is *.obj for the files in this list,
@@ -236,7 +242,6 @@ lisp2 = \
         $(lispsource)language/georgian.el \
         $(lispsource)language/khmer.el \
         $(lispsource)language/burmese.el \
-        $(lispsource)paths.el \
         $(lispsource)register.elc \
         $(lispsource)replace.elc \
         $(lispsource)simple.elc \
@@ -307,6 +312,7 @@ install:	$(INSTALL_FILES)
                 $(CP) $(BLD)/movemail.exe $(INSTALL_DIR)/bin
                 $(CP) $(BLD)/emacsclient.exe $(INSTALL_DIR)/bin
                 $(CP) $(BLD)/emacsclientw.exe $(INSTALL_DIR)/bin
+                $(CP) $(BLD)/profile.exe $(INSTALL_DIR)/bin
                 - mkdir "$(INSTALL_DIR)/etc"
                 $(CP) $(DOC) $(INSTALL_DIR)/etc
 
@@ -349,85 +355,108 @@ TAGS: $(BLD)/etags.exe *.c *.h
 ### DEPENDENCIES ###
 
 EMACS_ROOT      = ..
-SRC             = .
-
-$(BLD)/alloca.$(O) : \
-        $(SRC)/alloca.c \
-        $(EMACS_ROOT)/src/s/ms-w32.h \
-        $(EMACS_ROOT)/src/config.h \
-        $(EMACS_ROOT)/src/blockinput.h
+LIB_SRC         = .
+SRC             = $(EMACS_ROOT)/src
+NT_INC          = $(EMACS_ROOT)/nt/inc
+GNU_LIB         = $(EMACS_ROOT)/lib
+
+MS_W32_H       = $(SRC)/s/ms-w32.h \
+                 $(NT_INC)/sys/stat.h
+CONFIG_H       = $(SRC)/config.h \
+                 $(MS_W32_H)
+INTTYPES_H     = $(NT_INC)/inttypes.h \
+                 $(NT_INC)/stdint.h
+NTLIB_H        = $(LIB_SRC)/ntlib.h \
+                 $(NT_INC)/pwd.h
+SYSTIME_H      = $(SRC)/systime.h \
+                 $(NT_INC)/sys/time.h \
+                 $(GNU_LIB)/timespec.h
 
 $(BLD)/ctags.$(O) : \
-        $(SRC)/ctags.c \
-        $(EMACS_ROOT)/nt/inc/sys/param.h \
-        $(EMACS_ROOT)/nt/inc/sys/stat.h \
-        $(EMACS_ROOT)/src/s/ms-w32.h \
-        $(EMACS_ROOT)/lib-src/../src/config.h \
-        $(SRC)/ntlib.h \
-        $(EMACS_ROOT)/lib/getopt.h
+        $(LIB_SRC)/ctags.c \
+        $(SRC)/regex.h \
+        $(NT_INC)/sys/stat.h \
+        $(NT_INC)/unistd.h \
+        $(GNU_LIB)/c-strcase.h \
+        $(GNU_LIB)/getopt.h \
+        $(CONFIG_H)
 
 $(BLD)/ebrowse.$(O) : \
-        $(SRC)/ebrowse.c \
-        $(EMACS_ROOT)/lib/min-max.h \
-        $(EMACS_ROOT)/src/s/ms-w32.h \
-        $(EMACS_ROOT)/lib-src/../src/config.h
+        $(LIB_SRC)/ebrowse.c \
+        $(GNU_LIB)/getopt.h \
+        $(GNU_LIB)/min-max.h \
+        $(CONFIG_H)
 
 $(BLD)/emacsclient.$(O) : \
-        $(SRC)/emacsclient.c \
-        $(EMACS_ROOT)/nt/inc/sys/stat.h \
-        $(EMACS_ROOT)/src/s/ms-w32.h \
-        $(EMACS_ROOT)/lib-src/../src/config.h
+        $(LIB_SRC)/emacsclient.c \
+        $(NT_INC)/pwd.h \
+        $(NT_INC)/sys/stat.h \
+        $(NT_INC)/unistd.h \
+        $(GNU_LIB)/getopt.h \
+        $(CONFIG_H)
 
 $(BLD)/etags.$(O) : \
-        $(SRC)/etags.c \
-        $(EMACS_ROOT)/nt/inc/sys/param.h \
-        $(EMACS_ROOT)/nt/inc/sys/stat.h \
-        $(EMACS_ROOT)/src/s/ms-w32.h \
-        $(EMACS_ROOT)/lib-src/../src/config.h \
-        $(SRC)/ntlib.h \
-        $(EMACS_ROOT)/lib/getopt.h
+        $(LIB_SRC)/etags.c \
+        $(SRC)/regex.h \
+        $(NT_INC)/sys/stat.h \
+        $(NT_INC)/unistd.h \
+        $(GNU_LIB)/c-strcase.h \
+        $(GNU_LIB)/getopt.h \
+        $(CONFIG_H)
 
 $(BLD)/hexl.$(O) : \
-        $(SRC)/hexl.c
+        $(LIB_SRC)/hexl.c \
+        $(CONFIG_H)
 
 $(BLD)/make-docfile.$(O) : \
-        $(SRC)/make-docfile.c \
-        $(EMACS_ROOT)/src/config.h
+        $(LIB_SRC)/make-docfile.c \
+        $(NT_INC)/unistd.h \
+        $(CONFIG_H)
 
 $(BLD)/movemail.$(O) : \
-        $(SRC)/movemail.c \
-        $(EMACS_ROOT)/src/s/ms-w32.h \
-        $(EMACS_ROOT)/lib-src/../src/config.h \
-        $(EMACS_ROOT)/nt/inc/sys/file.h \
-        $(EMACS_ROOT)/nt/inc/sys/stat.h \
-        $(EMACS_ROOT)/lib-src/../src/syswait.h \
-        $(EMACS_ROOT)/nt/inc/pwd.h \
-        $(SRC)/ntlib.h
-        $(CC) $(CFLAGS) -DUSG $(CC_OUT)$@ movemail.c
+        $(LIB_SRC)/movemail.c \
+        $(LIB_SRC)/pop.h \
+        $(SRC)/syswait.h \
+        $(NT_INC)/pwd.h \
+        $(NT_INC)/sys/file.h \
+        $(NT_INC)/sys/stat.h \
+        $(NT_INC)/unistd.h \
+        $(GNU_LIB)/getopt.h \
+        $(CONFIG_H) \
+        $(NTLIB_H)
 
 $(BLD)/ntlib.$(O) : \
-        $(SRC)/ntlib.c \
-        $(SRC)/ntlib.h \
-        $(EMACS_ROOT)/nt/inc/sys/stat.h \
-        $(EMACS_ROOT)/nt/inc/pwd.h
+        $(LIB_SRC)/ntlib.c \
+        $(NT_INC)/sys/stat.h \
+        $(NTLIB_H)
 
 $(BLD)/pop.$(O) : \
-        $(SRC)/pop.c \
-        $(SRC)/pop.h \
-        $(EMACS_ROOT)/lib/min-max.h \
-        $(SRC)/ntlib.h
+        $(LIB_SRC)/pop.c \
+        $(LIB_SRC)/pop.h \
+        $(NT_INC)/netdb.h \
+        $(NT_INC)/pwd.h \
+        $(NT_INC)/unistd.h \
+        $(GNU_LIB)/min-max.h \
+        $(CONFIG_H) \
+        $(NTLIB_H)
 
 $(BLD)/profile.$(O) : \
-        $(SRC)/profile.c \
-        $(EMACS_ROOT)/src/s/ms-w32.h \
-        $(EMACS_ROOT)/lib-src/../src/config.h \
-        $(EMACS_ROOT)/lib-src/../src/systime.h
-
-$(BLD)/tcp.$(O) : \
-        $(SRC)/tcp.c
+        $(LIB_SRC)/profile.c \
+        $(GNU_LIB)/intprops.h \
+        $(CONFIG_H) \
+        $(INTTYPES_H) \
+        $(SYSTIME_H)
+
+$(BLD)/regex.$(O) : \
+        $(SRC)/regex.c \
+        $(SRC)/regex.h \
+        $(NT_INC)/unistd.h \
+        $(CONFIG_H)
 
 $(BLD)/test-distrib.$(O) : \
-        $(SRC)/test-distrib.c
+        $(LIB_SRC)/test-distrib.c \
+        $(NT_INC)/unistd.h \
+        $(CONFIG_H)
 
 # The following dependencies are for supporting parallel builds, where
 # we must make sure $(BLD) exists before any compilation starts.
diff --git a/lib-src/movemail.c b/lib-src/movemail.c
index 9d19df32814..d157aa8c0b9 100644
--- a/lib-src/movemail.c
+++ b/lib-src/movemail.c
@@ -133,16 +133,10 @@ static char *mail_spool_name (char *);
 #endif
 #endif
 
-#ifndef HAVE_STRERROR
-char *strerror (int);
-#endif
-
-static void fatal (const char *s1, const char *s2, const char *s3) NO_RETURN;
+static _Noreturn void fatal (const char *s1, const char *s2, const char *s3);
 static void error (const char *s1, const char *s2, const char *s3);
-static void pfatal_with_name (char *name) NO_RETURN;
-static void pfatal_and_delete (char *name) NO_RETURN;
-static char *concat (const char *s1, const char *s2, const char *s3);
-static long *xmalloc (unsigned int size);
+static _Noreturn void pfatal_with_name (char *name);
+static _Noreturn void pfatal_and_delete (char *name);
 #ifdef MAIL_USE_POP
 static int popmail (char *mailbox, char *outfile, int preserve, char *password, int reverse_order);
 static int pop_retr (popserver server, int msgno, FILE *arg);
@@ -151,6 +145,21 @@ static int mbx_delimit_begin (FILE *mbf);
 static int mbx_delimit_end (FILE *mbf);
 #endif
 
+#if (defined MAIL_USE_MAILLOCK                                          \
+     || (!defined DISABLE_DIRECT_ACCESS && !defined MAIL_USE_MMDF       \
+         && !defined MAIL_USE_SYSTEM_LOCK))
+/* Like malloc but get fatal error if memory is exhausted.  */
+
+static void *
+xmalloc (size_t size)
+{
+  void *result = malloc (size);
+  if (!result)
+    fatal ("virtual memory exhausted", 0, 0);
+  return result;
+}
+#endif
+
 /* Nonzero means this is name of a lock file to delete on fatal error.  */
 static char *delete_lockname;
 
@@ -168,7 +177,7 @@ main (int argc, char **argv)
   int tem;
   char *lockname;
   char *tempname;
-  size_t inname_dirlen;
+  size_t inname_len, inname_dirlen;
   int desc;
 #endif /* not MAIL_USE_SYSTEM_LOCK */
 
@@ -296,12 +305,15 @@ main (int argc, char **argv)
          should define MAIL_USE_SYSTEM_LOCK but does not, send a bug report
          to bug-gnu-emacs@prep.ai.mit.edu so we can fix it.  */
 
-      lockname = concat (inname, ".lock", "");
-      for (inname_dirlen = strlen (inname);
+      inname_len = strlen (inname);
+      lockname = xmalloc (inname_len + sizeof ".lock");
+      strcpy (lockname, inname);
+      strcpy (lockname + inname_len, ".lock");
+      for (inname_dirlen = inname_len;
            inname_dirlen && !IS_DIRECTORY_SEP (inname[inname_dirlen - 1]);
            inname_dirlen--)
         continue;
-      tempname = (char *) xmalloc (inname_dirlen + sizeof "EXXXXXX");
+      tempname = xmalloc (inname_dirlen + sizeof "EXXXXXX");
 
       while (1)
         {
@@ -583,8 +595,8 @@ mail_spool_name (char *inname)
   if (stat (MAILDIR, &stat1) < 0)
     return NULL;
 
-  indir = (char *) xmalloc (fname - inname + 1);
-  strncpy (indir, inname, fname - inname);
+  indir = xmalloc (fname - inname + 1);
+  memcpy (indir, inname, fname - inname);
   indir[fname-inname] = '\0';
 
 
@@ -643,33 +655,6 @@ pfatal_and_delete (char *name)
   unlink (name);
   fatal ("%s for %s", s, name);
 }
-
-/* Return a newly-allocated string whose contents concatenate those of s1, s2, s3.  */
-
-static char *
-concat (const char *s1, const char *s2, const char *s3)
-{
-  size_t len1 = strlen (s1), len2 = strlen (s2), len3 = strlen (s3);
-  char *result = (char *) xmalloc (len1 + len2 + len3 + 1);
-
-  strcpy (result, s1);
-  strcpy (result + len1, s2);
-  strcpy (result + len1 + len2, s3);
-  *(result + len1 + len2 + len3) = 0;
-
-  return result;
-}
-
-/* Like malloc but get fatal error if memory is exhausted.  */
-
-static long *
-xmalloc (unsigned int size)
-{
-  long *result = (long *) malloc (size);
-  if (!result)
-    fatal ("virtual memory exhausted", 0, 0);
-  return result;
-}
 
 /* This is the guts of the interface to the Post Office Protocol.  */
 
@@ -851,10 +836,7 @@ pop_retr (popserver server, int msgno, FILE *arg)
 
   if (pop_retrieve_first (server, msgno, &line))
     {
-      char *msg = concat ("Error from POP server: ", pop_error, "");
-      strncpy (Errmsg, msg, sizeof (Errmsg));
-      Errmsg[sizeof (Errmsg)-1] = '\0';
-      free (msg);
+      snprintf (Errmsg, sizeof Errmsg, "Error from POP server: %s", pop_error);
       return (NOTOK);
     }
 
@@ -873,10 +855,7 @@ pop_retr (popserver server, int msgno, FILE *arg)
 
   if (ret)
     {
-      char *msg = concat ("Error from POP server: ", pop_error, "");
-      strncpy (Errmsg, msg, sizeof (Errmsg));
-      Errmsg[sizeof (Errmsg)-1] = '\0';
-      free (msg);
+      snprintf (Errmsg, sizeof Errmsg, "Error from POP server: %s", pop_error);
       return (NOTOK);
     }
 
@@ -939,21 +918,3 @@ mbx_delimit_end (FILE *mbf)
 }
 
 #endif /* MAIL_USE_POP */
-
-#ifndef HAVE_STRERROR
-char *
-strerror (errnum)
-     int errnum;
-{
-  extern char *sys_errlist[];
-  extern int sys_nerr;
-
-  if (errnum >= 0 && errnum < sys_nerr)
-    return sys_errlist[errnum];
-  return (char *) "Unknown error";
-}
-
-#endif /* ! HAVE_STRERROR */
-
-
-/* movemail.c ends here */
diff --git a/lib-src/pop.c b/lib-src/pop.c
index c4c7f2b4e2f..74054e0e1b1 100644
--- a/lib-src/pop.c
+++ b/lib-src/pop.c
@@ -21,11 +21,7 @@ You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#else
-#define MAIL_USE_POP
-#endif
 
 #ifdef MAIL_USE_POP
 
@@ -101,7 +97,7 @@ extern char *krb_realmofhost (/* char * */);
 #endif /* KERBEROS */
 
 #ifndef WINDOWSNT
-#if !defined (HAVE_H_ERRNO) || !defined (HAVE_CONFIG_H)
+#ifndef HAVE_H_ERRNO
 extern int h_errno;
 #endif
 #endif
@@ -344,10 +340,7 @@ pop_stat (popserver server, int *count, int *size)
   if (strncmp (fromserver, "+OK ", 4))
     {
       if (0 == strncmp (fromserver, "-ERR", 4))
-        {
-          strncpy (pop_error, fromserver, ERROR_MAX);
-          pop_error[ERROR_MAX-1] = '\0';
-        }
+        snprintf (pop_error, ERROR_MAX, "%s", fromserver);
       else
         {
           strcpy (pop_error,
@@ -448,10 +441,7 @@ pop_list (popserver server, int message, int **IDs, int **sizes)
       if (strncmp (fromserver, "+OK ", 4))
         {
           if (! strncmp (fromserver, "-ERR", 4))
-            {
-              strncpy (pop_error, fromserver, ERROR_MAX);
-              pop_error[ERROR_MAX-1] = '\0';
-            }
+            snprintf (pop_error, ERROR_MAX, "%s", fromserver);
           else
             {
               strcpy (pop_error,
@@ -690,8 +680,7 @@ pop_multi_first (popserver server, const char *command, char **response)
 
   if (0 == strncmp (*response, "-ERR", 4))
     {
-      strncpy (pop_error, *response, ERROR_MAX);
-      pop_error[ERROR_MAX-1] = '\0';
+      snprintf (pop_error, ERROR_MAX, "%s", *response);
       return (-1);
     }
   else if (0 == strncmp (*response, "+OK", 3))
@@ -864,8 +853,7 @@ pop_last (popserver server)
 
   if (! strncmp (fromserver, "-ERR", 4))
     {
-      strncpy (pop_error, fromserver, ERROR_MAX);
-      pop_error[ERROR_MAX-1] = '\0';
+      snprintf (pop_error, ERROR_MAX, "%s", fromserver);
       return (-1);
     }
   else if (strncmp (fromserver, "+OK ", 4))
@@ -1065,9 +1053,8 @@ socket_connection (char *host, int flags)
   sock = socket (PF_INET, SOCK_STREAM, 0);
   if (sock < 0)
     {
-      strcpy (pop_error, POP_SOCKET_ERROR);
-      strncat (pop_error, strerror (errno),
-               ERROR_MAX - sizeof (POP_SOCKET_ERROR));
+      snprintf (pop_error, ERROR_MAX, "%s%s",
+                POP_SOCKET_ERROR, strerror (errno));
       return (-1);
 
     }
@@ -1143,9 +1130,7 @@ socket_connection (char *host, int flags)
   if (! connect_ok)
     {
       CLOSESOCKET (sock);
-      strcpy (pop_error, CONNECT_ERROR);
-      strncat (pop_error, strerror (errno),
-               ERROR_MAX - sizeof (CONNECT_ERROR));
+      snprintf (pop_error, ERROR_MAX, "%s%s", CONNECT_ERROR, strerror (errno));
       return (-1);
 
     }
@@ -1163,9 +1148,8 @@ socket_connection (char *host, int flags)
             krb5_auth_con_free (kcontext, auth_context);
           if (kcontext)
             krb5_free_context (kcontext);
-          strcpy (pop_error, KRB_ERROR);
-          strncat (pop_error, error_message (rem),
-                   ERROR_MAX - sizeof (KRB_ERROR));
+          snprintf (pop_error, ERROR_MAX, "%s%s",
+                    KRB_ERROR, error_message (rem));
           CLOSESOCKET (sock);
           return (-1);
         }
@@ -1203,30 +1187,19 @@ socket_connection (char *host, int flags)
       krb5_free_principal (kcontext, server);
       if (rem)
         {
-          strcpy (pop_error, KRB_ERROR);
-          strncat (pop_error, error_message (rem),
-                   ERROR_MAX - sizeof (KRB_ERROR));
+          int pop_error_len = snprintf (pop_error, ERROR_MAX, "%s%s",
+                                        KRB_ERROR, error_message (rem));
 #if defined HAVE_KRB5_ERROR_TEXT
           if (err_ret && err_ret->text.length)
             {
-              strncat (pop_error, " [server says '",
-                       ERROR_MAX - strlen (pop_error) - 1);
-              strncat (pop_error, err_ret->text.data,
-                       min (ERROR_MAX - strlen (pop_error) - 1,
-                            err_ret->text.length));
-              strncat (pop_error, "']",
-                       ERROR_MAX - strlen (pop_error) - 1);
+              int errlen = err_ret->text.length;
+              snprintf (pop_error + pop_error_len, ERROR_MAX - pop_error_len,
+                        " [server says '.*%s']", errlen, err_ret->text.data);
             }
 #elif defined HAVE_KRB5_ERROR_E_TEXT
-          if (err_ret && err_ret->e_text && strlen (*err_ret->e_text))
-            {
-              strncat (pop_error, " [server says '",
-                       ERROR_MAX - strlen (pop_error) - 1);
-              strncat (pop_error, *err_ret->e_text,
-                       ERROR_MAX - strlen (pop_error) - 1);
-              strncat (pop_error, "']",
-                       ERROR_MAX - strlen (pop_error) - 1);
-            }
+          if (err_ret && err_ret->e_text && **err_ret->e_text)
+            snprintf (pop_error + pop_error_len, ERRMAX - pop_error_len,
+                      " [server says '%s']", *err_ret->e_text);
 #endif
           if (err_ret)
             krb5_free_error (kcontext, err_ret);
@@ -1247,9 +1220,7 @@ socket_connection (char *host, int flags)
       free ((char *) ticket);
       if (rem != KSUCCESS)
         {
-          strcpy (pop_error, KRB_ERROR);
-          strncat (pop_error, krb_err_txt[rem],
-                   ERROR_MAX - sizeof (KRB_ERROR));
+          snprintf (pop_error, ERROR_MAX, "%s%s", KRB_ERROR, krb_err_txt[rem]);
           CLOSESOCKET (sock);
           return (-1);
         }
@@ -1354,9 +1325,8 @@ pop_getline (popserver server, char **line)
                   server->buffer_size - server->data - 1, 0);
       if (ret < 0)
         {
-          strcpy (pop_error, GETLINE_ERROR);
-          strncat (pop_error, strerror (errno),
-                   ERROR_MAX - sizeof (GETLINE_ERROR));
+          snprintf (pop_error, ERROR_MAX, "%s%s",
+                    GETLINE_ERROR, strerror (errno));
           pop_trash (server);
           return (-1);
         }
@@ -1440,9 +1410,7 @@ sendline (popserver server, const char *line)
   if (ret < 0)
     {
       pop_trash (server);
-      strcpy (pop_error, SENDLINE_ERROR);
-      strncat (pop_error, strerror (errno),
-               ERROR_MAX - sizeof (SENDLINE_ERROR));
+      snprintf (pop_error, ERROR_MAX, "%s%s", SENDLINE_ERROR, strerror (errno));
       return (ret);
     }
 
@@ -1504,8 +1472,7 @@ getok (popserver server)
     return (0);
   else if (! strncmp (fromline, "-ERR", 4))
     {
-      strncpy (pop_error, fromline, ERROR_MAX);
-      pop_error[ERROR_MAX-1] = '\0';
+      snprintf (pop_error, ERROR_MAX, "%s", fromline);
       return (-1);
     }
   else
diff --git a/lib-src/profile.c b/lib-src/profile.c
index 8ed4f318974..d21f2c28e58 100644
--- a/lib-src/profile.c
+++ b/lib-src/profile.c
@@ -20,7 +20,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
 /**
- **  To be run as an emacs process. Input string that starts with:
+ **  To be run as an emacs subprocess.  Input string that starts with:
  **    'z' -- resets the watch (to zero).
  **    'p' -- return time (on stdout) as string with format <sec>.<micro-sec>
  **    'q' -- exit.
@@ -29,53 +29,42 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
  **  operations: reset_watch, get_time
  */
 #include <config.h>
+
+#include <inttypes.h>
 #include <stdio.h>
+
+#include <intprops.h>
 #include <systime.h>
 
-static EMACS_TIME TV1, TV2;
+static EMACS_TIME TV1;
 static int watch_not_started = 1; /* flag */
-static char time_string[30];
+static char time_string[INT_STRLEN_BOUND (uintmax_t) + sizeof "."
+                        + LOG10_EMACS_TIME_RESOLUTION];
 
 /* Reset the stopwatch to zero.  */
 
 static void
 reset_watch (void)
 {
-  EMACS_GET_TIME (TV1);
+  TV1 = current_emacs_time ();
   watch_not_started = 0;
 }
 
 /* This call returns the time since the last reset_watch call.  The time
-   is returned as a string with the format  <seconds>.<micro-seconds>
+   is returned as a string with the format  <seconds>.<nanoseconds>
    If reset_watch was not called yet, exit.  */
 
 static char *
 get_time (void)
 {
+  EMACS_TIME TV2 = sub_emacs_time (current_emacs_time (), TV1);
+  uintmax_t s = EMACS_SECS (TV2);
+  int ns = EMACS_NSECS (TV2);
   if (watch_not_started)
     exit (EXIT_FAILURE);  /* call reset_watch first ! */
-  EMACS_GET_TIME (TV2);
-  EMACS_SUB_TIME (TV2, TV2, TV1);
-  sprintf (time_string, "%lu.%06lu", (unsigned long)EMACS_SECS (TV2), (unsigned long)EMACS_USECS (TV2));
+  sprintf (time_string, "%"PRIuMAX".%0*d", s, LOG10_EMACS_TIME_RESOLUTION, ns);
   return time_string;
 }
-
-#if ! defined (HAVE_GETTIMEOFDAY) && defined (HAVE_TIMEVAL)
-
-/* ARGSUSED */
-gettimeofday (tp, tzp)
-     struct timeval *tp;
-     struct timezone *tzp;
-{
-  extern long time ();
-
-  tp->tv_sec = time ((long *)0);
-  tp->tv_usec = 0;
-  if (tzp != 0)
-    tzp->tz_minuteswest = -1;
-}
-
-#endif
 
 int
 main (void)
diff --git a/lib-src/update-game-score.c b/lib-src/update-game-score.c
index e0c940510be..40397536fad 100644
--- a/lib-src/update-game-score.c
+++ b/lib-src/update-game-score.c
@@ -48,8 +48,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <sys/stat.h>
 #include <getopt.h>
 
-static int usage (int err) NO_RETURN;
-
 #define MAX_ATTEMPTS 5
 #define MAX_SCORES 200
 #define MAX_DATA_LEN 1024
@@ -59,7 +57,7 @@ static int usage (int err) NO_RETURN;
 #define difftime(t1, t0) (double)((t1) - (t0))
 #endif
 
-static int
+static _Noreturn void
 usage (int err)
 {
   fprintf (stdout, "Usage: update-game-score [-m MAX] [-r] [-d DIR] game/scorefile SCORE DATA\n");
@@ -89,34 +87,14 @@ static void sort_scores (struct score_entry *scores, int count, int reverse);
 static int write_scores (const char *filename,
                          const struct score_entry *scores, int count);
 
-static void lose (const char *msg) NO_RETURN;
-
-static void
+static _Noreturn void
 lose (const char *msg)
 {
   fprintf (stderr, "%s\n", msg);
   exit (EXIT_FAILURE);
 }
 
-static void lose_syserr (const char *msg) NO_RETURN;
-
-/* Taken from sysdep.c.  */
-#ifndef HAVE_STRERROR
-#ifndef WINDOWSNT
-char *
-strerror (int errnum)
-{
-  extern char *sys_errlist[];
-  extern int sys_nerr;
-
-  if (errnum >= 0 && errnum < sys_nerr)
-    return sys_errlist[errnum];
-  return (char *) "Unknown error";
-}
-#endif /* not WINDOWSNT */
-#endif /* ! HAVE_STRERROR */
-
-static void
+static _Noreturn void
 lose_syserr (const char *msg)
 {
   fprintf (stderr, "%s: %s\n", msg, strerror (errno));