From owner-p4-projects@FreeBSD.ORG  Sat Jul 28 21:01:33 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 57BB316A468; Sat, 28 Jul 2007 21:01:33 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F0B0B16A417
	for <perforce@freebsd.org>; Sat, 28 Jul 2007 21:01:32 +0000 (UTC)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C9A7A13C46A
	for <perforce@freebsd.org>; Sat, 28 Jul 2007 21:01:32 +0000 (UTC)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l6SL1WbZ093484
	for <perforce@freebsd.org>; Sat, 28 Jul 2007 21:01:32 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6SL1WWG093481
	for perforce@freebsd.org; Sat, 28 Jul 2007 21:01:32 GMT
	(envelope-from peter@freebsd.org)
Date: Sat, 28 Jul 2007 21:01:32 GMT
Message-Id: <200707282101.l6SL1WWG093481@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 124283 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 28 Jul 2007 21:01:33 -0000

http://perforce.freebsd.org/chv.cgi?CH=124283

Change 124283 by peter@peter_daintree on 2007/07/28 21:00:32

	Hack. take explicit card:port rather than decode /dev device names.

Affected files ...

.. //depot/projects/hammer/usr.sbin/sicontrol/sicontrol.c#4 edit

Differences ...

==== //depot/projects/hammer/usr.sbin/sicontrol/sicontrol.c#4 (text+ko) ====

@@ -150,22 +150,14 @@
 		alldev = 1;
 	} else {
 		sidev_t dev;
-		struct stat st;
+		int n;
+		int card, port;
 
-		if (strchr(Devname, '/') == NULL) {
-			char *acp = malloc(6 + strlen(Devname));
-			strcpy(acp, _PATH_DEV);
-			strcat(acp, Devname);
-			Devname = acp;
-		}
-		if (stat(Devname, &st) < 0)
-			errx(1, "can't stat %s", Devname);
-#if 0
-		dev.sid_card = SI_CARD(minor(st.st_rdev));
-		dev.sid_port = SI_PORT(minor(st.st_rdev));
-#else
-		errx(1, "Sorry, code missing to parse device name into card/port");
-#endif
+		n = sscanf(Devname, "%d:%d", &card, &port);
+		if (n != 2)
+			errx(1, "Devname must be in form card:port.  eg: 0:7");
+		dev.sid_card = card;
+		dev.sid_port = port;
 		tc.tc_dev = dev;
 	}
 	ctlfd = opencontrol();