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

* mount.cc (do_mount): Remove MOUNT_ENC code.

Browse Source 
(oopts): Remove "managed" option.
	(mount_commands): Drop "managed" handling.
	* path.cc (oopts): Remove "managed" option.
	(getmntent): Remove MOUNT_ENC code.
This commit is contained in:
Corinna Vinschen 2008-07-17 15:07:48 +00:00
parent 5fc03e3d73
commit 874149c80c
3 changed files with 10 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
winsup/utils/ChangeLog
View File

@ -1,3 +1,11 @@
2008-07-17 Corinna Vinschen <corinna@vinschen.de>
* mount.cc (do_mount): Remove MOUNT_ENC code.
(oopts): Remove "managed" option.
(mount_commands): Drop "managed" handling.
* path.cc (oopts): Remove "managed" option.
(getmntent): Remove MOUNT_ENC code.
2008-07-17 Corinna Vinschen <corinna@vinschen.de> 2008-07-17 Corinna Vinschen <corinna@vinschen.de>
* utils.sgml: Add id's to all examples. * utils.sgml: Add id's to all examples.

24
winsup/utils/mount.cc
View File

@ -103,25 +103,6 @@ do_mount (const char *dev, const char *where, int flags)
} }
} }
if (!force && flags & MOUNT_ENC)
{
DIR *dd = opendir (dev);
if (dd)
{
struct dirent *d;
while ((d = readdir (dd)))
{
if (d->d_name[0] != '.')
/* fall through */;
else if (d->d_name[1] == '\0'
|| (d->d_name[1] == '.' && d->d_name[2] == '\0'))
continue;
fprintf (stderr, "%s: error: don't use \"-o managed\" on non-empty directories\n", progname);
exit (1);
}
}
}
if (mount (dev, where, flags)) if (mount (dev, where, flags))
error (where); error (where);
@ -192,8 +173,7 @@ struct opt
{"exec", MOUNT_EXEC, 0}, {"exec", MOUNT_EXEC, 0},
{"notexec", MOUNT_NOTEXEC, 0}, {"notexec", MOUNT_NOTEXEC, 0},
{"cygexec", MOUNT_CYGWIN_EXEC, 0}, {"cygexec", MOUNT_CYGWIN_EXEC, 0},
{"nosuid", 0, 0}, {"nosuid", 0, 0}
{"managed", MOUNT_ENC, 0}
}; };
static void static void
@ -417,8 +397,6 @@ mount_commands (void)
strcat (opts, " -E"); strcat (opts, " -E");
if (strstr (p->mnt_opts, ",cygexec")) if (strstr (p->mnt_opts, ",cygexec"))
strcat (opts, " -X"); strcat (opts, " -X");
if (strstr (p->mnt_opts, ",managed"))
strcat (opts, " -o managed");
while ((c = strchr (p->mnt_fsname, '\\')) != NULL) while ((c = strchr (p->mnt_fsname, '\\')) != NULL)
*c = '/'; *c = '/';
printf (format_mnt, opts, p->mnt_fsname, p->mnt_dir); printf (format_mnt, opts, p->mnt_fsname, p->mnt_dir);

5
winsup/utils/path.cc
View File

@ -298,8 +298,7 @@ struct opt
{"exec", MOUNT_EXEC, 0}, {"exec", MOUNT_EXEC, 0},
{"notexec", MOUNT_NOTEXEC, 0}, {"notexec", MOUNT_NOTEXEC, 0},
{"cygexec", MOUNT_CYGWIN_EXEC, 0}, {"cygexec", MOUNT_CYGWIN_EXEC, 0},
{"nosuid", 0, 0}, {"nosuid", 0, 0}
{"managed", MOUNT_ENC, 0}
}; };
static bool static bool
@ -843,8 +842,6 @@ getmntent (FILE *)
strcat (mnt.mnt_opts, (char *) ",exec"); strcat (mnt.mnt_opts, (char *) ",exec");
else if (m->flags & MOUNT_NOTEXEC) else if (m->flags & MOUNT_NOTEXEC)
strcat (mnt.mnt_opts, (char *) ",noexec"); strcat (mnt.mnt_opts, (char *) ",noexec");
if (m->flags & MOUNT_ENC)
strcat (mnt.mnt_opts, ",managed");
if ((m->flags & MOUNT_CYGDRIVE)) /* cygdrive */ if ((m->flags & MOUNT_CYGDRIVE)) /* cygdrive */
strcat (mnt.mnt_opts, (char *) ",cygdrive"); strcat (mnt.mnt_opts, (char *) ",cygdrive");
mnt.mnt_freq = 1; mnt.mnt_freq = 1;