X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Foutput%2Fsrzip.c;h=2d2ce720d1f338edb23d04e04f25d48ee5288295;hb=de285cce11aca3afd0d4adfdd514c691e6a71c64;hp=18a79d5b50b15403319af4c916340c819113ee84;hpb=3250d8c7e05f2d6a3ffbdf2499af8a13fa99fe39;p=libsigrok.git

diff --git a/src/output/srzip.c b/src/output/srzip.c
index 18a79d5b..2d2ce720 100644
--- a/src/output/srzip.c
+++ b/src/output/srzip.c
@@ -17,6 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
@@ -24,7 +25,7 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <zip.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "output/srzip"
@@ -39,11 +40,16 @@ static int init(struct sr_output *o, GHashTable *options)
 {
 	struct out_context *outc;
 
+	(void)options;
+
+	if (strlen(o->filename) == 0) {
+		sr_info("srzip output module requires a file name, cannot save.");
+		return SR_ERR_ARG;
+	}
+
 	outc = g_malloc0(sizeof(struct out_context));
+	outc->filename = g_strdup(o->filename);
 	o->priv = outc;
-	outc->filename = g_strdup(g_variant_get_string(g_hash_table_lookup(options, "filename"), NULL));
-	if (strlen(outc->filename) == 0)
-		return SR_ERR_ARG;
 
 	return SR_OK;
 }
@@ -91,7 +97,7 @@ static int zip_create(const struct sr_output *o)
 	close(tmpfile);
 	meta = g_fopen(metafile, "wb");
 	fprintf(meta, "[global]\n");
-	fprintf(meta, "sigrok version = %s\n", PACKAGE_VERSION);
+	fprintf(meta, "sigrok version = %s\n", SR_PACKAGE_VERSION_STRING);
 	fprintf(meta, "[device 1]\ncapturefile = logic-1\n");
 	fprintf(meta, "total probes = %d\n", g_slist_length(o->sdi->channels));
 	s = sr_samplerate_string(outc->samplerate);
@@ -181,7 +187,7 @@ static int zip_append(const struct sr_output *o, unsigned char *buf,
 		if ((tmpfile = g_mkstemp(tmpname)) == -1)
 			return SR_ERR;
 		if (write(tmpfile, metafile, len) < 0) {
-			sr_dbg("Failed to create new metadata: %s", strerror(errno));
+			sr_dbg("Failed to create new metadata: %s", g_strerror(errno));
 			g_free(metafile);
 			unlink(tmpname);
 			return SR_ERR;
@@ -296,7 +302,6 @@ static int cleanup(struct sr_output *o)
 }
 
 static struct sr_option options[] = {
-	{ "filename", "Filename", "File to write", NULL, NULL },
 	ALL_ZERO
 };
 
@@ -312,9 +317,10 @@ SR_PRIV struct sr_output_module output_srzip = {
 	.id = "srzip",
 	.name = "srzip",
 	.desc = "srzip session file",
+	.exts = (const char*[]){"sr", NULL},
+	.flags = SR_OUTPUT_INTERNAL_IO_HANDLING,
 	.options = get_options,
 	.init = init,
 	.receive = receive,
 	.cleanup = cleanup,
 };
-