5 files changed, 114 insertions, 139 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 64a73027915..199d46f4984 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,40 @@
+2014-07-15  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Use "b" flag more consistently; avoid "t" (Bug#18006).
+        * make-docfile.c (READ_TEXT): Remove; all uses replaced by "r".
+        (READ_BINARY): Remove; all uses replaced by "rb".
+
+2014-07-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Use binary-io module, O_BINARY, and "b" flag (Bug#18006).
+        * etags.c, hexl.c, make-docfile.c:
+        Include binary-io.h instead of fcntl.h and/or io.h.
+        (main): Use set_binary_mode or SET_BINARY
+        in place of handcrafted code.
+        * etags.c (main) [DOS_NT]:
+        * movemail.c (main) [WINDOWSNT]:
+        Don't mess with _fmode.
+        * etags.c (main, process_file_name, analyse_regex):
+        Use fopen/popen's "b" flag instead.
+        * movemail.c (main, popmail): Use open/lk_open/mkostemp's O_BINARY
+        instead.
+
+2014-07-13  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * make-docfile.c: Simplify a bit, to simplify further refactoring.
+        (outfile): Remove static var.  All uses changed to use stdout,
+        since it's always stdout anyway.  While we're at it, prefer
+        putchar/puts/fputs to printf when there are no format strings.
+        (main): Use freopen rather than fopen, so that stdout is reused.
+        Move O_BINARY stuff after the freopen, so it affects the
+        reopened file.
+        (write_c_args): Omit first arg, since it's always stdout now.
+        All uses changed.
+
+2014-07-12  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * etags.c (Lisp_functions): Also record cl-defun etc. (Bug#17965)
+
 2014-06-26  Glenn Morris  <rgm@gnu.org>
 
         * Makefile.in (blessmail): Depend on lisp/mail/blessmail.el.
diff --git a/lib-src/etags.c b/lib-src/etags.c
index 66e7fbb467f..ae5491a8204 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -105,17 +105,13 @@ char pot_etags_version[] = "@(#) pot revision number is 17.38.1.4";
 #ifdef MSDOS
 # undef MSDOS
 # define MSDOS true
-# include <fcntl.h>
 # include <sys/param.h>
-# include <io.h>
 #else
 # define MSDOS false
 #endif /* MSDOS */
 
 #ifdef WINDOWSNT
-# include <fcntl.h>
 # include <direct.h>
-# include <io.h>
 # define MAXPATHLEN _MAX_PATH
 # undef HAVE_NTGUI
 # undef  DOS_NT
@@ -131,6 +127,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 <binary-io.h>
 #include <c-strcase.h>
 
 #include <assert.h>
@@ -1002,13 +999,8 @@ main (int argc, char **argv)
   linebuffer filename_lb;
   bool help_asked = false;
   ptrdiff_t len;
- char *optstring;
- int opt;
-
-
-#ifdef DOS_NT
-  _fmode = O_BINARY;   /* all of files are treated as binary files */
-#endif /* DOS_NT */
+  char *optstring;
+  int opt;
 
   progname = argv[0];
   nincluded_files = 0;
@@ -1195,15 +1187,10 @@ main (int argc, char **argv)
       if (streq (tagfile, "-"))
         {
           tagf = stdout;
-#ifdef DOS_NT
-          /* Switch redirected `stdout' to binary mode (setting `_fmode'
-             doesn't take effect until after `stdout' is already open). */
-          if (!isatty (fileno (stdout)))
-            setmode (fileno (stdout), O_BINARY);
-#endif /* DOS_NT */
+          SET_BINARY (fileno (stdout));
         }
       else
-        tagf = fopen (tagfile, append_to_tagfile ? "a" : "w");
+        tagf = fopen (tagfile, append_to_tagfile ? "ab" : "wb");
       if (tagf == NULL)
         pfatal (tagfile);
     }
@@ -1306,7 +1293,7 @@ main (int argc, char **argv)
       append_to_tagfile = true;
     }
 
-  tagf = fopen (tagfile, append_to_tagfile ? "a" : "w");
+  tagf = fopen (tagfile, append_to_tagfile ? "ab" : "wb");
   if (tagf == NULL)
     pfatal (tagfile);
   put_entries (nodehead);       /* write all the tags (CTAGS) */
@@ -1547,11 +1534,11 @@ process_file_name (char *file, language *lang)
   if (real_name == compressed_name)
     {
       char *cmd = concat (compr->command, " ", real_name);
-      inf = (FILE *) popen (cmd, "r");
+      inf = popen (cmd, "rb");
       free (cmd);
     }
   else
-    inf = fopen (real_name, "r");
+    inf = fopen (real_name, "rb");
   if (inf == NULL)
     {
       perror (real_name);
@@ -4747,6 +4734,9 @@ Lisp_functions (FILE *inf)
             }
         }
 
