]> git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - fs.c
provide a list of all gamedirs with modinfo.txt in fs_all_gamedirs for later use...
[xonotic/darkplaces.git] / fs.c
diff --git a/fs.c b/fs.c
index 7a80304defc4f17b6d1bc1c599016e779ae308b2..18c98c6be5dcad6928528e8279ba56b6b72c9743 100644 (file)
--- a/fs.c
+++ b/fs.c
@@ -66,7 +66,7 @@
 # define dup _dup
 #endif
 
-/*
+/** \page fs File System
 
 All of Quake's data access is through a hierchal file system, but the contents
 of the file system can be transparently merged from several sources.
@@ -111,8 +111,23 @@ CONSTANTS
 #define MAX_WBITS              15
 #define Z_OK                   0
 #define Z_STREAM_END   1
+#define Z_STREAM_ERROR  (-2)
+#define Z_DATA_ERROR    (-3)
+#define Z_MEM_ERROR     (-4)
+#define Z_BUF_ERROR     (-5)
 #define ZLIB_VERSION   "1.2.3"
 
+#define Z_BINARY 0
+#define Z_DEFLATED 8
+#define Z_MEMLEVEL_DEFAULT 8
+
+#define Z_NULL 0
+#define Z_DEFAULT_COMPRESSION (-1)
+#define Z_NO_FLUSH 0
+#define Z_SYNC_FLUSH 2
+#define Z_FULL_FLUSH 3
+#define Z_FINISH 4
+
 // Uncomment the following line if the zlib DLL you have still uses
 // the 1.1.x series calling convention on Win32 (WINAPI)
 //#define ZLIB_USES_WINAPI
@@ -126,62 +141,66 @@ TYPES
 =============================================================================
 */
 
-// Zlib stream (from zlib.h)
-// Warning: some pointers we don't use directly have
-// been cast to "void*" for a matter of simplicity
+/*! Zlib stream (from zlib.h)
+ * \warning: some pointers we don't use directly have
+ * been cast to "void*" for a matter of simplicity
+ */
 typedef struct
 {
-       unsigned char                   *next_in;       // next input byte
-       unsigned int    avail_in;       // number of bytes available at next_in
-       unsigned long   total_in;       // total nb of input bytes read so far
+       unsigned char                   *next_in;       ///< next input byte
+       unsigned int    avail_in;       ///< number of bytes available at next_in
+       unsigned long   total_in;       ///< total nb of input bytes read so far
 
-       unsigned char                   *next_out;      // next output byte should be put there
-       unsigned int    avail_out;      // remaining free space at next_out
-       unsigned long   total_out;      // total nb of bytes output so far
+       unsigned char                   *next_out;      ///< next output byte should be put there
+       unsigned int    avail_out;      ///< remaining free space at next_out
+       unsigned long   total_out;      ///< total nb of bytes output so far
 
-       char                    *msg;           // last error message, NULL if no error
-       void                    *state;         // not visible by applications
+       char                    *msg;           ///< last error message, NULL if no error
+       void                    *state;         ///< not visible by applications
 
-       void                    *zalloc;        // used to allocate the internal state
-       void                    *zfree;         // used to free the internal state
-       void                    *opaque;        // private data object passed to zalloc and zfree
+       void                    *zalloc;        ///< used to allocate the internal state
+       void                    *zfree;         ///< used to free the internal state
+       void                    *opaque;        ///< private data object passed to zalloc and zfree
 
-       int                             data_type;      // best guess about the data type: ascii or binary
-       unsigned long   adler;          // adler32 value of the uncompressed data
-       unsigned long   reserved;       // reserved for future use
+       int                             data_type;      ///< best guess about the data type: ascii or binary
+       unsigned long   adler;          ///< adler32 value of the uncompressed data
+       unsigned long   reserved;       ///< reserved for future use
 } z_stream;
 
 
-// inside a package (PAK or PK3)
+/// inside a package (PAK or PK3)
 #define QFILE_FLAG_PACKED (1 << 0)
-// file is compressed using the deflate algorithm (PK3 only)
+/// file is compressed using the deflate algorithm (PK3 only)
 #define QFILE_FLAG_DEFLATED (1 << 1)
+/// file is actually already loaded data
+#define QFILE_FLAG_DATA (1 << 2)
 
 #define FILE_BUFF_SIZE 2048
 typedef struct
 {
        z_stream        zstream;
-       size_t          comp_length;                    // length of the compressed file
-       size_t          in_ind, in_len;                 // input buffer current index and length
-       size_t          in_position;                    // position in the compressed file
+       size_t          comp_length;                    ///< length of the compressed file
+       size_t          in_ind, in_len;                 ///< input buffer current index and length
+       size_t          in_position;                    ///< position in the compressed file
        unsigned char           input [FILE_BUFF_SIZE];
 } ztoolkit_t;
 
 struct qfile_s
 {
        int                             flags;
-       int                             handle;                                 // file descriptor
-       fs_offset_t             real_length;                    // uncompressed file size (for files opened in "read" mode)
-       fs_offset_t             position;                               // current position in the file
-       fs_offset_t             offset;                                 // offset into the package (0 if external file)
-       int                             ungetc;                                 // single stored character from ungetc, cleared to EOF when read
+       int                             handle;                                 ///< file descriptor
+       fs_offset_t             real_length;                    ///< uncompressed file size (for files opened in "read" mode)
+       fs_offset_t             position;                               ///< current position in the file
+       fs_offset_t             offset;                                 ///< offset into the package (0 if external file)
+       int                             ungetc;                                 ///< single stored character from ungetc, cleared to EOF when read
 
        // Contents buffer
-       fs_offset_t             buff_ind, buff_len;             // buffer current index and length
+       fs_offset_t             buff_ind, buff_len;             ///< buffer current index and length
        unsigned char                   buff [FILE_BUFF_SIZE];
 
-       // For zipped files
-       ztoolkit_t*             ztk;
+       ztoolkit_t*             ztk;    ///< For zipped files.
+
+       const unsigned char *data;      ///< For data files.
 };
 
 
