Small fixes

Author: tarkah

crates/stone/src/payload/meta.rs

@@ -48,7 +48,7 @@ pub enum StonePayloadMetaDependency {
     #[strum(serialize = "sysbinary")]
     SystemBinary,
 
-    /// An emul32-compatible pkgconfig .pc dependency (lib32/*.pc)
+    /// An emul32-compatible pkgconfig .pc dependency (lib32*.pc)
     PkgConfig32,
 }
 

crates/stone/src/read/mod.rs

@@ -237,14 +237,14 @@ impl StoneDecodedPayload {
                         )?,
                     }),
                     StonePayloadKind::Content => {
-                        let offset = reader.stream_position()?;
-
                         // Skip past, these are read by user later
-                        reader.seek(SeekFrom::Current(header.stored_size as i64))?;
+                        let new_offset = reader.seek(SeekFrom::Current(header.stored_size as i64))?;
 
                         StoneDecodedPayload::Content(StonePayload {
                             header,
-                            body: StonePayloadContent { offset },
+                            body: StonePayloadContent {
+                                offset: (new_offset as i64 - header.stored_size as i64) as u64,
+                            },
                         })
                     }
                     StonePayloadKind::Dumb => unimplemented!("??"),

libstone/cbindgen.toml

@@ -12,7 +12,7 @@ prefix_with_name = true
 rename_variants = "ScreamingSnakeCase"
 
 [export]
-include = []
+include = ["STONE_HEADER_SIZE"]
 exclude = []
 
 [export.rename]

libstone/examples/read.c

@@ -330,7 +330,7 @@ size_t read_shim(void *fptr, char *buf, size_t n) {
   return fread(buf, 1, n, fptr);
 }
 
-uint64_t seek_shim(void *fptr, int64_t offset, StoneSeekFrom from) {
+int64_t seek_shim(void *fptr, int64_t offset, StoneSeekFrom from) {
   fseek(fptr, offset, from);
   return ftell(fptr);
 }

libstone/src/lib.rs

@@ -26,6 +26,8 @@ pub use self::payload::{
 
 mod payload;
 
+pub const STONE_HEADER_SIZE: usize = 32;
+
 pub type StoneReader<'a> = stone::StoneReader<StoneReadImpl<'a>>;
 pub type StonePayloadContentReader<'a> = stone::StonePayloadContentReader<'a, StoneReadImpl<'a>>;
 
@@ -115,13 +117,13 @@ enum StoneSeekFrom {
 #[repr(C)]
 pub struct StoneReadVTable {
     read: Option<unsafe extern "C" fn(*mut c_void, *mut c_char, usize) -> usize>,
-    seek: Option<unsafe extern "C" fn(*mut c_void, i64, StoneSeekFrom) -> u64>,
+    seek: Option<unsafe extern "C" fn(*mut c_void, i64, StoneSeekFrom) -> i64>,
 }
 
 pub struct StoneReadShim {
     data: *mut c_void,
     read: unsafe extern "C" fn(*mut c_void, *mut c_char, usize) -> usize,
-    seek: unsafe extern "C" fn(*mut c_void, i64, StoneSeekFrom) -> u64,
+    seek: unsafe extern "C" fn(*mut c_void, i64, StoneSeekFrom) -> i64,
 }
 
 impl Read for StoneReadShim {
@@ -138,7 +140,13 @@ impl Seek for StoneReadShim {
             std::io::SeekFrom::End(i) => (StoneSeekFrom::End, i),
         };
 
-        unsafe { Ok((self.seek)(self.data, offset, from)) }
+        let ret = unsafe { (self.seek)(self.data, offset, from) };
+
+        if ret < 0 {
+            Err(std::io::Error::new(std::io::ErrorKind::Other, ret.to_string()))
+        } else {
+            Ok(ret as u64)
+        }
     }
 }
 

libstone/src/payload.rs

@@ -25,11 +25,11 @@ impl StonePayload {
             return None;
         }
 
-        self.next_record += 1;
-
         let payload = self.decoded.layout()?;
         let record = payload.body.get(self.next_record)?;
 
+        self.next_record += 1;
+
         Some(record.into())
     }
 
@@ -38,11 +38,11 @@ impl StonePayload {
             return None;
         }
 
-        self.next_record += 1;
-
         let payload = self.decoded.meta()?;
         let record = payload.body.get(self.next_record)?;
 
+        self.next_record += 1;
+
         Some(record.into())
     }
 
@@ -51,11 +51,11 @@ impl StonePayload {
             return None;
         }
 
-        self.next_record += 1;
-
         let payload = self.decoded.index()?;
         let record = payload.body.get(self.next_record)?;
 
+        self.next_record += 1;
+
         Some(record.into())
     }
 
@@ -64,11 +64,11 @@ impl StonePayload {
             return None;
         }
 
-        self.next_record += 1;
-
         let payload = self.decoded.attributes()?;
         let record = payload.body.get(self.next_record)?;
 
+        self.next_record += 1;
+
         Some(record.into())
     }
 }