[newlib-cygwin] Cygwin: utils: MOUNT_BINARY -> MOUNT_TEXT

Corinna Vinschen corinna@sourceware.org
Mon Feb 18 10:03:00 GMT 2019


https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=26e0b37ed06c78926f1e1ee1e589b214a3813432

commit 26e0b37ed06c78926f1e1ee1e589b214a3813432
Author: Corinna Vinschen <corinna@vinschen.de>
Date:   Mon Feb 18 11:00:06 2019 +0100

    Cygwin: utils: MOUNT_BINARY -> MOUNT_TEXT
    
    Signed-off-by: Corinna Vinschen <corinna@vinschen.de>

Diff:
---
 winsup/utils/mount.cc |  2 +-
 winsup/utils/path.cc  | 15 +++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/winsup/utils/mount.cc b/winsup/utils/mount.cc
index 1d32755..bd26751 100644
--- a/winsup/utils/mount.cc
+++ b/winsup/utils/mount.cc
@@ -256,7 +256,7 @@ int
 main (int argc, char **argv)
 {
   int i;
-  int flags = MOUNT_BINARY;
+  int flags = 0;
   char *options = strdup ("");
   enum do_what
   {
diff --git a/winsup/utils/path.cc b/winsup/utils/path.cc
index 1a14a89..d8c2081 100644
--- a/winsup/utils/path.cc
+++ b/winsup/utils/path.cc
@@ -312,7 +312,7 @@ static struct opt
 {
   {"acl", MOUNT_NOACL, 1},
   {"auto", 0, 0},
-  {"binary", MOUNT_BINARY, 0},
+  {"binary", MOUNT_TEXT, 1},
   {"cygexec", MOUNT_CYGWIN_EXEC, 0},
   {"dos", MOUNT_DOS, 0},
   {"exec", MOUNT_EXEC, 0},
@@ -324,7 +324,7 @@ static struct opt
   {"override", MOUNT_OVERRIDE, 0},
   {"posix=0", MOUNT_NOPOSIX, 0},
   {"posix=1", MOUNT_NOPOSIX, 1},
-  {"text", MOUNT_BINARY, 1},
+  {"text", MOUNT_TEXT, 0},
   {"user", MOUNT_SYSTEM, 1}
 };
 
@@ -487,27 +487,26 @@ from_fstab (bool user, PWCHAR path, PWCHAR path_end)
 	*(native_path += 2) = '\\';
       m->posix = strdup ("/");
       m->native = strdup (native_path);
-      m->flags = MOUNT_SYSTEM | MOUNT_BINARY | MOUNT_IMMUTABLE
-		 | MOUNT_AUTOMATIC;
+      m->flags = MOUNT_SYSTEM | MOUNT_IMMUTABLE | MOUNT_AUTOMATIC;
       ++m;
       /* Create default /usr/bin and /usr/lib entries. */
       char *trail = strchr (native_path, '\0');
       strcpy (trail, "\\bin");
       m->posix = strdup ("/usr/bin");
       m->native = strdup (native_path);
-      m->flags = MOUNT_SYSTEM | MOUNT_BINARY | MOUNT_AUTOMATIC;
+      m->flags = MOUNT_SYSTEM | MOUNT_AUTOMATIC;
       ++m;
       strcpy (trail, "\\lib");
       m->posix = strdup ("/usr/lib");
       m->native = strdup (native_path);
-      m->flags = MOUNT_SYSTEM | MOUNT_BINARY | MOUNT_AUTOMATIC;
+      m->flags = MOUNT_SYSTEM | MOUNT_AUTOMATIC;
       ++m;
       /* 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. */
       m->posix = strdup (CYGWIN_INFO_CYGDRIVE_DEFAULT_PREFIX);
       m->native = strdup ("cygdrive prefix");
-      m->flags = MOUNT_BINARY | MOUNT_CYGDRIVE;
+      m->flags = MOUNT_CYGDRIVE;
       ++m;
       max_mount_entry = m - mount_table;
     }
@@ -935,7 +934,7 @@ getmntent (FILE *)
   strcpy (mnt.mnt_type,
 	  (char *) ((m->flags & MOUNT_SYSTEM) ? "system" : "user"));
 
-  if (!(m->flags & MOUNT_BINARY))
+  if (m->flags & MOUNT_TEXT)
     strcpy (mnt.mnt_opts, (char *) "text");
   else
     strcpy (mnt.mnt_opts, (char *) "binary");



More information about the Cygwin-cvs mailing list