+      if (strneq (dbp + 1, "cl-", 3) || strneq (dbp + 1, "CL-", 3))
+        dbp += 3;
+
       if (strneq (dbp+1, "def", 3) || strneq (dbp+1, "DEF", 3))
         {
           dbp = skip_non_spaces (dbp);
@@ -5611,7 +5601,7 @@ analyse_regex (char *regex_arg)
         char *regexfile = regex_arg + 1;
 
         /* regexfile is a file containing regexps, one per line. */
-        regexfp = fopen (regexfile, "r");
+        regexfp = fopen (regexfile, "rb");
         if (regexfp == NULL)
           pfatal (regexfile);
         linebuffer_init (&regexbuf);
diff --git a/lib-src/hexl.c b/lib-src/hexl.c
index 9e21ddf9de6..51744ab08a2 100644
--- a/lib-src/hexl.c
+++ b/lib-src/hexl.c
@@ -24,15 +24,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <stdio.h>
 #include <ctype.h>
-#ifdef DOS_NT
-#include <fcntl.h>
-#if __DJGPP__ >= 2
-#include <io.h>
-#endif
-#endif
-#ifdef WINDOWSNT
-#include <io.h>
-#endif
+
+#include <binary-io.h>
 
 #define DEFAULT_GROUPING        0x01
 #define DEFAULT_BASE            16
@@ -155,20 +148,12 @@ main (int argc, char **argv)
 
       if (un_flag)
         {
-          char buf[18];
-
-#ifdef DOS_NT
-#if (__DJGPP__ >= 2) || (defined WINDOWSNT)
-          if (!isatty (fileno (stdout)))
-            setmode (fileno (stdout), O_BINARY);
-#else
-          (stdout)->_flag &= ~_IOTEXT; /* print binary */
-          _setmode (fileno (stdout), O_BINARY);
-#endif
-#endif
+          SET_BINARY (fileno (stdout));
+
           for (;;)
             {
-              register int i, c = 0, d;
+              int i, c = 0, d;
+              char buf[18];
 
 #define hexchar(x) (isdigit (x) ? x - '0' : x - 'a' + 10)
 
@@ -210,15 +195,7 @@ main (int argc, char **argv)
         }
       else
         {
-#ifdef DOS_NT
-#if (__DJGPP__ >= 2) || (defined WINDOWSNT)
-          if (!isatty (fileno (fp)))
-            setmode (fileno (fp), O_BINARY);
-#else
-          (fp)->_flag &= ~_IOTEXT; /* read binary */
-          _setmode (fileno (fp), O_BINARY);
-#endif
-#endif
+          SET_BINARY (fileno (fp));
           address = 0;
           string[0] = ' ';
           string[17] = '\0';
diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index 15ffa138b51..884b6c1001e 100644
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -38,17 +38,16 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <stdio.h>
 #include <stdlib.h>   /* config.h unconditionally includes this anyway */
-#ifdef MSDOS
-#include <fcntl.h>
-#endif /* MSDOS */
+
 #ifdef WINDOWSNT
 /* Defined to be sys_fopen in ms-w32.h, but only #ifdef emacs, so this
    is really just insurance.  */
 #undef fopen
-#include <fcntl.h>
 #include <direct.h>
 #endif /* WINDOWSNT */
 
+#include <binary-io.h>
+
 #ifdef DOS_NT
 /* Defined to be sys_chdir in ms-w32.h, but only #ifdef emacs, so this
    is really just insurance.
@@ -56,12 +55,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    Similarly, msdos defines this as sys_chdir, but we're not linking with the
    file where that function is defined.  */
 #undef chdir
-#define READ_TEXT "rt"
-#define READ_BINARY "rb"
 #define IS_SLASH(c)  ((c) == '/' || (c) == '\\' || (c) == ':')
 #else  /* not DOS_NT */
-#define READ_TEXT "r"
-#define READ_BINARY "r"
 #define IS_SLASH(c)  ((c) == '/')
 #endif /* not DOS_NT */
 
@@ -73,9 +68,6 @@ static void write_globals (void);
 
 #include <unistd.h>
 
-/* Stdio stream for output to the DOC file.  */
-FILE *outfile;
-
 /* Name this program was invoked with.  */
 char *progname;
 
@@ -135,33 +127,24 @@ main (int argc, char **argv)
 
   progname = argv[0];
 
-  outfile = stdout;
-
-  /* Don't put CRs in the DOC file.  */
-#ifdef MSDOS
-  _fmode = O_BINARY;
-#if 0  /* Suspicion is that this causes hanging.
-          So instead we require people to use -o on MSDOS.  */
-  (stdout)->_flag &= ~_IOTEXT;
-  _setmode (fileno (stdout), O_BINARY);
-#endif
-  outfile = 0;
-#endif /* MSDOS */
-#ifdef WINDOWSNT
-  _fmode = O_BINARY;
-  _setmode (fileno (stdout), O_BINARY);
-#endif /* WINDOWSNT */
-
   /* If first two args are -o FILE, output to FILE.  */
   i = 1;
   if (argc > i + 1 && !strcmp (argv[i], "-o"))
     {
-      outfile = fopen (argv[i + 1], "w");
+      if (! freopen (argv[i + 1], "w", stdout))
+        {
+          perror (argv[i + 1]);
+          return EXIT_FAILURE;
+        }
       i += 2;
     }
   if (argc > i + 1 && !strcmp (argv[i], "-a"))
     {
-      outfile = fopen (argv[i + 1], "a");
+      if (! freopen (argv[i + 1], "a", stdout))
+        {
+          perror (argv[i + 1]);
+          return EXIT_FAILURE;
+        }
       i += 2;
     }
   if (argc > i + 1 && !strcmp (argv[i], "-d"))
@@ -179,8 +162,7 @@ main (int argc, char **argv)
       ++i;
     }
 
-  if (outfile == 0)
-    fatal ("No output file specified", "");
+  set_binary_mode (fileno (stdout), O_BINARY);
 
   if (generate_globals)
     start_globals ();
@@ -215,13 +197,11 @@ put_filename (char *filename)
         filename = tmp + 1;
     }
 
-  putc (037, outfile);
-  putc ('S', outfile);
-  fprintf (outfile, "%s\n", filename);
+  printf ("\037S%s\n", filename);
 }
 
