Commit 18198bb2 authored by Richard M. Stallman's avatar Richard M. Stallman

(main) [MSDOS]: Handle DJGPP version 2.

parent 515dd711
......@@ -89,8 +89,15 @@ main (argc, argv)
#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];
......
......@@ -532,9 +532,20 @@ main (argc, argv, envp)
/* We do all file input/output as binary files. When we need to translate
newlines, we do that manually. */
_fmode = O_BINARY;
#if __DJGPP__ >= 2
if (!isatty (fileno (stdin)))
setmode (fileno (stdin), O_BINARY);
if (!isatty (fileno (stdout)))
{
fflush (stdout);
setmode (fileno (stdout), O_BINARY);
}
#else /* not __DJGPP__ >= 2 */
(stdin)->_flag &= ~_IOTEXT;
(stdout)->_flag &= ~_IOTEXT;
(stderr)->_flag &= ~_IOTEXT;
#endif /* not __DJGPP__ >= 2 */
#endif /* MSDOS */
#ifdef SET_EMACS_PRIORITY
......@@ -776,9 +787,17 @@ Usage: %s [-t term] [--terminal term] [-nw] [--no-windows] [--batch]\n\
/* Call early 'cause init_environment needs it. */
init_dosfns ();
/* Set defaults for several environment variables. */
if (initialized) init_environment (argc, argv, skip_args);
else init_gettimeofday ();
if (initialized)
init_environment (argc, argv, skip_args);
else
{
#if __DGJPP__ >= 2
tzset ();
#else
init_gettimeofday ();
#endif
}
#endif /* MSDOS */
#ifdef WINDOWSNT
/* Initialize environment from registry settings. */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment