diff options
Diffstat (limited to 'usr.sbin/mpsutil')
-rw-r--r-- | usr.sbin/mpsutil/Makefile | 1 | ||||
-rw-r--r-- | usr.sbin/mpsutil/mps_cmd.c | 2 | ||||
-rw-r--r-- | usr.sbin/mpsutil/mps_show.c | 3 | ||||
-rw-r--r-- | usr.sbin/mpsutil/mpsutil.c | 7 | ||||
-rw-r--r-- | usr.sbin/mpsutil/mpsutil.h | 1 |
5 files changed, 10 insertions, 4 deletions
diff --git a/usr.sbin/mpsutil/Makefile b/usr.sbin/mpsutil/Makefile index c731f6df260e..1b2c1ff7f4ce 100644 --- a/usr.sbin/mpsutil/Makefile +++ b/usr.sbin/mpsutil/Makefile @@ -8,6 +8,7 @@ MAN= mpsutil.8 WARNS?= 3 LIBADD= cam util +LINKS= ${BINDIR}/mpsutil ${BINDIR}/mprutil CFLAGS+= -I${.CURDIR}/../../sys -I. -DUSE_MPT_IOCTLS -g diff --git a/usr.sbin/mpsutil/mps_cmd.c b/usr.sbin/mpsutil/mps_cmd.c index b6dc927b7635..ce1d5832cc36 100644 --- a/usr.sbin/mpsutil/mps_cmd.c +++ b/usr.sbin/mpsutil/mps_cmd.c @@ -621,7 +621,7 @@ mps_open(int unit) { char path[MAXPATHLEN]; - snprintf(path, sizeof(path), "/dev/mps%d", unit); + snprintf(path, sizeof(path), "/dev/mp%s%d", is_mps ? "s": "r", unit); return (open(path, O_RDWR)); } diff --git a/usr.sbin/mpsutil/mps_show.c b/usr.sbin/mpsutil/mps_show.c index de9a3d0582e2..adfe7a352383 100644 --- a/usr.sbin/mpsutil/mps_show.c +++ b/usr.sbin/mpsutil/mps_show.c @@ -270,7 +270,8 @@ show_adapters(int ac, char **av) free(man0); return (EINVAL); } - printf("/dev/mps%d\t%16s %16s %08x\n", unit, + printf("/dev/mp%s%d\t%16s %16s %08x\n", + is_mps ? "s": "r", unit, man0->ChipName, man0->BoardName, facts->FWVersion.Word); free(man0); free(facts); diff --git a/usr.sbin/mpsutil/mpsutil.c b/usr.sbin/mpsutil/mpsutil.c index f352f40db4c2..ce5d2c6f12f8 100644 --- a/usr.sbin/mpsutil/mpsutil.c +++ b/usr.sbin/mpsutil/mpsutil.c @@ -44,6 +44,7 @@ SET_DECLARE(MPS_DATASET(top), struct mpsutil_command); SET_DECLARE(MPS_DATASET(usage), struct mpsutil_usage); int mps_unit; +int is_mps; static void usage(void) @@ -51,7 +52,7 @@ usage(void) struct mpsutil_usage **cmd; const char *args, *desc; - fprintf(stderr, "usage: mpsutil [-u unit] <command> ...\n\n"); + fprintf(stderr, "usage: %s [-u unit] <command> ...\n\n", getprogname()); fprintf(stderr, "Commands include:\n"); SET_FOREACH(cmd, MPS_DATASET(usage)) { if (*cmd == NULL) @@ -72,7 +73,7 @@ static int version(int ac, char **av) { - printf("mpsutil: version %s", MPSUTIL_VERSION); + printf("%s: version %s", MPSUTIL_VERSION, getprogname()); #ifdef DEBUG printf(" (DEBUG)"); #endif @@ -88,6 +89,8 @@ main(int ac, char **av) struct mpsutil_command **cmd; int ch; + is_mps = !strcmp(getprogname(), "mpsutil"); + while ((ch = getopt(ac, av, "u:h?")) != -1) { switch (ch) { case 'u': diff --git a/usr.sbin/mpsutil/mpsutil.h b/usr.sbin/mpsutil/mpsutil.h index 48d3bb26edb9..393095102200 100644 --- a/usr.sbin/mpsutil/mpsutil.h +++ b/usr.sbin/mpsutil/mpsutil.h @@ -91,6 +91,7 @@ struct mpsutil_usage { _MPS_COMMAND(set, name, mpsutil_ ## name ## _table_handler) extern int mps_unit; +extern int is_mps; #define MPS_MAX_UNIT 10 void hexdump(const void *ptr, int length, const char *hdr, int flags); |