Fix for loops

[xonotic/gmqcc.git] / pak.c

diff --git a/pak.c b/pak.c
index 4bf7e5f423f4f96666b72009ec5f1f7763b062d9..9781c53aa2f8a9bcc3a603809cc3d48812e7c840 100644 (file)
--- a/pak.c
+++ b/pak.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013
+ * Copyright (C) 2013, 2014, 2015
  *     Dale Weiler
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
@@ -124,7 +124,7 @@ static void pak_tree_build(const char *entry) {
 typedef struct {
     pak_directory_t *directories;
     pak_header_t     header;
-    FILE            *handle;
+    fs_file_t       *handle;
     bool             insert;
 } pak_file_t;
 
@@ -145,7 +145,10 @@ static pak_file_t *pak_open_read(const char *file) {
 
     memset         (&pak->header, 0, sizeof(pak_header_t));
     fs_file_read   (&pak->header,    sizeof(pak_header_t), 1, pak->handle);
-    util_endianswap(&pak->header, 1, sizeof(pak_header_t));
+
+    util_endianswap(&pak->header.magic,  1, sizeof(pak->header.magic));
+    util_endianswap(&pak->header.diroff, 1, sizeof(pak->header.diroff));
+    util_endianswap(&pak->header.dirlen, 1, sizeof(pak->header.dirlen));
 
     /*
      * Every PAK file has "PACK" stored as FOURCC data in the
@@ -162,7 +165,7 @@ static pak_file_t *pak_open_read(const char *file) {
      * Time to read in the directory handles and prepare the directories
      * vector.  We're going to be reading some the file inwards soon.
      */
-    fs_file_seek(pak->handle, pak->header.diroff, SEEK_SET);
+    fs_file_seek(pak->handle, pak->header.diroff, FS_FILE_SEEK_SET);
 
     /*
      * Read in all directories from the PAK file. These are considered
@@ -171,7 +174,10 @@ static pak_file_t *pak_open_read(const char *file) {
     for (itr = 0; itr < pak->header.dirlen / 64; itr++) {
         pak_directory_t dir;
         fs_file_read   (&dir,    sizeof(pak_directory_t), 1, pak->handle);
-        util_endianswap(&dir, 1, sizeof(pak_directory_t));
+
+        /* Don't translate name - it's just an array of bytes. */
+        util_endianswap(&dir.pos, 1, sizeof(dir.pos));
+        util_endianswap(&dir.len, 1, sizeof(dir.len));
 
         vec_push(pak->directories, dir);
     }
@@ -266,7 +272,7 @@ static bool pak_extract_one(pak_file_t *pak, const char *file, const char *outdi
     pak_directory_t *dir   = NULL;
     unsigned char   *dat   = NULL;
     char            *local = NULL;
-    FILE            *out   = NULL;
+    fs_file_t       *out   = NULL;
 
     if (!pak_exists(pak, file, &dir)) {
         return false;
@@ -295,7 +301,7 @@ static bool pak_extract_one(pak_file_t *pak, const char *file, const char *outdi
     mem_d(local);
 
     /* read */
-    if (fs_file_seek (pak->handle, dir->pos, SEEK_SET) != 0)
+    if (fs_file_seek (pak->handle, dir->pos, FS_FILE_SEEK_SET) != 0)
         goto err;
 
     fs_file_read (dat, 1, dir->len, pak->handle);
@@ -304,7 +310,7 @@ static bool pak_extract_one(pak_file_t *pak, const char *file, const char *outdi
 
     mem_d(dat);
     return true;
-    
+
 err:
     if (dat) mem_d(dat);
     if (out) fs_file_close(out);
@@ -333,7 +339,7 @@ static bool pak_insert_one(pak_file_t *pak, const char *file) {
     pak_directory_t dir;
     unsigned char  *dat;
     long            len;
-    FILE           *fp;
+    fs_file_t      *fp;
 
     /*
      * We don't allow insertion on files that already exist within the
@@ -351,9 +357,9 @@ static bool pak_insert_one(pak_file_t *pak, const char *file) {
      * the directory entry, and the actual contents of the file
      * to the PAK file itself.
      */
-    if (fs_file_seek(fp, 0, SEEK_END) != 0 || ((len = fs_file_tell(fp)) < 0))
+    if (fs_file_seek(fp, 0, FS_FILE_SEEK_END) != 0 || ((len = fs_file_tell(fp)) < 0))
         goto err;
-    if (fs_file_seek(fp, 0, SEEK_SET) != 0)
+    if (fs_file_seek(fp, 0, FS_FILE_SEEK_SET) != 0)
         goto err;
 
     dir.len = len;
@@ -396,7 +402,8 @@ err:
  * Like pak_insert_one, except this collects files in all directories
  * from a root directory, and inserts them all.
  */
-bool pak_insert_all(pak_file_t *pak, const char *dir) {
+#if 0
+static bool pak_insert_all(pak_file_t *pak, const char *dir) {
     DIR           *dp;
     struct dirent *dirp;
 
@@ -416,6 +423,7 @@ bool pak_insert_all(pak_file_t *pak, const char *dir) {
     fs_dir_close(dp);
     return true;
 }
+#endif /*!if 0 renable when ready to use */
 
 static bool pak_close(pak_file_t *pak) {
     size_t itr;
@@ -436,18 +444,17 @@ static bool pak_close(pak_file_t *pak) {
         pak->header.diroff = tell;
 
         /* patch header */
-        if (fs_file_seek (pak->handle, 0, SEEK_SET) != 0)
+        if (fs_file_seek (pak->handle, 0, FS_FILE_SEEK_SET) != 0)
             goto err;
 
         fs_file_write(&(pak->header), sizeof(pak_header_t), 1, pak->handle);
 
         /* write directories */
-        if (fs_file_seek (pak->handle, pak->header.diroff, SEEK_SET) != 0)
+        if (fs_file_seek (pak->handle, pak->header.diroff, FS_FILE_SEEK_SET) != 0)
             goto err;
 
-        for (itr = 0; itr < vec_size(pak->directories); itr++) {
+        for (itr = 0; itr < vec_size(pak->directories); itr++)
             fs_file_write(&(pak->directories[itr]), sizeof(pak_directory_t), 1, pak->handle);
-        }
     }
 
     vec_free     (pak->directories);
@@ -494,6 +501,7 @@ static bool parsecmd(const char *optname, int *argc_, char ***argv_, char **out,
     return true;
 }
 
+#include <stdio.h>
 int main(int argc, char **argv) {
     bool          extract   = true;
     char         *redirout  = (char*)stdout;