libs/newlib-cygwin
libs
/
newlib-cygwin
mirror of git://sourceware.org/git/newlib-cygwin.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity

Cygwin: utils: MOUNT_BINARY -> MOUNT_TEXT 

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen 2019-02-18 11:00:06 +01:00
parent 9883959f08
commit 26e0b37ed0
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
winsup/utils/mount.cc
View File

@ -256,7 +256,7 @@ int
main (int argc, char **argv) main (int argc, char **argv)
{ {
int i; int i;
int flags = MOUNT_BINARY; int flags = 0;
char *options = strdup (""); char *options = strdup ("");
enum do_what enum do_what
{ {

15
winsup/utils/path.cc
View File

@ -312,7 +312,7 @@ static struct opt
{ {
{"acl", MOUNT_NOACL, 1}, {"acl", MOUNT_NOACL, 1},
{"auto", 0, 0}, {"auto", 0, 0},
{"binary", MOUNT_BINARY, 0}, {"binary", MOUNT_TEXT, 1},
{"cygexec", MOUNT_CYGWIN_EXEC, 0}, {"cygexec", MOUNT_CYGWIN_EXEC, 0},
{"dos", MOUNT_DOS, 0}, {"dos", MOUNT_DOS, 0},
{"exec", MOUNT_EXEC, 0}, {"exec", MOUNT_EXEC, 0},
@ -324,7 +324,7 @@ static struct opt
{"override", MOUNT_OVERRIDE, 0}, {"override", MOUNT_OVERRIDE, 0},
{"posix=0", MOUNT_NOPOSIX, 0}, {"posix=0", MOUNT_NOPOSIX, 0},
{"posix=1", MOUNT_NOPOSIX, 1}, {"posix=1", MOUNT_NOPOSIX, 1},
{"text", MOUNT_BINARY, 1}, {"text", MOUNT_TEXT, 0},
{"user", MOUNT_SYSTEM, 1} {"user", MOUNT_SYSTEM, 1}
}; };
@ -487,27 +487,26 @@ from_fstab (bool user, PWCHAR path, PWCHAR path_end)
*(native_path += 2) = '\\'; *(native_path += 2) = '\\';
m->posix = strdup ("/"); m->posix = strdup ("/");
m->native = strdup (native_path); m->native = strdup (native_path);
m->flags = MOUNT_SYSTEM | MOUNT_BINARY | MOUNT_IMMUTABLE m->flags = MOUNT_SYSTEM | MOUNT_IMMUTABLE | MOUNT_AUTOMATIC;
| MOUNT_AUTOMATIC;
++m; ++m;
/* Create default /usr/bin and /usr/lib entries. */ /* Create default /usr/bin and /usr/lib entries. */
char *trail = strchr (native_path, '\0'); char *trail = strchr (native_path, '\0');
strcpy (trail, "\\bin"); strcpy (trail, "\\bin");
m->posix = strdup ("/usr/bin"); m->posix = strdup ("/usr/bin");
m->native = strdup (native_path); m->native = strdup (native_path);
m->flags = MOUNT_SYSTEM | MOUNT_BINARY | MOUNT_AUTOMATIC; m->flags = MOUNT_SYSTEM | MOUNT_AUTOMATIC;
++m; ++m;
strcpy (trail, "\\lib"); strcpy (trail, "\\lib");
m->posix = strdup ("/usr/lib"); m->posix = strdup ("/usr/lib");
m->native = strdup (native_path); m->native = strdup (native_path);
m->flags = MOUNT_SYSTEM | MOUNT_BINARY | MOUNT_AUTOMATIC; m->flags = MOUNT_SYSTEM | MOUNT_AUTOMATIC;
++m; ++m;
/* Create a default cygdrive entry. Note that this is a user entry. /* Create a default cygdrive entry. Note that this is a user entry.
This allows to override it with mount, unless the sysadmin created This allows to override it with mount, unless the sysadmin created
a cygdrive entry in /etc/fstab. */ a cygdrive entry in /etc/fstab. */
m->posix = strdup (CYGWIN_INFO_CYGDRIVE_DEFAULT_PREFIX); m->posix = strdup (CYGWIN_INFO_CYGDRIVE_DEFAULT_PREFIX);
m->native = strdup ("cygdrive prefix"); m->native = strdup ("cygdrive prefix");
m->flags = MOUNT_BINARY | MOUNT_CYGDRIVE; m->flags = MOUNT_CYGDRIVE;
++m; ++m;
max_mount_entry = m - mount_table; max_mount_entry = m - mount_table;
} }
@ -935,7 +934,7 @@ getmntent (FILE *)
strcpy (mnt.mnt_type, strcpy (mnt.mnt_type,
(char *) ((m->flags & MOUNT_SYSTEM) ? "system" : "user")); (char *) ((m->flags & MOUNT_SYSTEM) ? "system" : "user"));
if (!(m->flags & MOUNT_BINARY)) if (m->flags & MOUNT_TEXT)
strcpy (mnt.mnt_opts, (char *) "text"); strcpy (mnt.mnt_opts, (char *) "text");
else else
strcpy (mnt.mnt_opts, (char *) "binary"); strcpy (mnt.mnt_opts, (char *) "binary");