darkplaces/gmqcc
0
0
Fork 0
mirror of https://github.com/DarkPlacesEngine/gmqcc.git synced 2025-02-21 10:51:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Flatten more external functions

Browse source
This commit is contained in:
Dale Weiler 2013-04-14 01:25:11 +00:00
parent a25bd052d7
commit eb2a74f7e7
3 changed files with 13 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
fs.c
View file

@ -298,7 +298,6 @@ int fs_file_getline(char **lineptr, size_t *n, FILE *stream) {
#else
# if !defined(__MINGW32__)
# include <sys/stat.h> /* mkdir */
# include <unistd.h> /* chdir */
int fs_dir_make(const char *path) {
return mkdir(path, 0700);
@ -321,8 +320,4 @@ struct dirent *fs_dir_read(DIR *dir) {
return readdir(dir);
}
int fs_dir_change(const char *path) {
return chdir(path);
}
#endif /*! defined(_WIN32) && !defined(__MINGW32__) */

3
gmqcc.h
View file

@ -479,11 +479,10 @@ FILE *fs_file_open (const char *, const char *);
int fs_file_getline(char **, size_t *, FILE *);
/* directory handling */
int fs_dir_make (const char *);
DIR *fs_dir_open (const char *);
int fs_dir_close (DIR *);
struct dirent *fs_dir_read (DIR *);
int fs_dir_make (const char *);
int fs_dir_change (const char *);
/*===================================================================*/

31
pak.c
View file

@ -259,9 +259,10 @@ bool pak_exists(pak_file_t *pak, const char *file, pak_directory_t **dir) {
/*
* 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;
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)) {
@ -278,15 +279,20 @@ bool pak_extract_one(pak_file_t *pak, const char *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);
@ -310,11 +316,8 @@ bool pak_extract_all(pak_file_t *pak, const char *dir) {
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;
}
@ -477,7 +480,6 @@ int main(int argc, char **argv) {
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;
@ -498,8 +500,6 @@ int main(int argc, char **argv) {
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;
@ -542,7 +542,7 @@ int main(int argc, char **argv) {
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);
@ -562,13 +562,6 @@ int main(int argc, char **argv) {
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);