resource: Also check $SIGROK_FIRMWARE_DIR for firmware files.

[libsigrok.git] / src / resource.c

diff --git a/src/resource.c b/src/resource.c
index c87e7be0b7bc2626f2c61d6d0f3ed3edd8f4ae4b..ec32a4420f7755de5c5491047a756c59d56d3ba7 100644 (file)
--- a/src/resource.c
+++ b/src/resource.c
@@ -102,9 +102,9 @@ static int resource_open_default(struct sr_resource *res,
 #ifdef FIRMWARE_DIR
        const char *builtindir;
 #endif
-       const char *subdir;
+       const char *subdir, *env;
        const char *const *datadirs;
-       FILE *file;
+       FILE *file = NULL;
 
        (void)cb_data;
 
@@ -120,7 +120,15 @@ static int resource_open_default(struct sr_resource *res,
                return SR_ERR_ARG;
        }
 
-       file = try_open_file(g_get_user_data_dir(), subdir, name);
+       env = g_getenv("SIGROK_FIRMWARE_DIR");
+       if (!env)
+               sr_dbg("SIGROK_FIRMWARE_DIR environment variable not set, ignoring.");
+       else
+               file = try_open_file(env, "", name);
+
+       if (!file)
+               file = try_open_file(g_get_user_data_dir(), subdir, name);
+
        /*
         * Scan the hard-coded directory before the system directories to
         * avoid picking up possibly outdated files from a system install.
@@ -135,7 +143,7 @@ static int resource_open_default(struct sr_resource *res,
                        file = try_open_file(*datadirs++, subdir, name);
        }
        if (!file) {
-               sr_err("Failed to locate '%s'.", name);
+               sr_dbg("Failed to locate '%s'.", name);
                return SR_ERR;
        }
 
@@ -266,7 +274,8 @@ SR_PRIV int sr_resource_open(struct sr_context *ctx,
        ret = (*ctx->resource_open_cb)(res, name, ctx->resource_cb_data);
 
        if (ret != SR_OK)
-               sr_err("Failed to open resource '%s'.", name);
+               sr_err("Failed to open resource '%s' (use loglevel 5/spew for"
+                      " details).", name);
 
        return ret;
 }