-/* Read file FILENAME and output its doc strings to outfile.  */
-/* Return 1 if file is not found, 0 if it is found.  */
+/* Read file FILENAME and output its doc strings to stdout.
+   Return 1 if file is not found, 0 if it is found.  */
 
 static int
 scan_file (char *filename)
@@ -232,19 +212,19 @@ scan_file (char *filename)
   if (!generate_globals)
     put_filename (filename);
   if (len > 4 && !strcmp (filename + len - 4, ".elc"))
-    return scan_lisp_file (filename, READ_BINARY);
+    return scan_lisp_file (filename, "rb");
   else if (len > 3 && !strcmp (filename + len - 3, ".el"))
-    return scan_lisp_file (filename, READ_TEXT);
+    return scan_lisp_file (filename, "r");
   else
-    return scan_c_file (filename, READ_TEXT);
+    return scan_c_file (filename, "r");
 }
 
 static void
 start_globals (void)
 {
-  fprintf (outfile, "/* This file was auto-generated by make-docfile.  */\n");
-  fprintf (outfile, "/* DO NOT EDIT.  */\n");
-  fprintf (outfile, "struct emacs_globals {\n");
+  puts ("/* This file was auto-generated by make-docfile.  */");
+  puts ("/* DO NOT EDIT.  */");
+  puts ("struct emacs_globals {");
 }
 
 static char input_buffer[128];
@@ -373,7 +353,7 @@ scan_keyword_or_put_char (int ch, struct rcsoc_state *state)
 
 /* Skip a C string or C-style comment from INFILE, and return the
    character that follows.  COMMENT non-zero means skip a comment.  If
-   PRINTFLAG is positive, output string contents to outfile.  If it is
+   PRINTFLAG is positive, output string contents to stdout.  If it is
    negative, store contents in buf.  Convert escape sequences \n and
    \t to newline and tab; discard \ followed by newline.
    If SAW_USAGE is non-zero, then any occurrences of the string `usage:'
@@ -388,7 +368,7 @@ read_c_string_or_comment (FILE *infile, int printflag, int comment, int *saw_usa
 
   state.in_file = infile;
   state.buf_ptr = (printflag < 0 ? input_buffer : 0);
-  state.out_file = (printflag > 0 ? outfile : 0);
+  state.out_file = (printflag > 0 ? stdout : 0);
   state.pending_spaces = 0;
   state.pending_newlines = 0;
   state.keyword = (saw_usage ? "usage:" : 0);
@@ -465,18 +445,18 @@ read_c_string_or_comment (FILE *infile, int printflag, int comment, int *saw_usa
 
 
 
-/* Write to file OUT the argument names of function FUNC, whose text is in BUF.
+/* Write to stdout the argument names of function FUNC, whose text is in BUF.
    MINARGS and MAXARGS are the minimum and maximum number of arguments.  */
 
 static void
