3
0
forked from pool/diffutils

- Only do freopen if O_BINARY is true.

OBS-URL: https://build.opensuse.org/package/show/Base:System/diffutils?expand=0&rev=10
This commit is contained in:
Philipp Thomas 2010-08-23 09:57:26 +00:00 committed by Git OBS Bridge
parent ed52506f4a
commit bc34d96468
3 changed files with 20 additions and 0 deletions

View File

@ -0,0 +1,13 @@
Index: src/diff.c
===================================================================
--- src/diff.c.orig 2010-08-20 12:12:57.564209017 +0200
+++ src/diff.c 2010-08-20 12:14:04.231266936 +0200
@@ -1087,7 +1087,7 @@ compare_files (struct comparison const *
else if (strcmp (cmp.file[f].name, "-") == 0)
{
cmp.file[f].desc = STDIN_FILENO;
- if (binary && ! isatty (STDIN_FILENO))
+ if (O_BINARY && binary && ! isatty (STDIN_FILENO))
freopen (NULL, "rb", stdin);
if (fstat (STDIN_FILENO, &cmp.file[f].stat) != 0)
cmp.file[f].desc = ERRNO_ENCODE (errno);

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Aug 20 10:15:36 UTC 2010 - pth@novell.com
- Only do freopen if O_BINARY is true.
-------------------------------------------------------------------
Mon Jun 28 06:38:35 UTC 2010 - jengelh@medozas.de

View File

@ -32,6 +32,7 @@ Summary: GNU diff Utilities
Source: diffutils-%{version}-cvs.tar.bz2
Patch1: diffutils-2.8.1-i18n-0.2.patch
Patch2: diffutils-2.8.7-autoconf.patch
Patch3: diffutils-no_binary_mode.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -42,6 +43,7 @@ make source code patches, for instance.
%setup -q -n %{name}-%{version}-cvs
%patch1 -p1
%patch2
%patch3
%build
AUTOPOINT=true autoreconf -fi