* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include <config.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <string.h>
#include <glib.h>
#include "sigrok-cli.h"
-#include "config.h"
#define BUFSIZE (16 * 1024)
g_hash_table_destroy(mod_args);
if ((fd = open(opt_input_file, O_RDONLY)) == -1)
g_critical("Failed to load %s: %s.", opt_input_file,
- strerror(errno));
+ g_strerror(errno));
} else {
if (strcmp(opt_input_file, "-")) {
/*
} else {
if ((fd = open(opt_input_file, O_RDONLY)) == -1)
g_critical("Failed to load %s: %s.", opt_input_file,
- strerror(errno));
+ g_strerror(errno));
}
if ((len = read(fd, buf->str, BUFSIZE)) < 1)
g_critical("Failed to read %s: %s.", opt_input_file,
- strerror(errno));
+ g_strerror(errno));
buf->len = len;
sr_input_scan_buffer(buf, &in);
}
g_string_truncate(buf, 0);
len = read(fd, buf->str, BUFSIZE);
if (len < 0)
- g_critical("Read failed: %s", strerror(errno));
+ g_critical("Read failed: %s", g_strerror(errno));
if (len == 0)
/* End of file or stream. */
break;
struct sr_session *session;
struct sr_dev_inst *sdi;
GSList *devices;
+ GMainLoop *main_loop;
int ret;
if (!strcmp(opt_input_file, "-")) {
ret = sr_session_dev_list(session, &devices);
if (ret != SR_OK || !devices || !devices->data) {
g_critical("Failed to access session device.");
+ g_slist_free(devices);
sr_session_destroy(session);
return;
}
sdi = devices->data;
+ g_slist_free(devices);
if (select_channels(sdi) != SR_OK) {
sr_session_destroy(session);
return;
}
+ main_loop = g_main_loop_new(NULL, FALSE);
+
sr_session_datafeed_callback_add(session, datafeed_in, NULL);
- sr_session_start(session);
- sr_session_run(session);
- sr_session_stop(session);
+ sr_session_stopped_callback_set(session,
+ (sr_session_stopped_callback)g_main_loop_quit,
+ main_loop);
+ if (sr_session_start(session) == SR_OK)
+ g_main_loop_run(main_loop);
+
+ g_main_loop_unref(main_loop);
+ sr_session_destroy(session);
} else if (ret != SR_ERR) {
/* It's a session file, but it didn't work out somehow. */
g_critical("Failed to load session file.");