-write_c_args (FILE *out, char *func, char *buf, int minargs, int maxargs)
+write_c_args (char *func, char *buf, int minargs, int maxargs)
 {
   register char *p;
   int in_ident = 0;
   char *ident_start IF_LINT (= NULL);
   size_t ident_length = 0;
 
-  fprintf (out, "(fn");
+  fputs ("(fn", stdout);
 
   if (*buf == '(')
     ++buf;
@@ -517,10 +497,10 @@ write_c_args (FILE *out, char *func, char *buf, int minargs, int maxargs)
           if (strncmp (ident_start, "void", ident_length) == 0)
             continue;
 
-          putc (' ', out);
+          putchar (' ');
 
           if (minargs == 0 && maxargs > 0)
-            fprintf (out, "&optional ");
+            fputs ("&optional ", stdout);
 
           minargs--;
           maxargs--;
@@ -528,7 +508,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 && memcmp (ident_start, "defalt", 6) == 0)
-            fprintf (out, "DEFAULT");
+            fputs ("DEFAULT", stdout);
           else
             while (ident_length-- > 0)
               {
@@ -539,12 +519,12 @@ write_c_args (FILE *out, char *func, char *buf, int minargs, int maxargs)
                 else if (c == '_')
                   /* Print underscore as hyphen.  */
                   c = '-';
-                putc (c, out);
+                putchar (c);
               }
         }
     }
 
-  putc (')', out);
+  putchar (')');
 }
 
 /* The types of globals.  These are sorted roughly in decreasing alignment
@@ -613,8 +593,8 @@ compare_globals (const void *a, const void *b)
 static void
 close_emacs_globals (void)
 {
-  fprintf (outfile, "};\n");
-  fprintf (outfile, "extern struct emacs_globals globals;\n");
+  puts ("};");
+  puts ("extern struct emacs_globals globals;");
 }
 
 static void
@@ -641,7 +621,7 @@ write_globals (void)
           if (!seen_defun)
             {
               close_emacs_globals ();
-              fprintf (outfile, "\n");
+              putchar ('\n');
               seen_defun = 1;
             }
           break;
@@ -651,9 +631,9 @@ write_globals (void)
 
       if (type)
         {
-          fprintf (outfile, "  %s f_%s;\n", type, globals[i].name);
-          fprintf (outfile, "#define %s globals.f_%s\n",
-                   globals[i].name, globals[i].name);
+          printf ("  %s f_%s;\n", type, globals[i].name);
+          printf ("#define %s globals.f_%s\n",
+                  globals[i].name, globals[i].name);
         }
       else
         {
@@ -664,16 +644,16 @@ write_globals (void)
               || strcmp (globals[i].name, "Fkill_emacs") == 0
               || strcmp (globals[i].name, "Fexit_recursive_edit") == 0
               || strcmp (globals[i].name, "Fabort_recursive_edit") == 0)
-            fprintf (outfile, "_Noreturn ");
+            fputs ("_Noreturn ", stdout);
 
-          fprintf (outfile, "EXFUN (%s, ", globals[i].name);
+          printf ("EXFUN (%s, ", globals[i].name);
           if (globals[i].value == -1)
-            fprintf (outfile, "MANY");
+            fputs ("MANY", stdout);
           else if (globals[i].value == -2)
-            fprintf (outfile, "UNEVALLED");
+            fputs ("UNEVALLED", stdout);
           else
-            fprintf (outfile, "%d", globals[i].value);
-          fprintf (outfile, ")");
+            printf ("%d", globals[i].value);
+          putchar (')');
 
           /* It would be nice to have a cleaner way to deal with these
              special hacks, too.  */
@@ -681,9 +661,9 @@ write_globals (void)
               || strcmp (globals[i].name, "Ftool_bar_height") == 0
               || strcmp (globals[i].name, "Fmax_char") == 0
               || strcmp (globals[i].name, "Fidentity") == 0)
-            fprintf (outfile, " ATTRIBUTE_CONST");
+            fputs (" ATTRIBUTE_CONST", stdout);
 
