Use g_strerror() in favor of strerror().

[sigrok-cli.git] / input.c

diff --git a/input.c b/input.c
index b81e84b47a5ab94541636dc02008aa256add3608..a4206e0e220bde32803566e56dfc73b4b617a976 100644 (file)
--- a/input.c
+++ b/input.c
@@ -17,8 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sigrok-cli.h"
-#include "config.h"
+#include <config.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -27,8 +26,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
+#include "sigrok-cli.h"
 
-#define BUFSIZE 16384
+#define BUFSIZE (16 * 1024)
 
 static void load_input_file_module(void)
 {
@@ -74,7 +74,7 @@ static void load_input_file_module(void)
                        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, "-")) {
                        /*
@@ -96,26 +96,26 @@ static void load_input_file_module(void)
                        } 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);
                }
                if (!in)
                        g_critical("Error: no input module found for this file.");
        }
-       sr_session_new(&session);
+       sr_session_new(sr_ctx, &session);
        sr_session_datafeed_callback_add(session, &datafeed_in, NULL);
 
        got_sdi = FALSE;
-       while(TRUE) {
+       while (TRUE) {
                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;
@@ -124,7 +124,7 @@ static void load_input_file_module(void)
                        break;
 
                sdi = sr_input_dev_inst_get(in);
-               if(!got_sdi && sdi) {
+               if (!got_sdi && sdi) {
                        /* First time we got a valid sdi. */
                        if (select_channels(sdi) != SR_OK)
                                return;
@@ -135,7 +135,6 @@ static void load_input_file_module(void)
                        }
                        got_sdi = TRUE;
                }
-
        }
        sr_input_end(in);
        sr_input_free(in);
@@ -152,25 +151,34 @@ void load_input_file(void)
        GSList *devices;
        int ret;
 
-       if (strcmp(opt_input_file, "-") && sr_session_load(opt_input_file, &session) == SR_OK) {
-               /* sigrok session file */
-               ret = sr_session_dev_list(session, &devices);
-               if (ret != SR_OK || !devices->data) {
-                       g_critical("Failed to access session device.");
-                       sr_session_destroy(session);
-                       return;
-               }
-               sdi = devices->data;
-               if (select_channels(sdi) != SR_OK) {
-                       sr_session_destroy(session);
-                       return;
-               }
-               sr_session_datafeed_callback_add(session, datafeed_in, NULL);
-               sr_session_start(session);
-               sr_session_run(session);
-               sr_session_stop(session);
-       } else {
-               /* fall back on input modules */
+       if (!strcmp(opt_input_file, "-")) {
+               /* Input from stdin is never a session file. */
                load_input_file_module();
+       } else {
+               if ((ret = sr_session_load(sr_ctx, opt_input_file,
+                               &session)) == SR_OK) {
+                       /* sigrok session file */
+                       ret = sr_session_dev_list(session, &devices);
+                       if (ret != SR_OK || !devices || !devices->data) {
+                               g_critical("Failed to access session device.");
+                               sr_session_destroy(session);
+                               return;
+                       }
+                       sdi = devices->data;
+                       if (select_channels(sdi) != SR_OK) {
+                               sr_session_destroy(session);
+                               return;
+                       }
+                       sr_session_datafeed_callback_add(session, datafeed_in, NULL);
+                       sr_session_start(session);
+                       sr_session_run(session);
+                       sr_session_stop(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.");
+               } else {
+                       /* Fall back on input modules. */
+                       load_input_file_module();
+               }
        }
 }