From 3a05e084dd569acf185648c5deb4a73da9819d2e Mon Sep 17 00:00:00 2001 From: mattn Date: Tue, 18 Mar 2008 19:31:49 +0000 Subject: [PATCH] * implemented FindFiles, NextFile and ~FindFiles for linux git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/branches/ZeroRadiant@228 8a3a26a2-13c4-0310-b231-cf6edde360e5 --- libs/missing.h | 4 ++++ radiant/missing.cpp | 56 +++++++++++++++++++++++++++++++-------------- 2 files changed, 43 insertions(+), 17 deletions(-) diff --git a/libs/missing.h b/libs/missing.h index f4fc6ee5..135f4d32 100644 --- a/libs/missing.h +++ b/libs/missing.h @@ -73,6 +73,9 @@ int MemorySize(void *ptr); #define MK_CONTROL 0x0008 #define MK_MBUTTON 0x0010 +#include +#include + #endif #define CString Str @@ -213,6 +216,7 @@ private: HANDLE findHandle; WIN32_FIND_DATA findFileData; #else + DIR *findHandle; #endif }; diff --git a/radiant/missing.cpp b/radiant/missing.cpp index 5f37538d..8afdb8eb 100644 --- a/radiant/missing.cpp +++ b/radiant/missing.cpp @@ -2,30 +2,30 @@ Copyright (c) 2001, Loki software, inc. All rights reserved. -Redistribution and use in source and binary forms, with or without modification, +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: -Redistributions of source code must retain the above copyright notice, this list +Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -Neither the name of Loki software nor the names of its contributors may be used -to endorse or promote products derived from this software without specific prior -written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY -DIRECT,INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +Neither the name of Loki software nor the names of its contributors may be used +to endorse or promote products derived from this software without specific prior +written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY +DIRECT,INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ // @@ -67,7 +67,7 @@ bool radCopyFile(const char *lpExistingFileName, const char *lpNewFileName) fclose (src); return false; } - + fseek (src, 0, SEEK_END); l = ftell (src); rewind (src); @@ -142,6 +142,28 @@ EPathCheck CheckFile( const char *path ) { return PATH_FILE; } +FindFiles::FindFiles( const char *_directory ) { + findHandle = opendir( _directory ); +} + +FindFiles::~FindFiles() { + if ( findHandle != NULL ) { + closedir( findHandle ); + } +} + +const char* FindFiles::NextFile() { + struct dirent *d; + + if ( findHandle == NULL ) + return NULL; + + d = readdir( findHandle ); + if ( d ) + return d->d_name; + return NULL; +} + #else FindFiles::FindFiles( const char *_directory ) { -- 2.39.2