-          fprintf (outfile, ";\n");
+          puts (";");
         }
 
       while (i + 1 < num_globals
@@ -952,9 +932,7 @@ scan_c_file (char *filename, const char *mode)
           int comment = c != '"';
           int saw_usage;
 
-          putc (037, outfile);
-          putc (defvarflag ? 'V' : 'F', outfile);
-          fprintf (outfile, "%s\n", input_buffer);
+          printf ("\037%c%s\n", defvarflag ? 'V' : 'F', input_buffer);
 
           if (comment)
             getc (infile);      /* Skip past `*'.  */
@@ -996,8 +974,8 @@ scan_c_file (char *filename, const char *mode)
               while (c != ')');
               *p = '\0';
               /* Output them.  */
-              fprintf (outfile, "\n\n");
-              write_c_args (outfile, input_buffer, argbuf, minargs, maxargs);
+              fputs ("\n\n", stdout);
+              write_c_args (input_buffer, argbuf, minargs, maxargs);
             }
           else if (defunflag && maxargs == -1 && !saw_usage)
             /* The DOC should provide the usage form.  */
@@ -1433,12 +1411,10 @@ scan_lisp_file (const char *filename, const char *mode)
          In the latter case, the opening quote (and leading backslash-newline)
          have already been read.  */
 
-      putc (037, outfile);
-      putc (type, outfile);
-      fprintf (outfile, "%s\n", buffer);
+      printf ("\037%c%s\n", type, buffer);
       if (saved_string)
         {
-          fputs (saved_string, outfile);
+          fputs (saved_string, stdout);
           /* Don't use one dynamic doc string twice.  */
           free (saved_string);
           saved_string = 0;
diff --git a/lib-src/movemail.c b/lib-src/movemail.c
index d0d00fcf4cc..c600fc0ea53 100644
--- a/lib-src/movemail.c
+++ b/lib-src/movemail.c
@@ -191,11 +191,6 @@ main (int argc, char **argv)
   uid_t real_gid = getgid ();
   uid_t priv_gid = getegid ();
 
-#ifdef WINDOWSNT
-  /* Ensure all file i/o is in binary mode. */
-  _fmode = _O_BINARY;
-#endif
-
   delete_lockname = 0;
 
   while ((c = getopt (argc, argv, ARGSTR)) != EOF)
@@ -304,7 +299,7 @@ main (int argc, char **argv)
 
           memcpy (tempname, inname, inname_dirlen);
           strcpy (tempname + inname_dirlen, "EXXXXXX");
-          desc = mkostemp (tempname, 0);
+          desc = mkostemp (tempname, O_BINARY);
           if (desc < 0)
             {
               int mkostemp_errno = errno;
@@ -358,12 +353,12 @@ main (int argc, char **argv)
 
 #ifndef MAIL_USE_MMDF
 #ifdef MAIL_USE_SYSTEM_LOCK
-      indesc = open (inname, O_RDWR);
+      indesc = open (inname, O_RDWR | O_BINARY);
 #else  /* if not MAIL_USE_SYSTEM_LOCK */
-      indesc = open (inname, O_RDONLY);
+      indesc = open (inname, O_RDONLY | O_BINARY);
 #endif /* not MAIL_USE_SYSTEM_LOCK */
 #else  /* MAIL_USE_MMDF */
-      indesc = lk_open (inname, O_RDONLY, 0, 0, 10);
+      indesc = lk_open (inname, O_RDONLY | O_BINARY, 0, 0, 10);
 #endif /* MAIL_USE_MMDF */
 
       if (indesc < 0)
@@ -372,7 +367,7 @@ main (int argc, char **argv)
       /* Make sure the user can read the output file.  */
       umask (umask (0) & 0377);
 
-      outdesc = open (outname, O_WRONLY | O_CREAT | O_EXCL, 0666);
+      outdesc = open (outname, O_WRONLY | O_BINARY | O_CREAT | O_EXCL, 0666);
       if (outdesc < 0)
         pfatal_with_name (outname);
 
@@ -675,7 +670,7 @@ popmail (char *mailbox, char *outfile, int preserve, char *password, int reverse
       return EXIT_SUCCESS;
     }
 
-  mbfi = open (outfile, O_WRONLY | O_CREAT | O_EXCL, 0666);
+  mbfi = open (outfile, O_WRONLY | O_BINARY | O_CREAT | O_EXCL, 0666);
   if (mbfi < 0)
     {
       pop_close (server);