Date: Thu, 15 Oct 2015 15:19:38 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r289364 - projects/mpsutil/usr.sbin/mpsutil Message-ID: <201510151519.t9FFJcC8033774@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Thu Oct 15 15:19:38 2015 New Revision: 289364 URL: https://svnweb.freebsd.org/changeset/base/289364 Log: Make mpsutil open the mpr devices when named mprutil Make mprutil a hardlink to mpsutil Sponsored by: Gandi.net Modified: projects/mpsutil/usr.sbin/mpsutil/Makefile projects/mpsutil/usr.sbin/mpsutil/mps_cmd.c projects/mpsutil/usr.sbin/mpsutil/mps_show.c projects/mpsutil/usr.sbin/mpsutil/mpsutil.c projects/mpsutil/usr.sbin/mpsutil/mpsutil.h Modified: projects/mpsutil/usr.sbin/mpsutil/Makefile ============================================================================== --- projects/mpsutil/usr.sbin/mpsutil/Makefile Thu Oct 15 08:49:52 2015 (r289363) +++ projects/mpsutil/usr.sbin/mpsutil/Makefile Thu Oct 15 15:19:38 2015 (r289364) @@ -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 Modified: projects/mpsutil/usr.sbin/mpsutil/mps_cmd.c ============================================================================== --- projects/mpsutil/usr.sbin/mpsutil/mps_cmd.c Thu Oct 15 08:49:52 2015 (r289363) +++ projects/mpsutil/usr.sbin/mpsutil/mps_cmd.c Thu Oct 15 15:19:38 2015 (r289364) @@ -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)); } Modified: projects/mpsutil/usr.sbin/mpsutil/mps_show.c ============================================================================== --- projects/mpsutil/usr.sbin/mpsutil/mps_show.c Thu Oct 15 08:49:52 2015 (r289363) +++ projects/mpsutil/usr.sbin/mpsutil/mps_show.c Thu Oct 15 15:19:38 2015 (r289364) @@ -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); Modified: projects/mpsutil/usr.sbin/mpsutil/mpsutil.c ============================================================================== --- projects/mpsutil/usr.sbin/mpsutil/mpsutil.c Thu Oct 15 08:49:52 2015 (r289363) +++ projects/mpsutil/usr.sbin/mpsutil/mpsutil.c Thu Oct 15 15:19:38 2015 (r289364) @@ -44,6 +44,7 @@ SET_DECLARE(MPS_DATASET(top), struct mps 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': Modified: projects/mpsutil/usr.sbin/mpsutil/mpsutil.h ============================================================================== --- projects/mpsutil/usr.sbin/mpsutil/mpsutil.h Thu Oct 15 08:49:52 2015 (r289363) +++ projects/mpsutil/usr.sbin/mpsutil/mpsutil.h Thu Oct 15 15:19:38 2015 (r289364) @@ -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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510151519.t9FFJcC8033774>