Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

9 files changed, 58 insertions, 72 deletions

diff --git a/lib-src/ebrowse.c b/lib-src/ebrowse.c
index 623911027ce..e77b7c94cca 100644
--- a/lib-src/ebrowse.c
+++ b/lib-src/ebrowse.c
@@ -20,21 +20,21 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 #include <stddef.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 #include <assert.h>
 #include <getopt.h>
 
+#include <flexmember.h>
+#include <min-max.h>
+#include <unlocked-io.h>
+
 /* The SunOS compiler doesn't have SEEK_END.  */
 #ifndef SEEK_END
 #define SEEK_END 2
 #endif
 
-#include <flexmember.h>
-#include <min-max.h>
-
 /* Files are read in chunks of this number of bytes.  */
 
 enum { READ_CHUNK_SIZE = 100 * 1024 };
@@ -3059,8 +3059,7 @@ class_definition (struct sym *containing, int tag, int flags, int nested)
                  MATCH until we see something like `;' or `{'.  */
               while (!LOOKING_AT3 (';', YYEOF, '{'))
                 MATCH ();
-              done = 1;
-
+              FALLTHROUGH;
             case '{':
               done = 1;
               break;
@@ -3184,7 +3183,7 @@ declaration (int flags)
               free (id);
               return;
             }
-
+          FALLTHROUGH;
         case '=':
           /* Assumed to be the start of an initialization in this
              context.  */
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 7b735dfb05d..f1d4e8976da 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -73,7 +73,6 @@ char *w32_getenv (const char *);
 
 #include <stdarg.h>
 #include <ctype.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <getopt.h>
@@ -84,6 +83,8 @@ char *w32_getenv (const char *);
 #include <signal.h>
 #include <errno.h>
 
+#include <unlocked-io.h>
+
 #ifndef VERSION
 #define VERSION "unspecified"
 #endif
@@ -149,6 +150,9 @@ const char *socket_name = NULL;
 /* If non-NULL, the filename of the authentication file.  */
 const char *server_file = NULL;
 
+/* If non-NULL, the tramp prefix emacs must use to find the files.  */
+const char *tramp_prefix = NULL;
+
 /* PID of the Emacs server process.  */
 int emacs_pid = 0;
 
@@ -178,6 +182,7 @@ struct option longopts[] =
   { "server-file",      required_argument, NULL, 'f' },
   { "display",  required_argument, NULL, 'd' },
   { "parent-id", required_argument, NULL, 'p' },
+  { "tramp",    required_argument, NULL, 'T' },
   { 0, 0, 0, 0 }
 };
 
@@ -204,7 +209,7 @@ char *get_current_dir_name (void);
 /* Return the current working directory.  Returns NULL on errors.
    Any other returned value must be freed with free.  This is used
    only when get_current_dir_name is not defined on the system.  */
-char*
+char *
 get_current_dir_name (void)
 {
   char *buf;
@@ -468,14 +473,15 @@ static void
 decode_options (int argc, char **argv)
 {
   alternate_editor = egetenv ("ALTERNATE_EDITOR");
+  tramp_prefix = egetenv ("EMACSCLIENT_TRAMP");
 
   while (1)
     {
       int opt = getopt_long_only (argc, argv,
 #ifndef NO_SOCKETS_IN_FILE_SYSTEM
-                             "VHnequa:s:f:d:F:tc",
+                             "VHnequa:s:f:d:F:tcT:",
 #else
-                             "VHnequa:f:d:F:tc",
+                             "VHnequa:f:d:F:tcT:",
 #endif
                              longopts, 0);
 
@@ -554,6 +560,10 @@ decode_options (int argc, char **argv)
           frame_parameters = optarg;
           break;
 
+        case 'T':
+          tramp_prefix = optarg;
+          break;
+
         default:
           message (true, "Try '%s --help' for more information\n", progname);
           exit (EXIT_FAILURE);
@@ -654,6 +664,9 @@ The following OPTIONS are accepted:\n\
                         Editor to fallback to if the server is not running\n"
 "                       If EDITOR is the empty string, start Emacs in daemon\n\
                         mode and try connecting again\n"
+"-T PREFIX, --tramp=PREFIX\n\
+                        PREFIX to prepend to filenames sent by emacsclient\n\
+                        for locating files remotely via Tramp\n"
 "\n\
 Report bugs with M-x report-emacs-bug.\n");
   exit (EXIT_SUCCESS);
@@ -1687,7 +1700,10 @@ main (int argc, char **argv)
         }
     }
   send_to_emacs (emacs_socket, "-dir ");
