10 files changed, 96 insertions, 523 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 2c386257c10..0f24b234972 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,48 @@
+2010-10-10  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * Makefile.in (PROFILING_LDFLAGS): Remove, not needed.
+
+2010-10-09  Glenn Morris  <rgm@gnu.org>
+
+        * b2m.c, b2m.pl: Remove files.
+        * Makefile.in (INSTALLABLES): Remove b2m.
+        * makefile.w32-in ($(BLD)/b2m.$(O)): Remove.
+
+2010-10-08  Glenn Morris  <rgm@gnu.org>
+
+        * emacsclient.c (set_local_socket) [DARWIN_OS]: Try as a fall-back
+        DARWIN_USER_TEMP_DIR.  (Bug#3992)
+
+2010-10-03  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * test-distrib.c (cool_read):
+        * movemail.c (main, concat):
+        * make-docfile.c (scan_file, write_c_args):
+        * emacsclient.c (get_server_config): Fix -Wconversion warning.
+        (egetenv): Move conditional definition earlier.
+        (progname): Use const.
+        * sorted-doc.c (xstrdup): Use const.
+
+        * Makefile.in: Remove ^L, old makes choke on it.
+
+2010-10-02  Wolfgang Schnerring  <wosc@wosc.de>  (tiny change)
+
+        * emacsclient.c (main): Return EXIT_FAILURE if Emacs sends us an
+        error string (Bug#6963).
+
+2010-10-02  Juanma Barranquero  <lekktu@gmail.com>
+
+        * makefile.w32-in (tags): Remove target.
+
+2010-10-01  Eli Zaretskii  <eliz@gnu.org>
+
+        * makefile.w32-in (tags, TAGS): New targets.
+
+2010-09-30  Juanma Barranquero  <lekktu@gmail.com>
+
+        * emacsclient.c (get_server_config): Don't read Emacs pid from
+        the authentication file.
+
 2010-09-29  Juanma Barranquero  <lekktu@gmail.com>
 
         * makefile.w32-in (../src/config.h): Remove target, it is stale.
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 9ad3c65afad..b90b19b69b6 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -1,6 +1,7 @@
 # Makefile for lib-src subdirectory in GNU Emacs.
 # Copyright (C) 1985, 1987, 1988, 1993, 1994, 2001, 2002, 2003, 2004,
-#   2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+#   2005, 2006, 2007, 2008, 2009, 2010
+#   Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -38,7 +39,6 @@ C_SWITCH_SYSTEM=@C_SWITCH_SYSTEM@
 C_SWITCH_MACHINE=@C_SWITCH_MACHINE@
 C_WARNINGS_SWITCH = @C_WARNINGS_SWITCH@
 PROFILING_CFLAGS = @PROFILING_CFLAGS@
-PROFILING_LDFLAGS = @PROFILING_LDFLAGS@
 
 # Program name transformation.
 TRANSFORM = @program_transform_name@
@@ -111,7 +111,7 @@ INSTALL_STRIP =
 
 # Things that a user might actually run, which should be installed in bindir.
 INSTALLABLES = etags${EXEEXT} ctags${EXEEXT} emacsclient${EXEEXT} \
-               b2m${EXEEXT} ebrowse${EXEEXT}
+               ebrowse${EXEEXT}
 
 INSTALLABLE_SCRIPTS = rcs-checkin grep-changelog
 STAMP_INST_SCRIPTS = stamp-rcs-checkin stamp-grep-changelog
@@ -172,12 +172,11 @@ BASE_CFLAGS = $(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) ${C_WARNINGS_SWITCH} \
               -DHAVE_CONFIG_H -I. -I../src -I${srcdir} -I${srcdir}/../src
 
 ALL_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${LDFLAGS} ${CPPFLAGS} ${CFLAGS}
-LINK_CFLAGS = ${BASE_CFLAGS} ${PROFILING_LDFLAGS} ${LDFLAGS} ${CFLAGS}
+LINK_CFLAGS = ${BASE_CFLAGS} ${LDFLAGS} ${CFLAGS}
 CPP_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${CPPFLAGS} ${CFLAGS}
 
 LOADLIBES=$(LIBS_SYSTEM)
 
-
 ## This is the default compilation command.
 ## But we should never rely on it, because some make version failed to
 ## find it for getopt.o.
@@ -360,10 +359,6 @@ digest-doc${EXEEXT}: ${srcdir}/digest-doc.c
 sorted-doc${EXEEXT}: ${srcdir}/sorted-doc.c
         $(CC) ${ALL_CFLAGS} ${srcdir}/sorted-doc.c $(LOADLIBES) -o sorted-doc
 
-b2m${EXEEXT}: ${srcdir}/b2m.c ../src/config.h $(GETOPTDEPS)
-        $(CC) ${ALL_CFLAGS} ${srcdir}/b2m.c  -DVERSION="\"${version}\"" \
-           $(GETOPTOBJS) $(LOADLIBES) -o b2m
-
 movemail${EXEEXT}: movemail.o pop.o $(GETOPTDEPS)
         $(CC) ${LINK_CFLAGS} ${MOVE_FLAGS} movemail.o pop.o \
           $(GETOPTOBJS) $(LOADLIBES) $(LIBS_MOVE) -o movemail
diff --git a/lib-src/b2m.c b/lib-src/b2m.c
deleted file mode 100644
index 803d75e233c..00000000000
--- a/lib-src/b2m.c
+++ /dev/null
@@ -1,318 +0,0 @@
-/*
- * b2m - a filter for Babyl -> Unix mail files
- * The copyright on this file has been disclaimed.
- *
- * usage:       b2m < babyl > mailbox
- *
- * I find this useful whenever I have to use a
- * system which - shock horror! - doesn't run
- * GNU Emacs. At least now I can read all my
- * GNU Emacs Babyl format mail files!
- *
- * it's not much but it's free!
- *
- *   Ed Wilkinson
- *   E.Wilkinson@massey.ac.nz
- *   Mon Nov 7 15:54:06 PDT 1988
- */
-
-/* Made conformant to the GNU coding standards January, 1995
-   by Francesco Potorti` <pot@cnuce.cnr.it>. */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-/* On some systems, Emacs defines static as nothing for the sake
-   of unexec.  We don't want that here since we don't use unexec. */
-#undef static
-#endif
-
-#include <stdio.h>
-#include <time.h>
-#include <sys/types.h>
-#include <getopt.h>
-#ifdef MSDOS
-#include <fcntl.h>
-#endif
-
-#undef TRUE
-#define TRUE    1
-#undef FALSE
-#define FALSE   0
-
-#define streq(s,t)      (strcmp (s, t) == 0)
-#define strneq(s,t,n)   (strncmp (s, t, n) == 0)
-
-typedef int logical;
-
-#define TM_YEAR_BASE 1900
-
-/* Nonzero if TM_YEAR is a struct tm's tm_year value that causes
-   asctime to have well-defined behavior.  */
-#ifndef TM_YEAR_IN_ASCTIME_RANGE
-# define TM_YEAR_IN_ASCTIME_RANGE(tm_year) \
-    (1000 - TM_YEAR_BASE <= (tm_year) && (tm_year) <= 9999 - TM_YEAR_BASE)
-#endif
-
-/*
- * A `struct linebuffer' is a structure which holds a line of text.
- * `readline' reads a line from a stream into a linebuffer and works
- * regardless of the length of the line.
- */
-struct linebuffer
-{
-  long size;
-  char *buffer;
-};
-
-extern char *strtok(char *, const char *);
-
-long *xmalloc (unsigned int size);
-long *xrealloc (char *ptr, unsigned int size);
-char *concat (const char *s1, const char *s2, const char *s3);
-long readline (struct linebuffer *linebuffer, register FILE *stream);
-void fatal (const char *message) NO_RETURN;
-
-/*
- * xnew -- allocate storage.  SYNOPSIS: Type *xnew (int n, Type);
- */
-#define xnew(n, Type)   ((Type *) xmalloc ((n) * sizeof (Type)))
-
-
-
-char *progname;
-
-struct option longopts[] =
-{
-  { "help",                     no_argument,       NULL,     'h'   },
-  { "version",                  no_argument,       NULL,     'V'   },
-  { 0 }
-};
-
-extern int optind;
-
-int
-main (int argc, char **argv)
-{
-  logical labels_saved, printing, header, first, last_was_blank_line;
-  time_t ltoday;
-  struct tm *tm;
-  char *labels, *p, *today;
-  struct linebuffer data;
-
-#ifdef MSDOS
-  _fmode = O_BINARY;            /* all of files are treated as binary files */
-#if __DJGPP__ > 1
-  if (!isatty (fileno (stdout)))
-    setmode (fileno (stdout), O_BINARY);
-  if (!isatty (fileno (stdin)))
-    setmode (fileno (stdin), O_BINARY);
-#else /* not __DJGPP__ > 1 */
-  (stdout)->_flag &= ~_IOTEXT;
-  (stdin)->_flag &= ~_IOTEXT;
-#endif /* not __DJGPP__ > 1 */
-#endif
-  progname = argv[0];
-
-  while (1)
-    {
-      int opt = getopt_long (argc, argv, "hV", longopts, 0);
-      if (opt == EOF)
-        break;
-
-      switch (opt)
-        {
-        case 'V':
-          printf ("%s (GNU Emacs %s)\n", "b2m", VERSION);
-          puts ("b2m is in the public domain.");
-          exit (EXIT_SUCCESS);
-
-        case 'h':
-          fprintf (stderr, "Usage: %s <babylmailbox >unixmailbox\n", progname);
-          exit (EXIT_SUCCESS);
-        }
-    }
-
-  if (optind != argc)
-    {
-      fprintf (stderr, "Usage: %s <babylmailbox >unixmailbox\n", progname);
-      exit (EXIT_SUCCESS);
-    }
-
-  labels_saved = printing = header = last_was_blank_line = FALSE;
-  first = TRUE;
-  ltoday = time (0);
-  /* Convert to a string, checking for out-of-range time stamps.
-     Don't use 'ctime', as that might dump core if the hardware clock
-     is set to a bizarre value.  */
-  tm = localtime (&ltoday);
-  if (! (tm && TM_YEAR_IN_ASCTIME_RANGE (tm->tm_year)
-         && (today = asctime (tm))))
-    fatal ("current time is out of range");
-  data.size = 200;
-  data.buffer = xnew (200, char);
-
-  if (readline (&data, stdin) == 0
-      || !strneq (data.buffer, "BABYL OPTIONS:", 14))
-    fatal ("standard input is not a Babyl mailfile.");
-
-  while (readline (&data, stdin) > 0)
-    {
-      if (streq (data.buffer, "*** EOOH ***") && !printing)
-        {
-          printing = header = TRUE;
-          printf ("From \"Babyl to mail by %s\" %s", progname, today);
-          continue;
-        }
-
-      if (data.buffer[0] == '\037')
-        {
-          if (data.buffer[1] == '\0')
-            continue;
-          else if (data.buffer[1] == '\f')
-            {
-              static char babyl[] = "X-Babyl-Labels: ";
-              if (first)
-                first = FALSE;
-              else if (! last_was_blank_line)
-                puts("");
-              /* Save labels. */
-              readline (&data, stdin);
-              p = strtok (data.buffer, " ,\r\n\t");
-              labels = babyl;
-
-              while ((p = strtok (NULL, " ,\r\n\t")))
-                labels = concat (labels, p, ", ");
-
-              p = &labels[strlen (labels) - 2];
-              if (*p == ',')
-                *p = '\0';
-              printing = header = FALSE;
-              labels_saved = TRUE;
-              continue;
-            }
-        }
-
-      if ((data.buffer[0] == '\0') && header)
-        {
-          header = FALSE;
-          if (labels_saved)
-            puts (labels);
-        }
-
-      if (printing)
-        {
-          puts (data.buffer);
-          if (data.buffer[0] == '\0')
-            last_was_blank_line = TRUE;
-          else
-            last_was_blank_line = FALSE;
-        }
-    }
-
-  return EXIT_SUCCESS;
-}
-
-
-
-/*
- * Return a newly-allocated string whose contents
- * concatenate those of s1, s2, s3.
- */
-char *
-concat (const char *s1, const char *s2, const char *s3)
-{
-  int len1 = strlen (s1), len2 = strlen (s2), len3 = strlen (s3);
-  char *result = xnew (len1 + len2 + len3 + 1, char);
-
-  strcpy (result, s1);
-  strcpy (result + len1, s2);
-  strcpy (result + len1 + len2, s3);
-  result[len1 + len2 + len3] = '\0';
-
-  return result;
-}
-
-/*
- * Read a line of text from `stream' into `linebuffer'.
- * Return the number of characters read from `stream',
- * which is the length of the line including the newline, if any.
- */
-long
-readline (struct linebuffer *linebuffer, register FILE *stream)
-{
-  char *buffer = linebuffer->buffer;
-  register char *p = linebuffer->buffer;
-  register char *pend;
-  int chars_deleted;
-
-  pend = p + linebuffer->size;  /* Separate to avoid 386/IX compiler bug.  */
-
-  while (1)
-    {
-      register int c = getc (stream);
-      if (p == pend)
-        {
-          linebuffer->size *= 2;
-          buffer = (char *) xrealloc (buffer, linebuffer->size);
-          p += buffer - linebuffer->buffer;
-          pend = buffer + linebuffer->size;
-          linebuffer->buffer = buffer;
-        }
-      if (c == EOF)
-        {
-          *p = '\0';
-          chars_deleted = 0;
-          break;
-        }
-      if (c == '\n')
-        {
-          if (p > buffer && p[-1] == '\r')
-            {
-              *--p = '\0';
-              chars_deleted = 2;
-            }
-          else
-            {
-              *p = '\0';
-              chars_deleted = 1;
-            }
-          break;
-        }
-      *p++ = c;
-    }
-
-  return (p - buffer + chars_deleted);
-}
-
-/*
- * Like malloc but get fatal error if memory is exhausted.
- */
-long *
-xmalloc (unsigned int size)
-{
-  long *result = (long *) malloc (size);
-  if (result == NULL)
-    fatal ("virtual memory exhausted");
-  return result;
-}
-
-long *
-xrealloc (char *ptr, unsigned int size)
-{
-  long *result = (long *) realloc (ptr, size);
-  if (result == NULL)
-    fatal ("virtual memory exhausted");
-  return result;
-}
-
-void
-fatal (const char *message)
-{
-  fprintf (stderr, "%s: %s\n", progname, message);
-  exit (EXIT_FAILURE);
-}
-
-/* arch-tag: 5a3ad2af-a802-408f-83cc-e7cf5e98653e
-   (do not change this comment) */
-
-/* b2m.c ends here */
diff --git a/lib-src/b2m.pl b/lib-src/b2m.pl
deleted file mode 100644
index d3c47f61545..00000000000
--- a/lib-src/b2m.pl
+++ /dev/null
@@ -1,158 +0,0 @@
-#!/usr/bin/perl
-
-# b2m.pl - Script to convert a Babyl file to an mbox file
-
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-#   Free Software Foundation, Inc.
-
-# Maintainer: Jonathan Kamens <jik@kamens.brookline.ma.us>
-
-# 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/>.
-
-
-# Requires CPAN modules: MailTools (for Mail::Address), TimeDate (for
-# Date::Parse).
-
-use warnings;
-use strict;
-use File::Basename;
-use Getopt::Long;
-use Mail::Address;
-use Date::Parse;
-
-my($whoami) = basename $0;
-my($version) = '$Revision$';
-my($usage) = "Usage: $whoami [--help] [--version] [--[no]full-headers] [Babyl-file]
-\tBy default, full headers are printed.\n";
-
-my($opt_help, $opt_version);
-my($opt_full_headers) = 1;
-
-die $usage if (! GetOptions(
-                            'help' => \$opt_help,
-                            'version' => \$opt_version,
-                            'full-headers!' => \$opt_full_headers,
-                            ));
-
-if ($opt_help) {
-    print $usage;
-    exit;
-}
-elsif ($opt_version) {
-    print "$whoami version: $version\n";
-    exit;
-}
-
-die $usage if (@ARGV > 1);
-
-$/ = "\n\037";
-
-if (<> !~ /^BABYL OPTIONS:/) {
-    die "$whoami: $ARGV is not a Babyl file\n$usage";
-}
-
-while (<>) {
-    my($msg_num) = $. - 1;
-    my($labels, $pruned, $full_header, $header);
-    my($from_line, $from_addr);
-    my($time);
-
-    # This will strip the initial form feed, any whitespace that may
-    # be following it, and then a newline
-    s/^\s+//;
-    # This will strip the ^_ off of the end of the message
-    s/\037$//;
-
-    if (! s/(.*)\n//) {
-      malformatted:
-        warn "$whoami: message $msg_num in $ARGV is malformatted\n";
-        next;
-    }
-    $labels = $1;
-
-    # Strip the integer indicating whether the header is pruned
-    $labels =~ s/^(\d+)[,\s]*//;
-    $pruned = $1;
-
-    s/(?:((?:.+\n)+)\n*)?\*\*\* EOOH \*\*\*\n+// || goto malformatted;
-    $full_header = $1;
-
-    if (s/((?:.+\n)+)\n+//) {
-        $header = $1;
-    }
-    else {
-        # Message has no body
-        $header = $_;
-        $_ = '';
-    }
-
-    # "$pruned eq '0'" is different from "! $pruned".  We want to make
-    # sure that we found a valid label line which explicitly indicated
-    # that the header was not pruned.
-    if ((! $full_header) || ($pruned eq '0')) {
-        $full_header = $header;
-    }
-
-    # End message with two newlines (some mbox parsers require a blank
-    # line before the next "From " line).
-    s/\s+$/\n\n/;
-
-    # Quote "^From "
-    s/(^|\n)From /$1>From /g;
-
-    # Strip extra commas and whitespace from the end
-    $labels =~ s/[,\s]+$//;
-    # Now collapse extra commas and whitespace in the remaining label string
-    $labels =~ s/[,\s]+/, /g;
-
-    foreach my $rmail_header qw(summary-line x-coding-system) {
-        $full_header =~ s/(^|\n)$rmail_header:.*\n/$1/i;
-    }
-
-    if ($full_header =~ s/(^|\n)mail-from:\s*(From .*)\n/$1/i) {
-        ($from_line = $2) =~ s/\s*$/\n/;
-    }
-    else {
-        foreach my $addr_header qw(return-path from really-from sender) {
-            if ($full_header =~ /(?:^|\n)$addr_header:\s*(.*\n(?:\B.*\n)*)/i) {
-                my($addr) = Mail::Address->parse($1);
-                $from_addr = $addr->address($addr);
-                last;
-            }
-        }
-
-        if (! $from_addr) {
-            $from_addr = "Babyl_to_mail_by_$whoami\@localhost";
-        }
-
-        if ($full_header =~ /(?:^|\n)date:\s*(\S.*\S)/i) {
-            $time = str2time($1);
-        }
-
-        if (! $time) {
-            # No Date header or we failed to parse it
-            $time = time;
-        }
-
-        $from_line = "From " . $from_addr . " " . localtime($time) . "\n";
-    }
-
-    print($from_line, ($opt_full_headers ? $full_header : $header),
-          ($labels ? "X-Babyl-Labels: $labels\n" : ""), "\n",
-          $_) || die "$whoami: error writing to stdout: $!\n";
-}
-
-close(STDOUT) || die "$whoami: Error closing stdout: $!\n";
-
-# arch-tag: 8c7c8ab0-721c-46d7-ba3e-139801240aa8
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 1f96c481129..b60b2661805 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -39,6 +39,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 # define CLOSE_SOCKET closesocket
 # define INITIALIZE() (initialize_sockets ())
 
+char *w32_getenv (char *);
+#define egetenv(VAR) w32_getenv(VAR)
+
 #else /* !WINDOWSNT */
 
 # include "syswait.h"
@@ -62,6 +65,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #  define WCONTINUED 8
 # endif
 
+#define egetenv(VAR) getenv(VAR)
+
 #endif /* !WINDOWSNT */
 
 #undef signal
@@ -86,13 +91,6 @@ char *getenv (const char *), *getwd (char *);
 char *(getcwd) (char *, size_t);
 #endif
 
-#ifdef WINDOWSNT
-char *w32_getenv (char *);
-#define egetenv(VAR) w32_getenv(VAR)
-#else
-#define egetenv(VAR) getenv(VAR)
-#endif
-
 #ifndef VERSION
 #define VERSION "unspecified"
 #endif
@@ -119,7 +117,7 @@ char *w32_getenv (char *);
 
 
 /* Name used to invoke this program.  */
-char *progname;
+const char *progname;
 
 /* The second argument to main. */
 char **main_argv;
@@ -752,7 +750,7 @@ send_to_emacs (HSOCKET s, const char *data)
 {
   while (data)
     {
-      int dlen = strlen (data);
+      size_t dlen = strlen (data);
       if (dlen + sblen >= SEND_BUFFER_SIZE)
         {
           int part = SEND_BUFFER_SIZE - sblen;
@@ -910,14 +908,13 @@ initialize_sockets (void)
 
 /*
  * Read the information needed to set up a TCP comm channel with
- * the Emacs server: host, port, pid and authentication string.
+ * the Emacs server: host, port, and authentication string.
  */
 int
 get_server_config (struct sockaddr_in *server, char *authentication)
 {
   char dotted[32];
   char *port;
-  char *pid;
   FILE *config = NULL;
 
   if (file_name_absolute_p (server_file))
@@ -948,12 +945,8 @@ get_server_config (struct sockaddr_in *server, char *authentication)
     return FALSE;
 
   if (fgets (dotted, sizeof dotted, config)
-      && (port = strchr (dotted, ':'))
-      && (pid = strchr (port, ' ')))
-    {
-      *port++ = '\0';
-      *pid++  = '\0';
-    }
+      && (port = strchr (dotted, ':')))
+    *port++ = '\0';
   else
     {
       message (TRUE, "%s: invalid configuration info\n", progname);
@@ -972,8 +965,6 @@ get_server_config (struct sockaddr_in *server, char *authentication)
 
   fclose (config);
 
-  emacs_pid = atoi (pid);
-
   return TRUE;
 }
 
@@ -1232,7 +1223,18 @@ set_local_socket (void)
       {
         tmpdir = egetenv ("TMPDIR");
         if (!tmpdir)
-          tmpdir = "/tmp";
+          {
+#ifdef DARWIN_OS
+            size_t n = confstr (_CS_DARWIN_USER_TEMP_DIR, NULL, (size_t) 0);
+            if (n > 0)
+              {
+                tmpdir = alloca (n);
+                confstr (_CS_DARWIN_USER_TEMP_DIR, tmpdir, n);
+              }
+            else
+#endif
+              tmpdir = "/tmp";
+          }
         socket_name = alloca (strlen (tmpdir) + strlen (server_name)
                               + EXTRA_SPACE);
         sprintf (socket_name, "%s/emacs%d/%s",
@@ -1506,6 +1508,7 @@ main (int argc, char **argv)
   char *cwd, *str;
   char string[BUFSIZ+1];
   int null_socket_name, null_server_file, start_daemon_if_needed;
+  int exit_status = EXIT_SUCCESS;
 
   main_argv = argv;
   progname = argv[0];
@@ -1705,7 +1708,8 @@ main (int argc, char **argv)
   fsync (1);
 
   /* Now, wait for an answer and print any messages.  */
-  while ((rl = recv (emacs_socket, string, BUFSIZ, 0)) > 0)
+  while (exit_status == EXIT_SUCCESS
+         && (rl = recv (emacs_socket, string, BUFSIZ, 0)) > 0)
     {
       char *p;
       string[rl] = '\0';
@@ -1744,6 +1748,7 @@ main (int argc, char **argv)
             printf ("\n");
           fprintf (stderr, "*ERROR*: %s", str);
           needlf = str[0] == '\0' ? needlf : str[strlen (str) - 1] != '\n';
+          exit_status = EXIT_FAILURE;
         }
 #ifdef SIGSTOP
       else if (strprefix ("-suspend ", string))
@@ -1761,7 +1766,8 @@ main (int argc, char **argv)
           if (needlf)
             printf ("\n");
           printf ("*ERROR*: Unknown message: %s", string);
-          needlf = string[0] == '\0' ? needlf : string[strlen (string) - 1] != '\n';
+          needlf = string[0]
+            == '\0' ? needlf : string[strlen (string) - 1] != '\n';
         }
     }
 
@@ -1770,8 +1776,11 @@ main (int argc, char **argv)
   fflush (stdout);
   fsync (1);
 
+  if (rl < 0)
+    exit_status = EXIT_FAILURE;
+
   CLOSE_SOCKET (emacs_socket);
-  return EXIT_SUCCESS;
+  return exit_status;
 }
 
 #endif /* HAVE_SOCKETS && HAVE_INET_SOCKETS */
diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index 4824731672b..e2dc99214d2 100644
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -204,7 +204,8 @@ put_filename (char *filename)
 int
 scan_file (char *filename)
 {
-  int len = strlen (filename);
+
+  size_t len = strlen (filename);
 
   put_filename (filename);
   if (len > 4 && !strcmp (filename + len - 4, ".elc"))
@@ -442,7 +443,7 @@ write_c_args (FILE *out, char *func, char *buf, int minargs, int maxargs)
   register char *p;
   int in_ident = 0;
   char *ident_start;
-  int ident_length = 0;
+  size_t ident_length = 0;
 
   fprintf (out, "(fn");
 
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 552dd1349fc..25fb499cf3b 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -378,6 +378,11 @@ cleanall:	clean
 getopt.h:               getopt_.h
                         $(CP) $(ALL_DEPS) $@
 
+### TAGS ###
+
+TAGS: $(BLD)/etags.exe *.c *.h
+        $(BLD)/etags.exe *.c *.h
+
 ### DEPENDENCIES ###
 
 EMACS_ROOT      = ..
@@ -390,12 +395,6 @@ $(BLD)/alloca.$(O) : \
         $(EMACS_ROOT)/src/config.h \
         $(EMACS_ROOT)/src/blockinput.h
 
-$(BLD)/b2m.$(O) : \
-        $(SRC)/b2m.c \
-        $(EMACS_ROOT)/src/s/ms-w32.h \
-        $(EMACS_ROOT)/src/m/intel386.h \
-        $(EMACS_ROOT)/lib-src/../src/config.h
-
 $(BLD)/ctags.$(O) : \
         $(SRC)/ctags.c \
         $(EMACS_ROOT)/nt/inc/sys/param.h \
diff --git a/lib-src/movemail.c b/lib-src/movemail.c
index 4ccdc93688c..f300942427e 100644
--- a/lib-src/movemail.c
+++ b/lib-src/movemail.c
@@ -169,7 +169,7 @@ main (int argc, char **argv)
 {
   char *inname, *outname;
   int indesc, outdesc;
-  int nread;
+  ssize_t nread;
   int status;
   int c, preserve_mail = 0;
 
@@ -551,8 +551,7 @@ main (int argc, char **argv)
    string-comparing the two paths, because one or both of them might
    be symbolic links pointing to some other directory. */
 static char *
-mail_spool_name (inname)
-     char *inname;
+mail_spool_name (char *inname)
 {
   struct stat stat1, stat2;
   char *indir, *fname;
@@ -632,7 +631,7 @@ pfatal_and_delete (char *name)
 static char *
 concat (const char *s1, const char *s2, const char *s3)
 {
-  int len1 = strlen (s1), len2 = strlen (s2), len3 = strlen (s3);
+  size_t len1 = strlen (s1), len2 = strlen (s2), len3 = strlen (s3);
   char *result = (char *) xmalloc (len1 + len2 + len3 + 1);
 
   strcpy (result, s1);
diff --git a/lib-src/sorted-doc.c b/lib-src/sorted-doc.c
index db3f3029532..4fe830e4013 100644
--- a/lib-src/sorted-doc.c
+++ b/lib-src/sorted-doc.c
@@ -93,7 +93,7 @@ xmalloc (int size)
 }
 
 char *
-xstrdup (char *str)
+xstrdup (const char *str)
 {
   char *buf = xmalloc (strlen (str) + 1);
   (void) strcpy (buf, str);
diff --git a/lib-src/test-distrib.c b/lib-src/test-distrib.c
index 880bd115882..1487c2bab57 100644
--- a/lib-src/test-distrib.c
+++ b/lib-src/test-distrib.c
@@ -52,9 +52,10 @@ char buf[300];
 
 /* Like `read' but keeps trying until it gets SIZE bytes or reaches eof.  */
 int
-cool_read (int fd, char *buf, int size)
+cool_read (int fd, char *buf, size_t size)
 {
-  int num, sofar = 0;
+  ssize_t num;
+  size_t sofar = 0;
 
   while (1)
     {