diff tools/packed.c @ 1033:c353e6bcb733

Change handling of filename field in PACKs.
author Matti Hamalainen <ccr@tnsp.org>
date Sun, 01 Mar 2015 16:39:46 +0200
parents f8d75a51de2c
children d2fa4f6d6117
line wrap: on
line diff
--- a/tools/packed.c	Sun Mar 01 16:27:05 2015 +0200
+++ b/tools/packed.c	Sun Mar 01 16:39:46 2015 +0200
@@ -171,8 +171,8 @@
     if (node == NULL)
         return NULL;
 
-    strncpy(node->filename, src->filename, sizeof(node->filename));
-    node->filename[sizeof(node->filename) - 1] = 0;
+    strncpy(node->filename, src->filename, DMRES_NAME_LEN);
+    node->filename[DMRES_NAME_LEN] = 0;
 
     node->size     = src->size;
     node->offset   = src->offset;
@@ -228,7 +228,7 @@
     while (node != NULL)
     {
         // Write one entry
-        if (!dm_fwrite_str(pack->file, node->filename, sizeof(node->filename)) ||
+        if (!dm_fwrite_str(pack->file, node->filename, DMRES_NAME_LEN) ||
             !dm_fwrite_le32(pack->file, node->size) ||
             !dm_fwrite_le32(pack->file, node->offset) ||
             !dm_fwrite_le32(pack->file, node->length) ||
@@ -362,8 +362,8 @@
     }
 
     // Create directory entry
-    strncpy(entry.filename, filename, sizeof(entry.filename));
-    entry.filename[sizeof(entry.filename) - 1] = 0;
+    strncpy(entry.filename, filename, DMRES_NAME_LEN)
+    entry.filename[DMRES_NAME_LEN] = 0;
     entry.offset = startOffs;
     entry.size   = zstr.total_in;
     entry.length = outSize;