X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=fs.c;h=6058893ec1d50023d841f33b70887a54c6dec235;hb=5c095672f598f0ee564c9926a53d0f03ab6aa382;hp=af163ce116247b6689564ca2dc1bec237bbf7248;hpb=11c4295b8ffc664deec6e3b01e90eaa2b03c0c7f;p=xonotic%2Fdarkplaces.git

diff --git a/fs.c b/fs.c
index af163ce1..6058893e 100644
--- a/fs.c
+++ b/fs.c
@@ -232,6 +232,7 @@ typedef struct pk3_endOfCentralDir_s
 	unsigned int cdir_size;			///< size of the central directory
 	unsigned int cdir_offset;		///< with respect to the starting disk number
 	unsigned short comment_size;
+	fs_offset_t prepended_garbage;
 } pk3_endOfCentralDir_t;
 
 
@@ -276,6 +277,7 @@ typedef struct pack_s
 	int handle;
 	int ignorecase;  ///< PK3 ignores case
 	int numfiles;
+	qboolean vpack;
 	packfile_t *files;
 } pack_t;
 //@}
@@ -286,7 +288,6 @@ typedef struct searchpath_s
 	// only one of filename / pack will be used
 	char filename[MAX_OSPATH];
 	pack_t *pack;
-	const char *vpack; // points into filename where the pack short name starts
 	struct searchpath_s *next;
 } searchpath_t;
 
@@ -327,6 +328,7 @@ const char *const fs_checkgamedir_missing = "missing";
 char fs_userdir[MAX_OSPATH];
 char fs_gamedir[MAX_OSPATH];
 char fs_basedir[MAX_OSPATH];
+static pack_t *fs_selfpack = NULL;
 
 // list of active game directories (empty if not running a mod)
 int fs_numgamedirs = 0;
