From 48a6a5bbb652cfc44e0726508644ad35c05e01f5 Mon Sep 17 00:00:00 2001 From: iedowse Date: Sun, 30 Sep 2001 15:14:16 +0000 Subject: Enable bug-for-bug compatibility with mount_mfs when the program name is "mount_mfs" or "mfs". Previously, the condition was that the program name must start with "mount_", but this both missed the case where mount(8) invokes mdmfs with argv[0] = "mfs", and it included cases such as "mount_md" where compatibility is not required. Reviewed by: dd --- sbin/mdmfs/mdmfs.8 | 7 ++++--- sbin/mdmfs/mdmfs.c | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'sbin/mdmfs') diff --git a/sbin/mdmfs/mdmfs.8 b/sbin/mdmfs/mdmfs.8 index 9fb7eb3..bb233a4 100644 --- a/sbin/mdmfs/mdmfs.8 +++ b/sbin/mdmfs/mdmfs.8 @@ -304,9 +304,10 @@ Full compatibility is enabled with the flag, or by starting .Nm -with -.Li mount_ -at the beginning of its name +with the name +.Li mount_mfs +or +.Li mfs (as returned by .Xr getprogname 3 ) . In this mode, only the options which would be accepted by diff --git a/sbin/mdmfs/mdmfs.c b/sbin/mdmfs/mdmfs.c index 62a3316..9c59db7 100644 --- a/sbin/mdmfs/mdmfs.c +++ b/sbin/mdmfs/mdmfs.c @@ -116,8 +116,9 @@ main(int argc, char **argv) newfs_arg = strdup(""); mount_arg = strdup(""); - /* If we were started as mount_*, imply -C. */ - if (strncmp(getprogname(), "mount_", 6) == 0) + /* If we were started as mount_mfs or mfs, imply -C. */ + if (strcmp(getprogname(), "mount_mfs") == 0 || + strcmp(getprogname(), "mfs") == 0) compat = true; while ((ch = getopt(argc, argv, -- cgit v1.1