diff --git a/Source/Ember/Xform.h b/Source/Ember/Xform.h index 47f5301..e7ad1be 100644 --- a/Source/Ember/Xform.h +++ b/Source/Ember/Xform.h @@ -185,7 +185,7 @@ public: //If this xform was already part of a different ember, then do not assign, else do. if (!m_ParentEmber && (typeid(T) == typeid(U))) - m_ParentEmber = static_cast*>(xform.ParentEmber()); + m_ParentEmber = reinterpret_cast*>(xform.ParentEmber()); CopyVec(m_Xaos, xform.XaosVec()); CopyVec(m_Motion, xform.m_Motion); diff --git a/Source/EmberCommon/JpegUtils.h b/Source/EmberCommon/JpegUtils.h index ea186bb..e07cb15 100644 --- a/Source/EmberCommon/JpegUtils.h +++ b/Source/EmberCommon/JpegUtils.h @@ -79,30 +79,30 @@ static bool WriteJpeg(const char* filename, byte* image, size_t width, size_t he //Write comments to jpeg. if (enableComments) { - jpeg_write_marker(&info, JPEG_COM, reinterpret_cast(verString), strlen(verString)); + jpeg_write_marker(&info, JPEG_COM, reinterpret_cast(verString), (uint)strlen(verString)); if (nick != "") { snprintf_s(nickString, 64, "flam3_nickname: %s", nick.c_str()); - jpeg_write_marker(&info, JPEG_COM, reinterpret_cast(nickString), strlen(nickString)); + jpeg_write_marker(&info, JPEG_COM, reinterpret_cast(nickString), (uint)strlen(nickString)); } if (url != "") { snprintf_s(urlString, 128, "flam3_url: %s", url.c_str()); - jpeg_write_marker(&info, JPEG_COM, reinterpret_cast(urlString), strlen(urlString)); + jpeg_write_marker(&info, JPEG_COM, reinterpret_cast(urlString), (uint)strlen(urlString)); } if (id != "") { snprintf_s(idString, 128, "flam3_id: %s", id.c_str()); - jpeg_write_marker(&info, JPEG_COM, reinterpret_cast(idString), strlen(idString)); + jpeg_write_marker(&info, JPEG_COM, reinterpret_cast(idString), (uint)strlen(idString)); } - jpeg_write_marker(&info, JPEG_COM, reinterpret_cast(bvString), strlen(bvString)); - jpeg_write_marker(&info, JPEG_COM, reinterpret_cast(niString), strlen(niString)); - jpeg_write_marker(&info, JPEG_COM, reinterpret_cast(rtString), strlen(rtString)); - jpeg_write_marker(&info, JPEG_COM, reinterpret_cast(genomeString), strlen(genomeString)); + jpeg_write_marker(&info, JPEG_COM, reinterpret_cast(bvString), (uint)strlen(bvString)); + jpeg_write_marker(&info, JPEG_COM, reinterpret_cast(niString), (uint)strlen(niString)); + jpeg_write_marker(&info, JPEG_COM, reinterpret_cast(rtString), (uint)strlen(rtString)); + jpeg_write_marker(&info, JPEG_COM, reinterpret_cast(genomeString), (uint)strlen(genomeString)); } for (i = 0; i < height; i++) diff --git a/Source/EmberCommon/SimpleGlob.h b/Source/EmberCommon/SimpleGlob.h index 35bb300..f3352f5 100644 --- a/Source/EmberCommon/SimpleGlob.h +++ b/Source/EmberCommon/SimpleGlob.h @@ -1,82 +1,82 @@ /*! @file SimpleGlob.h - @version 3.6 + @version 3.6 - @brief A cross-platform file globbing library providing the ability to - expand wildcards in command-line arguments to a list of all matching - files. It is designed explicitly to be portable to any platform and has - been tested on Windows and Linux. See CSimpleGlobTempl for the class - definition. + @brief A cross-platform file globbing library providing the ability to + expand wildcards in command-line arguments to a list of all matching + files. It is designed explicitly to be portable to any platform and has + been tested on Windows and Linux. See CSimpleGlobTempl for the class + definition. - @section features FEATURES - - MIT Licence allows free use in all software (including GPL and - commercial) - - multi-platform (Windows 95/98/ME/NT/2K/XP, Linux, Unix) - - supports most of the standard linux glob() options - - recognition of a forward paths as equivalent to a backward slash - on Windows. e.g. "c:/path/foo*" is equivalent to "c:\path\foo*". - - implemented with only a single C++ header file - - char, wchar_t and Windows TCHAR in the same program - - complete working examples included - - compiles cleanly at warning level 4 (Windows/VC.NET 2003), - warning level 3 (Windows/VC6) and -Wall (Linux/gcc) + @section features FEATURES + - MIT Licence allows free use in all software (including GPL and + commercial) + - multi-platform (Windows 95/98/ME/NT/2K/XP, Linux, Unix) + - supports most of the standard linux glob() options + - recognition of a forward paths as equivalent to a backward slash + on Windows. e.g. "c:/path/foo*" is equivalent to "c:\path\foo*". + - implemented with only a single C++ header file + - char, wchar_t and Windows TCHAR in the same program + - complete working examples included + - compiles cleanly at warning level 4 (Windows/VC.NET 2003), + warning level 3 (Windows/VC6) and -Wall (Linux/gcc) - @section usage USAGE - The SimpleGlob class is used by following these steps: -
    -
  1. Include the SimpleGlob.h header file + @section usage USAGE + The SimpleGlob class is used by following these steps: +
      +
    1. Include the SimpleGlob.h header file - 
      -        \#include "SimpleGlob.h"
-
      + 
      +		\#include "SimpleGlob.h"
+
    2. Instantiate a CSimpleGlob object supplying the appropriate flags. - 
      -        @link CSimpleGlobTempl CSimpleGlob @endlink glob(FLAGS);
-
      + 
      +		@link CSimpleGlobTempl CSimpleGlob @endlink glob(FLAGS);
+
    3. Add all file specifications to the glob class. - 
      -        glob.Add("file*");
-        glob.Add(argc, argv);
-
      + 
      +		glob.Add("file*");
+		glob.Add(argc, argv);
+
    4. Process all files with File(), Files() and FileCount() - 
      -        for (int n = 0; n < glob.FileCount(); ++n) {
-            ProcessFile(glob.File(n));
-        }
-
      + 
      +		for (int n = 0; n < glob.FileCount(); ++n) {
+			ProcessFile(glob.File(n));
+		}
+
      -
    +
- @section licence MIT LICENCE + @section licence MIT LICENCE 
-    The licence text below is the boilerplate "MIT Licence" used from:
-    http://www.opensource.org/licenses/mit-license.php
+	The licence text below is the boilerplate "MIT Licence" used from:
+	http://www.opensource.org/licenses/mit-license.php
 
-    Copyright (c) 2006-2013, Brodie Thiesfield
+	Copyright (c) 2006-2013, Brodie Thiesfield
 
-    Permission is hereby granted, free of charge, to any person obtaining a
-    copy of this software and associated documentation files (the "Software"),
-    to deal in the Software without restriction, including without limitation
-    the rights to use, copy, modify, merge, publish, distribute, sublicense,
-    and/or sell copies of the Software, and to permit persons to whom the
-    Software is furnished to do so, subject to the following conditions:
+	Permission is hereby granted, free of charge, to any person obtaining a
+	copy of this software and associated documentation files (the "Software"),
+	to deal in the Software without restriction, including without limitation
+	the rights to use, copy, modify, merge, publish, distribute, sublicense,
+	and/or sell copies of the Software, and to permit persons to whom the
+	Software is furnished to do so, subject to the following conditions:
 
