Constify a lot more items.

[libsigrok.git] / src / input / input.c

diff --git a/src/input/input.c b/src/input/input.c
index fa5a6f7c4f709e72dd6ab52697d35d54a019f148..9d471ca4fdad53612889036dec3d0c498d00c6df 100644 (file)
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -19,10 +19,6 @@
 
 #include <config.h>
 #include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <fcntl.h>
 #include <errno.h>
 #include <glib.h>
 #include <glib/gstdio.h>
@@ -246,7 +242,7 @@ SR_API struct sr_input *sr_input_new(const struct sr_input_module *imod,
                GHashTable *options)
 {
        struct sr_input *in;
-       struct sr_option *mod_opts;
+       const struct sr_option *mod_opts;
        const GVariantType *gvt;
        GHashTable *new_opts;
        GHashTableIter iter;
@@ -416,11 +412,11 @@ 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)
 {
+       int64_t filesize;
        FILE *stream;
        const struct sr_input_module *imod;
        GHashTable *meta;
        GString *header;
-       struct stat st;
        size_t count;
        unsigned int midx, i;
        int ret;
@@ -432,22 +428,18 @@ SR_API int sr_input_scan_file(const char *filename, const struct sr_input **in)
                sr_err("Invalid filename.");
                return SR_ERR_ARG;
        }
-
-       if (!g_file_test(filename, G_FILE_TEST_EXISTS)) {
-               sr_err("No such file.");
-               return SR_ERR_ARG;
-       }
-
-       if (stat(filename, &st) < 0) {
-               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;
        }
+       filesize = sr_file_get_size(stream);
+       if (filesize < 0) {
+               sr_err("Failed to get size of %s: %s",
+                       filename, g_strerror(errno));
+               fclose(stream);
+               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);
@@ -465,7 +457,7 @@ SR_API int sr_input_scan_file(const char *filename, const struct sr_input **in)
        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));
+                       GSIZE_TO_POINTER(MIN(filesize, G_MAXSSIZE)));
        g_hash_table_insert(meta, GINT_TO_POINTER(SR_INPUT_META_HEADER),
                        header);
        midx = 0;