flatten the use of strcpy, 90% of the cases we already knew the length of the string...

[xonotic/gmqcc.git] / pak.c

diff --git a/pak.c b/pak.c
index 1f905fef779df08e0bc7014a7726ffeb687cefce..fd80dea3145660b4c34cedb016c3717f9ce20376 100644 (file)
--- a/pak.c
+++ b/pak.c
@@ -20,8 +20,6 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#include <sys/stat.h>
-#include <dirent.h>
 #include "gmqcc.h"
 
 /*
@@ -96,7 +94,6 @@ static void pak_tree_build(const char *entry) {
     directory = (char *)mem_a(56);
 
     memset(pathsplit, 0, 56);
-    memset(directory, 0, 56);
 
     strncpy(directory, entry, 56);
     for (itr = 0; (token = pak_tree_sep(&directory, "/")) != NULL; itr++) {
@@ -197,6 +194,7 @@ static pak_file_t *pak_open_write(const char *file) {
          */   
         /* TODO backup directory clean */
 
+        mem_d(pak);
         return NULL;
     }
 
@@ -210,6 +208,9 @@ static pak_file_t *pak_open_write(const char *file) {
     pak->insert       = true;
     pak->header.magic = PAK_FOURCC;
 
+    /* on BE systems we need to swap the byte order of the FOURCC */
+    util_endianswap(&pak->header.magic, 1, sizeof(uint32_t));
+
     /*
      * We need to write out the header since files will be wrote out to
      * this even with directory entries, and that not wrote.  The header
@@ -360,7 +361,7 @@ bool pak_insert_one(pak_file_t *pak, const char *file) {
         return false;
     }
 
-    strcpy(dir.name, file);
+    strncpy(dir.name, file, strlen(file));
 
     /*
      * Allocate some memory for loading in the data that will be
@@ -530,37 +531,41 @@ int main(int argc, char **argv) {
 
     if (!file) {
         con_err("-file must be specified for output/input PAK file\n");
+        vec_free(files);
         return EXIT_FAILURE;
     }
 
     if (extract) {
         if (!(pak = pak_open(file, "r"))) {
             con_err("failed to open PAK file %s\n", file);
+            vec_free(files);
             return EXIT_FAILURE;
         }
 
         if (!pak_extract_all(pak, (directory) ? directory : "./")) {
             con_err("failed to extract PAK %s (files may be missing)\n", file);
             pak_close(pak);
+            vec_free(files);
             return EXIT_FAILURE;
         }
 
         /* not possible */
-        if (!pak_close(pak))
-            abort();
-
+        pak_close(pak);
+        vec_free(files);
         util_meminfo();
         return EXIT_SUCCESS;
     }
 
     if (!(pak = pak_open(file, "w"))) {
         con_err("failed to open PAK %s for writing\n", file);
+        vec_free(files);
         return EXIT_FAILURE;
     }
 
     if (directory && !fs_dir_change(directory)) {
         con_err("failed to change directory %s\n", directory);
         pak_close(pak);
+        vec_free(files);
         return EXIT_FAILURE;
     }
 
@@ -568,13 +573,16 @@ int main(int argc, char **argv) {
         if (!(pak_insert_one(pak, files[iter]))) {
             con_err("failed inserting %s for PAK %s\n", files[iter], file);
             pak_close(pak);
+            vec_free(files);
             return EXIT_FAILURE;
         }
     }
 
     /* not possible */
-    if (!pak_close(pak))
-        abort();
+    pak_close(pak);
+    vec_free(files);
+
 
+    util_meminfo();
     return EXIT_SUCCESS;
 }