frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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 <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
This commit is contained in:
Yaakov Selkowitz 2009-11-01 18:19:04 +00:00 committed by Jon TURNEY
parent 35901ece6a
commit 26a69bbd9b
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/xwin/InitOutput.c
View File

@ -334,7 +334,7 @@ winCheckMount(void)
while ((ent = getmntent(mnt)) != NULL) 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 root = (strcmp(ent->mnt_dir, "/") == 0);
BOOL tmp = (strcmp(ent->mnt_dir, "/tmp") == 0); BOOL tmp = (strcmp(ent->mnt_dir, "/tmp") == 0);
@ -361,7 +361,8 @@ winCheckMount(void)
continue; continue;
level = curlevel; level = curlevel;
if (winCheckMntOpt(ent, "binmode") == NULL) if ((winCheckMntOpt(ent, "binary") == NULL) ||
(winCheckMntOpt(ent, "binmode") == NULL))
binary = 0; binary = 0;
else else
binary = 1; binary = 1;
@ -374,7 +375,7 @@ winCheckMount(void)
} }
if (!binary) if (!binary)
winMsg(X_WARNING, "/tmp mounted int textmode\n"); winMsg(X_WARNING, "/tmp mounted in textmode\n");
} }
#else #else
static void static void