On Sun, May 14, 2000 at 03:03:00PM -0400, Roland McGrath wrote:
> You could produce a patch to fix this and then we would say "go ahead and
> check it in", and then you could check it in, and then it would be checked in.
How about this?
diff -ru /mnt/marcus/gnu/cvs/hurd/libdiskfs/opts-common.c libdiskfs/opts-common.c
--- /mnt/marcus/gnu/cvs/hurd/libdiskfs/opts-common.c Sun Sep 19 23:13:18 1999
+++ libdiskfs/opts-common.c Sun May 14 21:30:22 2000
@@ -34,7 +34,7 @@
{"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)"},
+ " default is to sync every " DEFAULT_SYNC_INTERVAL_STRING " 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"},
diff -ru /mnt/marcus/gnu/cvs/hurd/libdiskfs/priv.h libdiskfs/priv.h
--- /mnt/marcus/gnu/cvs/hurd/libdiskfs/priv.h Tue Nov 9 08:56:04 1999
+++ libdiskfs/priv.h Sun May 14 21:38:06 2000
@@ -52,6 +52,11 @@
#define OPT_EXEC_OK 601 /* --exec-ok */
#define OPT_ATIME 602 /* --atime */
+/* Common value for diskfs_common_options and diskfs_default_sync_interval. */
+#define DEFAULT_SYNC_INTERVAL 5
+#define DEFAULT_SYNC_INTERVAL_STRING STRINGIFY(DEFAULT_SYNC_INTERVAL)
+#define STRINGIFY(x) STRINGIFY_1(x)
+#define STRINGIFY_1(x) #x
/* Diskfs thinks the disk is dirty if this is set. */
extern int _diskfs_diskdirty;
diff -ru /mnt/marcus/gnu/cvs/hurd/libdiskfs/sync-default.c libdiskfs/sync-default.c
--- /mnt/marcus/gnu/cvs/hurd/libdiskfs/sync-default.c Mon Jun 28 01:55:35 1999
+++ libdiskfs/sync-default.c Sun May 14 21:34:38 2000
@@ -18,4 +18,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
-int diskfs_default_sync_interval = 5;
+#include "priv.h"
+
+int diskfs_default_sync_interval = DEFAULT_SYNC_INTERVAL;
--
`Rhubarb is no Egyptian god.' Debian http://www.debian.org Check Key server
Marcus Brinkmann GNU http://www.gnu.org for public PGP Key
[EMAIL PROTECTED], [EMAIL PROTECTED] PGP Key ID 36E7CD09
http://homepage.ruhr-uni-bochum.de/Marcus.Brinkmann/ [EMAIL PROTECTED]
