Changeset 491

Timestamp:

08/11/07 11:38:14 (1 year ago)

Author:

takkaria

Message:

Make the blockfile and smap functions endian-independent.

Files:

• trunk/src/z-blockfile.c (modified) (7 diffs)
• trunk/src/z-file.c (modified) (1 diff)
• trunk/src/z-file.h (modified) (1 diff)
• trunk/src/z-smap.c (modified) (10 diffs)

trunk/src/z-blockfile.c

@@ -185 +185 @@
-{
-        block_t *tmp;
+        u32b nr_blocks = flip_u32b(bf->nr_blocks);
-
-        file_seek(bf->fh, 0);
-bf->nr_blocks), sizeof(bf->
+nr_blocks), sizeof(
-
-        tmp = bf->block_head;
@@ -219 +220 @@
-
-        file_read(bf->fh, (char *) &(bf->nr_blocks), sizeof(bf->nr_blocks));
+        bf->nr_blocks = flip_u32b(bf->nr_blocks);
-
-        while (blockno < bf->nr_blocks)
@@ -233 +235 @@
-
-        file_read(bf->fh, (char *) &(bl->namelen), sizeof(bl->namelen));
+        bl->namelen = flip_u32b(bl->namelen);
-
-        bl->name = mem_alloc(bl->namelen);
@@ -238 +241 @@
-
-        file_read(bf->fh, (char *) &(bl->nr_records), sizeof(bl->nr_records));
+        bl->nr_records = flip_u32b(bl->nr_records);
-
-        while (recno < bl->nr_records)
@@ -261 +265 @@
-
-        file_read(bf->fh, (char *) &(rec->len), sizeof(rec->len));
+        rec->len = flip_u32b(rec->len);
-
-        rec->data = mem_alloc(rec->len);
@@ -281 +286 @@
-{
-        record_t *tmp;
-
-
+
+
+
+
-        file_write(bf->fh, bl->name, bl->namelen);
-bl->nr_records), sizeof(bl->
+nr_records), sizeof(
-
-        tmp = bl->record_head;
@@ -296 +303 @@
-void bf_saverecord(blockfile_t *bf, record_t *rec)
-{
-
+
+
+
-        file_write(bf->fh, rec->data, rec->len);
-}

trunk/src/z-file.c

@@ -219 +219 @@
-
-
+/*** Support for byte-swapping for endian-indepedent files ***/
+
+static bool is_bigendian()
+{
+        int i = 1;
+        char *p = (char *)&i;
+
+        if (p[0] != 1)
+                return TRUE;
+
+        return FALSE;
+}
+
+u16b flip_u16b(u16b arg)
+{
+        u16b ret;
+        char *in = (char *)&arg;
+        char *out = (char *)&ret;
+
+        if (is_bigendian())
+                return arg;
+
+        out[0] = in[1];
+        out[1] = in[0];
+
+        return ret;
+}
+
+u32b flip_u32b(u32b arg)
+{
+        u32b ret;
+        char *in = (char *)&arg;
+        char *out = (char *)&ret;
+
+        if (is_bigendian())
+                return arg;
+
+        out[0] = in[3];
+        out[1] = in[2];
+        out[2] = in[1];
+        out[3] = in[0];
+
+        return ret;
+}
+
+
-
-/*** File-handling API ***/

trunk/src/z-file.h

@@ -39 +39 @@
- */
-size_t path_build(char *buf, size_t len, const char *base, const char *leaf);
+
+
+
+/*** Byte-flipping functions ***/
+
+/*
+ * "Flip" the bits of the integer specified in `arg` to make them big-endian.
+ * Useful when writing to files intended to be portable across systems.
+ * 
+ * Returns the flipped value, or the original if the current system is already
+ * big-endian.
+ */
+u16b flip_u16b(u16b arg);
+u32b flip_u32b(u32b arg);
-
-

trunk/src/z-smap.c

@@ -16 +16 @@
- */
-#include "z-virt.h"
+#include "z-file.h"
-#include "z-smap.h"
-
@@ -65 +66 @@
-        snew->type = type;
-        snew->keylen = strlen(key) + 1;
-dup
+ing_make
-        snew->datalen = dlen;
-
@@ -118 +119 @@
-}
-
-
+onst c
-{
-        (smap_put(smap, key, ST_STR, strlen(val) + 1))->value.strval = string_make(val);
@@ -213 +214 @@
-
-/*** Serialising functions ***/
+
+#define memcpy_u32b(where, variable) \
+        do { \
+                u32b temp = flip_u32b(variable); \
+                memcpy(where, &temp, sizeof(temp)); \
+        } while (0);
-
-char *smap_tostring(smap_t *smap, u32b *length)
@@ -234 +241 @@
-
-        newbuf = mem_alloc(total_size);
-
-
+
-        curr_idx += sizeof(total_size);
-
@@ -241 +247 @@
-        while (se)
-        {
-(se->type)
+se->type
-                curr_idx += sizeof(se->type);
-                
-(newbuf + curr_idx, &(se->keylen), sizeof(se->keylen)
+_u32b(newbuf + curr_idx, se->keylen
-                curr_idx += sizeof(se->keylen);
-
-(newbuf + curr_idx, &(se->datalen), sizeof(se->datalen)
+_u32b(newbuf + curr_idx, se->datalen
-                curr_idx += sizeof(se->datalen);
-
@@ -265 +271 @@
-                                break;
-                        case ST_S16B:
-
-
+
+
+
+
+
-                        case ST_U16B:
-
-
+
+
+
+
+
-                        case ST_S32B:
-
-
+
+
+
+
+
-                        case ST_U32B:
-
-
+
+
+
+
+
-                        case ST_STR:
-                                memcpy(newbuf + curr_idx, se->value.strval, se->datalen);
@@ -308 +326 @@
-
-        memcpy(&total_len, string + idx, sizeof(total_len));
+        total_len = flip_u32b(total_len);
-        idx += sizeof(total_len);
+
+        /* We should do some checking of total_len against length here */
-
-        while (idx < total_len)
@@ -316 +337 @@
-
-                memcpy(&tmp_klen, string + idx, sizeof(tmp_klen));
+                tmp_klen = flip_u32b(tmp_klen);
-                idx += sizeof(tmp_klen);
-
-                memcpy(&tmp_dlen, string + idx, sizeof(tmp_dlen));
+                tmp_dlen = flip_u32b(tmp_dlen);
-                idx += sizeof(tmp_dlen);
-
@@ -338 +361 @@
-                        case ST_S16B:
-                                memcpy(&(se->value.s16bval), string + idx, sizeof(s16b));
+                                se->value.s16bval = (s16b) flip_u16b((u16b) se->value.s16bval);
-                                break;
-                        case ST_U16B:
-                                memcpy(&(se->value.u16bval), string + idx, sizeof(u16b));
+                                se->value.u16bval = flip_u16b(se->value.u16bval);
-                                break;
-                        case ST_S32B:
-                                memcpy(&(se->value.s32bval), string + idx, sizeof(s32b));
+                                se->value.s32bval = (s32b) flip_u32b((u32b) se->value.s32bval);
-                                break;
-                        case ST_U32B:
-                                memcpy(&(se->value.u32bval), string + idx, sizeof(u32b));
+                                se->value.u32bval = flip_u32b(se->value.u32bval);
-                                break;
-                        case ST_STR: