ECC-2167 added test + absolute offset

Author: danovaro

src/eccodes/grib_io.cc

@@ -868,7 +868,7 @@ static int ecc_read_any(reader* r, int no_alloc, int grib_ok, int bufr_ok, int h
     unsigned char c;
     int err             = 0;
     unsigned long magic = 0;
-    size_t offset = 0;
+    off_t offset        = r->offset;
 
     while (r->read(r->read_data, &c, 1, &err) == 1 && err == 0) {
         offset++;
@@ -1192,7 +1192,7 @@ static int ecc_wmo_read_any_from_file(FILE* f, void* buffer, size_t* len, off_t*
     r.seek            = &stdio_seek;
     r.seek_from_start = &stdio_seek_from_start;
     r.tell            = &stdio_tell;
-    r.offset          = 0;
+    r.offset          = *offset;
     r.message_size    = 0;
 
     err  = read_any(&r, no_alloc, grib_ok, bufr_ok, hdf5_ok, wrap_ok);

tests/CMakeLists.txt

@@ -13,6 +13,7 @@ list(APPEND test_c_bins
     wmo_read_bufr_from_file
     wmo_read_gts_from_file
     wmo_read_any_from_file
+    wmo_read_any_from_file_offset
     wmo_read_any_from_stream
     grib_bpv_limit
     grib_double_cmp
@@ -219,6 +220,7 @@ if( HAVE_BUILD_TOOLS )
         wmo_read_bufr_from_file
         wmo_read_gts_from_file
         wmo_read_any_from_file
+        wmo_read_any_from_file_offset
         wmo_read_any_from_stream
         bufr_templates
         bufr_rdbSubTypes

tests/wmo_read_any_from_file_offset.cc

@@ -0,0 +1,56 @@
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include <stdio.h>
+
+#include "grib_api_internal.h"
+
+#define SIZE 1024 * 1024
+char buffer[SIZE];
+
+int test_next(FILE* in, size_t* len, off_t offset_expected, off_t* offset) // , size_t* previous_end_of_message)
+{
+    *len = SIZE;
+
+    int err = wmo_read_any_from_file_offset(in, buffer, len, offset);
+    if (err == GRIB_END_OF_FILE && *len == 0)
+        printf("end of file\n");
+
+    ECCODES_ASSERT(*offset == offset_expected);
+
+    // *previous_end_of_message = *offset + *len;
+    *offset += *len;
+
+    return err;
+}
+
+int main(int argc, char** argv)
+{
+    int err = 0;
+    FILE* in = NULL;
+    size_t len = SIZE;
+
+    if (argc != 2) return 1;
+
+    in = fopen(argv[1], "r");
+    if (!in) return 1;
+
+    off_t offset = 0;
+    // size_t previous_end_of_message = 0;
+
+    err = test_next(in, &len, 5, &offset); // , &previous_end_of_message);
+    err = test_next(in, &len, 14161, &offset); // , &previous_end_of_message);
+    err = test_next(in, &len, 27581, &offset); // , &previous_end_of_message);
+    err = test_next(in, &len, 27689, &offset); // , &previous_end_of_message);
+    err = test_next(in, &len, 42133, &offset); // , &previous_end_of_message);
+    err = test_next(in, &len, 43333, &offset); // , &previous_end_of_message);
+
+    return err;
+}

tests/wmo_read_any_from_file_offset.sh

@@ -0,0 +1,24 @@
+#!/bin/sh
+# (C) Copyright 2005- ECMWF.
+#
+# This software is licensed under the terms of the Apache Licence Version 2.0
+# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+# 
+# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+#
+
+. ./include.ctest.sh
+
+label="wmo_read_any_from_file_offset_test"
+tempText=temp.$label.txt
+
+if [ $ECCODES_ON_WINDOWS -eq 1 ]; then
+    echo "$0: This test is currently disabled on Windows"
+    exit 0
+fi
+
+${test_dir}/wmo_read_any_from_file_offset $data_dir/pad.grib
+
+# Clean up
+rm -f $tempText