} searchpath_t;
+/*
+=============================================================================
+
+FUNCTION PROTOTYPES
+
+=============================================================================
+*/
+
+void FS_Dir_f(void);
+void FS_Ls_f(void);
+
+static packfile_t* FS_AddFileToPack (const char* name, pack_t* pack,
+ size_t offset, size_t packsize,
+ size_t realsize, file_flags_t flags);
+
+
/*
=============================================================================
for (ind = 0; ind < eocd->nbentries; ind++)
{
size_t namesize, count;
- packfile_t *file;
// Checking the remaining size
if (remaining < ZIP_CDIR_CHUNK_BASE_SIZE)
// WinZip doesn't use the "directory" attribute, so we need to check the name directly
if (ptr[ZIP_CDIR_CHUNK_BASE_SIZE + namesize - 1] != '/')
{
- // Extract the name
- file = &pack->files[pack->numfiles];
- memcpy (file->name, &ptr[ZIP_CDIR_CHUNK_BASE_SIZE], namesize);
- file->name[namesize] = '\0';
+ char filename [sizeof (pack->files[0].name)];
+ size_t offset, packsize, realsize;
+ file_flags_t flags;
- // Compression, sizes and offset
- if (BuffLittleShort (&ptr[10]))
- file->flags = FILE_FLAG_DEFLATED;
- file->packsize = BuffLittleLong (&ptr[20]);
- file->realsize = BuffLittleLong (&ptr[24]);
- file->offset = BuffLittleLong (&ptr[42]);
+ // Extract the name (strip it if necessary)
+ if (namesize >= sizeof (filename))
+ namesize = sizeof (filename) - 1;
+ memcpy (filename, &ptr[ZIP_CDIR_CHUNK_BASE_SIZE], namesize);
+ filename[namesize] = '\0';
- pack->numfiles++;
+ if (BuffLittleShort (&ptr[10]))
+ flags = FILE_FLAG_DEFLATED;
+ else
+ flags = 0;
+ offset = BuffLittleLong (&ptr[42]);
+ packsize = BuffLittleLong (&ptr[20]);
+ realsize = BuffLittleLong (&ptr[24]);
+ FS_AddFileToPack (filename, pack, offset, packsize, realsize, flags);
}
}
if (real_nb_files <= 0)
Sys_Error ("%s is not a valid PK3 file", packfile);
- Con_Printf ("Added packfile %s (%i files)\n", packfile, real_nb_files);
+ Con_Printf("Added packfile %s (%i files)\n", packfile, real_nb_files);
return pack;
}
*/
+/*
+====================
+FS_AddFileToPack
+
+Add a file to the list of files contained into a package
+====================
+*/
+static packfile_t* FS_AddFileToPack (const char* name, pack_t* pack,
+ size_t offset, size_t packsize,
+ size_t realsize, file_flags_t flags)
+{
+ int (*strcmp_funct) (const char* str1, const char* str2);
+ size_t left, right, middle;
+ int diff;
+ packfile_t *file;
+
+ strcmp_funct = pack->ignorecase ? strcasecmp : strcmp;
+
+ // Look for the slot we should put that file into (binary search)
+ left = 0;
+ right = pack->numfiles;
+ while (left != right)
+ {
+ middle = (left + right - 1) / 2;
+ diff = strcmp_funct (pack->files[middle].name, name);
+
+ // If we found the file, there's a problem
+ if (!diff)
+ Sys_Error ("Package %s contains several time the file %s\n",
+ pack->filename, name);
+
+ // If we're too far in the list
+ if (diff > 0)
+ right = middle;
+ else
+ left = middle + 1;
+ }
+
+ // We have to move the right of the list by one slot to free the one we need
+ file = &pack->files[left];
+ memmove (file + 1, file, (pack->numfiles - left) * sizeof (*file));
+ pack->numfiles++;
+
+ strlcpy (file->name, name, sizeof (file->name));
+ file->offset = offset;
+ file->packsize = packsize;
+ file->realsize = realsize;
+ file->flags = flags;
+
+ return file;
+}
+
+
/*
============
FS_CreatePath
-Only used for FS_WriteFile.
+Only used for FS_Open.
============
*/
void FS_CreatePath (char *path)
{
searchpath_t *s;
- Con_Printf ("Current search path:\n");
+ Con_Print("Current search path:\n");
for (s=fs_searchpaths ; s ; s=s->next)
{
if (s->pack)
{
- Con_Printf ("%s (%i files)\n", s->pack->filename, s->pack->numfiles);
+ Con_Printf("%s (%i files)\n", s->pack->filename, s->pack->numfiles);
}
else
- Con_Printf ("%s\n", s->filename);
+ Con_Printf("%s\n", s->filename);
}
}
pack->ignorecase = false; // PAK is case sensitive
strlcpy (pack->filename, packfile, sizeof (pack->filename));
pack->handle = packhandle;
- pack->numfiles = numpackfiles;
+ pack->numfiles = 0;
pack->mempool = Mem_AllocPool(packfile);
pack->files = Mem_Alloc(pack->mempool, numpackfiles * sizeof(packfile_t));
pack->next = packlist;
// parse the directory
for (i = 0;i < numpackfiles;i++)
{
- size_t size;
- packfile_t *file = &pack->files[i];
-
- strlcpy (file->name, info[i].name, sizeof (file->name));
- file->offset = LittleLong(info[i].filepos);
- size = LittleLong (info[i].filelen);
- file->packsize = size;
- file->realsize = size;
- file->flags = FILE_FLAG_TRUEOFFS;
+ size_t offset = LittleLong (info[i].filepos);
+ size_t size = LittleLong (info[i].filelen);
+
+ FS_AddFileToPack (info[i].name, pack, offset, size, size, FILE_FLAG_TRUEOFFS);
}
Mem_Free(info);
- Con_Printf ("Added packfile %s (%i files)\n", packfile, numpackfiles);
+ Con_Printf("Added packfile %s (%i files)\n", packfile, numpackfiles);
return pack;
}
strlcpy (fs_gamedir, dir, sizeof (fs_gamedir));
+#ifndef AKVERSION
// add the directory to the search path
search = Mem_Alloc(pak_mempool, sizeof(searchpath_t));
strlcpy (search->filename, dir, sizeof (search->filename));
search->next = fs_searchpaths;
fs_searchpaths = search;
+#endif
list = listdirectory(dir);
}
}
freedirectory(list);
+
+// Unpacked files have the priority over packed files if AKVERSION is defined
+#ifdef AKVERSION
+ // add the directory to the search path
+ search = Mem_Alloc(pak_mempool, sizeof(searchpath_t));
+ strlcpy (search->filename, dir, sizeof (search->filename));
+ search->next = fs_searchpaths;
+ fs_searchpaths = search;
+#endif
}
return exten;
}
-void FS_Dir_f(void);
-void FS_Ls_f(void);
/*
================
return file;
}
+
/*
-===========
-FS_FOpenFile
+====================
+FS_FindFile
-If the requested file is inside a packfile, a new qfile_t* will be opened
-into the file.
+Look for a file in the packages and in the filesystem
-Sets fs_filesize
-===========
+Return the searchpath where the file was found (or NULL)
+and the file index in the package if relevant
+====================
*/
-qfile_t *FS_FOpenFile (const char *filename, qboolean quiet)
+static searchpath_t *FS_FindFile (const char *name, int* index, qboolean quiet)
{
searchpath_t *search;
- char netpath[MAX_OSPATH];
pack_t *pak;
- int i, filenamelen, matched;
-
- filenamelen = strlen (filename);
+ int (*strcmp_funct) (const char* str1, const char* str2);
- // LordHavoc: this is not written right!
- // (should search have higher priority for files in each gamedir, while
- // preserving the gamedir priorities, not searching for all paks in all
- // gamedirs and then all files in all gamedirs)
-#ifdef AKVERSION
- // first we search for a real file, after that we start to search through the paks
// search through the path, one element at a time
- search = fs_searchpaths;
-
- for( ; search ; search = search->next)
- if(!search->pack)
- {
- snprintf (netpath, sizeof (netpath), "%s/%s",search->filename, filename);
-
- if (!FS_SysFileExists (netpath))
- continue;
-
- if (!quiet)
- Sys_Printf ("FindFile: %s\n",netpath);
- return FS_OpenRead (netpath, -1, -1);
- }
-
- search = fs_searchpaths;
- for ( ; search ; search = search->next)
+ for (search = fs_searchpaths;search;search = search->next)
+ {
// is the element a pak file?
if (search->pack)
{
- // look through all the pak file elements
+ size_t left, right, middle;
+
pak = search->pack;
- for (i=0 ; i<pak->numfiles ; i++)
- {
- if (pak->ignorecase)
- matched = !strcasecmp (pak->files[i].name, filename);
- else
- matched = !strcmp (pak->files[i].name, filename);
- if (matched) // found it?
- {
- qfile_t *file;
+ strcmp_funct = pak->ignorecase ? strcasecmp : strcmp;
- if (!quiet)
- Sys_Printf ("PackFile: %s : %s\n",pak->filename, pak->files[i].name);
+ // Look for the file (binary search)
+ left = 0;
+ right = pak->numfiles;
+ while (left != right)
+ {
+ int diff;
- // If we don't have the true offset, get it now
- if (! (pak->files[i].flags & FILE_FLAG_TRUEOFFS))
- PK3_GetTrueFileOffset (&pak->files[i], pak);
+ middle = (left + right - 1) / 2;
+ diff = strcmp_funct (pak->files[middle].name, name);
- // No Zlib DLL = no compressed files
- if (!zlib_dll && (pak->files[i].flags & FILE_FLAG_DEFLATED))
- {
- Con_Printf ("WARNING: can't open the compressed file %s\n"
- "You need the Zlib DLL to use compressed files\n", filename);
- fs_filesize = -1;
- return NULL;
- }
+ // Found it
+ if (!diff)
+ {
+ if (!quiet)
+ Sys_Printf("FS_FindFile: %s in %s\n",
+ pak->files[middle].name, pak->filename);
- // open a new file in the pakfile
- file = FS_OpenRead (pak->filename, pak->files[i].offset, pak->files[i].packsize);
- fs_filesize = pak->files[i].realsize;
+ if (index != NULL)
+ *index = middle;
+ return search;
+ }
- if (pak->files[i].flags & FILE_FLAG_DEFLATED)
- {
- ztoolkit_t *ztk;
+ // If we're too far in the list
+ if (diff > 0)
+ right = middle;
+ else
+ left = middle + 1;
+ }
+ }
+ else
+ {
+ char netpath[MAX_OSPATH];
+ snprintf(netpath, sizeof(netpath), "%s/%s", search->filename, name);
+ if (FS_SysFileExists (netpath))
+ {
+ if (!quiet)
+ Sys_Printf("FS_FindFile: %s\n", netpath);
- file->flags |= FS_FLAG_DEFLATED;
+ if (index != NULL)
+ *index = -1;
+ return search;
+ }
+ }
+ }
- // We need some more variables
- ztk = Mem_Alloc (fs_mempool, sizeof (*file->z));
+ if (!quiet)
+ Sys_Printf("FS_FindFile: can't find %s\n", name);
- ztk->real_length = pak->files[i].realsize;
+ if (index != NULL)
+ *index = -1;
+ return NULL;
+}
- // Initialize zlib stream
- ztk->zstream.next_in = ztk->input;
- ztk->zstream.avail_in = 0;
- /* From Zlib's "unzip.c":
- *
- * windowBits is passed < 0 to tell that there is no zlib header.
- * Note that in this case inflate *requires* an extra "dummy" byte
- * after the compressed stream in order to complete decompression and
- * return Z_STREAM_END.
- * In unzip, i don't wait absolutely Z_STREAM_END because I known the
- * size of both compressed and uncompressed data
- */
- if (qz_inflateInit2 (&ztk->zstream, -MAX_WBITS) != Z_OK)
- Sys_Error ("inflate init error (file: %s)", filename);
+/*
+===========
+FS_FOpenFile
- ztk->zstream.next_out = ztk->output;
- ztk->zstream.avail_out = sizeof (ztk->output);
+If the requested file is inside a packfile, a new qfile_t* will be opened
+into the file.
- file->z = ztk;
- }
+Sets fs_filesize
+===========
+*/
+qfile_t *FS_FOpenFile (const char *filename, qboolean quiet)
+{
+ searchpath_t *search;
+ packfile_t *packfile;
+ int i;
+ qfile_t *file;
- return file;
- }
- }
- }
-#else
- // search through the path, one element at a time
- search = fs_searchpaths;
+ search = FS_FindFile (filename, &i, quiet);
- for ( ; search ; search = search->next)
+ // Not found?
+ if (search == NULL)
{
- // is the element a pak file?
- if (search->pack)
- {
- // look through all the pak file elements
- pak = search->pack;
- for (i=0 ; i<pak->numfiles ; i++)
- {
- if (pak->ignorecase)
- matched = !strcasecmp (pak->files[i].name, filename);
- else
- matched = !strcmp (pak->files[i].name, filename);
- if (matched) // found it?
- {
- qfile_t *file;
-
- if (!quiet)
- Sys_Printf ("PackFile: %s : %s\n",pak->filename, pak->files[i].name);
-
- // If we don't have the true offset, get it now
- if (! (pak->files[i].flags & FILE_FLAG_TRUEOFFS))
- PK3_GetTrueFileOffset (&pak->files[i], pak);
+ fs_filesize = -1;
+ return NULL;
+ }
- // No Zlib DLL = no compressed files
- if (!zlib_dll && (pak->files[i].flags & FILE_FLAG_DEFLATED))
- {
- Con_Printf ("WARNING: can't open the compressed file %s\n"
- "You need the Zlib DLL to use compressed files\n", filename);
- fs_filesize = -1;
- return NULL;
- }
+ // Found in the filesystem?
+ if (i < 0)
+ {
+ char netpath[MAX_OSPATH];
+ snprintf(netpath, sizeof(netpath), "%s/%s", search->filename, filename);
+ return FS_OpenRead(netpath, -1, -1);
+ }
- // open a new file in the pakfile
- file = FS_OpenRead (pak->filename, pak->files[i].offset, pak->files[i].packsize);
- fs_filesize = pak->files[i].realsize;
+ // So, we found it in a package...
+ packfile = &search->pack->files[i];
- if (pak->files[i].flags & FILE_FLAG_DEFLATED)
- {
- ztoolkit_t *ztk;
+ // If we don't have the true offset, get it now
+ if (! (packfile->flags & FILE_FLAG_TRUEOFFS))
+ PK3_GetTrueFileOffset (packfile, search->pack);
- file->flags |= FS_FLAG_DEFLATED;
+ // No Zlib DLL = no compressed files
+ if (!zlib_dll && (packfile->flags & FILE_FLAG_DEFLATED))
+ {
+ Con_Printf("WARNING: can't open the compressed file %s\n"
+ "You need the Zlib DLL to use compressed files\n",
+ filename);
+ fs_filesize = -1;
+ return NULL;
+ }
- // We need some more variables
- ztk = Mem_Alloc (fs_mempool, sizeof (*file->z));
+ // open a new file in the pakfile
+ file = FS_OpenRead (search->pack->filename, packfile->offset, packfile->packsize);
+ fs_filesize = packfile->realsize;
- ztk->real_length = pak->files[i].realsize;
+ if (packfile->flags & FILE_FLAG_DEFLATED)
+ {
+ ztoolkit_t *ztk;
- // Initialize zlib stream
- ztk->zstream.next_in = ztk->input;
- ztk->zstream.avail_in = 0;
+ file->flags |= FS_FLAG_DEFLATED;
- /* From Zlib's "unzip.c":
- *
- * windowBits is passed < 0 to tell that there is no zlib header.
- * Note that in this case inflate *requires* an extra "dummy" byte
- * after the compressed stream in order to complete decompression and
- * return Z_STREAM_END.
- * In unzip, i don't wait absolutely Z_STREAM_END because I known the
- * size of both compressed and uncompressed data
- */
- if (qz_inflateInit2 (&ztk->zstream, -MAX_WBITS) != Z_OK)
- Sys_Error ("inflate init error (file: %s)", filename);
+ // We need some more variables
+ ztk = Mem_Alloc (fs_mempool, sizeof (*file->z));
- ztk->zstream.next_out = ztk->output;
- ztk->zstream.avail_out = sizeof (ztk->output);
+ ztk->real_length = packfile->realsize;
- file->z = ztk;
- }
+ // Initialize zlib stream
+ ztk->zstream.next_in = ztk->input;
+ ztk->zstream.avail_in = 0;
- return file;
- }
- }
- }
- else
- {
- snprintf (netpath, sizeof (netpath), "%s/%s",search->filename, filename);
+ /* From Zlib's "unzip.c":
+ *
+ * windowBits is passed < 0 to tell that there is no zlib header.
+ * Note that in this case inflate *requires* an extra "dummy" byte
+ * after the compressed stream in order to complete decompression and
+ * return Z_STREAM_END.
+ * In unzip, i don't wait absolutely Z_STREAM_END because I known the
+ * size of both compressed and uncompressed data
+ */
+ if (qz_inflateInit2 (&ztk->zstream, -MAX_WBITS) != Z_OK)
+ Sys_Error ("inflate init error (file: %s)", filename);
- if (!FS_SysFileExists (netpath))
- continue;
+ ztk->zstream.next_out = ztk->output;
+ ztk->zstream.avail_out = sizeof (ztk->output);
- if (!quiet)
- Sys_Printf ("FindFile: %s\n",netpath);
- return FS_OpenRead (netpath, -1, -1);
- }
+ file->z = ztk;
}
-#endif
-
- if (!quiet)
- Sys_Printf ("FindFile: can't find %s\n", filename);
- fs_filesize = -1;
- return NULL;
+ return file;
}
// If "input" is also empty, we need to fill it
if (ztk->in_ind == ztk->in_max)
{
- size_t remain = file->length - ztk->in_position;
+ size_t remain;
// If we are at the end of the file
- if (!remain)
+ if (ztk->out_position == ztk->real_length)
return nb;
+ remain = file->length - ztk->in_position;
count = (remain > sizeof (ztk->input)) ? sizeof (ztk->input) : remain;
fread (ztk->input, 1, count, file->stream);
}
+/*
+====================
+FS_Print
+
+Print a string into a file
+====================
+*/
+int FS_Print(qfile_t* file, const char *msg)
+{
+ return FS_Write(file, msg, strlen(msg));
+}
+
/*
====================
FS_Printf
Print a string into a file
====================
*/
-int FS_Printf (qfile_t* file, const char* format, ...)
+int FS_Printf(qfile_t* file, const char* format, ...)
{
int result;
va_list args;
Always appends a 0 byte.
============
*/
-qbyte *FS_LoadFile (const char *path, qboolean quiet)
+qbyte *FS_LoadFile (const char *path, mempool_t *pool, qboolean quiet)
{
qfile_t *h;
qbyte *buf;
if (!h)
return NULL;
- buf = Mem_Alloc(tempmempool, fs_filesize+1);
+ buf = Mem_Alloc(pool, fs_filesize+1);
if (!buf)
Sys_Error ("FS_LoadFile: not enough available memory for %s (size %i)", path, fs_filesize);
*/
qboolean FS_WriteFile (const char *filename, void *data, int len)
{
- FILE *handle;
- char name[MAX_OSPATH];
+ qfile_t *handle;
- snprintf (name, sizeof (name), "%s/%s", fs_gamedir, filename);
-
- // Create directories up to the file
- FS_CreatePath (name);
-
- handle = fopen (name, "wb");
+ handle = FS_Open (filename, "wb", false);
if (!handle)
{
- Con_Printf ("FS_WriteFile: failed on %s\n", name);
+ Con_Printf("FS_WriteFile: failed on %s\n", filename);
return false;
}
- Con_DPrintf ("FS_WriteFile: %s\n", name);
- fwrite (data, 1, len, handle);
- fclose (handle);
+ Con_DPrintf("FS_WriteFile: %s\n", filename);
+ FS_Write (handle, data, len);
+ FS_Close (handle);
return true;
}
}
+/*
+==================
+FS_FileExists
+
+Look for a file in the packages and in the filesystem
+==================
+*/
qboolean FS_FileExists (const char *filename)
{
- searchpath_t *search;
- char netpath[MAX_OSPATH];
- pack_t *pak;
- int i;
-
- for (search = fs_searchpaths;search;search = search->next)
- {
- if (search->pack)
- {
- pak = search->pack;
- for (i = 0;i < pak->numfiles;i++)
- if (!strcmp (pak->files[i].name, filename))
- return true;
- }
- else
- {
- snprintf (netpath, sizeof (netpath), "%s/%s",search->filename, filename);
- if (FS_SysFileExists (netpath))
- return true;
- }
- }
-
- return false;
+ return (FS_FindFile (filename, NULL, true) != NULL);
}
+/*
+==================
+FS_SysFileExists
+
+Look for a file in the filesystem only
+==================
+*/
qboolean FS_SysFileExists (const char *path)
{
#if WIN32
{
for (dirfile = dir;dirfile;dirfile = dirfile->next)
{
- memcpy(temp, basepath, basepathlength);
- strcpy(temp + basepathlength, dirfile->text);
+ snprintf(temp, sizeof(temp), "%s/%s", basepath, dirfile->text);
if (matchpattern(temp, (char *)pattern, true))
{
for (listtemp = liststart;listtemp;listtemp = listtemp->next)
return numfiles;
}
-void FS_Dir_f(void)
+static void FS_ListDirectoryCmd (const char* cmdname, int oneperline)
{
- char pattern[MAX_OSPATH];
+ const char *pattern;
if (Cmd_Argc() > 3)
{
- Con_Printf("usage:\ndir [path/pattern]\n");
+ Con_Printf("usage:\n%s [path/pattern]\n", cmdname);
return;
}
- strcpy(pattern, "*");
if (Cmd_Argc() == 2)
- snprintf(pattern, sizeof(pattern), "%s", Cmd_Argv(1));
- if (!FS_ListDirectory(pattern, true))
- Con_Printf("No files found.\n");
+ pattern = Cmd_Argv(1);
+ else
+ pattern = "*";
+ if (!FS_ListDirectory(pattern, oneperline))
+ Con_Print("No files found.\n");
+}
+
+void FS_Dir_f(void)
+{
+ FS_ListDirectoryCmd("dir", true);
}
void FS_Ls_f(void)
{
- char pattern[MAX_OSPATH];
- if (Cmd_Argc() > 3)
- {
- Con_Printf("usage:\nls [path/pattern]\n");
- return;
- }
- strcpy(pattern, "*");
- if (Cmd_Argc() == 2)
- snprintf(pattern, sizeof(pattern), "%s", Cmd_Argv(1));
- FS_ListDirectory(pattern, false);
+ FS_ListDirectoryCmd("ls", false);
}
projects / xonotic / darkplaces.git / blobdiff