/*
- * Copyright (C) 2013
+ * Copyright (C) 2013, 2014, 2015
* Dale Weiler
*
* Permission is hereby granted, free of charge, to any person obtaining a copy of
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
+#include <string.h>
+#include <stdlib.h>
+
#include "gmqcc.h"
/*
typedef struct {
pak_directory_t *directories;
pak_header_t header;
- FILE *handle;
+ fs_file_t *handle;
bool insert;
} pak_file_t;
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
* 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
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);
}
pak_directory_t *dir = NULL;
unsigned char *dat = NULL;
char *local = NULL;
- FILE *out;
+ fs_file_t *out = NULL;
if (!pak_exists(pak, file, &dir)) {
return false;
}
- if (!(dat = (unsigned char *)mem_a(dir->len))) {
- return false;
- }
+ if (!(dat = (unsigned char *)mem_a(dir->len)))
+ goto err;
/*
* Generate the directory structure / tree that will be required
* Now create the file, if this operation fails. Then abort
* It shouldn't fail though.
*/
- if (!(out = fs_file_open(local, "wb"))) {
- mem_d(dat);
- return false;
- }
+ if (!(out = fs_file_open(local, "wb")))
+ goto err;
/* free memory for directory string */
mem_d(local);
/* read */
- fs_file_seek (pak->handle, dir->pos, SEEK_SET);
- fs_file_read (dat, 1, dir->len, pak->handle);
+ if (fs_file_seek (pak->handle, dir->pos, FS_FILE_SEEK_SET) != 0)
+ goto err;
- /* write */
+ fs_file_read (dat, 1, dir->len, pak->handle);
fs_file_write(dat, 1, dir->len, out);
-
- /* close */
fs_file_close(out);
- /* free */
mem_d(dat);
-
return true;
+
+err:
+ if (dat) mem_d(dat);
+ if (out) fs_file_close(out);
+ return false;
}
static bool pak_extract_all(pak_file_t *pak, const char *dir) {
static bool pak_insert_one(pak_file_t *pak, const char *file) {
pak_directory_t dir;
unsigned char *dat;
- FILE *fp;
+ long len;
+ fs_file_t *fp;
/*
* We don't allow insertion on files that already exist within the
* the directory entry, and the actual contents of the file
* to the PAK file itself.
*/
- fs_file_seek(fp, 0, SEEK_END);
- dir.len = fs_file_tell(fp);
- fs_file_seek(fp, 0, SEEK_SET);
+ 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, FS_FILE_SEEK_SET) != 0)
+ goto err;
+ dir.len = len;
dir.pos = fs_file_tell(pak->handle);
/*
* We're limited to 56 bytes for a file name string, that INCLUDES
* the directory and '/' seperators.
*/
- if (strlen(file) >= 56) {
- fs_file_close(fp);
- return false;
- }
+ if (strlen(file) >= 56)
+ goto err;
util_strncpy(dir.name, file, strlen(file));
* Allocate some memory for loading in the data that will be
* redirected into the PAK file.
*/
- if (!(dat = (unsigned char *)mem_a(dir.len))) {
- fs_file_close(fp);
- return false;
- }
+ if (!(dat = (unsigned char *)mem_a(dir.len)))
+ goto err;
fs_file_read (dat, dir.len, 1, fp);
fs_file_close(fp);
vec_push(pak->directories, dir);
return true;
+
+err:
+ fs_file_close(fp);
+ return false;
}
/*
* 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;
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;
+ long tell;
if (!pak)
return false;
* our directory entries at the end of the file.
*/
if (pak->insert) {
+ if ((tell = fs_file_tell(pak->handle)) != 0)
+ goto err;
+
pak->header.dirlen = vec_size(pak->directories) * 64;
- pak->header.diroff = ftell(pak->handle);
+ pak->header.diroff = tell;
/* patch header */
- fs_file_seek (pak->handle, 0, SEEK_SET);
+ 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 */
- fs_file_seek (pak->handle, pak->header.diroff, SEEK_SET);
+ 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);
mem_d (pak);
return true;
+
+err:
+ vec_free (pak->directories);
+ fs_file_close(pak->handle);
+ mem_d (pak);
+
+ return false;
}
/*
return true;
}
+#include <stdio.h>
int main(int argc, char **argv) {
bool extract = true;
char *redirout = (char*)stdout;
/* not possible */
pak_close(pak);
vec_free(files);
- util_meminfo();
+ stat_info();
+
return EXIT_SUCCESS;
}
pak_close(pak);
vec_free(files);
- util_meminfo();
+ stat_info();
return EXIT_SUCCESS;
}
projects / xonotic / gmqcc.git / blobdiff