summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2016-03-23 04:18:57 +0000
committerimp <imp@FreeBSD.org>2016-03-23 04:18:57 +0000
commit6837b0bc3fda7f0a57c4ef6345e2e890b71e87fc (patch)
tree0f28d0ba9bb681ee39a919b529e285972d2aae46
parentf16f170e156f1cc5c2d9bbdf9bba2a4cc4ef9964 (diff)
downloadFreeBSD-src-6837b0bc3fda7f0a57c4ef6345e2e890b71e87fc.zip
FreeBSD-src-6837b0bc3fda7f0a57c4ef6345e2e890b71e87fc.tar.gz
Implement suggestion by jhb@ to have _PATH_FIRMWARE instead of hard
coding it to be "/usr/share/firmware".
-rw-r--r--include/paths.h1
-rw-r--r--usr.sbin/uathload/uathload.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/include/paths.h b/include/paths.h
index af18c26..3fa54dc 100644
--- a/include/paths.h
+++ b/include/paths.h
@@ -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"
diff --git a/usr.sbin/uathload/uathload.c b/usr.sbin/uathload/uathload.c
index ba2258f..50e9eb6 100644
--- a/usr.sbin/uathload/uathload.c
+++ b/usr.sbin/uathload/uathload.c
@@ -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);
OpenPOWER on IntegriCloud