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

* path.cc: Include sys/cygwin.h if built for mount(1). 

(struct opt): Add "dos" and "ihash" options.
	(from_fstab_line): Call cygwin_internal rather than read_flags if
	built for mount(1).
This commit is contained in:
Corinna Vinschen 2010-04-29 10:39:35 +00:00
parent 5b4c992bf6
commit a361b4715f
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
winsup/utils/ChangeLog
View File

@ -1,3 +1,10 @@
2010-04-29 Corinna Vinschen <corinna@vinschen.de>
* path.cc: Include sys/cygwin.h if built for mount(1).
(struct opt): Add "dos" and "ihash" options.
(from_fstab_line): Call cygwin_internal rather than read_flags if
built for mount(1).
2010-04-29 Corinna Vinschen <corinna@vinschen.de> 2010-04-29 Corinna Vinschen <corinna@vinschen.de>
* mount.cc (oopts): Remove entirely. * mount.cc (oopts): Remove entirely.

11
winsup/utils/path.cc
View File

@ -1,6 +1,6 @@
/* path.cc /* path.cc
Copyright 2001, 2002, 2003, 2005, 2006, 2007, 2008, 2009 Red Hat, Inc. Copyright 2001, 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010 Red Hat, Inc.
This file is part of Cygwin. This file is part of Cygwin.
@ -26,6 +26,9 @@ details. */
#include "cygwin/include/sys/mount.h" #include "cygwin/include/sys/mount.h"
#include "cygwin/include/mntent.h" #include "cygwin/include/mntent.h"
#include "testsuite.h" #include "testsuite.h"
#ifdef FSTAB_ONLY
#include <sys/cygwin.h>
#endif
#ifndef FSTAB_ONLY #ifndef FSTAB_ONLY
/* Used when treating / and \ as equivalent. */ /* Used when treating / and \ as equivalent. */
@ -306,7 +309,9 @@ static struct opt
{"auto", 0, 0}, {"auto", 0, 0},
{"binary", MOUNT_BINARY, 0}, {"binary", MOUNT_BINARY, 0},
{"cygexec", MOUNT_CYGWIN_EXEC, 0}, {"cygexec", MOUNT_CYGWIN_EXEC, 0},
{"dos", MOUNT_DOS, 0},
{"exec", MOUNT_EXEC, 0}, {"exec", MOUNT_EXEC, 0},
{"ihash", MOUNT_IHASH, 0},
{"noacl", MOUNT_NOACL, 0}, {"noacl", MOUNT_NOACL, 0},
{"nosuid", 0, 0}, {"nosuid", 0, 0},
{"notexec", MOUNT_NOTEXEC, 0}, {"notexec", MOUNT_NOTEXEC, 0},
@ -381,7 +386,11 @@ from_fstab_line (mnt_t *m, char *line, bool user)
cend = find_ws (c); cend = find_ws (c);
*cend = '\0'; *cend = '\0';
unsigned mount_flags = MOUNT_SYSTEM; unsigned mount_flags = MOUNT_SYSTEM;
#ifndef FSTAB_ONLY
if (!read_flags (c, mount_flags)) if (!read_flags (c, mount_flags))
#else
if (cygwin_internal (CW_CVT_MNT_OPTS, &c, &mount_flags))
#endif
return false; return false;
if (user) if (user)
mount_flags &= ~MOUNT_SYSTEM; mount_flags &= ~MOUNT_SYSTEM;