@@ -527,6 +529,8 @@ qboolean PK3_GetEndOfCentralDir (const char *packfile, int packhandle, pk3_endOf
 	eocd->cdir_size = LittleLong (eocd->cdir_size);
 	eocd->cdir_offset = LittleLong (eocd->cdir_offset);
 	eocd->comment_size = LittleShort (eocd->comment_size);
+	eocd->prepended_garbage = filesize - (ind + ZIP_END_CDIR_SIZE) - eocd->cdir_offset - eocd->cdir_size; // this detects "SFX" zip files
+	eocd->cdir_offset += eocd->prepended_garbage;
 
 	Mem_Free (buffer);
 
@@ -620,7 +624,7 @@ int PK3_BuildFileList (pack_t *pack, const pk3_endOfCentralDir_t *eocd)
 					flags = PACKFILE_FLAG_DEFLATED;
 				else
 					flags = 0;
-				offset = BuffLittleLong (&ptr[42]);
+				offset = BuffLittleLong (&ptr[42]) + eocd->prepended_garbage;
 				packsize = BuffLittleLong (&ptr[20]);
 				realsize = BuffLittleLong (&ptr[24]);
 
@@ -661,21 +665,12 @@ FS_LoadPackPK3
 Create a package entry associated with a PK3 file
 ====================
 */
-pack_t *FS_LoadPackPK3 (const char *packfile)
+pack_t *FS_LoadPackPK3FromFD (const char *packfile, int packhandle)
 {
-	int packhandle;
 	pk3_endOfCentralDir_t eocd;
 	pack_t *pack;
 	int real_nb_files;
 
-#if _MSC_VER >= 1400
-	_sopen_s(&packhandle, packfile, O_RDONLY | O_BINARY, _SH_DENYNO, _S_IREAD | _S_IWRITE);
-#else
-	packhandle = open (packfile, O_RDONLY | O_BINARY);
-#endif
-	if (packhandle < 0)
-		return NULL;
-
 	if (! PK3_GetEndOfCentralDir (packfile, packhandle, &eocd))
 	{
 		Con_Printf ("%s is not a PK3 file\n", packfile);
@@ -722,6 +717,18 @@ pack_t *FS_LoadPackPK3 (const char *packfile)
 	Con_DPrintf("Added packfile %s (%i files)\n", packfile, real_nb_files);
 	return pack;
 }
+pack_t *FS_LoadPackPK3 (const char *packfile)
+{
+	int packhandle;
+#if _MSC_VER >= 1400
+	_sopen_s(&packhandle, packfile, O_RDONLY | O_BINARY, _SH_DENYNO, _S_IREAD | _S_IWRITE);
+#else
+	packhandle = open (packfile, O_RDONLY | O_BINARY);
+#endif
+	if (packhandle < 0)
+		return NULL;
+	return FS_LoadPackPK3FromFD(packfile, packhandle);
+}
 
 
 /*
@@ -858,9 +865,12 @@ void FS_Path_f (void)
 	for (s=fs_searchpaths ; s ; s=s->next)
 	{
 		if (s->pack)
-			Con_Printf("%s (%i files)\n", s->pack->filename, s->pack->numfiles);
-		else if (s->vpack)
-			Con_Printf("%s (virtual pack)\n", s->filename);
+		{
+			if(s->pack->vpack)
+				Con_Printf("%sdir (virtual pack)\n", s->pack->filename);
+			else
+				Con_Printf("%s (%i files)\n", s->pack->filename, s->pack->numfiles);
+		}
 		else
 			Con_Printf("%s\n", s->filename);
 	}
@@ -954,6 +964,27 @@ pack_t *FS_LoadPackPAK (const char *packfile)
 	return pack;
 }
 
+/*
+====================
+FS_LoadPackVirtual
+
+Create a package entry associated with a directory file
+====================
+*/
+pack_t *FS_LoadPackVirtual (const char *dirname)
+{
+	pack_t *pack;
+	pack = (pack_t *)Mem_Alloc(fs_mempool, sizeof (pack_t));
+	pack->vpack = true;
+	pack->ignorecase = false;
+	strlcpy (pack->filename, dirname, sizeof(pack->filename));
+	pack->handle = -1;
+	pack->numfiles = -1;
+	pack->files = NULL;
+	Con_DPrintf("Added packfile %s (virtual pack)\n", dirname);
+	return pack;
+}
+
 /*
 ================
 FS_AddPack_Fullpath
@@ -973,12 +1004,12 @@ static qboolean FS_AddPack_Fullpath(const char *pakfile, const char *shortname,
 {
 	searchpath_t *search;
 	pack_t *pak = NULL;
-	qboolean fakepack = true;
 	const char *ext = FS_FileExtension(pakfile);
+	size_t l;
 
 	for(search = fs_searchpaths; search; search = search->next)
 	{
-		if(search->pack ? !strcasecmp(search->pack->filename, pakfile) : (search->vpack && !strcasecmp(search->filename, pakfile)))
+		if(search->pack && !strcasecmp(search->pack->filename, pakfile))
 		{
 			if(already_loaded)
 				*already_loaded = true;
@@ -989,11 +1020,8 @@ static qboolean FS_AddPack_Fullpath(const char *pakfile, const char *shortname,
 	if(already_loaded)
 		*already_loaded = false;
 
-	if(FS_SysFileType(pakfile) == FS_FILETYPE_DIRECTORY)
-	{
-		fakepack = true;
-		Con_DPrintf("Added packfile %s (virtual pack)\n", pakfile);
-	}
+	if(!strcasecmp(ext, "pk3dir"))
+		pak = FS_LoadPackVirtual (pakfile);
 	else if(!strcasecmp(ext, "pak"))
 		pak = FS_LoadPackPAK (pakfile);
 	else if(!strcasecmp(ext, "pk3"))
@@ -1001,9 +1029,10 @@ static qboolean FS_AddPack_Fullpath(const char *pakfile, const char *shortname,
 	else
 		Con_Printf("\"%s\" does not have a pack extension\n", pakfile);
 
-	if (pak)
+	if(pak)
 	{
 		strlcpy(pak->shortname, shortname, sizeof(pak->shortname));
+
 		//Con_DPrintf("  Registered pack with short name %s\n", shortname);
 		if(keep_plain_dirs)
 		{
@@ -1016,7 +1045,7 @@ static qboolean FS_AddPack_Fullpath(const char *pakfile, const char *shortname,
 				{
 					if(!insertion_point->next)
 						break;
-					if(insertion_point->next->vpack)
+					if(insertion_point->next->pack)
 						break;
 					insertion_point = insertion_point->next;
 				}
@@ -1045,16 +1074,20 @@ static qboolean FS_AddPack_Fullpath(const char *pakfile, const char *shortname,
 			fs_searchpaths = search;
 		}
 		search->pack = pak;
-		if(!pak)
+		if(pak->vpack)
 		{
-			strlcpy(search->filename, pakfile, sizeof(search->filename));
-			if(strlen(search->filename) >= strlen(shortname))
-				search->vpack = search->filename + strlen(search->filename) - strlen(shortname);
-			else
-				search->vpack = search->filename;
+			dpsnprintf(search->filename, sizeof(search->filename), "%s/", pakfile);
+			// if shortname ends with "pk3dir", strip that suffix to make it just "pk3"
+			// same goes for the name inside the pack structure
+			l = strlen(pak->shortname);
+			if(l >= 7)
+				if(!strcasecmp(pak->shortname + l - 7, ".pk3dir"))
+					pak->shortname[l - 3] = 0;
+			l = strlen(pak->filename);
+			if(l >= 7)
+				if(!strcasecmp(pak->filename + l - 7, ".pk3dir"))
+					pak->filename[l - 3] = 0;
 		}
-		else
-			search->vpack = search->pack->shortname;
 		return true;
 	}
 	else
@@ -1090,7 +1123,7 @@ qboolean FS_AddPack(const char *pakfile, qboolean *already_loaded, qboolean keep
 
 	// then find the real name...
 	search = FS_FindFile(pakfile, &index, true);
-	if(!search || search->vpack)
+	if(!search || search->pack)
 	{
 		Con_Printf("could not find pak \"%s\"\n", pakfile);
 		return false;
@@ -1134,7 +1167,7 @@ void FS_AddGameDirectory (const char *dir)
 	// add any PK3 package in the directory
 	for (i = 0;i < list.numstrings;i++)
 	{
-		if (!strcasecmp(FS_FileExtension(list.strings[i]), "pk3"))
+		if (!strcasecmp(FS_FileExtension(list.strings[i]), "pk3") || !strcasecmp(FS_FileExtension(list.strings[i]), "pk3dir"))
 		{
 			FS_AddPack_Fullpath(list.strings[i], list.strings[i] + strlen(dir), NULL, false);
 		}
@@ -1225,19 +1258,34 @@ void FS_ClearSearchPath (void)
 	{
 		searchpath_t *search = fs_searchpaths;
 		fs_searchpaths = search->next;
-		if (search->pack)
+		if (search->pack && search->pack != fs_selfpack)
 		{
-			// close the file
-			close(search->pack->handle);
-			// free any memory associated with it
-			if (search->pack->files)
-				Mem_Free(search->pack->files);
+			if(!search->pack->vpack)
+			{
+				// close the file
+				close(search->pack->handle);
+				// free any memory associated with it
+				if (search->pack->files)
+					Mem_Free(search->pack->files);
+			}
 			Mem_Free(search->pack);
 		}
 		Mem_Free(search);
 	}
 }
 
+static void FS_AddSelfPack(void)
+{
+	if(fs_selfpack)
+	{
+		searchpath_t *search;
+		search = Mem_Alloc(fs_mempool, sizeof(searchpath_t));
+		search->next = fs_searchpaths;
+		search->pack = fs_selfpack;
+		fs_searchpaths = search;
+	}
+}
+
 
 /*
 ================
@@ -1284,6 +1332,9 @@ void FS_Rescan (void)
 	}
 	Cvar_SetQuick(&cvar_fs_gamedir, gamedirbuf); // so QC or console code can query it
 
+	// add back the selfpack as new first item
+	FS_AddSelfPack();
+
 	// set the default screenshot name to either the mod name or the
 	// gamemode screenshot name
 	if (strcmp(com_modname, gamedirname1))
@@ -1548,6 +1599,58 @@ static void FS_ListGameDirs(void)
 	}
 }
 
+/*
+================
+FS_Init_SelfPack
+================
+*/
+void FS_Init_SelfPack (void)
+{
+	PK3_OpenLibrary ();
+	fs_mempool = Mem_AllocPool("file management", 0, NULL);
+	if(com_selffd >= 0)
+	{
+		fs_selfpack = FS_LoadPackPK3FromFD(com_argv[0], com_selffd);
+		if(fs_selfpack)
+		{
+			char *buf, *q;
+			const char *p;
+			FS_AddSelfPack();
+			buf = (char *) FS_LoadFile("darkplaces.opt", tempmempool, true, NULL);
+			if(buf)
+			{
+				const char **new_argv;
+				int i = 0;
+				int args_left = 256;
+				new_argv = (const char **)Mem_Alloc(fs_mempool, sizeof(*com_argv) * (com_argc + args_left + 2));
+				if(com_argc == 0)
+				{
+					new_argv[0] = "dummy";
+					com_argc = 1;
+				}
+				else
+				{
+					memcpy(&new_argv[0], &com_argv[0], sizeof(*com_argv) * com_argc);
+				}
+				p = buf;
+				while(COM_ParseToken_Console(&p))
+				{
+					if(i >= args_left)
+						break;
+					q = (char *)Mem_Alloc(fs_mempool, strlen(com_token) + 1);
+					strlcpy(q, com_token, strlen(com_token) + 1);
+					new_argv[com_argc + i] = q;
+					++i;
+				}
+				new_argv[i+com_argc] = NULL;
+				com_argv = new_argv;
+				com_argc = com_argc + i;
+			}
+			Mem_Free(buf);
+		}
+	}
+}
+
 /*
 ================
 FS_Init
@@ -1575,8 +1678,6 @@ void FS_Init (void)
 	// don't care for the result; if it fails, %USERPROFILE% will be used instead
 #endif
 
-	fs_mempool = Mem_AllocPool("file management", 0, NULL);
-
 	// Add the personal game directory
 	if((i = COM_CheckParm("-userdir")) && i < com_argc - 1)
 	{
@@ -1665,8 +1766,6 @@ void FS_Init (void)
 #endif
 #endif
 
-	PK3_OpenLibrary ();
-
 	// -basedir <path>
 	// Overrides the system supplied base directory (under GAMENAME)
 // COMMANDLINEOPTION: Filesystem: -basedir <path> chooses what base directory the game data is in, inside this there should be a data directory for the game (for example id1)
@@ -1753,16 +1852,9 @@ void FS_Shutdown (void)
 #endif
 }
 
-/*
-====================
-FS_SysOpen
-
-Internal function used to create a qfile_t and open the relevant non-packed file on disk
-====================
-*/
-static qfile_t* FS_SysOpen (const char* filepath, const char* mode, qboolean nonblocking)
+int FS_SysOpenFD(const char *filepath, const char *mode, qboolean nonblocking)
 {
-	qfile_t* file;
+	int handle;
 	int mod, opt;
 	unsigned int ind;
 
@@ -1783,7 +1875,7 @@ static qfile_t* FS_SysOpen (const char* filepath, const char* mode, qboolean non
 			break;
 		default:
 			Con_Printf ("FS_SysOpen(%s, %s): invalid mode\n", filepath, mode);
-			return NULL;
+			return -1;
 	}
 	for (ind = 1; mode[ind] != '\0'; ind++)
 	{
@@ -1804,15 +1896,28 @@ static qfile_t* FS_SysOpen (const char* filepath, const char* mode, qboolean non
 	if (nonblocking)
 		opt |= O_NONBLOCK;
 
-	file = (qfile_t *)Mem_Alloc (fs_mempool, sizeof (*file));
-	memset (file, 0, sizeof (*file));
-	file->ungetc = EOF;
-
 #if _MSC_VER >= 1400
-	_sopen_s(&file->handle, filepath, mod | opt, _SH_DENYNO, _S_IREAD | _S_IWRITE);
+	_sopen_s(&handle, filepath, mod | opt, _SH_DENYNO, _S_IREAD | _S_IWRITE);
 #else
-	file->handle = open (filepath, mod | opt, 0666);
+	handle = open (filepath, mod | opt, 0666);
 #endif
+	return handle;
+}
+
+/*
+====================
+FS_SysOpen
+
+Internal function used to create a qfile_t and open the relevant non-packed file on disk
+====================
+*/
+static qfile_t* FS_SysOpen (const char* filepath, const char* mode, qboolean nonblocking)
+{
+	qfile_t* file;
+
+	file = (qfile_t *)Mem_Alloc (fs_mempool, sizeof (*file));
+	file->ungetc = EOF;
+	file->handle = FS_SysOpenFD(filepath, mode, nonblocking);
 	if (file->handle < 0)
 	{
 		Mem_Free (file);
@@ -1822,7 +1927,7 @@ static qfile_t* FS_SysOpen (const char* filepath, const char* mode, qboolean non
 	file->real_length = lseek (file->handle, 0, SEEK_END);
 
 	// For files opened in append mode, we start at the end of the file
-	if (mod & O_APPEND)
+	if (mode[0] == 'a')
 		file->position = file->real_length;
 	else
 		lseek (file->handle, 0, SEEK_SET);
@@ -2013,7 +2118,7 @@ static searchpath_t *FS_FindFile (const char *name, int* index, qboolean quiet)
 	for (search = fs_searchpaths;search;search = search->next)
 	{
 		// is the element a pak file?
-		if (search->pack)
+		if (search->pack && !search->pack->vpack)
 		{
 			int (*strcmp_funct) (const char* str1, const char* str2);
 			int left, right, middle;
@@ -2893,7 +2998,7 @@ int FS_FileType (const char *filename)
 	if(!search)
 		return FS_FILETYPE_NONE;
 
-	if(search->pack)
+	if(search->pack && !search->pack->vpack)
 		return FS_FILETYPE_FILE; // TODO can't check directories in paks yet, maybe later
 
 	dpsnprintf(fullpath, sizeof(fullpath), "%s%s", search->filename, filename);
@@ -3014,7 +3119,7 @@ fssearch_t *FS_Search(const char *pattern, int caseinsensitive, int quiet)
 	for (searchpath = fs_searchpaths;searchpath;searchpath = searchpath->next)
 	{
 		// is the element a pak file?
-		if (searchpath->pack)
+		if (searchpath->pack && !searchpath->pack->vpack)
 		{
 			// look through all the pak file elements
 			pak = searchpath->pack;
@@ -3290,9 +3395,12 @@ void FS_Which_f(void)
 		return;
 	}
 	if (sp->pack)
-		Con_Printf("%s is in package %s\n", filename, sp->pack->shortname);
-	else if (sp->vpack)
-		Con_Printf("%s is in virtual package %s\n", filename, sp->vpack);
+	{
+		if(sp->pack->vpack)
+			Con_Printf("%s is in virtual package %sdir\n", filename, sp->pack->shortname);
+		else
+			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);
 }
@@ -3304,8 +3412,6 @@ const char *FS_WhichPack(const char *filename)
 	searchpath_t *sp = FS_FindFile(filename, &index, true);
 	if(sp && sp->pack)
 		return sp->pack->shortname;
-	else if(sp && sp->vpack)
-		return sp->vpack;
 	else
 		return 0;
 }
@@ -3327,7 +3433,8 @@ qboolean FS_IsRegisteredQuakePack(const char *name)
 	// search through the path, one element at a time
 	for (search = fs_searchpaths;search;search = search->next)
 	{
-		if (search->pack && !strcasecmp(FS_FileWithoutPath(search->filename), name))
+		if (search->pack && !search->pack->vpack && !strcasecmp(FS_FileWithoutPath(search->filename), name))
+			// TODO do we want to support vpacks in here too?
 		{
 			int (*strcmp_funct) (const char* str1, const char* str2);
 			int left, right, middle;
@@ -3359,7 +3466,6 @@ qboolean FS_IsRegisteredQuakePack(const char *name)
 			// we found the requested pack but it is not registered quake
 			return false;
 		}
-		// TODO do we want to support vpacks in here too?
 	}
 
 	return false;