@@ -193,11 +212,11 @@ typedef struct pk3_endOfCentralDir_s
 {
        unsigned int signature;
        unsigned short disknum;
-       unsigned short cdir_disknum;    // number of the disk with the start of the central directory
-       unsigned short localentries;    // number of entries in the central directory on this disk
-       unsigned short nbentries;               // total number of entries in the central directory on this disk
-       unsigned int cdir_size;                 // size of the central directory
-       unsigned int cdir_offset;               // with respect to the starting disk number
+       unsigned short cdir_disknum;    ///< number of the disk with the start of the central directory
+       unsigned short localentries;    ///< number of entries in the central directory on this disk
+       unsigned short nbentries;               ///< total number of entries in the central directory on this disk
+       unsigned int cdir_size;                 ///< size of the central directory
+       unsigned int cdir_offset;               ///< with respect to the starting disk number
        unsigned short comment_size;
 } pk3_endOfCentralDir_t;
 
@@ -217,12 +236,14 @@ typedef struct dpackheader_s
 } dpackheader_t;
 
 
-// Packages in memory
-// the offset in packfile_t is the true contents offset
+/*! \name Packages in memory
+ * @{
+ */
+/// the offset in packfile_t is the true contents offset
 #define PACKFILE_FLAG_TRUEOFFS (1 << 0)
-// file compressed using the deflate algorithm
+/// file compressed using the deflate algorithm
 #define PACKFILE_FLAG_DEFLATED (1 << 1)
-// file is a symbolic link
+/// file is a symbolic link
 #define PACKFILE_FLAG_SYMLINK (1 << 2)
 
 typedef struct packfile_s
@@ -230,8 +251,8 @@ typedef struct packfile_s
        char name [MAX_QPATH];
        int flags;
        fs_offset_t offset;
-       fs_offset_t packsize;   // size in the package
-       fs_offset_t realsize;   // real file size (uncompressed)
+       fs_offset_t packsize;   ///< size in the package
+       fs_offset_t realsize;   ///< real file size (uncompressed)
 } packfile_t;
 
 typedef struct pack_s
@@ -239,13 +260,13 @@ typedef struct pack_s
        char filename [MAX_OSPATH];
        char shortname [MAX_QPATH];
        int handle;
-       int ignorecase;  // PK3 ignores case
+       int ignorecase;  ///< PK3 ignores case
        int numfiles;
        packfile_t *files;
 } pack_t;
+//@}
 
