Flatten more external functions

diff --git a/fs.c b/fs.c
index 6ff0e8161efb6169af24268e347507560fd4bae3..e39858a0ed9fd3619abc6c8aca8b51721f42f201 100644 (file)
--- a/fs.c
+++ b/fs.c
@@ -298,7 +298,6 @@ int fs_file_getline(char **lineptr, size_t *n, FILE *stream) {
 #else
 #   if !defined(__MINGW32__)
 #       include <sys/stat.h> /* mkdir */
 #else
 #   if !defined(__MINGW32__)
 #       include <sys/stat.h> /* mkdir */

-#       include <unistd.h>   /* chdir */

 
         int fs_dir_make(const char *path) {
             return mkdir(path, 0700);
 
         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);
 }
 
     return readdir(dir);
 }
 

-int fs_dir_change(const char *path) {
-    return chdir(path);
-}
-

 #endif /*! defined(_WIN32) && !defined(__MINGW32__) */
 #endif /*! defined(_WIN32) && !defined(__MINGW32__) */

diff --git a/gmqcc.h b/gmqcc.h
index 3539155df83549b6cbeb175a4d5041f2621a250b..6d4d9718fc78f5f8ad4550961211052b4d5e9791 100644 (file)
--- a/gmqcc.h
+++ b/gmqcc.h
@@ -479,11 +479,10 @@ FILE          *fs_file_open   (const char *, const char *);
 int            fs_file_getline(char  **, size_t *, FILE *);
 
 /* directory handling */
 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 *);
 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 *);

 
 
 /*===================================================================*/
 
 
 /*===================================================================*/

diff --git a/pak.c b/pak.c
index fd80dea3145660b4c34cedb016c3717f9ce20376..a9ef112869066920a06b46608926fc3cdf47f823 100644 (file)
--- a/pak.c
+++ b/pak.c
@@ -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.
  */ 
 /*
  * 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)) {
     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);
 
      */   
     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.
      */   
     /*
      * 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;
     }
 
         mem_d(dat);
         return false;
     }
 

+    /* free memory for directory string */
+    mem_d(local);

 
     /* read */
     fs_file_seek (pak->handle, dir->pos, SEEK_SET);
 
     /* 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_make(dir))
         return false;
 

-    if (fs_dir_change(dir))
-        return false;
-

     for (itr = 0; itr < vec_size(pak->directories); itr++) {
     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;
     }
 
             return false;
     }
 


@@ -477,7 +480,6 @@ int main(int argc, char **argv) {
     bool          extract   = true;
     char         *redirout  = (char*)stdout;
     char         *redirerr  = (char*)stderr;
     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;
     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;
                 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;
 
             if (parsecmd("file",      &argc, &argv, &file,      1, false))
                 continue;
 


@@ -542,7 +542,7 @@ int main(int argc, char **argv) {
             return EXIT_FAILURE;
         }
 
             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);
             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;
     }
 
         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);
     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);