improved setinfo handling so that quakeworld works much better now (name/topcolor...

[xonotic/darkplaces.git] / fs.c

diff --git a/fs.c b/fs.c
index 2179d6d5db6cfe38191e8afaed39f9d3b86e6472..58c5ed0a0ab763c3aca028185f94c3306c7b5e30 100644 (file)
--- a/fs.c
+++ b/fs.c
@@ -273,7 +273,7 @@ char fs_basedir[MAX_OSPATH];
 
 qboolean fs_modified;   // set true if using non-id files
 
-cvar_t scr_screenshot_name = {0, "scr_screenshot_name","dp"};
+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)"};
 
 
 /*
@@ -550,7 +550,7 @@ pack_t *FS_LoadPackPK3 (const char *packfile)
 
        if (! PK3_GetEndOfCentralDir (packfile, packhandle, &eocd))
        {
-               Con_Printf ("%s is not a PK3 file", packfile);
+               Con_Printf ("%s is not a PK3 file\n", packfile);
                close(packhandle);
                return NULL;
        }
@@ -558,7 +558,7 @@ pack_t *FS_LoadPackPK3 (const char *packfile)
        // Multi-volume ZIP archives are NOT allowed
        if (eocd.disknum != 0 || eocd.cdir_disknum != 0)
        {
-               Con_Printf ("%s is a multi-volume ZIP archive", packfile);
+               Con_Printf ("%s is a multi-volume ZIP archive\n", packfile);
                close(packhandle);
                return NULL;
        }
@@ -568,7 +568,7 @@ pack_t *FS_LoadPackPK3 (const char *packfile)
 #if MAX_FILES_IN_PACK < 65535
        if (eocd.nbentries > MAX_FILES_IN_PACK)
        {
-               Con_Printf ("%s contains too many files (%hu)", packfile, eocd.nbentries);
+               Con_Printf ("%s contains too many files (%hu)\n", packfile, eocd.nbentries);
                close(packhandle);
                return NULL;
        }
@@ -587,7 +587,7 @@ pack_t *FS_LoadPackPK3 (const char *packfile)
        real_nb_files = PK3_BuildFileList (pack, &eocd);
        if (real_nb_files < 0)
        {
-               Con_Printf ("%s is not a valid PK3 file", packfile);
+               Con_Printf ("%s is not a valid PK3 file\n", packfile);
                close(pack->handle);
                Mem_Free(pack);
                return NULL;
@@ -619,7 +619,7 @@ qboolean PK3_GetTrueFileOffset (packfile_t *pfile, pack_t *pack)
        count = read (pack->handle, buffer, ZIP_LOCAL_CHUNK_BASE_SIZE);
        if (count != ZIP_LOCAL_CHUNK_BASE_SIZE || BuffBigLong (buffer) != ZIP_DATA_HEADER)
        {
-               Con_Printf ("Can't retrieve file %s in package %s", pfile->name, pack->filename);
+               Con_Printf ("Can't retrieve file %s in package %s\n", pfile->name, pack->filename);
                return false;
        }
 
@@ -763,7 +763,7 @@ pack_t *FS_LoadPackPAK (const char *packfile)
        read (packhandle, (void *)&header, sizeof(header));
        if (memcmp(header.id, "PACK", 4))
        {
-               Con_Printf ("%s is not a packfile", packfile);
+               Con_Printf ("%s is not a packfile\n", packfile);
                close(packhandle);
                return NULL;
        }
@@ -772,7 +772,7 @@ pack_t *FS_LoadPackPAK (const char *packfile)
 
        if (header.dirlen % sizeof(dpackfile_t))
        {
-               Con_Printf ("%s has an invalid directory size", packfile);
+               Con_Printf ("%s has an invalid directory size\n", packfile);
                close(packhandle);
                return NULL;
        }
@@ -781,7 +781,7 @@ pack_t *FS_LoadPackPAK (const char *packfile)
 
        if (numpackfiles > MAX_FILES_IN_PACK)
        {
-               Con_Printf ("%s has %i files", packfile, numpackfiles);
+               Con_Printf ("%s has %i files\n", packfile, numpackfiles);
                close(packhandle);
                return NULL;
        }
@@ -894,7 +894,7 @@ void FS_AddGameHierarchy (const char *dir)
 #endif
 
        // Add the common game directory
-       FS_AddGameDirectory (va("%s/%s/", fs_basedir, dir));
+       FS_AddGameDirectory (va("%s%s/", fs_basedir, dir));
 
 #ifndef WIN32
        // Add the personal game directory
@@ -942,7 +942,7 @@ void FS_Init (void)
 
        fs_mempool = Mem_AllocPool("file management", 0, NULL);
 
-       strcpy(fs_basedir, ".");
+       strcpy(fs_basedir, "");
        strcpy(fs_gamedir, "");
 
 #ifdef MACOSX
@@ -973,6 +973,10 @@ void FS_Init (void)
                        fs_basedir[i-1] = 0;
        }
 
+       // add a path separator to the end of the basedir if it lacks one
+       if (fs_basedir[0] && fs_basedir[strlen(fs_basedir) - 1] != '/' && fs_basedir[strlen(fs_basedir) - 1] != '\\')
+               strlcat(fs_basedir, "/", sizeof(fs_basedir));
+
        // -path <dir or packfile> [<dir or packfile>] ...
        // Fully specifies the exact search path, overriding the generated one
 // COMMANDLINEOPTION: Filesystem: -path <path ..> specifies the full search path manually, overriding the generated one, example: -path c:\quake\id1 c:\quake\pak0.pak c:\quake\pak1.pak (not recommended)
@@ -991,7 +995,7 @@ void FS_Init (void)
                                search->pack = FS_LoadPackPAK (com_argv[i]);
                                if (!search->pack)
                                {
-                                       Con_Printf ("Couldn't load packfile: %s", com_argv[i]);
+                                       Con_Printf ("Couldn't load packfile: %s\n", com_argv[i]);
                                        Mem_Free(search);
                                        continue;
                                }
@@ -1001,7 +1005,7 @@ void FS_Init (void)
                                search->pack = FS_LoadPackPK3 (com_argv[i]);
                                if (!search->pack)
                                {
-                                       Con_Printf ("Couldn't load packfile: %s", com_argv[i]);
+                                       Con_Printf ("Couldn't load packfile: %s\n", com_argv[i]);
                                        Mem_Free(search);
                                        continue;
                                }
@@ -1054,9 +1058,9 @@ void FS_Init_Commands(void)
 {
        Cvar_RegisterVariable (&scr_screenshot_name);
 
-       Cmd_AddCommand ("path", FS_Path_f);
-       Cmd_AddCommand ("dir", FS_Dir_f);
-       Cmd_AddCommand ("ls", FS_Ls_f);
+       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");
 
        // set the default screenshot name to either the mod name or the
        // gamemode screenshot name
@@ -1183,7 +1187,7 @@ qfile_t *FS_OpenPackedFile (pack_t* pack, int pack_ind)
        // the dup() call to avoid having to close the dup_handle on error here
        if (lseek (pack->handle, pfile->offset, SEEK_SET) == -1)
        {
-               Con_Printf ("FS_OpenPackedFile: can't lseek to %s in %s (offset: %d)",
+               Con_Printf ("FS_OpenPackedFile: can't lseek to %s in %s (offset: %d)\n",
                                        pfile->name, pack->filename, pfile->offset);
                return NULL;
        }
@@ -1191,7 +1195,7 @@ qfile_t *FS_OpenPackedFile (pack_t* pack, int pack_ind)
        dup_handle = dup (pack->handle);
        if (dup_handle < 0)
        {
-               Con_Printf ("FS_OpenPackedFile: can't dup package's handle (pack: %s)", pack->filename);
+               Con_Printf ("FS_OpenPackedFile: can't dup package's handle (pack: %s)\n", pack->filename);
                return NULL;
        }
 
@@ -1230,7 +1234,7 @@ qfile_t *FS_OpenPackedFile (pack_t* pack, int pack_ind)
                 */
                if (qz_inflateInit2 (&ztk->zstream, -MAX_WBITS) != Z_OK)
                {
-                       Con_Printf ("FS_OpenPackedFile: inflate init error (file: %s)", pfile->name);
+                       Con_Printf ("FS_OpenPackedFile: inflate init error (file: %s)\n", pfile->name);
                        close(dup_handle);
                        Mem_Free(file);
                        return NULL;
@@ -1327,8 +1331,8 @@ static searchpath_t *FS_FindFile (const char *name, int* index, qboolean quiet)
                                // Found it
                                if (!diff)
                                {
-                                       if (!quiet)
-                                               Con_DPrintf("FS_FindFile: %s in %s\n",
+                                       if (!quiet && developer.integer >= 10)
+                                               Con_Printf("FS_FindFile: %s in %s\n",
                                                                        pak->files[middle].name, pak->filename);
 
                                        if (index != NULL)
@@ -1349,8 +1353,8 @@ static searchpath_t *FS_FindFile (const char *name, int* index, qboolean quiet)
                        dpsnprintf(netpath, sizeof(netpath), "%s%s", search->filename, name);
                        if (FS_SysFileExists (netpath))
                        {
-                               if (!quiet)
-                                       Con_DPrintf("FS_FindFile: %s\n", netpath);
+                               if (!quiet && developer.integer >= 10)
+                                       Con_Printf("FS_FindFile: %s\n", netpath);
 
                                if (index != NULL)
                                        *index = -1;
@@ -1359,8 +1363,8 @@ static searchpath_t *FS_FindFile (const char *name, int* index, qboolean quiet)
                }
        }
 
-       if (!quiet)
-               Con_DPrintf("FS_FindFile: can't find %s\n", name);
+       if (!quiet && developer.integer >= 10)
+               Con_Printf("FS_FindFile: can't find %s\n", name);
 
        if (index != NULL)
                *index = -1;
@@ -1428,7 +1432,7 @@ qfile_t* FS_Open (const char* filepath, const char* mode, qboolean quiet, qboole
                char real_path [MAX_OSPATH];
 
                // Open the file on disk directly
-               dpsnprintf (real_path, sizeof (real_path), "%s%s", fs_gamedir, filepath);
+               dpsnprintf (real_path, sizeof (real_path), "%s/%s", fs_gamedir, filepath);
 
                // Create directories up to the file
                FS_CreatePath (real_path);
@@ -1604,7 +1608,7 @@ fs_offset_t FS_Read (qfile_t* file, void* buffer, size_t buffersize)
                        lseek (file->handle, file->offset + (fs_offset_t)ztk->in_position, SEEK_SET);
                        if (read (file->handle, ztk->input, count) != count)
                        {
-                               Con_Printf ("FS_Read: unexpected end of file");
+                               Con_Printf ("FS_Read: unexpected end of file\n");
                                break;
                        }
 
@@ -1627,7 +1631,7 @@ fs_offset_t FS_Read (qfile_t* file, void* buffer, size_t buffersize)
                        error = qz_inflate (&ztk->zstream, Z_SYNC_FLUSH);
                        if (error != Z_OK && error != Z_STREAM_END)
                        {
-                               Con_Printf ("FS_Read: Can't inflate file");
+                               Con_Printf ("FS_Read: Can't inflate file\n");
                                break;
                        }
                        ztk->in_ind = ztk->in_len - ztk->zstream.avail_in;
@@ -1649,7 +1653,7 @@ fs_offset_t FS_Read (qfile_t* file, void* buffer, size_t buffersize)
                        error = qz_inflate (&ztk->zstream, Z_SYNC_FLUSH);
                        if (error != Z_OK && error != Z_STREAM_END)
                        {
-                               Con_Printf ("FS_Read: Can't inflate file");
+                               Con_Printf ("FS_Read: Can't inflate file\n");
                                break;
                        }
                        ztk->in_ind = ztk->in_len - ztk->zstream.avail_in;
@@ -1712,18 +1716,17 @@ Print a string into a file
 int FS_VPrintf (qfile_t* file, const char* format, va_list ap)
 {
        int len;
-       fs_offset_t buff_size;
-       char *tempbuff = NULL;
+       fs_offset_t buff_size = MAX_INPUTLINE;
+       char *tempbuff;
 
-       buff_size = 1024;
-       tempbuff = (char *)Mem_Alloc (tempmempool, buff_size);
-       len = dpvsnprintf (tempbuff, buff_size, format, ap);
-       while (len < 0)
+       for (;;)
        {
-               Mem_Free (tempbuff);
-               buff_size *= 2;
                tempbuff = (char *)Mem_Alloc (tempmempool, buff_size);
                len = dpvsnprintf (tempbuff, buff_size, format, ap);
+               if (len >= 0 && len < buff_size)
+                       break;
+               Mem_Free (tempbuff);
+               buff_size *= 2;
        }
 
        len = write (file->handle, tempbuff, len);
@@ -2219,7 +2222,7 @@ int FS_ListDirectory(const char *pattern, int oneperline)
        int linebufpos;
        int i, j, k, l;
        const char *name;
-       char linebuf[4096];
+       char linebuf[MAX_INPUTLINE];
        fssearch_t *search;
        search = FS_Search(pattern, true, true);
        if (!search)