diff options
author | Corinna Vinschen <corinna@vinschen.de> | 2017-02-24 22:55:14 +0300 |
---|---|---|
committer | Corinna Vinschen <corinna@vinschen.de> | 2017-02-24 22:55:14 +0300 |
commit | f5ecacfc6ccf4cd5c9fcd1601ad9919828b80a1d (patch) | |
tree | bbe71c9169417ccff44b81f0e8ff16538b8f5f2a /winsup | |
parent | fa9d3148bff3f1839ba813dde66855ebd65e356a (diff) |
Generate output with Unix line endings even from Mingw64 utils
This affects cygcheck and strace.
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
Diffstat (limited to 'winsup')
-rw-r--r-- | winsup/utils/cygcheck.cc | 4 | ||||
-rw-r--r-- | winsup/utils/strace.cc | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/winsup/utils/cygcheck.cc b/winsup/utils/cygcheck.cc index e745b20e5..2d5cda382 100644 --- a/winsup/utils/cygcheck.cc +++ b/winsup/utils/cygcheck.cc @@ -14,6 +14,7 @@ #include <string.h> #include <sys/time.h> #include <ctype.h> +#include <fcntl.h> #include <io.h> #include <windows.h> #include <wininet.h> @@ -2251,6 +2252,9 @@ main (int argc, char **argv) bool ok = true; load_cygwin (argc, argv); + _setmode (1, _O_BINARY); + _setmode (2, _O_BINARY); + /* Need POSIX sorting while parsing args, but don't forget the user's original environment. */ char *posixly = getenv ("POSIXLY_CORRECT"); diff --git a/winsup/utils/strace.cc b/winsup/utils/strace.cc index 4046ccef1..beab67b90 100644 --- a/winsup/utils/strace.cc +++ b/winsup/utils/strace.cc @@ -13,6 +13,7 @@ details. */ #define cygwin_internal cygwin_internal_dontuse #include <stdio.h> #include <fcntl.h> +#include <io.h> #include <getopt.h> #include <stdarg.h> #include <string.h> @@ -1054,6 +1055,9 @@ main2 (int argc, char **argv) argc++; } + _setmode (1, _O_BINARY); + _setmode (2, _O_BINARY); + if (!(pgm = strrchr (*argv, '\\')) && !(pgm = strrchr (*argv, '/'))) pgm = *argv; else |