+  if (tramp_prefix)
+    quote_argument (emacs_socket, tramp_prefix);
   quote_argument (emacs_socket, cwd);
+  free (cwd);
   send_to_emacs (emacs_socket, "/");
   send_to_emacs (emacs_socket, " ");
 
@@ -1791,6 +1807,8 @@ main (int argc, char **argv)
 #endif
 
           send_to_emacs (emacs_socket, "-file ");
+          if (tramp_prefix && file_name_absolute_p (argv[i]))
+            quote_argument (emacs_socket, tramp_prefix);
           quote_argument (emacs_socket, argv[i]);
           send_to_emacs (emacs_socket, " ");
         }
diff --git a/lib-src/etags.c b/lib-src/etags.c
index 015cbbe0ef3..e5ff7bd10fc 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -123,6 +123,7 @@ char pot_etags_version[] = "@(#) pot revision number is 17.38.1.4";
 #include <errno.h>
 #include <fcntl.h>
 #include <binary-io.h>
+#include <unlocked-io.h>
 #include <c-ctype.h>
 #include <c-strcase.h>
 
@@ -1157,7 +1158,7 @@ main (int argc, char **argv)
       case 'c':
         /* Backward compatibility: support obsolete --ignore-case-regexp. */
         optarg = concat (optarg, "i", ""); /* memory leak here */
-        /* FALLTHRU */
+        FALLTHROUGH;
       case 'r':
         argbuffer[current_arg].arg_type = at_regexp;
         argbuffer[current_arg].what = optarg;
@@ -1192,7 +1193,7 @@ main (int argc, char **argv)
       case 't': typedefs = true;                                break;
       case 'T': typedefs = typedefs_or_cplusplus = true;        break;
       case 'u': update = true;                                  break;
-      case 'v': vgrind_style = true;                      /*FALLTHRU*/
+      case 'v': vgrind_style = true;                            FALLTHROUGH;
       case 'x': cxref_style = true;                             break;
       case 'w': no_warnings = true;                             break;
       default:
@@ -2564,7 +2565,7 @@ hash (const char *str, int len)
     {
       default:
         hval += asso_values[(unsigned char) str[2]];
-      /*FALLTHROUGH*/
+        FALLTHROUGH;
       case 2:
         hval += asso_values[(unsigned char) str[1]];
         break;
@@ -3013,7 +3014,7 @@ consider_token (char *str, int len, int c, int *c_extp,
          *c_extp = (*c_extp | C_PLPL) & ~C_AUTO;
        if (toktype == st_C_template)
          break;
-       /* FALLTHRU */
+       FALLTHROUGH;
      case st_C_struct:
      case st_C_enum:
        if (parlev == 0
@@ -3176,7 +3177,7 @@ consider_token (char *str, int len, int c, int *c_extp,
              default:
                break;
              }
-          /* FALLTHRU */
+           FALLTHROUGH;
           case fvnameseen:
           if (len >= 10 && strneq (str+len-10, "::operator", 10))
             {
@@ -3387,7 +3388,7 @@ C_entries (int c_ext, FILE *inf)
             case '\0':
               /* Hmmm, something went wrong. */
               CNL ();
-              /* FALLTHRU */
+              FALLTHROUGH;
             case '\'':
               inchar = false;
               break;
@@ -3828,7 +3829,7 @@ C_entries (int c_ext, FILE *inf)
                       || (members
                           && plainc && instruct))
                     make_C_tag (true);  /* a function */
-                  /* FALLTHRU */
+                  FALLTHROUGH;
                 default:
                   fvextern = false;
                   fvdef = fvnone;
@@ -3838,7 +3839,7 @@ C_entries (int c_ext, FILE *inf)
                   else
                     token.valid = false;
                 } /* switch (fvdef) */
-              /* FALLTHRU */
+              FALLTHROUGH;
             default:
               if (!instruct)
                 typdef = tnone;
@@ -3926,7 +3927,7 @@ C_entries (int c_ext, FILE *inf)
                       || (globals && bracelev == 0
                           && (!fvextern || declarations)))
                     make_C_tag (false); /* a variable */
-                  /* FALLTHRU */
+                  FALLTHROUGH;
                 default:
                   fvdef = fvnone;
                 }
@@ -3959,7 +3960,7 @@ C_entries (int c_ext, FILE *inf)
                   fvdef = fignore;
                   break;
                 }
-              /* FALLTHRU */
+              FALLTHROUGH;
             case foperator:
               fvdef = fstartlist;
               break;
@@ -4049,7 +4050,7 @@ C_entries (int c_ext, FILE *inf)
                     }
                 }
               make_C_tag (true);    /* a function */
-              /* FALLTHRU */
+              FALLTHROUGH;
             case fignore:
               fvdef = fvnone;
               break;
@@ -4142,7 +4143,7 @@ C_entries (int c_ext, FILE *inf)
               if ((members && bracelev == 1)
                   || (globals && bracelev == 0 && (!fvextern || declarations)))
                 make_C_tag (false); /* a variable */
-              /* FALLTHRU */
+              FALLTHROUGH;
             default:
               fvdef = vignore;
             }
@@ -4169,7 +4170,7 @@ C_entries (int c_ext, FILE *inf)
               objdef = omethodsign;
               break;
             }
-          /* FALLTHRU */
+          FALLTHROUGH;
         resetfvdef:
         case '#': case '~': case '&': case '%': case '/':
         case '|': case '^': case '!': case '.': case '?':
@@ -6354,7 +6355,7 @@ add_regex (char *regexp_pattern, language *lang)
         break;
       case 's':
         single_line = true;
-        /* FALLTHRU */
+        FALLTHROUGH;
       case 'm':
         multi_line = true;
         need_filebuf = true;
diff --git a/lib-src/hexl.c b/lib-src/hexl.c
index 319ce8bc890..d949af08902 100644
--- a/lib-src/hexl.c
+++ b/lib-src/hexl.c
@@ -22,11 +22,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <config.h>
 
 #include <inttypes.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include <binary-io.h>
+#include <unlocked-io.h>
 
 static char *progname;
 
diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index 53970a06238..6b2cc110403 100644
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -39,10 +39,14 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <stdarg.h>
 #include <stddef.h>
 #include <stdint.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include <binary-io.h>
+#include <intprops.h>
+#include <min-max.h>
+#include <unlocked-io.h>
+
 #ifdef WINDOWSNT
 /* Defined to be sys_fopen in ms-w32.h, but only #ifdef emacs, so this
    is really just insurance.  */
@@ -50,10 +54,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <direct.h>
 #endif /* WINDOWSNT */
 
