From owner-svn-src-all@FreeBSD.ORG  Wed Jul 24 22:43:41 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 3375BAAD;
 Wed, 24 Jul 2013 22:43:41 +0000 (UTC)
 (envelope-from jimharris@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 205AA200C;
 Wed, 24 Jul 2013 22:43:41 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6OMhe6r037297;
 Wed, 24 Jul 2013 22:43:40 GMT
 (envelope-from jimharris@svn.freebsd.org)
Received: (from jimharris@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6OMheBd037294;
 Wed, 24 Jul 2013 22:43:40 GMT
 (envelope-from jimharris@svn.freebsd.org)
Message-Id: <201307242243.r6OMheBd037294@svn.freebsd.org>
From: Jim Harris <jimharris@FreeBSD.org>
Date: Wed, 24 Jul 2013 22:43:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r253628 - stable/9/sbin/nvmecontrol
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 24 Jul 2013 22:43:41 -0000

Author: jimharris
Date: Wed Jul 24 22:43:40 2013
New Revision: 253628
URL: http://svnweb.freebsd.org/changeset/base/253628

Log:
  MFC r253459:
  
    Use _PATH_DEV (from paths.h) for the "/dev/" string, rather than
    hard-coding it.
  
  Approved by:	re (kib)
  Sponsored by:	Intel

Modified:
  stable/9/sbin/nvmecontrol/devlist.c
  stable/9/sbin/nvmecontrol/nvmecontrol.c
Directory Properties:
  stable/9/sbin/nvmecontrol/   (props changed)

Modified: stable/9/sbin/nvmecontrol/devlist.c
==============================================================================
--- stable/9/sbin/nvmecontrol/devlist.c	Wed Jul 24 22:42:00 2013	(r253627)
+++ stable/9/sbin/nvmecontrol/devlist.c	Wed Jul 24 22:43:40 2013	(r253628)
@@ -32,6 +32,7 @@ __FBSDID("$FreeBSD$");
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <paths.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -82,7 +83,7 @@ devlist(int argc, char *argv[])
 
 		if (ret != 0) {
 			if (ret == EACCES) {
-				warnx("could not open /dev/%s\n", name);
+				warnx("could not open "_PATH_DEV"%s\n", name);
 				continue;
 			} else
 				break;

Modified: stable/9/sbin/nvmecontrol/nvmecontrol.c
==============================================================================
--- stable/9/sbin/nvmecontrol/nvmecontrol.c	Wed Jul 24 22:42:00 2013	(r253627)
+++ stable/9/sbin/nvmecontrol/nvmecontrol.c	Wed Jul 24 22:43:40 2013	(r253628)
@@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$");
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <paths.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdio.h>
@@ -175,7 +176,7 @@ open_dev(const char *str, int *fd, int s
 			return (EINVAL);
 	}
 
-	snprintf(full_path, sizeof(full_path), "/dev/%s", str);
+	snprintf(full_path, sizeof(full_path), _PATH_DEV"%s", str);
 	*fd = open(full_path, O_RDWR);
 	if (*fd < 0) {
 		if (show_error)