changed searchpath directories to have a trailing / (allowing %s%s instead of %s...

fixed FS_Search to support empty paths (*.cfg and such), and use %s%s concatenation as the rest of the filesystem does, this required changing listdirectory slightly
some cleanup of the opendir implementation of listdirectory

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@5421 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/filematch.c b/filematch.c
index a4f670f9732b5b906a9e227be050bb6712d1765a..758575f2e8329d4369e8be1449678ff9a95837bf 100644 (file)
--- a/filematch.c
+++ b/filematch.c
@@ -85,6 +85,9 @@ stringlist_t *stringlistsort(stringlist_t *start)
 {
        int notdone;
        stringlist_t *current, *previous, *temp2, *temp3, *temp4;
+       // exit early if there's nothing to sort
+       if (start == NULL || start->next == NULL)
+               return start;
        notdone = 1;
        while (notdone)
        {
@@ -122,33 +125,29 @@ stringlist_t *listdirectory(const char *path)
 {
        char pattern[4096], *c;
        struct _finddata_t n_file;
-    long hFile;
+       long hFile;
        stringlist_t *start, *current;
        strlcpy (pattern, path, sizeof (pattern));
-       strlcat (pattern, "\\*", sizeof (pattern));
+       strlcat (pattern, "*", sizeof (pattern));
        // ask for the directory listing handle
        hFile = _findfirst(pattern, &n_file);
-       if(hFile != -1)
-       {
-               // start a new chain with the the first name
-               start = current = stringlistappend(NULL, n_file.name);
-               // iterate through the directory
-               while (_findnext(hFile, &n_file) == 0)
-                       current = stringlistappend(current, n_file.name);
-               _findclose(hFile);
+       if(hFile == -1)
+               return NULL;
+       // start a new chain with the the first name
+       start = current = stringlistappend(NULL, n_file.name);
+       // iterate through the directory
+       while (_findnext(hFile, &n_file) == 0)
+               current = stringlistappend(current, n_file.name);
+       _findclose(hFile);
 
-               // convert names to lowercase because windows does not care, but pattern matching code often does
-               for (current = start;current;current = current->next)
-                       for (c = current->text;*c;c++)
-                               if (*c >= 'A' && *c <= 'Z')
-                                       *c += 'a' - 'A';
+       // convert names to lowercase because windows does not care, but pattern matching code often does
+       for (current = start;current;current = current->next)
+               for (c = current->text;*c;c++)
+                       if (*c >= 'A' && *c <= 'Z')
+                               *c += 'a' - 'A';
 
-               // sort the list alphanumerically
-               start = stringlistsort(start);
-               return start;
-       }
-       else
-               return NULL;
+       // sort the list alphanumerically
+       return stringlistsort(start);
 }
 #else
 #include <dirent.h>
@@ -160,15 +159,16 @@ stringlist_t *listdirectory(const char *path)
        dir = opendir(path);
        if (!dir)
                return NULL;
-       ent = readdir(dir);
-       if (!ent)
+       start = current = NULL;
+       while ((ent = readdir(dir)))
        {
-               closedir(dir);
-               return NULL;
+               if (strcmp(ent->d_name, ".") && strcmp(ent->d_name, ".."))
+               {
+                       current = stringlistappend(current, ent->d_name);
+                       if (!start)
+                               start = current;
+               }
        }
-       start = current = stringlistappend(NULL, ent->d_name);
-       while((ent = readdir(dir)))
-               current = stringlistappend(current, ent->d_name);
        closedir(dir);
        // sort the list alphanumerically
        return stringlistsort(start);

diff --git a/fs.c b/fs.c
index 0b72b4d125200fc3d0fdb8609dd35764f4f987f2..2d53dbddc43cc9c735bd91e15913c73d459763d1 100644 (file)
--- a/fs.c
+++ b/fs.c
@@ -702,9 +702,7 @@ 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
                        Con_Printf("%s\n", s->filename);
        }
@@ -799,7 +797,7 @@ void FS_AddGameDirectory (const char *dir)
        {
                if (matchpattern(current->text, "*.pak", true))
                {
-                       dpsnprintf (pakfile, sizeof (pakfile), "%s/%s", dir, current->text);
+                       dpsnprintf (pakfile, sizeof (pakfile), "%s%s", dir, current->text);
                        pak = FS_LoadPackPAK (pakfile);
                        if (pak)
                        {
@@ -818,7 +816,7 @@ void FS_AddGameDirectory (const char *dir)
        {
                if (matchpattern(current->text, "*.pk3", true))
                {
-                       dpsnprintf (pakfile, sizeof (pakfile), "%s/%s", dir, current->text);
+                       dpsnprintf (pakfile, sizeof (pakfile), "%s%s", dir, current->text);
                        pak = FS_LoadPackPK3 (pakfile);
                        if (pak)
                        {
@@ -854,13 +852,13 @@ 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
        homedir = getenv ("HOME");
        if (homedir != NULL && homedir[0] != '\0')
-               FS_AddGameDirectory (va("%s/.%s/%s", homedir, gameuserdirname, dir));
+               FS_AddGameDirectory (va("%s/.%s/%s/", homedir, gameuserdirname, dir));
 #endif
 }
 
@@ -1289,7 +1287,7 @@ static searchpath_t *FS_FindFile (const char *name, int* index, qboolean quiet)
                else
                {
                        char netpath[MAX_OSPATH];
-                       dpsnprintf(netpath, sizeof(netpath), "%s/%s", search->filename, name);
+                       dpsnprintf(netpath, sizeof(netpath), "%s%s", search->filename, name);
                        if (FS_SysFileExists (netpath))
                        {
                                if (!quiet)
@@ -1338,7 +1336,7 @@ qfile_t *FS_OpenReadFile (const char *filename, qboolean quiet, qboolean nonbloc
        if (pack_ind < 0)
        {
                char path [MAX_OSPATH];
-               dpsnprintf (path, sizeof (path), "%s/%s", search->filename, filename);
+               dpsnprintf (path, sizeof (path), "%s%s", search->filename, filename);
                return FS_SysOpen (path, "rb", nonblocking);
        }
 
@@ -1378,7 +1376,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);
@@ -2020,10 +2018,14 @@ fssearch_t *FS_Search(const char *pattern, int caseinsensitive, int quiet)
        char netpath[MAX_OSPATH];
        char temp[MAX_OSPATH];
 
-       while(!strncmp(pattern, "./", 2))
-               pattern += 2;
-       while(!strncmp(pattern, ".\\", 2))
-               pattern += 2;
+       for (i = 0;pattern[i] == '.' || pattern[i] == ':' || pattern[i] == '/' || pattern[i] == '\\';i++)
+               ;
+
+       if (i > 0)
+       {
+               Con_Printf("Don't use punctuation at the beginning of a search pattern!\n");
+               return NULL;
+       }
 
        search = NULL;
        liststart = NULL;
@@ -2032,14 +2034,9 @@ fssearch_t *FS_Search(const char *pattern, int caseinsensitive, int quiet)
        slash = strrchr(pattern, '/');
        backslash = strrchr(pattern, '\\');
        colon = strrchr(pattern, ':');
-       separator = pattern;
-       if (separator < slash)
-               separator = slash;
-       if (separator < backslash)
-               separator = backslash;
-       if (separator < colon)
-               separator = colon;
-       basepathlength = separator - pattern;
+       separator = max(slash, backslash);
+       separator = max(separator, colon);
+       basepathlength = separator ? (separator + 1 - pattern) : 0;
        basepath = Mem_Alloc (tempmempool, basepathlength + 1);
        if (basepathlength)
                memcpy(basepath, pattern, basepathlength);
@@ -2091,12 +2088,12 @@ fssearch_t *FS_Search(const char *pattern, int caseinsensitive, int quiet)
                else
                {
                        // get a directory listing and look at each name
-                       dpsnprintf(netpath, sizeof (netpath), "%s/%s", searchpath->filename, basepath);
+                       dpsnprintf(netpath, sizeof (netpath), "%s%s", searchpath->filename, basepath);
                        if ((dir = listdirectory(netpath)))
                        {
                                for (dirfile = dir;dirfile;dirfile = dirfile->next)
                                {
-                                       dpsnprintf(temp, sizeof(temp), "%s/%s", basepath, dirfile->text);
+                                       dpsnprintf(temp, sizeof(temp), "%s%s", basepath, dirfile->text);
                                        if (matchpattern(temp, (char *)pattern, true))
                                        {
                                                for (listtemp = liststart;listtemp;listtemp = listtemp->next)