-
-// Search paths for files (including packages)
+/// Search paths for files (including packages)
 typedef struct searchpath_s
 {
        // only one of filename / pack will be used
@@ -265,6 +286,7 @@ FUNCTION PROTOTYPES
 
 void FS_Dir_f(void);
 void FS_Ls_f(void);
+void FS_Which_f(void);
 
 static searchpath_t *FS_FindFile (const char *name, int* index, qboolean quiet);
 static packfile_t* FS_AddFileToPack (const char* name, pack_t* pack,
@@ -283,9 +305,11 @@ VARIABLES
 mempool_t *fs_mempool;
 
 searchpath_t *fs_searchpaths = NULL;
+const char *const fs_checkgamedir_missing = "missing";
 
 #define MAX_FILES_IN_PACK      65536
 
+char fs_userdir[MAX_OSPATH];
 char fs_gamedir[MAX_OSPATH];
 char fs_basedir[MAX_OSPATH];
 
@@ -293,7 +317,11 @@ char fs_basedir[MAX_OSPATH];
 int fs_numgamedirs = 0;
 char fs_gamedirs[MAX_GAMEDIRS][MAX_QPATH];
 
-cvar_t scr_screenshot_name = {0, "scr_screenshot_name","dp", "prefix name for saved screenshots (changes based on -game commandline, as well as which game mode is running)"};
+// list of all gamedirs with modinfo.txt
+gamedir_t *fs_all_gamedirs = NULL;
+int fs_all_gamedirs_count = 0;
+
+cvar_t scr_screenshot_name = {0, "scr_screenshot_name","dp", "prefix name for saved screenshots (changes based on -game commandline, as well as which game mode is running; the date is encoded using strftime escapes)"};
 cvar_t fs_empty_files_in_pack_mark_deletions = {0, "fs_empty_files_in_pack_mark_deletions", "0", "if enabled, empty files in a pak/pk3 count as not existing but cancel the search in further packs, effectively allowing patch pak/pk3 files to 'delete' files"};
 
 
@@ -316,9 +344,16 @@ static int (ZEXPORT *qz_inflate) (z_stream* strm, int flush);
 static int (ZEXPORT *qz_inflateEnd) (z_stream* strm);
 static int (ZEXPORT *qz_inflateInit2_) (z_stream* strm, int windowBits, const char *version, int stream_size);
 static int (ZEXPORT *qz_inflateReset) (z_stream* strm);
+static int (ZEXPORT *qz_deflateInit2_) (z_stream* strm, int level, int method, int windowBits, int memLevel, int strategy, const char *version, int stream_size);
+static int (ZEXPORT *qz_deflateEnd) (z_stream* strm);
+static int (ZEXPORT *qz_deflate) (z_stream* strm, int flush);
 
 #define qz_inflateInit2(strm, windowBits) \
         qz_inflateInit2_((strm), (windowBits), ZLIB_VERSION, sizeof(z_stream))
+#define qz_deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
+        qz_deflateInit2_((strm), (level), (method), (windowBits), (memLevel), (strategy), ZLIB_VERSION, sizeof(z_stream))
+
+//        qz_deflateInit_((strm), (level), ZLIB_VERSION, sizeof(z_stream))
 
 static dllfunction_t zlibfuncs[] =
 {
@@ -326,10 +361,13 @@ static dllfunction_t zlibfuncs[] =
        {"inflateEnd",          (void **) &qz_inflateEnd},
        {"inflateInit2_",       (void **) &qz_inflateInit2_},
        {"inflateReset",        (void **) &qz_inflateReset},
+       {"deflateInit2_",   (void **) &qz_deflateInit2_},
+       {"deflateEnd",      (void **) &qz_deflateEnd},
+       {"deflate",         (void **) &qz_deflate},
        {NULL, NULL}
 };
 
-// Handle for Zlib DLL
+/// Handle for Zlib DLL
 static dllhandle_t zlib_dll = NULL;
 
 #ifdef WIN32
@@ -392,6 +430,18 @@ qboolean PK3_OpenLibrary (void)
        return Sys_LoadLibrary (dllnames, &zlib_dll, zlibfuncs);
 }
 
+/*
+====================
+FS_HasZlib
+
+See if zlib is available
+====================
+*/
+qboolean FS_HasZlib(void)
+{
+       PK3_OpenLibrary(); // to be safe
+       return (zlib_dll != 0);
+}
 
 /*
 ====================
@@ -472,7 +522,11 @@ int PK3_BuildFileList (pack_t *pack, const pk3_endOfCentralDir_t *eocd)
        // Load the central directory in memory
        central_dir = (unsigned char *)Mem_Alloc (tempmempool, eocd->cdir_size);
        lseek (pack->handle, eocd->cdir_offset, SEEK_SET);
-       read (pack->handle, central_dir, eocd->cdir_size);
+       if(read (pack->handle, central_dir, eocd->cdir_size) != (ssize_t) eocd->cdir_size)
+       {
+               Mem_Free (central_dir);
+               return -1;
+       }
 
        // Extract the files properties
        // The parsing is done "by hand" because some fields have variable sizes and
@@ -741,7 +795,7 @@ static packfile_t* FS_AddFileToPack (const char* name, pack_t* pack,
 ============
 FS_CreatePath
 
-Only used for FS_Open.
+Only used for FS_OpenRealFile.
 ============
 */
 void FS_CreatePath (char *path)
@@ -786,13 +840,12 @@ void FS_Path_f (void)
 /*
 =================
 FS_LoadPackPAK
-
-Takes an explicit (not game tree related) path to a pak file.
-
-Loads the header and directory, adding the files at the beginning
-of the list so they override previous pack files.
 =================
 */
+/*! Takes an explicit (not game tree related) path to a pak file.
+ *Loads the header and directory, adding the files at the beginning
+ *of the list so they override previous pack files.
+ */
 pack_t *FS_LoadPackPAK (const char *packfile)
 {
        dpackheader_t header;
@@ -808,7 +861,12 @@ pack_t *FS_LoadPackPAK (const char *packfile)
 #endif
        if (packhandle < 0)
                return NULL;
-       read (packhandle, (void *)&header, sizeof(header));
+       if(read (packhandle, (void *)&header, sizeof(header)) != sizeof(header))
+       {
+               Con_Printf ("%s is not a packfile\n", packfile);
+               close(packhandle);
+               return NULL;
+       }
        if (memcmp(header.id, "PACK", 4))
        {
                Con_Printf ("%s is not a packfile\n", packfile);
@@ -869,17 +927,18 @@ pack_t *FS_LoadPackPAK (const char *packfile)
 /*
 ================
 FS_AddPack_Fullpath
-
-Adds the given pack to the search path.
-The pack type is autodetected by the file extension.
-
-Returns true if the file was successfully added to the
-search path or if it was already included.
-
-If keep_plain_dirs is set, the pack will be added AFTER the first sequence of
-plain directories.
 ================
 */
+/*! Adds the given pack to the search path.
+ * The pack type is autodetected by the file extension.
+ *
+ * Returns true if the file was successfully added to the
+ * search path or if it was already included.
+ *
+ * If keep_plain_dirs is set, the pack will be added AFTER the first sequence of
+ * plain directories.
+ *
+ */
 static qboolean FS_AddPack_Fullpath(const char *pakfile, const char *shortname, qboolean *already_loaded, qboolean keep_plain_dirs)
 {
        searchpath_t *search;
@@ -965,17 +1024,17 @@ static qboolean FS_AddPack_Fullpath(const char *pakfile, const char *shortname,
 /*
 ================
 FS_AddPack
-
-Adds the given pack to the search path and searches for it in the game path.
-The pack type is autodetected by the file extension.
-
-Returns true if the file was successfully added to the
-search path or if it was already included.
-
-If keep_plain_dirs is set, the pack will be added AFTER the first sequence of
-plain directories.
 ================
 */
+/*! Adds the given pack to the search path and searches for it in the game path.
+ * The pack type is autodetected by the file extension.
+ *
+ * Returns true if the file was successfully added to the
+ * search path or if it was already included.
+ *
+ * If keep_plain_dirs is set, the pack will be added AFTER the first sequence of
+ * plain directories.
+ */
 qboolean FS_AddPack(const char *pakfile, qboolean *already_loaded, qboolean keep_plain_dirs)
 {
        char fullpath[MAX_QPATH];
@@ -1055,86 +1114,11 @@ FS_AddGameHierarchy
 */
 void FS_AddGameHierarchy (const char *dir)
 {
-       int i;
-       char userdir[MAX_QPATH];
-#ifdef WIN32
-       TCHAR mydocsdir[MAX_PATH + 1];
-#if _MSC_VER >= 1400
-       size_t homedirlen;
-#endif
-#endif
-       char *homedir;
-
        // Add the common game directory
        FS_AddGameDirectory (va("%s%s/", fs_basedir, dir));
 
-       *userdir = 0;
-
-       // Add the personal game directory
-#ifdef WIN32
-       if(qSHGetFolderPath && (qSHGetFolderPath(NULL, CSIDL_PERSONAL, NULL, 0, mydocsdir) == S_OK))
-       {
-               dpsnprintf(userdir, sizeof(userdir), "%s/My Games/%s/", mydocsdir, gameuserdirname);
-               Con_DPrintf("Obtained personal directory %s from SHGetFolderPath\n", userdir);
-       }
-       else
-       {
-               // use the environment
-#if _MSC_VER >= 1400
-               _dupenv_s (&homedir, &homedirlen, "USERPROFILE");
-#else
-               homedir = getenv("USERPROFILE");
-#endif
-
-               if(homedir)
-               {
-                       dpsnprintf(userdir, sizeof(userdir), "%s/My Documents/My Games/%s/", homedir, gameuserdirname);
-#if _MSC_VER >= 1400
-                       free(homedir);
-#endif
-                       Con_DPrintf("Obtained personal directory %s from environment\n", userdir);
-               }
-               else
-                       *userdir = 0; // just to make sure it hasn't been written to by SHGetFolderPath returning failure
-       }
-
-       if(!*userdir)
-               Con_DPrintf("Could not obtain home directory; not supporting -mygames\n");
-#else
-       homedir = getenv ("HOME");
-       if(homedir)
-               dpsnprintf(userdir, sizeof(userdir), "%s/.%s/", homedir, gameuserdirname);
-
-       if(!*userdir)
-               Con_DPrintf("Could not obtain home directory; assuming -nohome\n");
-#endif
-
-
-#ifdef WIN32
-       if(!COM_CheckParm("-mygames"))
-       {
-#if _MSC_VER >= 1400
-               int fd;
-               _sopen_s(&fd, va("%s%s/config.cfg", fs_basedir, dir), O_WRONLY | O_CREAT, _SH_DENYNO, _S_IREAD | _S_IWRITE); // note: no O_TRUNC here!
-#else
-               int fd = open (va("%s%s/config.cfg", fs_basedir, dir), O_WRONLY | O_CREAT, 0666); // note: no O_TRUNC here!
-#endif
-               if(fd >= 0)
-               {
-                       close(fd);
-                       *userdir = 0; // we have write access to the game dir, so let's use it
-               }
-       }
-#endif
-
-       if(COM_CheckParm("-nohome"))
-               *userdir = 0;
-
-       if((i = COM_CheckParm("-userdir")) && i < com_argc - 1)
-               dpsnprintf(userdir, sizeof(userdir), "%s/", com_argv[i+1]);
-
-       if (*userdir)
-               FS_AddGameDirectory(va("%s%s/", userdir, dir));
+       if (*fs_userdir)
+               FS_AddGameDirectory(va("%s%s/", fs_userdir, dir));
 }
 
 
@@ -1294,6 +1278,7 @@ extern void Host_LoadConfig_f (void);
 qboolean FS_ChangeGameDirs(int numgamedirs, char gamedirs[][MAX_QPATH], qboolean complain, qboolean failmissing)
 {
        int i;
+       const char *p;
 
        if (fs_numgamedirs == numgamedirs)
        {
@@ -1314,17 +1299,14 @@ qboolean FS_ChangeGameDirs(int numgamedirs, char gamedirs[][MAX_QPATH], qboolean
        for (i = 0;i < numgamedirs;i++)
        {
                // if string is nasty, reject it
-               if(FS_CheckNastyPath(gamedirs[i], true))
+               p = FS_CheckGameDir(gamedirs[i]);
+               if(!p)
                {
                        if (complain)
                                Con_Printf("Nasty gamedir name rejected: %s\n", gamedirs[i]);
                        return false; // nasty gamedirs
                }
-       }
-
-       for (i = 0;i < numgamedirs;i++)
-       {
-               if (!FS_CheckGameDir(gamedirs[i]) && failmissing)
+               if(p == fs_checkgamedir_missing && failmissing)
                {
                        if (complain)
                                Con_Printf("Gamedir missing: %s%s/\n", fs_basedir, gamedirs[i]);
@@ -1396,23 +1378,121 @@ void FS_GameDir_f (void)
        FS_ChangeGameDirs(numgamedirs, gamedirs, true, true);
 }
 
+static qfile_t* FS_SysOpen (const char* filepath, const char* mode, qboolean nonblocking);
+static const char *FS_SysCheckGameDir(const char *gamedir)
+{
+       static char buf[8192];
+       qboolean success;
+       qfile_t *f;
+       stringlist_t list;
+       fs_offset_t n;
+
+       stringlistinit(&list);
+       listdirectory(&list, gamedir, "");
+       success = list.numstrings > 0;
+       stringlistfreecontents(&list);
+
+       if(success)
+       {
+               f = FS_SysOpen(va("%smodinfo.txt", gamedir), "r", false);
+               if(f)
+               {
+                       n = FS_Read (f, buf, sizeof(buf) - 1);
+                       if(n >= 0)
+                               buf[n] = 0;
+                       else
+                               *buf = 0;
+                       FS_Close(f);
+               }
+               else
+                       *buf = 0;
+               return buf;
+       }
+
+       return NULL;
+}
 
 /*
 ================
 FS_CheckGameDir
 ================
 */
-qboolean FS_CheckGameDir(const char *gamedir)
+const char *FS_CheckGameDir(const char *gamedir)
 {
-       qboolean success;
-       stringlist_t list;
+       const char *ret;
+
+       if (FS_CheckNastyPath(gamedir, true))
+               return NULL;
+
+       ret = FS_SysCheckGameDir(va("%s%s/", fs_userdir, gamedir));
+       if(ret)
+       {
+               if(!*ret)
+               {
+                       // get description from basedir
+                       ret = FS_SysCheckGameDir(va("%s%s/", fs_basedir, gamedir));
+                       if(ret)
+                               return ret;
+                       return "";
+               }
+               return ret;
+       }
+
+       ret = FS_SysCheckGameDir(va("%s%s/", fs_basedir, gamedir));
+       if(ret)
+               return ret;
+       
+       return fs_checkgamedir_missing;
+}
+
+static void FS_ListGameDirs()
+{
+       stringlist_t list, list2;
+       int i, j;
+       const char *info;
+
+       fs_all_gamedirs_count = 0;
+       if(fs_all_gamedirs)
+               Mem_Free(fs_all_gamedirs);
+
        stringlistinit(&list);
-       listdirectory(&list, va("%s%s/", fs_basedir, gamedir), "");
-       success = list.numstrings > 0;
+       listdirectory(&list, va("%s/", fs_basedir), "");
+       listdirectory(&list, va("%s/", fs_userdir), "");
+       stringlistsort(&list);
+
+       stringlistinit(&list2);
+       for(i = 0; i < list.numstrings; ++i)
+       {
+               if(i)
+                       if(!strcmp(list.strings[i-1], list.strings[i]))
+                               continue;
+               info = FS_CheckGameDir(list.strings[i]);
+               if(!info)
+                       continue;
+               if(info == fs_checkgamedir_missing)
+                       continue;
+               if(!*info)
+                       continue;
+               stringlistappend(&list2, list.strings[i]); 
+       }
        stringlistfreecontents(&list);
-       return success;
-}
 
+       fs_all_gamedirs = Mem_Alloc(fs_mempool, list2.numstrings * sizeof(*fs_all_gamedirs));
+       for(i = 0; i < list2.numstrings; ++i)
+       {
+               info = FS_CheckGameDir(list2.strings[i]);
+               // all this cannot happen any more, but better be safe than sorry
+               if(!info)
+                       continue;
+               if(info == fs_checkgamedir_missing)
+                       continue;
+               if(!*info)
+                       continue;
+               strlcpy(fs_all_gamedirs[fs_all_gamedirs_count].name, list2.strings[i], sizeof(fs_all_gamedirs[j].name));
+               strlcpy(fs_all_gamedirs[fs_all_gamedirs_count].description, info, sizeof(fs_all_gamedirs[j].description));
+               ++fs_all_gamedirs_count;
+       }
+}
 
 /*
 ================
@@ -1421,7 +1501,15 @@ FS_Init
 */
 void FS_Init (void)
 {
+       const char *p;
        int i;
+#ifdef WIN32
+       TCHAR mydocsdir[MAX_PATH + 1];
+#if _MSC_VER >= 1400
+       size_t homedirlen;
+#endif
+#endif
+       char *homedir;
 
 #ifdef WIN32
        const char* dllnames [] =
@@ -1435,13 +1523,78 @@ void FS_Init (void)
 
        fs_mempool = Mem_AllocPool("file management", 0, NULL);
 
+       // Add the personal game directory
+       if((i = COM_CheckParm("-userdir")) && i < com_argc - 1)
+       {
+               dpsnprintf(fs_userdir, sizeof(fs_userdir), "%s/", com_argv[i+1]);
+       }
+       else if(COM_CheckParm("-nohome"))
+       {
+               *fs_userdir = 0;
+       }
+       else
+       {
+#ifdef WIN32
+               if(qSHGetFolderPath && (qSHGetFolderPath(NULL, CSIDL_PERSONAL, NULL, 0, mydocsdir) == S_OK))
+               {
+                       dpsnprintf(fs_userdir, sizeof(fs_userdir), "%s/My Games/%s/", mydocsdir, gameuserdirname);
+                       Con_DPrintf("Obtained personal directory %s from SHGetFolderPath\n", fs_userdir);
+               }
+               else
+               {
+                       // use the environment
+#if _MSC_VER >= 1400
+                       _dupenv_s (&homedir, &homedirlen, "USERPROFILE");
+#else
+                       homedir = getenv("USERPROFILE");
+#endif
+
+                       if(homedir)
+                       {
+                               dpsnprintf(fs_userdir, sizeof(fs_userdir), "%s/My Documents/My Games/%s/", homedir, gameuserdirname);
+#if _MSC_VER >= 1400
+                               free(homedir);
+#endif
+                               Con_DPrintf("Obtained personal directory %s from environment\n", fs_userdir);
+                       }
+               }
+
+               if(!*fs_userdir)
+                       Con_DPrintf("Could not obtain home directory; not supporting -mygames\n");
+#else
+               homedir = getenv ("HOME");
+               if(homedir)
+                       dpsnprintf(fs_userdir, sizeof(fs_userdir), "%s/.%s/", homedir, gameuserdirname);
+
+               if(!*fs_userdir)
+                       Con_DPrintf("Could not obtain home directory; assuming -nohome\n");
+#endif
+
+#ifdef WIN32
+               if(!COM_CheckParm("-mygames"))
+               {
+#if _MSC_VER >= 1400
+                       int fd;
+                       _sopen_s(&fd, va("%s%s/config.cfg", fs_basedir, dir), O_WRONLY | O_CREAT, _SH_DENYNO, _S_IREAD | _S_IWRITE); // note: no O_TRUNC here!
+#else
+                       int fd = open (va("%s%s/config.cfg", fs_basedir, dir), O_WRONLY | O_CREAT, 0666); // note: no O_TRUNC here!
+#endif
+                       if(fd >= 0)
+                       {
+                               close(fd);
+                               *fs_userdir = 0; // we have write access to the game dir, so let's use it
+                       }
+               }
+#endif
+       }
+
        strlcpy(fs_gamedir, "", sizeof(fs_gamedir));
 
 // If the base directory is explicitly defined by the compilation process
 #ifdef DP_FS_BASEDIR
        strlcpy(fs_basedir, DP_FS_BASEDIR, sizeof(fs_basedir));
 #else
-       strlcpy(fs_basedir, "", sizeof(fs_basedir));
+       *fs_basedir = 0;
 
 #ifdef MACOSX
        // FIXME: is there a better way to find the directory outside the .app?
@@ -1476,11 +1629,18 @@ void FS_Init (void)
        if (fs_basedir[0] && fs_basedir[strlen(fs_basedir) - 1] != '/' && fs_basedir[strlen(fs_basedir) - 1] != '\\')
                strlcat(fs_basedir, "/", sizeof(fs_basedir));
 
-       if (!FS_CheckGameDir(gamedirname1))
+       FS_ListGameDirs();
+
+       p = FS_CheckGameDir(gamedirname1);
+       if(!p || p == fs_checkgamedir_missing)
                Con_Printf("WARNING: base gamedir %s%s/ not found!\n", fs_basedir, gamedirname1);
 
-       if (gamedirname2 && !FS_CheckGameDir(gamedirname2))
-               Con_Printf("WARNING: base gamedir %s%s/ not found!\n", fs_basedir, gamedirname2);
+       if(gamedirname2)
+       {
+               p = FS_CheckGameDir(gamedirname2);
+               if(!p || p == fs_checkgamedir_missing)
+                       Con_Printf("WARNING: base gamedir %s%s/ not found!\n", fs_basedir, gamedirname2);
+       }
 
        // -game <gamedir>
        // Adds basedir/gamedir as an override game
@@ -1492,9 +1652,10 @@ void FS_Init (void)
                if (!strcmp (com_argv[i], "-game") && i < com_argc-1)
                {
                        i++;
-                       if (FS_CheckNastyPath(com_argv[i], true))
-                               Sys_Error("-game %s%s/ is a dangerous/non-portable path\n", fs_basedir, com_argv[i]);
-                       if (!FS_CheckGameDir(com_argv[i]))
+                       p = FS_CheckGameDir(com_argv[i]);
+                       if(!p)
+                               Sys_Error("Nasty -game name rejected: %s", com_argv[i]);
+                       if(p == fs_checkgamedir_missing)
                                Con_Printf("WARNING: -game %s%s/ not found!\n", fs_basedir, com_argv[i]);
                        // add the gamedir to the list of active gamedirs
                        strlcpy (fs_gamedirs[fs_numgamedirs], com_argv[i], sizeof(fs_gamedirs[fs_numgamedirs]));
@@ -1516,6 +1677,7 @@ void FS_Init_Commands(void)
        Cmd_AddCommand ("path", FS_Path_f, "print searchpath (game directories and archives)");
        Cmd_AddCommand ("dir", FS_Dir_f, "list files in searchpath matching an * filename pattern, one per line");
        Cmd_AddCommand ("ls", FS_Ls_f, "list files in searchpath matching an * filename pattern, multiple per line");
+       Cmd_AddCommand ("which", FS_Which_f, "accepts a file name as argument and reports where the file is taken from");
 }
 
 /*
@@ -1982,38 +2144,70 @@ MAIN PUBLIC FUNCTIONS
 
 /*
 ====================
-FS_Open
+FS_OpenRealFile
 
-Open a file. The syntax is the same as fopen
+Open a file in the userpath. The syntax is the same as fopen
+Used for savegame scanning in menu, and all file writing.
 ====================
 */
-qfile_t* FS_Open (const char* filepath, const char* mode, qboolean quiet, qboolean nonblocking)
+qfile_t* FS_OpenRealFile (const char* filepath, const char* mode, qboolean quiet)
 {
+       char real_path [MAX_OSPATH];
+
        if (FS_CheckNastyPath(filepath, false))
        {
-               Con_Printf("FS_Open(\"%s\", \"%s\", %s): nasty filename rejected\n", filepath, mode, quiet ? "true" : "false");
+               Con_Printf("FS_OpenRealFile(\"%s\", \"%s\", %s): nasty filename rejected\n", filepath, mode, quiet ? "true" : "false");
                return NULL;
        }
 
-       // If the file is opened in "write", "append", or "read/write" mode
+       dpsnprintf (real_path, sizeof (real_path), "%s/%s", fs_gamedir, filepath);
+
+       // If the file is opened in "write", "append", or "read/write" mode,
+       // create directories up to the file.
        if (mode[0] == 'w' || mode[0] == 'a' || strchr (mode, '+'))
-       {
-               char real_path [MAX_OSPATH];
+               FS_CreatePath (real_path);
+       return FS_SysOpen (real_path, mode, false);
+}
 
-               // Open the file on disk directly
-               dpsnprintf (real_path, sizeof (real_path), "%s/%s", fs_gamedir, filepath);
 
-               // Create directories up to the file
-               FS_CreatePath (real_path);
+/*
+====================
+FS_OpenVirtualFile
 
-               return FS_SysOpen (real_path, mode, nonblocking);
+Open a file. The syntax is the same as fopen
+====================
+*/
+qfile_t* FS_OpenVirtualFile (const char* filepath, qboolean quiet)
+{
+       if (FS_CheckNastyPath(filepath, false))
+       {
+               Con_Printf("FS_OpenVirtualFile(\"%s\", %s): nasty filename rejected\n", filepath, quiet ? "true" : "false");
+               return NULL;
        }
-       // Else, we look at the various search paths and open the file in read-only mode
-       else
-               return FS_OpenReadFile (filepath, quiet, nonblocking, 16);
+
+       return FS_OpenReadFile (filepath, quiet, false, 16);
 }
 
 
+/*
+====================
+FS_FileFromData
+
+Open a file. The syntax is the same as fopen
+====================
+*/
+qfile_t* FS_FileFromData (const unsigned char *data, const size_t size, qboolean quiet)
+{
+       qfile_t* file;
+       file = (qfile_t *)Mem_Alloc (fs_mempool, sizeof (*file));
+       memset (file, 0, sizeof (*file));
+       file->flags = QFILE_FLAG_DATA;
+       file->ungetc = EOF;
+       file->real_length = size;
+       file->data = data;
+       return file;
+}
+
 /*
 ====================
 FS_Close
@@ -2023,6 +2217,12 @@ Close a file
 */
 int FS_Close (qfile_t* file)
 {
+       if(file->flags & QFILE_FLAG_DATA)
+       {
+               Mem_Free(file);
+               return 0;
+       }
+
        if (close (file->handle))
                return EOF;
 
@@ -2093,6 +2293,16 @@ fs_offset_t FS_Read (qfile_t* file, void* buffer, size_t buffersize)
        else
                done = 0;
 
+       if(file->flags & QFILE_FLAG_DATA)
+       {
+               size_t left = file->real_length - file->position;
+               if(buffersize > left)
+                       buffersize = left;
+               memcpy(buffer, file->data + file->position, buffersize);
+               file->position += buffersize;
+               return buffersize;
+       }
+
        // First, we copy as many bytes as we can from "buff"
        if (file->buff_ind < file->buff_len)
        {
@@ -2374,6 +2584,12 @@ int FS_Seek (qfile_t* file, fs_offset_t offset, int whence)
        if (offset < 0 || offset > file->real_length)
                return -1;
 
+       if(file->flags & QFILE_FLAG_DATA)
+       {
+               file->position = offset;
+               return 0;
+       }
+
        // If we have the data in our read buffer, we don't need to actually seek
        if (file->position - file->buff_len <= offset && offset <= file->position)
        {
@@ -2491,10 +2707,17 @@ unsigned char *FS_LoadFile (const char *path, mempool_t *pool, qboolean quiet, f
        unsigned char *buf = NULL;
        fs_offset_t filesize = 0;
 
-       file = FS_Open (path, "rb", quiet, false);
+       file = FS_OpenVirtualFile(path, quiet);
        if (file)
        {
                filesize = file->real_length;
+               if(filesize < 0)
+               {
+                       Con_Printf("FS_LoadFile(\"%s\", pool, %s, filesizepointer): trying to open a non-regular file\n", path, quiet ? "true" : "false");
+                       FS_Close(file);
+                       return NULL;
+               }
+
                buf = (unsigned char *)Mem_Alloc (pool, filesize + 1);
                buf[filesize] = '\0';
                FS_Read (file, buf, filesize);
@@ -2520,7 +2743,7 @@ qboolean FS_WriteFile (const char *filename, void *data, fs_offset_t len)
 {
        qfile_t *file;
 
-       file = FS_Open (filename, "wb", false, false);
+       file = FS_OpenRealFile(filename, "wb", false);
        if (!file)
        {
                Con_Printf("FS_WriteFile: failed on %s\n", filename);
@@ -2989,6 +3212,29 @@ void FS_Ls_f(void)
        FS_ListDirectoryCmd("ls", false);
 }
 
+void FS_Which_f(void)
+{
+       const char *filename;
+       int index;
+       searchpath_t *sp;
+       if (Cmd_Argc() != 2)
+       {
+               Con_Printf("usage:\n%s <file>\n", Cmd_Argv(0));
+               return;
+       }  
+       filename = Cmd_Argv(1);
+       sp = FS_FindFile(filename, &index, true);
+       if (!sp) {
+               Con_Printf("%s isn't anywhere\n", filename);
+               return;
+       }
+       if (sp->pack)
+               Con_Printf("%s is in package %s\n", filename, sp->pack->shortname);
+       else
+               Con_Printf("%s is file %s%s\n", filename, sp->filename, filename);
+}
+
+
 const char *FS_WhichPack(const char *filename)
 {
        int index;
@@ -3073,3 +3319,181 @@ int FS_CRCFile(const char *filename, size_t *filesizepointer)
        return crc;
 }
 
+unsigned char *FS_Deflate(const unsigned char *data, size_t size, size_t *deflated_size, int level, mempool_t *mempool)
+{
+       z_stream strm;
+       unsigned char *out = NULL;
+       unsigned char *tmp;
+
+       memset(&strm, 0, sizeof(strm));
+       strm.zalloc = Z_NULL;
+       strm.zfree = Z_NULL;
+       strm.opaque = Z_NULL;
+
+       if(level < 0)
+               level = Z_DEFAULT_COMPRESSION;
+
+       if(qz_deflateInit2(&strm, level, Z_DEFLATED, -MAX_WBITS, Z_MEMLEVEL_DEFAULT, Z_BINARY) != Z_OK)
+       {
+               Con_Printf("FS_Deflate: deflate init error!\n");
+               return NULL;
+       }
+
+       strm.next_in = (unsigned char*)data;
+       strm.avail_in = size;
+
+       tmp = (unsigned char *) Mem_Alloc(tempmempool, size);
+       if(!tmp)
+       {
+               Con_Printf("FS_Deflate: not enough memory in tempmempool!\n");
+               qz_deflateEnd(&strm);
+               return NULL;
+       }
+
+       strm.next_out = tmp;
+       strm.avail_out = size;
+
+       if(qz_deflate(&strm, Z_FINISH) != Z_STREAM_END)
+       {
+               Con_Printf("FS_Deflate: deflate failed!\n");
+               qz_deflateEnd(&strm);
+               Mem_Free(tmp);
+               return NULL;
+       }
+       
+       if(qz_deflateEnd(&strm) != Z_OK)
+       {
+               Con_Printf("FS_Deflate: deflateEnd failed\n");
+               Mem_Free(tmp);
+               return NULL;
+       }
+
+       if(strm.total_out >= size)
+       {
+               Con_Printf("FS_Deflate: deflate is useless on this data!\n");
+               Mem_Free(tmp);
+               return NULL;
+       }
+
+       out = (unsigned char *) Mem_Alloc(mempool, strm.total_out);
+       if(!out)
+       {
+               Con_Printf("FS_Deflate: not enough memory in target mempool!\n");
+               Mem_Free(tmp);
+               return NULL;
+       }
+
+       if(deflated_size)
+               *deflated_size = (size_t)strm.total_out;
+
+       memcpy(out, tmp, strm.total_out);
+       Mem_Free(tmp);
+       
+       return out;
+}
+
+static void AssertBufsize(sizebuf_t *buf, int length)
+{
+       if(buf->cursize + length > buf->maxsize)
+       {
+               int oldsize = buf->maxsize;
+               unsigned char *olddata;
+               olddata = buf->data;
+               buf->maxsize += length;
+               buf->data = (unsigned char *) Mem_Alloc(tempmempool, buf->maxsize);
+               if(olddata)
+               {
+                       memcpy(buf->data, olddata, oldsize);
+                       Mem_Free(olddata);
+               }
+       }
+}
+
+unsigned char *FS_Inflate(const unsigned char *data, size_t size, size_t *inflated_size, mempool_t *mempool)
+{
+       int ret;
+       z_stream strm;
+       unsigned char *out = NULL;
+       unsigned char tmp[2048];
+       unsigned int have;
+       sizebuf_t outbuf;
+
+       memset(&outbuf, 0, sizeof(outbuf));
+       outbuf.data = (unsigned char *) Mem_Alloc(tempmempool, sizeof(tmp));
+       outbuf.maxsize = sizeof(tmp);
+
+       memset(&strm, 0, sizeof(strm));
+       strm.zalloc = Z_NULL;
+       strm.zfree = Z_NULL;
+       strm.opaque = Z_NULL;
+
+       if(qz_inflateInit2(&strm, -MAX_WBITS) != Z_OK)
+       {
+               Con_Printf("FS_Inflate: inflate init error!\n");
+               Mem_Free(outbuf.data);
+               return NULL;
+       }
+
+       strm.next_in = (unsigned char*)data;
+       strm.avail_in = size;
+
+       do
+       {
+               strm.next_out = tmp;
+               strm.avail_out = sizeof(tmp);
+               ret = qz_inflate(&strm, Z_NO_FLUSH);
+               // it either returns Z_OK on progress, Z_STREAM_END on end
+               // or an error code
+               switch(ret)
+               {
+                       case Z_STREAM_END:
+                       case Z_OK:
+                               break;
+                               
+                       case Z_STREAM_ERROR:
+                               Con_Print("FS_Inflate: stream error!\n");
+                               break;
+                       case Z_DATA_ERROR:
+                               Con_Print("FS_Inflate: data error!\n");
+                               break;
+                       case Z_MEM_ERROR:
+                               Con_Print("FS_Inflate: mem error!\n");
+                               break;
+                       case Z_BUF_ERROR:
+                               Con_Print("FS_Inflate: buf error!\n");
+                               break;
+                       default:
+                               Con_Print("FS_Inflate: unknown error!\n");
+                               break;
+                               
+               }
+               if(ret != Z_OK && ret != Z_STREAM_END)
+               {
+                       Con_Printf("Error after inflating %u bytes\n", (unsigned)strm.total_in);
+                       Mem_Free(outbuf.data);
+                       qz_inflateEnd(&strm);
+                       return NULL;
+               }
+               have = sizeof(tmp) - strm.avail_out;
+               AssertBufsize(&outbuf, max(have, sizeof(tmp)));
+               SZ_Write(&outbuf, tmp, have);
+       } while(ret != Z_STREAM_END);
+
+       qz_inflateEnd(&strm);
+
+       out = (unsigned char *) Mem_Alloc(mempool, outbuf.cursize);
+       if(!out)
+       {
+               Con_Printf("FS_Inflate: not enough memory in target mempool!\n");
+               Mem_Free(outbuf.data);
+               return NULL;
+       }
+
+       memcpy(out, outbuf.data, outbuf.cursize);
+       Mem_Free(outbuf.data);
+
+       if(inflated_size)
+               *inflated_size = (size_t)outbuf.cursize;
+       
+       return out;
+}