-    The above copyright notice and this permission notice shall be included
-    in all copies or substantial portions of the Software.
+	The above copyright notice and this permission notice shall be included
+	in all copies or substantial portions of the Software.
 
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-    OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-    IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-    CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-    TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-    SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+	OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+	MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+	IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+	CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+	TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+	SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/ @@ -84,66 +84,66 @@ #define INCLUDED_SimpleGlob /*! @brief The operation of SimpleGlob is fine-tuned via the use of a - combination of the following flags. + combination of the following flags. - The flags may be passed at initialization of the class and used for every - filespec added, or alternatively they may optionally be specified in the - call to Add() and be different for each filespec. + The flags may be passed at initialization of the class and used for every + filespec added, or alternatively they may optionally be specified in the + call to Add() and be different for each filespec. - @param SG_GLOB_ERR - Return upon read error (e.g. directory does not have read permission) + @param SG_GLOB_ERR + Return upon read error (e.g. directory does not have read permission) - @param SG_GLOB_MARK - Append a slash (backslash in Windows) to every path which corresponds - to a directory + @param SG_GLOB_MARK + Append a slash (backslash in Windows) to every path which corresponds + to a directory - @param SG_GLOB_NOSORT - By default, files are returned in sorted into string order. With this - flag, no sorting is done. This is not compatible with - SG_GLOB_FULLSORT. + @param SG_GLOB_NOSORT + By default, files are returned in sorted into string order. With this + flag, no sorting is done. This is not compatible with + SG_GLOB_FULLSORT. - @param SG_GLOB_FULLSORT - By default, files are sorted in groups belonging to each filespec that - was added. For example if the filespec "b*" was added before the - filespec "a*" then the argv array will contain all b* files sorted in - order, followed by all a* files sorted in order. If this flag is - specified, the entire array will be sorted ignoring the filespec - groups. + @param SG_GLOB_FULLSORT + By default, files are sorted in groups belonging to each filespec that + was added. For example if the filespec "b*" was added before the + filespec "a*" then the argv array will contain all b* files sorted in + order, followed by all a* files sorted in order. If this flag is + specified, the entire array will be sorted ignoring the filespec + groups. - @param SG_GLOB_NOCHECK - If the pattern doesn't match anything, return the original pattern. + @param SG_GLOB_NOCHECK + If the pattern doesn't match anything, return the original pattern. - @param SG_GLOB_TILDE - Tilde expansion is carried out (on Unix platforms) + @param SG_GLOB_TILDE + Tilde expansion is carried out (on Unix platforms) - @param SG_GLOB_ONLYDIR - Return only directories which match (not compatible with - SG_GLOB_ONLYFILE) + @param SG_GLOB_ONLYDIR + Return only directories which match (not compatible with + SG_GLOB_ONLYFILE) - @param SG_GLOB_ONLYFILE - Return only files which match (not compatible with SG_GLOB_ONLYDIR) + @param SG_GLOB_ONLYFILE + Return only files which match (not compatible with SG_GLOB_ONLYDIR) - @param SG_GLOB_NODOT - Do not return the "." or ".." special directories. + @param SG_GLOB_NODOT + Do not return the "." or ".." special directories. */ enum SG_Flags { - SG_GLOB_ERR = 1 << 0, - SG_GLOB_MARK = 1 << 1, - SG_GLOB_NOSORT = 1 << 2, - SG_GLOB_NOCHECK = 1 << 3, - SG_GLOB_TILDE = 1 << 4, - SG_GLOB_ONLYDIR = 1 << 5, - SG_GLOB_ONLYFILE = 1 << 6, - SG_GLOB_NODOT = 1 << 7, - SG_GLOB_FULLSORT = 1 << 8 + SG_GLOB_ERR = 1 << 0, + SG_GLOB_MARK = 1 << 1, + SG_GLOB_NOSORT = 1 << 2, + SG_GLOB_NOCHECK = 1 << 3, + SG_GLOB_TILDE = 1 << 4, + SG_GLOB_ONLYDIR = 1 << 5, + SG_GLOB_ONLYFILE = 1 << 6, + SG_GLOB_NODOT = 1 << 7, + SG_GLOB_FULLSORT = 1 << 8 }; /*! @brief Error return codes */ enum SG_Error { - SG_SUCCESS = 0, - SG_ERR_NOMATCH = 1, - SG_ERR_MEMORY = -1, - SG_ERR_FAILURE = -2 + SG_SUCCESS = 0, + SG_ERR_NOMATCH = 1, + SG_ERR_MEMORY = -1, + SG_ERR_FAILURE = -2 }; // --------------------------------------------------------------------------- @@ -213,86 +213,86 @@ enum SG_Error { class SimpleGlobUtil { public: - static const char * strchr(const char *s, char c) { - return sg_strchr(reinterpret_cast(s), c); - } - static const wchar_t * strchr(const wchar_t *s, wchar_t c) { - return ::wcschr(s, c); - } + static const char * strchr(const char *s, char c) { + return reinterpret_cast(sg_strchr(reinterpret_cast(s), c)); + } + static const wchar_t * strchr(const wchar_t *s, wchar_t c) { + return ::wcschr(s, c); + } #if SG_HAVE_ICU - static const UChar * strchr(const UChar *s, UChar c) { - return ::u_strchr(s, c); - } + static const UChar * strchr(const UChar *s, UChar c) { + return ::u_strchr(s, c); + } #endif - static const char * strrchr(const char *s, char c) { - return sg_strrchr(reinterpret_cast(s), c); - } - static const wchar_t * strrchr(const wchar_t *s, wchar_t c) { - return ::wcsrchr(s, c); - } + static const char * strrchr(const char *s, char c) { + return reinterpret_cast(sg_strrchr(reinterpret_cast(s), c)); + } + static const wchar_t * strrchr(const wchar_t *s, wchar_t c) { + return ::wcsrchr(s, c); + } #if SG_HAVE_ICU - static const UChar * strrchr(const UChar *s, UChar c) { - return ::u_strrchr(s, c); - } + static const UChar * strrchr(const UChar *s, UChar c) { + return ::u_strrchr(s, c); + } #endif - // Note: char strlen returns number of bytes, not characters - static size_t strlen(const char *s) { return ::strlen(s); } - static size_t strlen(const wchar_t *s) { return ::wcslen(s); } + // Note: char strlen returns number of bytes, not characters + static size_t strlen(const char *s) { return ::strlen(s); } + static size_t strlen(const wchar_t *s) { return ::wcslen(s); } #if SG_HAVE_ICU - static size_t strlen(const UChar *s) { return ::u_strlen(s); } + static size_t strlen(const UChar *s) { return ::u_strlen(s); } #endif - static void strcpy_s(char *dst, size_t n, const char *src) { - (void) n; - sg_strcpy_s(reinterpret_cast(dst), n, reinterpret_cast(src)); - } - static void strcpy_s(wchar_t *dst, size_t n, const wchar_t *src) { + static void strcpy_s(char *dst, size_t n, const char *src) { + (void) n; + sg_strcpy_s(reinterpret_cast(dst), n, reinterpret_cast(src)); + } + static void strcpy_s(wchar_t *dst, size_t n, const wchar_t *src) { # if __STDC_WANT_SECURE_LIB__ - ::wcscpy_s(dst, n, src); + ::wcscpy_s(dst, n, src); #else - (void) n; - ::wcscpy(dst, src); + (void) n; + ::wcscpy(dst, src); #endif - } + } #if SG_HAVE_ICU - static void strcpy_s(UChar *dst, size_t n, const UChar *src) { - ::u_strncpy(dst, src, n); - } + static void strcpy_s(UChar *dst, size_t n, const UChar *src) { + ::u_strncpy(dst, src, n); + } #endif - static int strcmp(const char *s1, const char *s2) { - return sg_strcmp(reinterpret_cast(s1), reinterpret_cast(s2)); - } - static int strcmp(const wchar_t *s1, const wchar_t *s2) { - return ::wcscmp(s1, s2); - } + static int strcmp(const char *s1, const char *s2) { + return sg_strcmp(reinterpret_cast(s1), reinterpret_cast(s2)); + } + static int strcmp(const wchar_t *s1, const wchar_t *s2) { + return ::wcscmp(s1, s2); + } #if SG_HAVE_ICU - static int strcmp(const UChar *s1, const UChar *s2) { - return ::u_strcmp(s1, s2); - } + static int strcmp(const UChar *s1, const UChar *s2) { + return ::u_strcmp(s1, s2); + } #endif - static int strcasecmp(const char *s1, const char *s2) { - return sg_strcasecmp(reinterpret_cast(s1), reinterpret_cast(s2)); - } + static int strcasecmp(const char *s1, const char *s2) { + return sg_strcasecmp(reinterpret_cast(s1), reinterpret_cast(s2)); + } #if _WIN32 - static int strcasecmp(const wchar_t *s1, const wchar_t *s2) { - return ::_wcsicmp(s1, s2); - } + static int strcasecmp(const wchar_t *s1, const wchar_t *s2) { + return ::_wcsicmp(s1, s2); + } #endif // _WIN32 #if SG_HAVE_ICU - static int strcasecmp(const UChar *s1, const UChar *s2) { - return u_strcasecmp(s1, s2, 0); - } + static int strcasecmp(const UChar *s1, const UChar *s2) { + return u_strcasecmp(s1, s2, 0); + } #endif }; enum SG_FileType { - SG_FILETYPE_INVALID, - SG_FILETYPE_FILE, - SG_FILETYPE_DIR + SG_FILETYPE_INVALID, + SG_FILETYPE_FILE, + SG_FILETYPE_DIR }; #ifdef _WIN32 @@ -307,76 +307,76 @@ enum SG_FileType { template struct SimpleGlobBase { - SimpleGlobBase() : m_hFind(INVALID_HANDLE_VALUE) { } + SimpleGlobBase() : m_hFind(INVALID_HANDLE_VALUE) { } - int FindFirstFileS(const char * a_pszFileSpec, uint) { - m_hFind = FindFirstFileA(a_pszFileSpec, &m_oFindDataA); - if (m_hFind != INVALID_HANDLE_VALUE) { - return SG_SUCCESS; - } - DWORD dwErr = GetLastError(); - if (dwErr == ERROR_FILE_NOT_FOUND) { - return SG_ERR_NOMATCH; - } - return SG_ERR_FAILURE; - } - int FindFirstFileS(const wchar_t * a_pszFileSpec, uint) { - m_hFind = FindFirstFileW(a_pszFileSpec, &m_oFindDataW); - if (m_hFind != INVALID_HANDLE_VALUE) { - return SG_SUCCESS; - } - DWORD dwErr = GetLastError(); - if (dwErr == ERROR_FILE_NOT_FOUND) { - return SG_ERR_NOMATCH; - } - return SG_ERR_FAILURE; - } + int FindFirstFileS(const char * a_pszFileSpec, uint) { + m_hFind = FindFirstFileA(a_pszFileSpec, &m_oFindDataA); + if (m_hFind != INVALID_HANDLE_VALUE) { + return SG_SUCCESS; + } + DWORD dwErr = GetLastError(); + if (dwErr == ERROR_FILE_NOT_FOUND) { + return SG_ERR_NOMATCH; + } + return SG_ERR_FAILURE; + } + int FindFirstFileS(const wchar_t * a_pszFileSpec, uint) { + m_hFind = FindFirstFileW(a_pszFileSpec, &m_oFindDataW); + if (m_hFind != INVALID_HANDLE_VALUE) { + return SG_SUCCESS; + } + DWORD dwErr = GetLastError(); + if (dwErr == ERROR_FILE_NOT_FOUND) { + return SG_ERR_NOMATCH; + } + return SG_ERR_FAILURE; + } - bool FindNextFileS(char) { - return FindNextFileA(m_hFind, &m_oFindDataA) != FALSE; - } - bool FindNextFileS(wchar_t) { - return FindNextFileW(m_hFind, &m_oFindDataW) != FALSE; - } + bool FindNextFileS(char) { + return FindNextFileA(m_hFind, &m_oFindDataA) != FALSE; + } + bool FindNextFileS(wchar_t) { + return FindNextFileW(m_hFind, &m_oFindDataW) != FALSE; + } - void FindDone() { - FindClose(m_hFind); - } + void FindDone() { + FindClose(m_hFind); + } - const char * GetFileNameS(char) const { - return m_oFindDataA.cFileName; - } - const wchar_t * GetFileNameS(wchar_t) const { - return m_oFindDataW.cFileName; - } + const char * GetFileNameS(char) const { + return m_oFindDataA.cFileName; + } + const wchar_t * GetFileNameS(wchar_t) const { + return m_oFindDataW.cFileName; + } - bool IsDirS(char) const { - return this->GetFileTypeS(m_oFindDataA.dwFileAttributes) == SG_FILETYPE_DIR; - } - bool IsDirS(wchar_t) const { - return this->GetFileTypeS(m_oFindDataW.dwFileAttributes) == SG_FILETYPE_DIR; - } + bool IsDirS(char) const { + return this->GetFileTypeS(m_oFindDataA.dwFileAttributes) == SG_FILETYPE_DIR; + } + bool IsDirS(wchar_t) const { + return this->GetFileTypeS(m_oFindDataW.dwFileAttributes) == SG_FILETYPE_DIR; + } - SG_FileType GetFileTypeS(const char * a_pszPath) { - return this->GetFileTypeS(GetFileAttributesA(a_pszPath)); - } - SG_FileType GetFileTypeS(const wchar_t * a_pszPath) { - return this->GetFileTypeS(GetFileAttributesW(a_pszPath)); - } - SG_FileType GetFileTypeS(DWORD a_dwAttribs) const { - if (a_dwAttribs == INVALID_FILE_ATTRIBUTES) { - return SG_FILETYPE_INVALID; - } - if (a_dwAttribs & FILE_ATTRIBUTE_DIRECTORY) { - return SG_FILETYPE_DIR; - } - return SG_FILETYPE_FILE; - } + SG_FileType GetFileTypeS(const char * a_pszPath) { + return this->GetFileTypeS(GetFileAttributesA(a_pszPath)); + } + SG_FileType GetFileTypeS(const wchar_t * a_pszPath) { + return this->GetFileTypeS(GetFileAttributesW(a_pszPath)); + } + SG_FileType GetFileTypeS(DWORD a_dwAttribs) const { + if (a_dwAttribs == INVALID_FILE_ATTRIBUTES) { + return SG_FILETYPE_INVALID; + } + if (a_dwAttribs & FILE_ATTRIBUTE_DIRECTORY) { + return SG_FILETYPE_DIR; + } + return SG_FILETYPE_FILE; + } private: - HANDLE m_hFind; - WIN32_FIND_DATAA m_oFindDataA; - WIN32_FIND_DATAW m_oFindDataW; + HANDLE m_hFind; + WIN32_FIND_DATAA m_oFindDataA; + WIN32_FIND_DATAW m_oFindDataW; }; #else // !_WIN32 @@ -387,126 +387,126 @@ private: template struct SimpleGlobBase { - SimpleGlobBase() { - memset(&m_glob, 0, sizeof(m_glob)); - m_uiCurr = size_t(-1); - } + SimpleGlobBase() { + memset(&m_glob, 0, sizeof(m_glob)); + m_uiCurr = size_t(-1); + } - ~SimpleGlobBase() { - globfree(&m_glob); - } + ~SimpleGlobBase() { + globfree(&m_glob); + } - void FilePrep() { - m_bIsDir = false; - size_t len = strlen(m_glob.gl_pathv[m_uiCurr]); - if (m_glob.gl_pathv[m_uiCurr][len-1] == '/') { - m_bIsDir = true; - m_glob.gl_pathv[m_uiCurr][len-1] = 0; - } - } + void FilePrep() { + m_bIsDir = false; + size_t len = strlen(m_glob.gl_pathv[m_uiCurr]); + if (m_glob.gl_pathv[m_uiCurr][len-1] == '/') { + m_bIsDir = true; + m_glob.gl_pathv[m_uiCurr][len-1] = 0; + } + } - int FindFirstFileS(const char * a_pszFileSpec, uint a_uiFlags) { - int nFlags = GLOB_MARK | GLOB_NOSORT; - if (a_uiFlags & SG_GLOB_ERR) nFlags |= GLOB_ERR; - if (a_uiFlags & SG_GLOB_TILDE) nFlags |= GLOB_TILDE; - int rc = glob(a_pszFileSpec, nFlags, nullptr, &m_glob); - if (rc == GLOB_NOSPACE) return SG_ERR_MEMORY; - if (rc == GLOB_ABORTED) return SG_ERR_FAILURE; - if (rc == GLOB_NOMATCH) return SG_ERR_NOMATCH; - m_uiCurr = 0; - FilePrep(); - return SG_SUCCESS; - } + int FindFirstFileS(const char * a_pszFileSpec, uint a_uiFlags) { + int nFlags = GLOB_MARK | GLOB_NOSORT; + if (a_uiFlags & SG_GLOB_ERR) nFlags |= GLOB_ERR; + if (a_uiFlags & SG_GLOB_TILDE) nFlags |= GLOB_TILDE; + int rc = glob(a_pszFileSpec, nFlags, nullptr, &m_glob); + if (rc == GLOB_NOSPACE) return SG_ERR_MEMORY; + if (rc == GLOB_ABORTED) return SG_ERR_FAILURE; + if (rc == GLOB_NOMATCH) return SG_ERR_NOMATCH; + m_uiCurr = 0; + FilePrep(); + return SG_SUCCESS; + } #if SG_HAVE_ICU - int FindFirstFileS(const UChar * a_pszFileSpec, uint a_uiFlags) { - char buf[PATH_MAX] = { 0 }; - UErrorCode status = U_ZERO_ERROR; - u_strToUTF8(buf, sizeof(buf), nullptr, a_pszFileSpec, -1, &status); - if (U_FAILURE(status)) return SG_ERR_FAILURE; - return this->FindFirstFileS(buf, a_uiFlags); - } + int FindFirstFileS(const UChar * a_pszFileSpec, uint a_uiFlags) { + char buf[PATH_MAX] = { 0 }; + UErrorCode status = U_ZERO_ERROR; + u_strToUTF8(buf, sizeof(buf), nullptr, a_pszFileSpec, -1, &status); + if (U_FAILURE(status)) return SG_ERR_FAILURE; + return this->FindFirstFileS(buf, a_uiFlags); + } #endif - bool FindNextFileS(char) { - SG_ASSERT(m_uiCurr != (size_t)-1); - if (++m_uiCurr >= m_glob.gl_pathc) { - return false; - } - FilePrep(); - return true; - } + bool FindNextFileS(char) { + SG_ASSERT(m_uiCurr != (size_t)-1); + if (++m_uiCurr >= m_glob.gl_pathc) { + return false; + } + FilePrep(); + return true; + } #if SG_HAVE_ICU - bool FindNextFileS(UChar) { - return this->FindNextFileS((char)0); - } + bool FindNextFileS(UChar) { + return this->FindNextFileS((char)0); + } #endif - void FindDone() { - globfree(&m_glob); - memset(&m_glob, 0, sizeof(m_glob)); - m_uiCurr = size_t(-1); - } + void FindDone() { + globfree(&m_glob); + memset(&m_glob, 0, sizeof(m_glob)); + m_uiCurr = size_t(-1); + } - const char * GetFileNameS(char) const { - SG_ASSERT(m_uiCurr != size_t(-1)); - return m_glob.gl_pathv[m_uiCurr]; - } + const char * GetFileNameS(char) const { + SG_ASSERT(m_uiCurr != size_t(-1)); + return m_glob.gl_pathv[m_uiCurr]; + } #if SG_HAVE_ICU - const UChar * GetFileNameS(UChar) const { - const char * pszFile = this->GetFileNameS((char)0); - if (!pszFile) return nullptr; - UErrorCode status = U_ZERO_ERROR; - memset(m_szBuf, 0, sizeof(m_szBuf)); - u_strFromUTF8(m_szBuf, PATH_MAX, nullptr, pszFile, -1, &status); - if (U_FAILURE(status)) return nullptr; - return m_szBuf; - } + const UChar * GetFileNameS(UChar) const { + const char * pszFile = this->GetFileNameS((char)0); + if (!pszFile) return nullptr; + UErrorCode status = U_ZERO_ERROR; + memset(m_szBuf, 0, sizeof(m_szBuf)); + u_strFromUTF8(m_szBuf, PATH_MAX, nullptr, pszFile, -1, &status); + if (U_FAILURE(status)) return nullptr; + return m_szBuf; + } #endif - bool IsDirS(char) const { - SG_ASSERT(m_uiCurr != size_t(-1)); - return m_bIsDir; - } + bool IsDirS(char) const { + SG_ASSERT(m_uiCurr != size_t(-1)); + return m_bIsDir; + } #if SG_HAVE_ICU - bool IsDirS(UChar) const { - return this->IsDirS((char)0); - } + bool IsDirS(UChar) const { + return this->IsDirS((char)0); + } #endif - SG_FileType GetFileTypeS(const char * a_pszPath) const { - struct stat sb; - if (0 != stat(a_pszPath, &sb)) { - return SG_FILETYPE_INVALID; - } - if (S_ISDIR(sb.st_mode)) { - return SG_FILETYPE_DIR; - } - if (S_ISREG(sb.st_mode)) { - return SG_FILETYPE_FILE; - } - return SG_FILETYPE_INVALID; - } + SG_FileType GetFileTypeS(const char * a_pszPath) const { + struct stat sb; + if (0 != stat(a_pszPath, &sb)) { + return SG_FILETYPE_INVALID; + } + if (S_ISDIR(sb.st_mode)) { + return SG_FILETYPE_DIR; + } + if (S_ISREG(sb.st_mode)) { + return SG_FILETYPE_FILE; + } + return SG_FILETYPE_INVALID; + } #if SG_HAVE_ICU - SG_FileType GetFileTypeS(const UChar * a_pszPath) const { - char buf[PATH_MAX] = { 0 }; - UErrorCode status = U_ZERO_ERROR; - u_strToUTF8(buf, sizeof(buf), nullptr, a_pszPath, -1, &status); - if (U_FAILURE(status)) return SG_FILETYPE_INVALID; - return this->GetFileTypeS(buf); - } + SG_FileType GetFileTypeS(const UChar * a_pszPath) const { + char buf[PATH_MAX] = { 0 }; + UErrorCode status = U_ZERO_ERROR; + u_strToUTF8(buf, sizeof(buf), nullptr, a_pszPath, -1, &status); + if (U_FAILURE(status)) return SG_FILETYPE_INVALID; + return this->GetFileTypeS(buf); + } #endif private: - glob_t m_glob; - size_t m_uiCurr; - bool m_bIsDir; + glob_t m_glob; + size_t m_uiCurr; + bool m_bIsDir; #if SG_HAVE_ICU - mutable UChar m_szBuf[PATH_MAX]; + mutable UChar m_szBuf[PATH_MAX]; #endif }; @@ -523,117 +523,117 @@ template class CSimpleGlobTempl : private SimpleGlobBase { public: - /*! @brief Initialize the class. + /*! @brief Initialize the class. - @param a_uiFlags Combination of SG_GLOB flags. - @param a_nReservedSlots Number of slots in the argv array that - should be reserved. In the returned array these slots - argv[0] ... argv[a_nReservedSlots-1] will be left empty for - the caller to fill in. - */ - CSimpleGlobTempl(uint a_uiFlags = 0, int a_nReservedSlots = 0); + @param a_uiFlags Combination of SG_GLOB flags. + @param a_nReservedSlots Number of slots in the argv array that + should be reserved. In the returned array these slots + argv[0] ... argv[a_nReservedSlots-1] will be left empty for + the caller to fill in. + */ + CSimpleGlobTempl(uint a_uiFlags = 0, int a_nReservedSlots = 0); - /*! @brief Deallocate all memory buffers. */ - ~CSimpleGlobTempl(); + /*! @brief Deallocate all memory buffers. */ + ~CSimpleGlobTempl(); - /*! @brief Initialize (or re-initialize) the class in preparation for - adding new filespecs. + /*! @brief Initialize (or re-initialize) the class in preparation for + adding new filespecs. - All existing files are cleared. Note that allocated memory is only - deallocated at object destruction. + All existing files are cleared. Note that allocated memory is only + deallocated at object destruction. - @param a_uiFlags Combination of SG_GLOB flags. - @param a_nReservedSlots Number of slots in the argv array that - should be reserved. In the returned array these slots - argv[0] ... argv[a_nReservedSlots-1] will be left empty for - the caller to fill in. - */ - int Init(uint a_uiFlags = 0, int a_nReservedSlots = 0); + @param a_uiFlags Combination of SG_GLOB flags. + @param a_nReservedSlots Number of slots in the argv array that + should be reserved. In the returned array these slots + argv[0] ... argv[a_nReservedSlots-1] will be left empty for + the caller to fill in. + */ + int Init(uint a_uiFlags = 0, int a_nReservedSlots = 0); - /*! @brief Add a new filespec to the glob. + /*! @brief Add a new filespec to the glob. - The filesystem will be immediately scanned for all matching files and - directories and they will be added to the glob. + The filesystem will be immediately scanned for all matching files and + directories and they will be added to the glob. - @param a_pszFileSpec Filespec to add to the glob. + @param a_pszFileSpec Filespec to add to the glob. - @return SG_SUCCESS Matching files were added to the glob. - @return SG_ERR_NOMATCH Nothing matched the pattern. To ignore this - error compare return value to >= SG_SUCCESS. - @return SG_ERR_MEMORY Out of memory failure. - @return SG_ERR_FAILURE General failure. - */ - int Add(const SOCHAR *a_pszFileSpec); + @return SG_SUCCESS Matching files were added to the glob. + @return SG_ERR_NOMATCH Nothing matched the pattern. To ignore this + error compare return value to >= SG_SUCCESS. + @return SG_ERR_MEMORY Out of memory failure. + @return SG_ERR_FAILURE General failure. + */ + int Add(const SOCHAR *a_pszFileSpec); - /*! @brief Add an array of filespec to the glob. + /*! @brief Add an array of filespec to the glob. - The filesystem will be immediately scanned for all matching files and - directories in each filespec and they will be added to the glob. + The filesystem will be immediately scanned for all matching files and + directories in each filespec and they will be added to the glob. - @param a_nCount Number of filespec in the array. - @param a_rgpszFileSpec Array of filespec to add to the glob. + @param a_nCount Number of filespec in the array. + @param a_rgpszFileSpec Array of filespec to add to the glob. - @return SG_SUCCESS Matching files were added to the glob. - @return SG_ERR_NOMATCH Nothing matched the pattern. To ignore this - error compare return value to >= SG_SUCCESS. - @return SG_ERR_MEMORY Out of memory failure. - @return SG_ERR_FAILURE General failure. - */ - int Add(int a_nCount, const SOCHAR * const * a_rgpszFileSpec); + @return SG_SUCCESS Matching files were added to the glob. + @return SG_ERR_NOMATCH Nothing matched the pattern. To ignore this + error compare return value to >= SG_SUCCESS. + @return SG_ERR_MEMORY Out of memory failure. + @return SG_ERR_FAILURE General failure. + */ + int Add(int a_nCount, const SOCHAR * const * a_rgpszFileSpec); - /*! @brief Return the number of files in the argv array. - */ - inline int FileCount() const { return m_nArgsLen; } + /*! @brief Return the number of files in the argv array. + */ + inline int FileCount() const { return m_nArgsLen; } - /*! @brief Return the full argv array. */ - inline SOCHAR ** Files() { - SetArgvArrayType(POINTERS); - return m_rgpArgs; - } + /*! @brief Return the full argv array. */ + inline SOCHAR ** Files() { + SetArgvArrayType(POINTERS); + return m_rgpArgs; + } - /*! @brief Return the a single file. */ - inline SOCHAR * File(int n) { - SG_ASSERT(n >= 0 && n < m_nArgsLen); - return Files()[n]; - } + /*! @brief Return the a single file. */ + inline SOCHAR * File(int n) { + SG_ASSERT(n >= 0 && n < m_nArgsLen); + return Files()[n]; + } private: - CSimpleGlobTempl(const CSimpleGlobTempl &); // disabled - CSimpleGlobTempl & operator=(const CSimpleGlobTempl &); // disabled + CSimpleGlobTempl(const CSimpleGlobTempl &); // disabled + CSimpleGlobTempl & operator=(const CSimpleGlobTempl &); // disabled - /*! @brief The argv array has it's members stored as either an offset into - the string buffer, or as pointers to their string in the buffer. The - offsets are used because if the string buffer is dynamically resized, - all pointers into that buffer would become invalid. - */ - enum ARG_ARRAY_TYPE { OFFSETS, POINTERS }; + /*! @brief The argv array has it's members stored as either an offset into + the string buffer, or as pointers to their string in the buffer. The + offsets are used because if the string buffer is dynamically resized, + all pointers into that buffer would become invalid. + */ + enum ARG_ARRAY_TYPE { OFFSETS, POINTERS }; - /*! @brief Change the type of data stored in the argv array. */ - void SetArgvArrayType(ARG_ARRAY_TYPE a_nNewType); + /*! @brief Change the type of data stored in the argv array. */ + void SetArgvArrayType(ARG_ARRAY_TYPE a_nNewType); - /*! @brief Add a filename to the array if it passes all requirements. */ - int AppendName(const SOCHAR *a_pszFileName, bool a_bIsDir); + /*! @brief Add a filename to the array if it passes all requirements. */ + int AppendName(const SOCHAR *a_pszFileName, bool a_bIsDir); - /*! @brief Grow the argv array to the required size. */ - bool GrowArgvArray(int a_nNewLen); + /*! @brief Grow the argv array to the required size. */ + bool GrowArgvArray(int a_nNewLen); - /*! @brief Grow the string buffer to the required size. */ - bool GrowStringBuffer(size_t a_uiMinSize); + /*! @brief Grow the string buffer to the required size. */ + bool GrowStringBuffer(size_t a_uiMinSize); - /*! @brief Compare two (possible nullptr) strings */ - static int fileSortCompare(const void *a1, const void *a2); + /*! @brief Compare two (possible nullptr) strings */ + static int fileSortCompare(const void *a1, const void *a2); private: - uint m_uiFlags; - ARG_ARRAY_TYPE m_nArgArrayType; //!< argv is indexes or pointers - SOCHAR ** m_rgpArgs; //!< argv - int m_nReservedSlots; //!< # client slots in argv array - int m_nArgsSize; //!< allocated size of array - int m_nArgsLen; //!< used length - SOCHAR * m_pBuffer; //!< argv string buffer - size_t m_uiBufferSize; //!< allocated size of buffer - size_t m_uiBufferLen; //!< used length of buffer - SOCHAR m_szPathPrefix[MAX_PATH]; //!< wildcard path prefix + uint m_uiFlags; + ARG_ARRAY_TYPE m_nArgArrayType; //!< argv is indexes or pointers + SOCHAR ** m_rgpArgs; //!< argv + int m_nReservedSlots; //!< # client slots in argv array + int m_nArgsSize; //!< allocated size of array + int m_nArgsLen; //!< used length + SOCHAR * m_pBuffer; //!< argv string buffer + size_t m_uiBufferSize; //!< allocated size of buffer + size_t m_uiBufferLen; //!< used length of buffer + SOCHAR m_szPathPrefix[MAX_PATH]; //!< wildcard path prefix }; // --------------------------------------------------------------------------- @@ -642,291 +642,291 @@ private: template CSimpleGlobTempl::CSimpleGlobTempl( - uint a_uiFlags, - int a_nReservedSlots - ) + uint a_uiFlags, + int a_nReservedSlots + ) { - m_rgpArgs = nullptr; - m_nArgsSize = 0; - m_pBuffer = nullptr; - m_uiBufferSize = 0; + m_rgpArgs = nullptr; + m_nArgsSize = 0; + m_pBuffer = nullptr; + m_uiBufferSize = 0; - Init(a_uiFlags, a_nReservedSlots); + Init(a_uiFlags, a_nReservedSlots); } template CSimpleGlobTempl::~CSimpleGlobTempl() { - if (m_rgpArgs) free(m_rgpArgs); - if (m_pBuffer) free(m_pBuffer); + if (m_rgpArgs) free(m_rgpArgs); + if (m_pBuffer) free(m_pBuffer); } template int CSimpleGlobTempl::Init( - uint a_uiFlags, - int a_nReservedSlots - ) + uint a_uiFlags, + int a_nReservedSlots + ) { - m_nArgArrayType = POINTERS; - m_uiFlags = a_uiFlags; - m_nArgsLen = a_nReservedSlots; - m_nReservedSlots = a_nReservedSlots; - m_uiBufferLen = 0; + m_nArgArrayType = POINTERS; + m_uiFlags = a_uiFlags; + m_nArgsLen = a_nReservedSlots; + m_nReservedSlots = a_nReservedSlots; + m_uiBufferLen = 0; - if (m_nReservedSlots > 0) { - if (!GrowArgvArray(m_nReservedSlots)) { - return SG_ERR_MEMORY; - } - for (int n = 0; n < m_nReservedSlots; ++n) { - m_rgpArgs[n] = nullptr; - } - } + if (m_nReservedSlots > 0) { + if (!GrowArgvArray(m_nReservedSlots)) { + return SG_ERR_MEMORY; + } + for (int n = 0; n < m_nReservedSlots; ++n) { + m_rgpArgs[n] = nullptr; + } + } - return SG_SUCCESS; + return SG_SUCCESS; } template int CSimpleGlobTempl::Add( - const SOCHAR *a_pszFileSpec - ) + const SOCHAR *a_pszFileSpec + ) { #ifdef _WIN32 - // Windows FindFirst/FindNext recognizes forward slash as the same as - // backward slash and follows the directories. We need to do the same - // when calculating the prefix and when we have no wildcards. - SOCHAR szFileSpec[MAX_PATH]; - SimpleGlobUtil::strcpy_s(szFileSpec, MAX_PATH, a_pszFileSpec); - const SOCHAR * pszPath = SimpleGlobUtil::strchr(szFileSpec, '/'); - while (pszPath) { - szFileSpec[pszPath - szFileSpec] = SG_PATH_CHAR; - pszPath = SimpleGlobUtil::strchr(pszPath + 1, '/'); - } - a_pszFileSpec = szFileSpec; + // Windows FindFirst/FindNext recognizes forward slash as the same as + // backward slash and follows the directories. We need to do the same + // when calculating the prefix and when we have no wildcards. + SOCHAR szFileSpec[MAX_PATH]; + SimpleGlobUtil::strcpy_s(szFileSpec, MAX_PATH, a_pszFileSpec); + const SOCHAR * pszPath = SimpleGlobUtil::strchr(szFileSpec, '/'); + while (pszPath) { + szFileSpec[pszPath - szFileSpec] = SG_PATH_CHAR; + pszPath = SimpleGlobUtil::strchr(pszPath + 1, '/'); + } + a_pszFileSpec = szFileSpec; #endif - // if this doesn't contain wildcards then we can just add it directly - m_szPathPrefix[0] = 0; - if (!SimpleGlobUtil::strchr(a_pszFileSpec, '*') && - !SimpleGlobUtil::strchr(a_pszFileSpec, '?')) - { - SG_FileType nType = this->GetFileTypeS(a_pszFileSpec); - if (nType == SG_FILETYPE_INVALID) { - if (m_uiFlags & SG_GLOB_NOCHECK) { - return AppendName(a_pszFileSpec, false); - } - return SG_ERR_NOMATCH; - } - return AppendName(a_pszFileSpec, nType == SG_FILETYPE_DIR); - } + // if this doesn't contain wildcards then we can just add it directly + m_szPathPrefix[0] = 0; + if (!SimpleGlobUtil::strchr(a_pszFileSpec, '*') && + !SimpleGlobUtil::strchr(a_pszFileSpec, '?')) + { + SG_FileType nType = this->GetFileTypeS(a_pszFileSpec); + if (nType == SG_FILETYPE_INVALID) { + if (m_uiFlags & SG_GLOB_NOCHECK) { + return AppendName(a_pszFileSpec, false); + } + return SG_ERR_NOMATCH; + } + return AppendName(a_pszFileSpec, nType == SG_FILETYPE_DIR); + } #ifdef _WIN32 - // Windows doesn't return the directory with the filename, so we need to - // extract the path from the search string ourselves and prefix it to the - // filename we get back. - const SOCHAR * pszFilename = - SimpleGlobUtil::strrchr(a_pszFileSpec, SG_PATH_CHAR); - if (pszFilename) { - SimpleGlobUtil::strcpy_s(m_szPathPrefix, MAX_PATH, a_pszFileSpec); - m_szPathPrefix[pszFilename - a_pszFileSpec + 1] = 0; - } + // Windows doesn't return the directory with the filename, so we need to + // extract the path from the search string ourselves and prefix it to the + // filename we get back. + const SOCHAR * pszFilename = + SimpleGlobUtil::strrchr(a_pszFileSpec, SG_PATH_CHAR); + if (pszFilename) { + SimpleGlobUtil::strcpy_s(m_szPathPrefix, MAX_PATH, a_pszFileSpec); + m_szPathPrefix[pszFilename - a_pszFileSpec + 1] = 0; + } #endif - // search for the first match on the file - int rc = this->FindFirstFileS(a_pszFileSpec, m_uiFlags); - if (rc != SG_SUCCESS) { - if (rc == SG_ERR_NOMATCH && (m_uiFlags & SG_GLOB_NOCHECK)) { - int ok = AppendName(a_pszFileSpec, false); - if (ok != SG_SUCCESS) rc = ok; - } - return rc; - } + // search for the first match on the file + int rc = this->FindFirstFileS(a_pszFileSpec, m_uiFlags); + if (rc != SG_SUCCESS) { + if (rc == SG_ERR_NOMATCH && (m_uiFlags & SG_GLOB_NOCHECK)) { + int ok = AppendName(a_pszFileSpec, false); + if (ok != SG_SUCCESS) rc = ok; + } + return rc; + } - // add it and find all subsequent matches - int nError, nStartLen = m_nArgsLen; - bool bSuccess; - do { - nError = AppendName(this->GetFileNameS(SOCHAR(0)), this->IsDirS(SOCHAR(0))); - bSuccess = this->FindNextFileS(SOCHAR(0)); - } - while (nError == SG_SUCCESS && bSuccess); - SimpleGlobBase::FindDone(); + // add it and find all subsequent matches + int nError, nStartLen = m_nArgsLen; + bool bSuccess; + do { + nError = AppendName(this->GetFileNameS(SOCHAR(0)), this->IsDirS(SOCHAR(0))); + bSuccess = this->FindNextFileS(SOCHAR(0)); + } + while (nError == SG_SUCCESS && bSuccess); + SimpleGlobBase::FindDone(); - // sort these files if required - if (m_nArgsLen > nStartLen && !(m_uiFlags & SG_GLOB_NOSORT)) { - if (m_uiFlags & SG_GLOB_FULLSORT) { - nStartLen = m_nReservedSlots; - } - SetArgvArrayType(POINTERS); - qsort( - m_rgpArgs + nStartLen, - m_nArgsLen - nStartLen, - sizeof(m_rgpArgs[0]), fileSortCompare); - } + // sort these files if required + if (m_nArgsLen > nStartLen && !(m_uiFlags & SG_GLOB_NOSORT)) { + if (m_uiFlags & SG_GLOB_FULLSORT) { + nStartLen = m_nReservedSlots; + } + SetArgvArrayType(POINTERS); + qsort( + m_rgpArgs + nStartLen, + m_nArgsLen - nStartLen, + sizeof(m_rgpArgs[0]), fileSortCompare); + } - return nError; + return nError; } template int CSimpleGlobTempl::Add( - int a_nCount, - const SOCHAR * const * a_rgpszFileSpec - ) + int a_nCount, + const SOCHAR * const * a_rgpszFileSpec + ) { - int nResult; - for (int n = 0; n < a_nCount; ++n) { - nResult = Add(a_rgpszFileSpec[n]); - if (nResult != SG_SUCCESS) { - return nResult; - } - } - return SG_SUCCESS; + int nResult; + for (int n = 0; n < a_nCount; ++n) { + nResult = Add(a_rgpszFileSpec[n]); + if (nResult != SG_SUCCESS) { + return nResult; + } + } + return SG_SUCCESS; } template int CSimpleGlobTempl::AppendName( - const SOCHAR * a_pszFileName, - bool a_bIsDir - ) + const SOCHAR * a_pszFileName, + bool a_bIsDir + ) { - // we need the argv array as offsets in case we resize it - SetArgvArrayType(OFFSETS); + // we need the argv array as offsets in case we resize it + SetArgvArrayType(OFFSETS); - // check for special cases which cause us to ignore this entry - if ((m_uiFlags & SG_GLOB_ONLYDIR) && !a_bIsDir) { - return SG_SUCCESS; - } - if ((m_uiFlags & SG_GLOB_ONLYFILE) && a_bIsDir) { - return SG_SUCCESS; - } - if ((m_uiFlags & SG_GLOB_NODOT) && a_bIsDir) { - if (a_pszFileName[0] == '.') { - if (a_pszFileName[1] == '\0') { - return SG_SUCCESS; - } - if (a_pszFileName[1] == '.' && a_pszFileName[2] == '\0') { - return SG_SUCCESS; - } - } - } + // check for special cases which cause us to ignore this entry + if ((m_uiFlags & SG_GLOB_ONLYDIR) && !a_bIsDir) { + return SG_SUCCESS; + } + if ((m_uiFlags & SG_GLOB_ONLYFILE) && a_bIsDir) { + return SG_SUCCESS; + } + if ((m_uiFlags & SG_GLOB_NODOT) && a_bIsDir) { + if (a_pszFileName[0] == '.') { + if (a_pszFileName[1] == '\0') { + return SG_SUCCESS; + } + if (a_pszFileName[1] == '.' && a_pszFileName[2] == '\0') { + return SG_SUCCESS; + } + } + } - // ensure that we have enough room in the argv array - if (!GrowArgvArray(m_nArgsLen + 1)) { - return SG_ERR_MEMORY; - } + // ensure that we have enough room in the argv array + if (!GrowArgvArray(m_nArgsLen + 1)) { + return SG_ERR_MEMORY; + } - // ensure that we have enough room in the string buffer (+1 for null) - size_t uiPrefixLen = SimpleGlobUtil::strlen(m_szPathPrefix); - size_t uiLen = uiPrefixLen + SimpleGlobUtil::strlen(a_pszFileName) + 1; - if (a_bIsDir && (m_uiFlags & SG_GLOB_MARK) == SG_GLOB_MARK) { - ++uiLen; // need space for the backslash - } - if (!GrowStringBuffer(m_uiBufferLen + uiLen)) { - return SG_ERR_MEMORY; - } + // ensure that we have enough room in the string buffer (+1 for null) + size_t uiPrefixLen = SimpleGlobUtil::strlen(m_szPathPrefix); + size_t uiLen = uiPrefixLen + SimpleGlobUtil::strlen(a_pszFileName) + 1; + if (a_bIsDir && (m_uiFlags & SG_GLOB_MARK) == SG_GLOB_MARK) { + ++uiLen; // need space for the backslash + } + if (!GrowStringBuffer(m_uiBufferLen + uiLen)) { + return SG_ERR_MEMORY; + } - // add this entry. m_uiBufferLen is offset from beginning of buffer. - m_rgpArgs[m_nArgsLen++] = reinterpret_cast(m_uiBufferLen); - SimpleGlobUtil::strcpy_s(m_pBuffer + m_uiBufferLen, - m_uiBufferSize - m_uiBufferLen, m_szPathPrefix); - SimpleGlobUtil::strcpy_s(m_pBuffer + m_uiBufferLen + uiPrefixLen, - m_uiBufferSize - m_uiBufferLen - uiPrefixLen, a_pszFileName); - m_uiBufferLen += uiLen; + // add this entry. m_uiBufferLen is offset from beginning of buffer. + m_rgpArgs[m_nArgsLen++] = reinterpret_cast(m_uiBufferLen); + SimpleGlobUtil::strcpy_s(m_pBuffer + m_uiBufferLen, + m_uiBufferSize - m_uiBufferLen, m_szPathPrefix); + SimpleGlobUtil::strcpy_s(m_pBuffer + m_uiBufferLen + uiPrefixLen, + m_uiBufferSize - m_uiBufferLen - uiPrefixLen, a_pszFileName); + m_uiBufferLen += uiLen; - // add the directory slash if desired - if (a_bIsDir && (m_uiFlags & SG_GLOB_MARK) == SG_GLOB_MARK) { - const static SOCHAR szDirSlash[] = { SG_PATH_CHAR, 0 }; - SimpleGlobUtil::strcpy_s(m_pBuffer + m_uiBufferLen - 2, - m_uiBufferSize - (m_uiBufferLen - 2), szDirSlash); - } + // add the directory slash if desired + if (a_bIsDir && (m_uiFlags & SG_GLOB_MARK) == SG_GLOB_MARK) { + const static SOCHAR szDirSlash[] = { SG_PATH_CHAR, 0 }; + SimpleGlobUtil::strcpy_s(m_pBuffer + m_uiBufferLen - 2, + m_uiBufferSize - (m_uiBufferLen - 2), szDirSlash); + } - return SG_SUCCESS; + return SG_SUCCESS; } template void CSimpleGlobTempl::SetArgvArrayType( - ARG_ARRAY_TYPE a_nNewType - ) + ARG_ARRAY_TYPE a_nNewType + ) { - if (m_nArgArrayType == a_nNewType) return; - if (a_nNewType == POINTERS) { - SG_ASSERT(m_nArgArrayType == OFFSETS); - for (int n = 0; n < m_nArgsLen; ++n) { - m_rgpArgs[n] = (m_rgpArgs[n] == reinterpret_cast(-1)) ? - nullptr : m_pBuffer + size_t(m_rgpArgs[n]); - } - } - else { - SG_ASSERT(a_nNewType == OFFSETS); - SG_ASSERT(m_nArgArrayType == POINTERS); - for (int n = 0; n < m_nArgsLen; ++n) { - m_rgpArgs[n] = (m_rgpArgs[n] == nullptr) ? - reinterpret_cast(-1) : reinterpret_cast(m_rgpArgs[n] - m_pBuffer); - } - } - m_nArgArrayType = a_nNewType; + if (m_nArgArrayType == a_nNewType) return; + if (a_nNewType == POINTERS) { + SG_ASSERT(m_nArgArrayType == OFFSETS); + for (int n = 0; n < m_nArgsLen; ++n) { + m_rgpArgs[n] = (m_rgpArgs[n] == reinterpret_cast(-1)) ? + nullptr : m_pBuffer + size_t(m_rgpArgs[n]); + } + } + else { + SG_ASSERT(a_nNewType == OFFSETS); + SG_ASSERT(m_nArgArrayType == POINTERS); + for (int n = 0; n < m_nArgsLen; ++n) { + m_rgpArgs[n] = (m_rgpArgs[n] == nullptr) ? + reinterpret_cast(-1) : reinterpret_cast(m_rgpArgs[n] - m_pBuffer); + } + } + m_nArgArrayType = a_nNewType; } template bool CSimpleGlobTempl::GrowArgvArray( - int a_nNewLen - ) + int a_nNewLen + ) { - if (a_nNewLen >= m_nArgsSize) { - static const int SG_ARGV_INITIAL_SIZE = 32; - int nNewSize = (m_nArgsSize > 0) ? - m_nArgsSize * 2 : SG_ARGV_INITIAL_SIZE; - while (a_nNewLen >= nNewSize) { - nNewSize *= 2; - } - void * pNewBuffer = realloc(m_rgpArgs, nNewSize * sizeof(SOCHAR*)); - if (!pNewBuffer) return false; - m_nArgsSize = nNewSize; - m_rgpArgs = reinterpret_cast(pNewBuffer); - } - return true; + if (a_nNewLen >= m_nArgsSize) { + static const int SG_ARGV_INITIAL_SIZE = 32; + int nNewSize = (m_nArgsSize > 0) ? + m_nArgsSize * 2 : SG_ARGV_INITIAL_SIZE; + while (a_nNewLen >= nNewSize) { + nNewSize *= 2; + } + void * pNewBuffer = realloc(m_rgpArgs, nNewSize * sizeof(SOCHAR*)); + if (!pNewBuffer) return false; + m_nArgsSize = nNewSize; + m_rgpArgs = reinterpret_cast(pNewBuffer); + } + return true; } template bool CSimpleGlobTempl::GrowStringBuffer( - size_t a_uiMinSize - ) + size_t a_uiMinSize + ) { - if (a_uiMinSize >= m_uiBufferSize) { - static const int SG_BUFFER_INITIAL_SIZE = 1024; - size_t uiNewSize = (m_uiBufferSize > 0) ? - m_uiBufferSize * 2 : SG_BUFFER_INITIAL_SIZE; - while (a_uiMinSize >= uiNewSize) { - uiNewSize *= 2; - } - void * pNewBuffer = realloc(m_pBuffer, uiNewSize * sizeof(SOCHAR)); - if (!pNewBuffer) return false; - m_uiBufferSize = uiNewSize; - m_pBuffer = reinterpret_cast(pNewBuffer); - } - return true; + if (a_uiMinSize >= m_uiBufferSize) { + static const int SG_BUFFER_INITIAL_SIZE = 1024; + size_t uiNewSize = (m_uiBufferSize > 0) ? + m_uiBufferSize * 2 : SG_BUFFER_INITIAL_SIZE; + while (a_uiMinSize >= uiNewSize) { + uiNewSize *= 2; + } + void * pNewBuffer = realloc(m_pBuffer, uiNewSize * sizeof(SOCHAR)); + if (!pNewBuffer) return false; + m_uiBufferSize = uiNewSize; + m_pBuffer = reinterpret_cast(pNewBuffer); + } + return true; } template int CSimpleGlobTempl::fileSortCompare( - const void *a1, - const void *a2 - ) + const void *a1, + const void *a2 + ) { - const SOCHAR * s1 = *(reinterpret_cast(a1)); - const SOCHAR * s2 = *(reinterpret_cast(a2)); - if (s1 && s2) { - return SimpleGlobUtil::strcasecmp(s1, s2); - } - // nullptr sorts first - return s1 == s2 ? 0 : (s1 ? 1 : -1); + const SOCHAR * s1 = *(reinterpret_cast(a1)); + const SOCHAR * s2 = *(reinterpret_cast(a2)); + if (s1 && s2) { + return SimpleGlobUtil::strcasecmp(s1, s2); + } + // nullptr sorts first + return s1 == s2 ? 0 : (s1 ? 1 : -1); } // ---------------------------------------------------------------------------