JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cygwin: mount: define binary mount as default

Browse Source 
Commit c1023ee353 changed the way
path_conv::binmode() works.  Rather than returning three states,
O_BINARY, O_TEXT, 0, it only returned 2 states, O_BINARY, O_TEXT.  Since
mounts are only binary if they are explicitely mounted binary by setting
the MOUNT_BINARY flag, textmode is default.

This introduced a new bug.  When inheriting stdio HANDLEs from native
Windows processes, the fhandler and its path_conv are created from a
device struct only.  None of the path or mount flags get set this way.
So the mount flags are 0 and path_conv::binmode() returned 0.

After the path_conv::binmode() change it returned O_TEXT since, as
explained above, the default mount mode is textmode.

Rather than just enforcing binary mode for path_conv's created from
device structs, this patch changes the default mount mode to binary:

Replace MOUNT_BINARY flag with MOUNT_TEXT flag with opposite meaning.
Drop all explicit setting of MOUNT_BINARY.  Drop local set_flags
function, it doesn't add any value.

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen
2019-02-18 10:12:07 +01:00
parent f76c8519ac
commit 367c1ae161
4 changed files with 24 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
winsup/cygwin/include/sys/mount.h
View File

@ -22,7 +22,7 @@ extern "C" {
enum
{
MOUNT_BINARY = _BIT ( 1), /* "binary" format read/writes */
MOUNT_TEXT = _BIT ( 0), /* "binary" format read/writes */
MOUNT_SYSTEM = _BIT ( 3), /* mount point came from system table */
MOUNT_EXEC = _BIT ( 4), /* Any file in the mounted directory
gets 'x' bit */

45
winsup/cygwin/mount.cc
View File

@ -473,13 +473,13 @@ mount_info::create_root_entry (const PWCHAR root)
sys_wcstombs (native_root, PATH_MAX, root);
assert (*native_root != '\0');
if (add_item (native_root, "/",
MOUNT_SYSTEM | MOUNT_BINARY | MOUNT_IMMUTABLE | MOUNT_AUTOMATIC)
MOUNT_SYSTEM | MOUNT_IMMUTABLE | MOUNT_AUTOMATIC)
< 0)
api_fatal ("add_item (\"%s\", \"/\", ...) failed, errno %d", native_root, errno);
/* Create a default cygdrive entry. Note that this is a user entry.
This allows to override it with mount, unless the sysadmin created
a cygdrive entry in /etc/fstab. */
cygdrive_flags = MOUNT_BINARY | MOUNT_NOPOSIX | MOUNT_CYGDRIVE;
cygdrive_flags = MOUNT_NOPOSIX | MOUNT_CYGDRIVE;
strcpy (cygdrive, CYGWIN_INFO_CYGDRIVE_DEFAULT_PREFIX "/");
cygdrive_len = strlen (cygdrive);
}
@ -508,32 +508,23 @@ mount_info::init (bool user_init)
if (!got_usr_bin)
{
stpcpy (p, "\\bin");
add_item (native, "/usr/bin",
MOUNT_SYSTEM | MOUNT_BINARY | MOUNT_AUTOMATIC);
add_item (native, "/usr/bin", MOUNT_SYSTEM | MOUNT_AUTOMATIC);
}
if (!got_usr_lib)
{
stpcpy (p, "\\lib");
add_item (native, "/usr/lib",
MOUNT_SYSTEM | MOUNT_BINARY | MOUNT_AUTOMATIC);
add_item (native, "/usr/lib", MOUNT_SYSTEM | MOUNT_AUTOMATIC);
}
}
}
static void
set_flags (unsigned *flags, unsigned val)
{
*flags = val;
debug_printf ("flags: binary (%y)", *flags & MOUNT_BINARY);
}
int
mount_item::build_win32 (char *dst, const char *src, unsigned *outflags, unsigned chroot_pathlen)
{
int n, err = 0;
const char *real_native_path;
int real_posix_pathlen;
set_flags (outflags, (unsigned) flags);
*outflags = flags;
if (!cygheap->root.exists () || posix_pathlen != 1 || posix_path[0] != '/')
{
n = native_pathlen;
@ -604,7 +595,7 @@ mount_info::conv_to_win32_path (const char *src_path, char *dst, device& dev,
/* See if this is a cygwin "device" */
if (win32_device_name (src_path, dst, dev))
{
*flags = MOUNT_BINARY; /* FIXME: Is this a sensible default for devices? */
*flags = 0;
rc = 0;
goto out_no_chroot_check;
}
@ -617,7 +608,7 @@ mount_info::conv_to_win32_path (const char *src_path, char *dst, device& dev,
if (!strchr (src_path + 2, '/'))
{
dev = *netdrive_dev;
set_flags (flags, MOUNT_BINARY);
*flags = 0;
}
else
{
@ -626,7 +617,7 @@ mount_info::conv_to_win32_path (const char *src_path, char *dst, device& dev,
are rather (warning, poetic description ahead) windows into the
native Win32 world. This also gives the user an elegant way to
change the settings for those paths in a central place. */
set_flags (flags, (unsigned) cygdrive_flags);
*flags = cygdrive_flags;
}
backslashify (src_path, dst, 0);
/* Go through chroot check */
@ -638,14 +629,14 @@ mount_info::conv_to_win32_path (const char *src_path, char *dst, device& dev,
dev = fhandler_proc::get_proc_fhandler (src_path);
if (dev == FH_NADA)
return ENOENT;
set_flags (flags, MOUNT_BINARY);
*flags = 0;
if (isprocsys_dev (dev))
{
if (src_path[procsys_len])
backslashify (src_path + procsys_len, dst, 0);
else /* Avoid empty NT path. */
stpcpy (dst, "\\");
set_flags (flags, (unsigned) cygdrive_flags);
*flags = cygdrive_flags;
}
else
strcpy (dst, src_path);
@ -666,7 +657,7 @@ mount_info::conv_to_win32_path (const char *src_path, char *dst, device& dev,
}
else if (cygdrive_win32_path (src_path, dst, unit))
{
set_flags (flags, (unsigned) cygdrive_flags);
*flags = cygdrive_flags;
goto out;
}
else if (mount_table->cygdrive_len > 1)
@ -1024,7 +1015,7 @@ struct opt
{
{"acl", MOUNT_NOACL, 1},
{"auto", 0, 0},
{"binary", MOUNT_BINARY, 0},
{"binary", MOUNT_TEXT, 1},
{"bind", MOUNT_BIND, 0},
{"cygexec", MOUNT_CYGWIN_EXEC, 0},
{"dos", MOUNT_DOS, 0},
@ -1038,7 +1029,7 @@ struct opt
{"posix=0", MOUNT_NOPOSIX, 0},
{"posix=1", MOUNT_NOPOSIX, 1},
{"sparse", MOUNT_SPARSE, 0},
{"text", MOUNT_BINARY, 1},
{"text", MOUNT_TEXT, 0},
{"user", MOUNT_SYSTEM, 1}
};
@ -1140,7 +1131,7 @@ mount_info::from_fstab_line (char *line, bool user)
return true;
cend = find_ws (c);
*cend = '\0';
unsigned mount_flags = MOUNT_SYSTEM | MOUNT_BINARY;
unsigned mount_flags = MOUNT_SYSTEM;
if (!strcmp (fs_type, "cygdrive"))
mount_flags |= MOUNT_NOPOSIX;
if (!strcmp (fs_type, "usertemp"))
@ -1157,7 +1148,7 @@ mount_info::from_fstab_line (char *line, bool user)
int error = conv_to_win32_path (bound_path, native_path, dev, &flags);
if (error || strlen (native_path) >= MAX_PATH)
return true;
if ((mount_flags & ~MOUNT_SYSTEM) == (MOUNT_BIND | MOUNT_BINARY))
if ((mount_flags & ~MOUNT_SYSTEM) == MOUNT_BIND)
mount_flags = (MOUNT_BIND | flags)
& ~(MOUNT_IMMUTABLE | MOUNT_AUTOMATIC);
}
@ -1277,7 +1268,7 @@ mount_info::get_cygdrive_info (char *user, char *system, char *user_flags,
path[cygdrive_len - 1] = '\0';
}
if (flags)
strcpy (flags, (cygdrive_flags & MOUNT_BINARY) ? "binmode" : "textmode");
strcpy (flags, (cygdrive_flags & MOUNT_TEXT) ? "textmode" : "binmode");
return 0;
}
@ -1603,7 +1594,7 @@ fillout_mntent (const char *native_path, const char *posix_path, unsigned flags)
binary or textmode, or exec. We don't print
`silent' here; it's a magic internal thing. */
if (!(flags & MOUNT_BINARY))
if (flags & MOUNT_TEXT)
strcpy (_my_tls.locals.mnt_opts, (char *) "text");
else
strcpy (_my_tls.locals.mnt_opts, (char *) "binary");
@ -1759,7 +1750,7 @@ mount (const char *win32_path, const char *posix_path, unsigned flags)
dev, &conv_flags);
if (error || strlen (w32_path) >= MAX_PATH)
return true;
if ((flags & ~MOUNT_SYSTEM) == (MOUNT_BIND | MOUNT_BINARY))
if ((flags & ~MOUNT_SYSTEM) == MOUNT_BIND)
flags = (MOUNT_BIND | conv_flags)
& ~(MOUNT_IMMUTABLE | MOUNT_AUTOMATIC);
}

4
winsup/cygwin/path.h
View File

@ -174,9 +174,7 @@ class path_conv
int has_buggy_basic_info () const {return fs.has_buggy_basic_info ();}
int binmode () const
{
if (mount_flags & MOUNT_BINARY)
return O_BINARY;
return O_TEXT;
return (mount_flags & MOUNT_TEXT) ? O_TEXT : O_BINARY;
}
int issymlink () const {return path_flags & PATH_SYMLINK;}
int is_lnk_symlink () const {return path_flags & PATH_LNK;}

4
winsup/cygwin/release/3.0.1
View File

@ -14,3 +14,7 @@ Bug Fixes
- Fix Command-line argument handling of kill(1) in terms of negative PID.
Addresses: report on IRC
- Fix an accidentally introduced O_TEXT handling of pipes inherited
from native Windows processes.
Addresses: https://cygwin.com/ml/cygwin/2019-02/msg00246.html