svn commit: r297205 - in head: include usr.sbin/uathload

[Warner Losh]

Author: imp
Date: Wed Mar 23 04:18:57 2016
New Revision: 297205
URL: https://svnweb.freebsd.org/changeset/base/297205

Log:
  Implement suggestion by jhb@ to have _PATH_FIRMWARE instead of hard
  coding it to be "/usr/share/firmware".

Modified:
  head/include/paths.h
  head/usr.sbin/uathload/uathload.c

Modified: head/include/paths.h
==============================================================================
--- head/include/paths.h	Wed Mar 23 00:53:31 2016	(r297204)
+++ head/include/paths.h	Wed Mar 23 04:18:57 2016	(r297205)
@@ -56,6 +56,7 @@
 #define	_PATH_DRUM	"/dev/drum"
 #define	_PATH_ESDB	"/usr/share/i18n/esdb"
 #define	_PATH_ETC	"/etc"
+#define	_PATH_FIRMWARE	"/usr/share/firmware"
 #define	_PATH_FTPUSERS	"/etc/ftpusers"
 #define	_PATH_FWMEM	"/dev/fwmem"
 #define	_PATH_GBDE	"/sbin/gbde"

Modified: head/usr.sbin/uathload/uathload.c
==============================================================================
--- head/usr.sbin/uathload/uathload.c	Wed Mar 23 00:53:31 2016	(r297204)
+++ head/usr.sbin/uathload/uathload.c	Wed Mar 23 04:18:57 2016	(r297205)
@@ -143,7 +143,7 @@ main(int argc, char *argv[])
 	if (argc == 1)
 		fwname = argv[0];
 	else
-		fwname = "/usr/share/firmware/ar5523.bin";
+		fwname = _PATH_FIRMWARE "/ar5523.bin";
 	fw = open(fwname, O_RDONLY, 0);
 	if (fw < 0)
 		err(-1, "open(%s)", fwname);