From 26a69bbd9b6f415c443d6d6f8f450329f348edc3 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Sun, 1 Nov 2009 18:19:04 +0000 Subject: [PATCH] Cygwin/X: Mount options have changed in cygwin-1.7 Mount options have changed in cygwin-1.7 Also fix a typo in the warning issued if /tmp is a textmode mount Signed-off-by: Jon TURNEY Reviewed-by: Colin Harrison --- hw/xwin/InitOutput.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c index a33056d38..0bf79185e 100644 --- a/hw/xwin/InitOutput.c +++ b/hw/xwin/InitOutput.c @@ -334,7 +334,7 @@ winCheckMount(void) while ((ent = getmntent(mnt)) != NULL) { - BOOL system = (strcmp(ent->mnt_type, "system") == 0); + BOOL system = (winCheckMntOpt(ent, "user") != NULL); BOOL root = (strcmp(ent->mnt_dir, "/") == 0); BOOL tmp = (strcmp(ent->mnt_dir, "/tmp") == 0); @@ -361,7 +361,8 @@ winCheckMount(void) continue; level = curlevel; - if (winCheckMntOpt(ent, "binmode") == NULL) + if ((winCheckMntOpt(ent, "binary") == NULL) || + (winCheckMntOpt(ent, "binmode") == NULL)) binary = 0; else binary = 1; @@ -374,7 +375,7 @@ winCheckMount(void) } if (!binary) - winMsg(X_WARNING, "/tmp mounted int textmode\n"); + winMsg(X_WARNING, "/tmp mounted in textmode\n"); } #else static void