/*
* Copyright (C) 2013
- * Dale Weiler
+ * Dale Weiler
*
* Permission is hereby granted, free of charge, to any person obtaining a copy of
* this software and associated documentation files (the "Software"), to deal in
* 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"
/*
* The PAK format uses a FOURCC concept for storing the magic ident within
* the header as a uint32_t.
- */
-#define PAK_FOURCC ((uint32_t)(('P' | ('A' << 8) | ('C' << 16) | ('K' << 24))))
+ */
+#define PAK_FOURCC ((uint32_t)(((uint8_t)'P'|((uint8_t)'A'<<8)|((uint8_t)'C'<<16)|((uint8_t)'K'<<24))))
typedef struct {
uint32_t magic; /* "PACK" */
* best to store the directories at the end of the file opposed
* to the front, since it allows easy insertion without having
* to load the entire file into memory again.
- */
+ */
uint32_t diroff;
uint32_t dirlen;
} pak_header_t;
* describes a file (with directories/nested ones too in it's
* file name). Hence it can be a file, file with directory, or
* file with directories.
- */
+ */
typedef struct {
char name[56];
uint32_t pos;
* Used to get the next token from a string, where the
* strings themselfs are seperated by chracters from
* `sep`. This is essentially strsep.
- */
+ */
static char *pak_tree_sep(char **str, const char *sep) {
char *beg = *str;
char *end;
memset(pathsplit, 0, 56);
- strncpy(directory, entry, 56);
+ util_strncpy(directory, entry, 56);
for (itr = 0; (token = pak_tree_sep(&directory, "/")) != NULL; itr++) {
elements[itr] = token;
}
for (jtr = 0; jtr < itr - 1; jtr++) {
- strcat(pathsplit, elements[jtr]);
- strcat(pathsplit, "/");
+ util_strcat(pathsplit, elements[jtr]);
+ util_strcat(pathsplit, "/");
if (fs_dir_make(pathsplit)) {
mem_d(pathsplit);
/*
* 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);
/*
* Read in all directories from the PAK file. These are considered
* to be the "file entries".
- */
+ */
for (itr = 0; itr < pak->header.dirlen / 64; itr++) {
pak_directory_t dir;
fs_file_read (&dir, sizeof(pak_directory_t), 1, pak->handle);
/*
* Generate the required directory structure / tree for
* writing this PAK file too.
- */
+ */
pak_tree_build(file);
if (!(pak->handle = fs_file_open(file, "wb"))) {
/*
* The directory tree that was created, needs to be
* removed entierly if we failed to open a file.
- */
+ */
/* TODO backup directory clean */
mem_d(pak);
return pak;
}
-pak_file_t *pak_open(const char *file, const char *mode) {
+static pak_file_t *pak_open(const char *file, const char *mode) {
if (!file || !mode)
return NULL;
return NULL;
}
-bool pak_exists(pak_file_t *pak, const char *file, pak_directory_t **dir) {
+static bool pak_exists(pak_file_t *pak, const char *file, pak_directory_t **dir) {
size_t itr;
if (!pak || !file)
return false;
-
+
for (itr = 0; itr < vec_size(pak->directories); itr++) {
if (!strcmp(pak->directories[itr].name, file)) {
/*
* Store back a pointer to the directory that matches
* the request if requested (NULL is not allowed).
- */
+ */
if (dir) {
*dir = &(pak->directories[itr]);
}
/*
* Extraction abilities. These work as you expect them to.
- */
-bool pak_extract_one(pak_file_t *pak, const char *file) {
- pak_directory_t *dir = NULL;
- unsigned char *dat = NULL;
+ */
+static bool pak_extract_one(pak_file_t *pak, const char *file, const char *outdir) {
+ pak_directory_t *dir = NULL;
+ unsigned char *dat = NULL;
+ char *local = NULL;
FILE *out;
if (!pak_exists(pak, file, &dir)) {
/*
* Generate the directory structure / tree that will be required
* to store the extracted file.
- */
+ */
pak_tree_build(file);
+ /* TODO portable path seperators */
+ util_asprintf(&local, "%s/%s", outdir, file);
+
/*
* Now create the file, if this operation fails. Then abort
* It shouldn't fail though.
- */
- if (!(out = fs_file_open(file, "wb"))) {
+ */
+ if (!(out = fs_file_open(local, "wb"))) {
mem_d(dat);
return false;
}
+ /* free memory for directory string */
+ mem_d(local);
/* read */
fs_file_seek (pak->handle, dir->pos, SEEK_SET);
return true;
}
-bool pak_extract_all(pak_file_t *pak, const char *dir) {
+static bool pak_extract_all(pak_file_t *pak, const char *dir) {
size_t itr;
if (!fs_dir_make(dir))
return false;
- if (fs_dir_change(dir))
- return false;
-
for (itr = 0; itr < vec_size(pak->directories); itr++) {
- if (!pak_extract_one(pak, pak->directories[itr].name))
+ if (!pak_extract_one(pak, pak->directories[itr].name, dir))
return false;
}
* Insertion functions (the opposite of extraction). Yes for generating
* PAKs.
*/
-bool pak_insert_one(pak_file_t *pak, const char *file) {
+static bool pak_insert_one(pak_file_t *pak, const char *file) {
pak_directory_t dir;
unsigned char *dat;
+ long len;
FILE *fp;
/*
* We don't allow insertion on files that already exist within the
* pak file. Weird shit can happen if we allow that ;). We also
- * don't allow insertion if the pak isn't opened in write mode.
- */
+ * don't allow insertion if the pak isn't opened in write mode.
+ */
if (!pak || !file || !pak->insert || pak_exists(pak, file, NULL))
return false;
* to the PAK file itself.
*/
fs_file_seek(fp, 0, SEEK_END);
- dir.len = fs_file_tell(fp);
+ if ((len = fs_file_tell(fp)) < 0) {
+ fs_file_close(fp);
+ return false;
+ }
fs_file_seek(fp, 0, SEEK_SET);
+ 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;
}
- strncpy(dir.name, file, strlen(file));
+ 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;
/*
* 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) {
DIR *dp;
struct dirent *dirp;
return true;
}
-bool pak_close(pak_file_t *pak) {
+static bool pak_close(pak_file_t *pak) {
size_t itr;
if (!pak)
/*
* In insert mode we need to patch the header, and write
* our directory entries at the end of the file.
- */
+ */
if (pak->insert) {
+ int tell = fs_file_tell(pak->handle);
+ if (tell < 0) {
+ vec_free (pak->directories);
+ fs_file_close(pak->handle);
+ mem_d (pak);
+
+ return false;
+ }
pak->header.dirlen = vec_size(pak->directories) * 64;
- pak->header.diroff = ftell(pak->handle);
+ pak->header.diroff = tell;
- /* patch header */
+ /* patch header */
fs_file_seek (pak->handle, 0, SEEK_SET);
fs_file_write(&(pak->header), sizeof(pak_header_t), 1, pak->handle);
bool extract = true;
char *redirout = (char*)stdout;
char *redirerr = (char*)stderr;
- char *directory = NULL;
char *file = NULL;
char **files = NULL;
pak_file_t *pak = NULL;
continue;
if (parsecmd("redirerr", &argc, &argv, &redirerr, 1, false))
continue;
- if (parsecmd("directory", &argc, &argv, &directory, 1, false))
- continue;
if (parsecmd("file", &argc, &argv, &file, 1, false))
continue;
return EXIT_FAILURE;
}
- if (!pak_extract_all(pak, (directory) ? directory : "./")) {
+ if (!pak_extract_all(pak, "./")) {
con_err("failed to extract PAK %s (files may be missing)\n", file);
pak_close(pak);
vec_free(files);
/* not possible */
pak_close(pak);
vec_free(files);
- util_meminfo();
+ stat_info();
+
return EXIT_SUCCESS;
}
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;
- }
-
for (iter = 0; iter < vec_size(files); iter++) {
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);
-
- util_meminfo();
+ stat_info();
return EXIT_SUCCESS;
}
projects / xonotic / gmqcc.git / blobdiff