1 files changed, 9 insertions, 2 deletions

diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index 6f3c799c937..50b755b41bb 100644
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -114,19 +114,23 @@ main (argc, argv)
 
   progname = argv[0];
 
+  outfile = stdout;
+
   /* Don't put CRs in the DOC file.  */
 #ifdef MSDOS
+#if 0  /* Suspicion is that this causes hanging.
+          So instead we require people to use -o on MSDOS.  */
   _fmode = O_BINARY;
   (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 */
 
-  outfile = stdout;
-
   /* If first two args are -o FILE, output to FILE.  */
   i = 1;
   if (argc > i + 1 && !strcmp (argv[i], "-o"))
@@ -145,6 +149,9 @@ main (argc, argv)
       i += 2;
     }
 
+  if (outfile == 0)
+    fatal ("No output file specified", "");
+
   first_infile = i;
   for (; i < argc; i++)
     {