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:
parent
35901ece6a
commit
26a69bbd9b
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue
Block a user