From owner-svn-src-projects@freebsd.org Thu Oct 15 15:19:40 2015 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 294A7A15FFC for ; Thu, 15 Oct 2015 15:19:40 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0357E1D0C; Thu, 15 Oct 2015 15:19:39 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9FFJdVa033779; Thu, 15 Oct 2015 15:19:39 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9FFJcC8033774; Thu, 15 Oct 2015 15:19:38 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201510151519.t9FFJcC8033774@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Thu, 15 Oct 2015 15:19:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r289364 - projects/mpsutil/usr.sbin/mpsutil X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Oct 2015 15:19:40 -0000 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] ...\n\n"); + fprintf(stderr, "usage: %s [-u unit] ...\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);