summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon TURNEY <jon.turney@dronecode.org.uk>2010-02-22 19:13:30 +0000
committerYaakov Selkowitz <yselkowitz@users.sourceforge.net>2010-03-21 20:22:41 -0500
commit540d8d78344919da98ec865052c9242f53f784ef (patch)
treeda0ff6b11d334cb4b573bf238523f8c2074a485c
parentd1f7fd0e925a2cba61e34206f6ee7991cf77a75f (diff)
Cygwin/X: Fix thinko in mount option checkingxserver-cygwin-1.7.6-2
Fix a thinko in mount option checking. Use symbolic names for values assigned to binary flag for clarity. Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Colin Harrison <colin.harrison@virgin.net> (cherry picked from commit 178e830378c3514b9c53a5b1c6d2d5f930c3779b)
-rw-r--r--hw/xwin/InitOutput.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c
index 3525892b8..d154d0ef8 100644
--- a/hw/xwin/InitOutput.c
+++ b/hw/xwin/InitOutput.c
@@ -1,3 +1,4 @@
+
/*
Copyright 1993, 1998 The Open Group
@@ -363,11 +364,11 @@ winCheckMount(void)
continue;
level = curlevel;
- if ((winCheckMntOpt(ent, "binary") == NULL) ||
+ if ((winCheckMntOpt(ent, "binary") == NULL) &&
(winCheckMntOpt(ent, "binmode") == NULL))
- binary = 0;
+ binary = FALSE;
else
- binary = 1;
+ binary = TRUE;
}
if (endmntent(mnt) != 1)