X-Git-Url: http://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=session.c;h=b4ff3ffd9645abcd0fc081fae5e2f996bca9bcf0;hp=983d4841af7e3a2cce5960d85ac7dad72b3406ec;hb=5899178d2d92d12bb8bed7e6b874ea778b7329c2;hpb=3d24ca2da53f03585db396e67252a7dcd9e67e6e
diff --git a/session.c b/session.c
index 983d484..b4ff3ff 100644
--- a/session.c
+++ b/session.c
@@ -17,15 +17,14 @@
* along with this program. If not, see .
*/
-#include "sigrok-cli.h"
#include
#include
#include
#include
+#include "sigrok-cli.h"
static uint64_t limit_samples = 0;
static uint64_t limit_frames = 0;
-static char *srzip_and_filename = NULL;
#ifdef HAVE_SRD
extern struct srd_session *srd_sess;
@@ -53,7 +52,7 @@ static int set_limit_time(const struct sr_dev_inst *sdi)
}
} else if (config_key_has_cap(driver, sdi, NULL, SR_CONF_SAMPLERATE,
SR_CONF_GET | SR_CONF_SET)) {
- /* Convert to samples based on the samplerate. */
+ /* Convert to samples based on the samplerate. */
sr_config_get(driver, sdi, NULL, SR_CONF_SAMPLERATE, &gvar);
samplerate = g_variant_get_uint64(gvar);
g_variant_unref(gvar);
@@ -81,17 +80,13 @@ const struct sr_output *setup_output_format(const struct sr_dev_inst *sdi)
const struct sr_option **options;
const struct sr_output *o;
GHashTable *fmtargs, *fmtopts;
- int size;
char *fmtspec;
if (!opt_output_format) {
if (opt_output_file) {
- size = strlen(opt_output_file) + 32;
- srzip_and_filename = g_malloc(size);
- snprintf(srzip_and_filename, size, "srzip:filename=%s", opt_output_file);
- opt_output_format = srzip_and_filename;
+ opt_output_format = DEFAULT_OUTPUT_FORMAT_FILE;
} else {
- opt_output_format = DEFAULT_OUTPUT_FORMAT;
+ opt_output_format = DEFAULT_OUTPUT_FORMAT_NOFILE;
}
}
@@ -107,7 +102,8 @@ const struct sr_output *setup_output_format(const struct sr_dev_inst *sdi)
sr_output_options_free(options);
} else
fmtopts = NULL;
- o = sr_output_new(omod, fmtopts, sdi);
+ o = sr_output_new(omod, fmtopts, sdi, opt_output_file);
+
if (fmtopts)
g_hash_table_destroy(fmtopts);
g_hash_table_destroy(fmtargs);
@@ -171,7 +167,7 @@ void datafeed_in(const struct sr_dev_inst *sdi,
driver = sr_dev_inst_driver_get(sdi);
/* If the first packet to come in isn't a header, don't even try. */
- if (packet->type != SR_DF_HEADER && o == NULL)
+ if (packet->type != SR_DF_HEADER && !o)
return;
session = cb_data;
@@ -182,12 +178,26 @@ void datafeed_in(const struct sr_dev_inst *sdi,
g_critical("Failed to initialize output module.");
/* Set up backup analog output module. */
- oa = sr_output_new(sr_output_find("analog"), NULL, sdi);
-
- if (opt_output_file)
- outfile = g_fopen(opt_output_file, "wb");
- else
+ oa = sr_output_new(sr_output_find("analog"), NULL, sdi, NULL);
+
+ /*
+ * Don't open a file when using the "srzip" output format.
+ * The srzip output module does open/write/rename/close
+ * on its own. This is especially important on Windows since
+ * libzip (used by srzip) will try to rename a temporary
+ * ZIP file to the final *.sr filename as specified by
+ * the sigrok-cli user. However, on Windows file renames
+ * of files that are already opened by any process are not
+ * possible. Thus, we don't open the *.sr file here,
+ * but rather let srzip perform all file operations.
+ */
+ if (opt_output_file) {
+ /* Only open the file if output format != srzip. */
+ if (!g_str_has_prefix(opt_output_format, "srzip"))
+ outfile = g_fopen(opt_output_file, "wb");
+ } else {
outfile = stdout;
+ }
rcvd_samples_logic = rcvd_samples_analog = 0;
@@ -303,7 +313,7 @@ void datafeed_in(const struct sr_dev_inst *sdi,
break;
}
- if (o && outfile && !opt_pds) {
+ if (o && (outfile || g_str_has_prefix(opt_output_format, "srzip")) && !opt_pds) {
if (sr_output_send(o, packet, &out) == SR_OK) {
if (!out || (out->len == 0
&& !opt_output_format
@@ -330,11 +340,8 @@ void datafeed_in(const struct sr_dev_inst *sdi,
if (packet->type == SR_DF_END) {
g_debug("cli: Received SR_DF_END.");
- if (o) {
+ if (o)
sr_output_free(o);
- if (srzip_and_filename)
- g_free(srzip_and_filename);
- }
o = NULL;
sr_output_free(oa);
@@ -372,7 +379,7 @@ int opt_to_gvar(char *key, char *value, struct sr_config *src)
}
src->key = srci->key;
- if ((value == NULL || strlen(value) == 0) &&
+ if ((!value || strlen(value) == 0) &&
(srci->datatype != SR_T_BOOL)) {
g_critical("Option '%s' needs a value.", (char *)key);
return -1;