X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fresource.c;h=ec32a4420f7755de5c5491047a756c59d56d3ba7;hb=bbcffe51d29343f7648e1e2f3b925dd571984bd3;hp=bcb7a19146b59ef7ca6ea70372ae7a377d04d076;hpb=7d89fd60e5bce5bbb3271a5ecd54c3c6c63dc6bf;p=libsigrok.git

diff --git a/src/resource.c b/src/resource.c
index bcb7a191..ec32a442 100644
--- a/src/resource.c
+++ b/src/resource.c
@@ -99,15 +99,20 @@ static int resource_open_default(struct sr_resource *res,
 		const char *name, void *cb_data)
 {
 	int64_t filesize;
-	const char *builtindir, *subdir;
+#ifdef FIRMWARE_DIR
+	const char *builtindir;
+#endif
+	const char *subdir, *env;
 	const char *const *datadirs;
-	FILE *file;
+	FILE *file = NULL;
 
 	(void)cb_data;
 
 	switch (res->type) {
 	case SR_RESOURCE_FIRMWARE:
+#ifdef FIRMWARE_DIR
 		builtindir = FIRMWARE_DIR;
+#endif
 		subdir = "sigrok-firmware";
 		break;
 	default:
@@ -115,21 +120,30 @@ 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.
 	 */
+#ifdef FIRMWARE_DIR
 	if (!file)
 		file = try_open_file(builtindir, "", name);
-
+#endif
 	if (!file) {
 		datadirs = g_get_system_data_dirs();
 		while (*datadirs && !file)
 			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;
 	}
 
@@ -167,7 +181,7 @@ static int resource_close_default(struct sr_resource *res, void *cb_data)
 	return SR_OK;
 }
 
-static ssize_t resource_read_default(const struct sr_resource *res,
+static gssize resource_read_default(const struct sr_resource *res,
 		void *buf, size_t count, void *cb_data)
 {
 	FILE *file;
@@ -180,7 +194,7 @@ static ssize_t resource_read_default(const struct sr_resource *res,
 		sr_err("%s: invalid handle.", __func__);
 		return SR_ERR_ARG;
 	}
-	if (count > SSIZE_MAX) {
+	if (count > G_MAXSSIZE) {
 		sr_err("%s: count %zu too large.", __func__, count);
 		return SR_ERR_ARG;
 	}
@@ -218,15 +232,15 @@ SR_API int sr_resource_set_hooks(struct sr_context *ctx,
 		return SR_ERR_ARG;
 	}
 	if (open_cb && close_cb && read_cb) {
-		ctx->resource_open_cb  = open_cb;
+		ctx->resource_open_cb = open_cb;
 		ctx->resource_close_cb = close_cb;
-		ctx->resource_read_cb  = read_cb;
-		ctx->resource_cb_data  = cb_data;
+		ctx->resource_read_cb = read_cb;
+		ctx->resource_cb_data = cb_data;
 	} else if (!open_cb && !close_cb && !read_cb) {
-		ctx->resource_open_cb  = &resource_open_default;
+		ctx->resource_open_cb = &resource_open_default;
 		ctx->resource_close_cb = &resource_close_default;
-		ctx->resource_read_cb  = &resource_read_default;
-		ctx->resource_cb_data  = ctx;
+		ctx->resource_read_cb = &resource_read_default;
+		ctx->resource_cb_data = ctx;
 	} else {
 		sr_err("%s: inconsistent callback pointers.", __func__);
 		return SR_ERR_ARG;
@@ -260,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;
 }
@@ -303,10 +318,10 @@ SR_PRIV int sr_resource_close(struct sr_context *ctx, struct sr_resource *res)
  *
  * @private
  */
-SR_PRIV ssize_t sr_resource_read(struct sr_context *ctx,
+SR_PRIV gssize sr_resource_read(struct sr_context *ctx,
 		const struct sr_resource *res, void *buf, size_t count)
 {
-	ssize_t n_read;
+	gssize n_read;
 
 	n_read = (*ctx->resource_read_cb)(res, buf, count,
 			ctx->resource_cb_data);
@@ -326,7 +341,7 @@ SR_PRIV ssize_t sr_resource_read(struct sr_context *ctx,
  * @param max_size Size limit. Error out if the resource is larger than this.
  *
  * @return A buffer containing the resource data, or NULL on failure. Must
- *  be freed by the caller using g_free().
+ *         be freed by the caller using g_free().
  *
  * @private
  */
@@ -335,7 +350,8 @@ SR_PRIV void *sr_resource_load(struct sr_context *ctx,
 {
 	struct sr_resource res;
 	void *buf;
-	ssize_t n_read;
+	size_t res_size;
+	gssize n_read;
 
 	if (sr_resource_open(ctx, &res, type, name) != SR_OK)
 		return NULL;
@@ -346,17 +362,19 @@ SR_PRIV void *sr_resource_load(struct sr_context *ctx,
 		sr_resource_close(ctx, &res);
 		return NULL;
 	}
-	buf = g_try_malloc(res.size);
+	res_size = res.size;
+
+	buf = g_try_malloc(res_size);
 	if (!buf) {
 		sr_err("Failed to allocate buffer for '%s'.", name);
 		sr_resource_close(ctx, &res);
 		return NULL;
 	}
 
-	n_read = sr_resource_read(ctx, &res, buf, res.size);
+	n_read = sr_resource_read(ctx, &res, buf, res_size);
 	sr_resource_close(ctx, &res);
 
-	if (n_read < 0 || (size_t)n_read != res.size) {
+	if (n_read < 0 || (size_t)n_read != res_size) {
 		if (n_read >= 0)
 			sr_err("Failed to read '%s': premature end of file.",
 				name);
@@ -364,7 +382,7 @@ SR_PRIV void *sr_resource_load(struct sr_context *ctx,
 		return NULL;
 	}
 
-	*size = res.size;
+	*size = res_size;
 	return buf;
 }