From 9a51ee3f9fbd12e2ded858c8b9c72b2d5e56b83d Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Sun, 19 Sep 1999 21:13:30 +0000 Subject: 1999-09-19 Roland McGrath * node-times.c (diskfs_set_node_times): If _diskfs_noatime is set and neither NP->dn_set_mtime nor NP->dn_set_ctime is set, clear NP->dn_set_atime. Short-circuit return if none of dn_set_?time set. * opts-common.c (diskfs_common_options): Include "priv.h". Add aliases --ro/--rw for -r/-w. Add alias --nosuid for --no-suid, --noexec for --no-exec. Move --suid-ok, --exec-ok here from ... * opts-std-runtime.c (std_runtime_options): ... here. (struct parse_hook): New member `noatime'. (set_opts): Use H->noatime to set _diskfs_noatime. (parse_opt): Grok -A and OPT_ATIME to set/clear H->noatime. (OPT_ATIME): New macro. (OPT_SUID_OK, OPT_EXEC_OK): Moved to ... * priv.h: ... here. (diskfs_common_options): Add const to decl. * opts-std-startup.c (parse_startup_opt): Grok OPT_SUID_OK, OPT_EXEC_OK, -A, and OPT_ATIME. * init-init.c (_diskfs_noatime): New variable. (_diskfs_nosuid, _diskfs_noexec): Use uninitialized defns. * opts-append-std.c (diskfs_append_std_options): Add --no-atime if _diskfs_noatime is set. --- libdiskfs/opts-common.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'libdiskfs/opts-common.c') diff --git a/libdiskfs/opts-common.c b/libdiskfs/opts-common.c index 41bf1a8b..05de5144 100644 --- a/libdiskfs/opts-common.c +++ b/libdiskfs/opts-common.c @@ -1,6 +1,6 @@ /* Options common to both startup and runtime - Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. + Copyright (C) 1995, 1996, 1997, 1999 Free Software Foundation, Inc. Written by Miles Bader @@ -21,20 +21,31 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include +#include "priv.h" const struct argp_option diskfs_common_options[] = { {"readonly", 'r', 0, 0, "Never write to disk or allow opens for writing"}, {"rdonly", 0, 0, OPTION_ALIAS | OPTION_HIDDEN}, + {"ro", 0, 0, OPTION_ALIAS | OPTION_HIDDEN}, {"writable", 'w', 0, 0, "Use normal read/write behavior"}, {"rdwr", 0, 0, OPTION_ALIAS | OPTION_HIDDEN}, + {"rw", 0, 0, OPTION_ALIAS | OPTION_HIDDEN}, {"sync", 's', "INTERVAL", OPTION_ARG_OPTIONAL, "If INTERVAL is supplied, sync all data not actually written to disk" " every INTERVAL seconds, otherwise operate in synchronous mode (the" " default is to sync every 30 seconds)"}, {"no-sync", 'n', 0, 0, "Don't automatically sync data to disk"}, {"nosync", 0, 0, OPTION_ALIAS | OPTION_HIDDEN}, - {"no-suid", 'S', 0, 0, "Don't permit set-uid or set-gid execution"}, + {"no-suid", 'S', 0, 0, "Don't permit set-uid or set-gid execution"}, + {"nosuid", 0, 0, OPTION_ALIAS | OPTION_HIDDEN}, + {"suid-ok", OPT_SUID_OK, 0, 0, "Enable set-uid execution"}, {"no-exec", 'E', 0, 0, "Don't permit any execution of files on this filesystem"}, + {"noexec", 0, 0, OPTION_ALIAS | OPTION_HIDDEN}, + {"exec-ok", OPT_EXEC_OK, 0, 0, "Enable execution of files"}, + {"no-atime", 'A', 0, 0, + "Do not update file access times on disk for reads"}, + {"noatime", 0, 0, OPTION_ALIAS | OPTION_HIDDEN}, + {"atime", OPT_ATIME, 0, 0, "Do update file access times for reads normally"}, {0, 0} }; -- cgit v1.2.3