diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2009-07-22 16:24:17 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2009-07-22 16:24:17 +0000 |
| commit | 3955529c8b351de06a733adb225b195bb82eba91 (patch) | |
| tree | 044b559f166de94f1a66efac61012c4eb8197eca | |
| parent | 6c188691db7c649af3189cd71d6f674e48b1ffa9 (diff) | |
| download | cygnal-3955529c8b351de06a733adb225b195bb82eba91.tar.gz cygnal-3955529c8b351de06a733adb225b195bb82eba91.tar.bz2 cygnal-3955529c8b351de06a733adb225b195bb82eba91.zip | |
* mount.cc (do_mount): Replace --no-executable flag with notexec
mount option in hint for remote filesystems.
* path.cc (getmntent): Fix typo (noexec -> notexec).
| -rw-r--r-- | winsup/utils/ChangeLog | 6 | ||||
| -rw-r--r-- | winsup/utils/mount.cc | 2 | ||||
| -rw-r--r-- | winsup/utils/path.cc | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog index 5d7193939..090e841d9 100644 --- a/winsup/utils/ChangeLog +++ b/winsup/utils/ChangeLog @@ -1,5 +1,11 @@ 2009-07-22 Corinna Vinschen <corinna@vinschen.de> + * mount.cc (do_mount): Replace --no-executable flag with notexec + mount option in hint for remote filesystems. + * path.cc (getmntent): Fix typo (noexec -> notexec). + +2009-07-22 Corinna Vinschen <corinna@vinschen.de> + * Makefile.in (path-mount.o): Add a rule to build stripped down version of path.cc for usage in mount. (mount.exe): Add dependency to path-mount.o. diff --git a/winsup/utils/mount.cc b/winsup/utils/mount.cc index 3412feccb..bdedfa171 100644 --- a/winsup/utils/mount.cc +++ b/winsup/utils/mount.cc @@ -100,7 +100,7 @@ do_mount (const char *dev, const char *where, int flags) strcat (devtmp, "\\"); if (GetDriveType (devtmp) == DRIVE_REMOTE) { - fprintf (stderr, "%s: defaulting to '--no-executable' flag for speed since native path\n" + fprintf (stderr, "%s: defaulting to 'notexec' mount option for speed since native path\n" "%*creferences a remote share. Use '-f' option to override.\n", progname, strlen(progname) + 2, ' '); flags |= MOUNT_NOTEXEC; diff --git a/winsup/utils/path.cc b/winsup/utils/path.cc index 63eda1640..63c2ccc43 100644 --- a/winsup/utils/path.cc +++ b/winsup/utils/path.cc @@ -882,7 +882,7 @@ getmntent (FILE *) else if (m->flags & MOUNT_EXEC) strcat (mnt.mnt_opts, (char *) ",exec"); else if (m->flags & MOUNT_NOTEXEC) - strcat (mnt.mnt_opts, (char *) ",noexec"); + strcat (mnt.mnt_opts, (char *) ",notexec"); if (m->flags & MOUNT_NOACL) strcat (mnt.mnt_opts, (char *) ",noacl"); |