-#include <binary-io.h>
-#include <intprops.h>
-#include <min-max.h>
-
 #ifdef DOS_NT
 /* Defined to be sys_chdir in ms-w32.h, but only #ifdef emacs, so this
    is really just insurance.
@@ -845,8 +845,7 @@ scan_c_stream (FILE *infile)
       bool defvarperbufferflag = false;
       bool defvarflag = false;
       enum global_type type = INVALID;
-      static char *name;
-      static ptrdiff_t name_size;
+      static char name[sizeof input_buffer];
 
       if (c != '\n' && c != '\r')
         {
@@ -967,22 +966,13 @@ scan_c_stream (FILE *infile)
               if (c < 0)
                 goto eof;
               input_buffer[i++] = c;
+              if (sizeof input_buffer <= i)
+                fatal ("identifier too long");
               c = getc (infile);
             }
           while (! (c == ',' || c == ' ' || c == '\t'
                     || c == '\n' || c == '\r'));
           input_buffer[i] = '\0';
-
-          if (name_size <= i)
-            {
-              free (name);
-              name_size = i + 1;
-              ptrdiff_t doubled;
-              if (! INT_MULTIPLY_WRAPV (name_size, 2, &doubled)
-                  && doubled <= SIZE_MAX)
-                name_size = doubled;
-              name = xmalloc (name_size);
-            }
           memcpy (name, input_buffer, i + 1);
 
           if (type == SYMBOL)
diff --git a/lib-src/movemail.c b/lib-src/movemail.c
index cd12c48ed36..e5ca0b16611 100644
--- a/lib-src/movemail.c
+++ b/lib-src/movemail.c
@@ -59,7 +59,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/file.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <time.h>
@@ -69,6 +68,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <fcntl.h>
 #include <signal.h>
 #include <string.h>
+
+#include <unlocked-io.h>
+
 #include "syswait.h"
 #ifdef MAIL_USE_POP
 #include "pop.h"
diff --git a/lib-src/ntlib.c b/lib-src/ntlib.c
index 4bffc612f9b..78ba9061f6b 100644
--- a/lib-src/ntlib.c
+++ b/lib-src/ntlib.c
@@ -50,8 +50,6 @@ struct timezone
 };
 #endif
 
-void gettimeofday (struct timeval *, struct timezone *);
-
 #define MAXPATHLEN _MAX_PATH
 
 /* Emulate sleep...we could have done this with a define, but that
@@ -229,29 +227,6 @@ getpass (const char * prompt)
   return NULL;
 }
 
-/* This is needed because lib/gettime.c calls gettimeofday, which MSVC
-   doesn't have.  Copied from w32.c.  */
-void
-gettimeofday (struct timeval *tv, struct timezone *tz)
-{
-  struct _timeb tb;
-  _ftime (&tb);
-
-  tv->tv_sec = tb.time;
-  tv->tv_usec = tb.millitm * 1000L;
-  /* Implementation note: _ftime sometimes doesn't update the dstflag
-     according to the new timezone when the system timezone is
-     changed.  We could fix that by using GetSystemTime and
-     GetTimeZoneInformation, but that doesn't seem necessary, since
-     Emacs always calls gettimeofday with the 2nd argument NULL (see
-     current_emacs_time).  */
-  if (tz)
-    {
-      tz->tz_minuteswest = tb.timezone; /* minutes west of Greenwich  */
-      tz->tz_dsttime = tb.dstflag;      /* type of dst correction  */
-    }
-}
-
 int
 fchown (int fd, unsigned uid, unsigned gid)
 {
diff --git a/lib-src/profile.c b/lib-src/profile.c
index 253f00e2d80..f4ab45c1718 100644
--- a/lib-src/profile.c
+++ b/lib-src/profile.c
@@ -34,11 +34,11 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <config.h>
 
 #include <inttypes.h>
-#include <stdio.h>
 #include <stdlib.h>
 
 #include <intprops.h>
 #include <systime.h>
+#include <unlocked-io.h>
 
 static struct timespec TV1;
 static int watch_not_started = 1; /* flag */
diff --git a/lib-src/update-game-score.c b/lib-src/update-game-score.c
index 5edc8e79569..942aeeb399d 100644
--- a/lib-src/update-game-score.c
+++ b/lib-src/update-game-score.c
@@ -39,7 +39,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <limits.h>
 #include <string.h>
 #include <stdlib.h>
-#include <stdio.h>
 #include <time.h>
 #include <pwd.h>
 #include <ctype.h>
@@ -47,6 +46,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <sys/stat.h>
 #include <getopt.h>
 
+#include <unlocked-io.h>
+
 #ifdef WINDOWSNT
 #include "ntlib.h"
 #endif