X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Finput%2Finput.c;h=fa5a6f7c4f709e72dd6ab52697d35d54a019f148;hb=5e364d4fe0b6367717d7dcf3389685b8fe985211;hp=3c1d2beb7c6beb1903066ec2a9731c39b80d9ed6;hpb=c7bc82ffa1b09a228a8395049e2b691cd7bd85f8;p=libsigrok.git

diff --git a/src/input/input.c b/src/input/input.c
index 3c1d2beb..fa5a6f7c 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -17,16 +17,21 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
-#include "libsigrok.h"
+#include <glib.h>
+#include <glib/gstdio.h>
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
+/** @cond PRIVATE */
 #define LOG_PREFIX "input"
+/** @endcond */
 
 /**
  * @file
@@ -89,14 +94,14 @@ SR_API const struct sr_input_module **sr_input_list(void)
  *
  * @since 0.4.0
  */
-SR_API const char *sr_input_id_get(const struct sr_input_module *o)
+SR_API const char *sr_input_id_get(const struct sr_input_module *imod)
 {
-	if (!o) {
+	if (!imod) {
 		sr_err("Invalid input module NULL!");
 		return NULL;
 	}
 
-	return o->id;
+	return imod->id;
 }
 
 /**
@@ -104,14 +109,14 @@ SR_API const char *sr_input_id_get(const struct sr_input_module *o)
  *
  * @since 0.4.0
  */
-SR_API const char *sr_input_name_get(const struct sr_input_module *o)
+SR_API const char *sr_input_name_get(const struct sr_input_module *imod)
 {
-	if (!o) {
+	if (!imod) {
 		sr_err("Invalid input module NULL!");
 		return NULL;
 	}
 
-	return o->name;
+	return imod->name;
 }
 
 /**
@@ -119,14 +124,14 @@ SR_API const char *sr_input_name_get(const struct sr_input_module *o)
  *
  * @since 0.4.0
  */
-SR_API const char *sr_input_description_get(const struct sr_input_module *o)
+SR_API const char *sr_input_description_get(const struct sr_input_module *imod)
 {
-	if (!o) {
+	if (!imod) {
 		sr_err("Invalid input module NULL!");
 		return NULL;
 	}
 
-	return o->desc;
+	return imod->desc;
 }
 
 /**
@@ -138,14 +143,14 @@ SR_API const char *sr_input_description_get(const struct sr_input_module *o)
  * @since 0.4.0
  */
 SR_API const char *const *sr_input_extensions_get(
-		const struct sr_input_module *o)
+		const struct sr_input_module *imod)
 {
-	if (!o) {
+	if (!imod) {
 		sr_err("Invalid input module NULL!");
 		return NULL;
 	}
 
-	return o->exts;
+	return imod->exts;
 }
 
 /**
@@ -231,7 +236,7 @@ SR_API void sr_input_options_free(const struct sr_option **options)
  *
  * @param imod The input module to use. Must not be NULL.
  * @param options GHashTable consisting of keys corresponding with
- * the module options \c id field. The values should be GVariant
+ * the module options @c id field. The values should be GVariant
  * pointers with sunk references, of the same GVariantType as the option's
  * default value.
  *
@@ -261,7 +266,8 @@ SR_API struct sr_input *sr_input_new(const struct sr_input_module *imod,
 				/* Option not given: insert the default value. */
 				gvt = g_variant_get_type(mod_opts[i].def);
 				if (!g_variant_is_of_type(value, gvt)) {
-					sr_err("Invalid type for '%s' option.", key);
+					sr_err("Invalid type for '%s' option.",
+						(char *)key);
 					g_free(in);
 					return NULL;
 				}
@@ -279,7 +285,8 @@ SR_API struct sr_input *sr_input_new(const struct sr_input_module *imod,
 			g_hash_table_iter_init(&iter, options);
 			while (g_hash_table_iter_next(&iter, &key, &value)) {
 				if (!g_hash_table_lookup(new_opts, key)) {
-					sr_err("Input module '%s' has no option '%s'", imod->id, key);
+					sr_err("Input module '%s' has no option '%s'",
+						imod->id, (char *)key);
 					g_hash_table_destroy(new_opts);
 					g_free(in);
 					return NULL;
@@ -409,14 +416,17 @@ SR_API int sr_input_scan_buffer(GString *buf, const struct sr_input **in)
  */
 SR_API int sr_input_scan_file(const char *filename, const struct sr_input **in)
 {
+	FILE *stream;
 	const struct sr_input_module *imod;
 	GHashTable *meta;
-	GString *header_buf;
+	GString *header;
 	struct stat st;
-	unsigned int midx, m, i;
-	int fd, ret;
-	ssize_t size;
-	uint8_t mitem, avail_metadata[8];
+	size_t count;
+	unsigned int midx, i;
+	int ret;
+	uint8_t avail_metadata[8];
+
+	*in = NULL;
 
 	if (!filename || !filename[0]) {
 		sr_err("Invalid filename.");
@@ -429,22 +439,45 @@ SR_API int sr_input_scan_file(const char *filename, const struct sr_input **in)
 	}
 
 	if (stat(filename, &st) < 0) {
-		sr_err("%s", strerror(errno));
+		sr_err("%s", g_strerror(errno));
 		return SR_ERR_ARG;
 	}
 
+	stream = g_fopen(filename, "rb");
+	if (!stream) {
+		sr_err("Failed to open %s: %s", filename, g_strerror(errno));
+		return SR_ERR;
+	}
+	/* This actually allocates 256 bytes to allow for NUL termination. */
+	header = g_string_sized_new(255);
+	count = fread(header->str, 1, header->allocated_len - 1, stream);
+
+	if (count != header->allocated_len - 1 && ferror(stream)) {
+		sr_err("Failed to read %s: %s", filename, g_strerror(errno));
+		fclose(stream);
+		g_string_free(header, TRUE);
+		return SR_ERR;
+	}
+	fclose(stream);
+	g_string_set_size(header, count);
+
+	meta = g_hash_table_new(NULL, NULL);
+	g_hash_table_insert(meta, GINT_TO_POINTER(SR_INPUT_META_FILENAME),
+			(char *)filename);
+	g_hash_table_insert(meta, GINT_TO_POINTER(SR_INPUT_META_FILESIZE),
+			GSIZE_TO_POINTER(st.st_size));
+	g_hash_table_insert(meta, GINT_TO_POINTER(SR_INPUT_META_HEADER),
+			header);
 	midx = 0;
 	avail_metadata[midx++] = SR_INPUT_META_FILENAME;
 	avail_metadata[midx++] = SR_INPUT_META_FILESIZE;
 	avail_metadata[midx++] = SR_INPUT_META_HEADER;
+	avail_metadata[midx] = 0;
 	/* TODO: MIME type */
 
-	*in = NULL;
 	ret = SR_ERR;
-	header_buf = g_string_sized_new(128);
-	for (i = 0; input_module_list[i]; i++) {
-		g_string_truncate(header_buf, 0);
 
+	for (i = 0; input_module_list[i]; i++) {
 		imod = input_module_list[i];
 		if (!imod->metadata[0]) {
 			/* Module has no metadata for matching so will take
@@ -455,60 +488,24 @@ SR_API int sr_input_scan_file(const char *filename, const struct sr_input **in)
 			/* Cannot satisfy this module's requirements. */
 			continue;
 
-		meta = g_hash_table_new(NULL, NULL);
-		for (m = 0; m < sizeof(imod->metadata); m++) {
-			mitem = imod->metadata[m] & ~SR_INPUT_META_REQUIRED;
-			if (!mitem)
-				/* Metadata list is 0-terminated. */
-				break;
-			if (mitem == SR_INPUT_META_FILENAME) {
-				g_hash_table_insert(meta, GINT_TO_POINTER(mitem),
-						(gpointer)filename);
-			} else if (mitem == SR_INPUT_META_FILESIZE) {
-				g_hash_table_insert(meta, GINT_TO_POINTER(mitem),
-						GINT_TO_POINTER(st.st_size));
-			} else if (mitem == SR_INPUT_META_HEADER) {
-				if ((fd = open(filename, O_RDONLY)) < 0) {
-					sr_err("%s", strerror(errno));
-					return SR_ERR;
-				}
-				size = read(fd, header_buf->str, 128);
-				header_buf->len = size;
-				close(fd);
-				if (size <= 0) {
-					g_string_free(header_buf, TRUE);
-					sr_err("%s", strerror(errno));
-					return SR_ERR;
-				}
-				g_hash_table_insert(meta, GINT_TO_POINTER(mitem), header_buf);
-			}
-		}
-		if (g_hash_table_size(meta) == 0) {
-			/* No metadata for this module, so there's no way it
-			 * can match. */
-			g_hash_table_destroy(meta);
-			continue;
-		}
-		sr_spew("Trying module %s.", imod->id);
+		sr_dbg("Trying module %s.", imod->id);
+
 		ret = imod->format_match(meta);
-		g_hash_table_destroy(meta);
-		if (ret == SR_ERR_DATA) {
-			/* Module recognized this buffer, but cannot handle it. */
-			break;
-		} else if (ret == SR_ERR) {
+		if (ret == SR_ERR) {
 			/* Module didn't recognize this buffer. */
 			continue;
 		} else if (ret != SR_OK) {
-			/* Can be SR_ERR_NA. */
-			return ret;
+			/* Module recognized this buffer, but cannot handle it. */
+			break;
 		}
-
 		/* Found a matching module. */
-		sr_spew("Module %s matched.", imod->id);
+		sr_dbg("Module %s matched.", imod->id);
+
 		*in = sr_input_new(imod, NULL);
 		break;
 	}
-	g_string_free(header_buf, TRUE);
+	g_hash_table_destroy(meta);
+	g_string_free(header, TRUE);
 
 	return ret;
 }
@@ -547,7 +544,8 @@ SR_API struct sr_dev_inst *sr_input_dev_inst_get(const struct sr_input *in)
  */
 SR_API int sr_input_send(const struct sr_input *in, GString *buf)
 {
-	sr_spew("Sending %d bytes to %s module.", buf->len, in->module->id);
+	sr_spew("Sending %" G_GSIZE_FORMAT " bytes to %s module.",
+		buf->len, in->module->id);
 	return in->module->receive((struct sr_input *)in, buf);
 }
 
@@ -581,12 +579,12 @@ SR_API void sr_input_free(const struct sr_input *in)
 		sr_dev_inst_free(in->sdi);
 	if (in->buf->len > 64) {
 		/* That seems more than just some sub-unitsize leftover... */
-		sr_warn("Found %d unprocessed bytes at free time.", in->buf->len);
+		sr_warn("Found %" G_GSIZE_FORMAT
+			" unprocessed bytes at free time.", in->buf->len);
 	}
 	g_string_free(in->buf, TRUE);
 	g_free(in->priv);
 	g_free((gpointer)in);
 }
 
-
 /** @} */