diff options
author | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2016-02-27 13:55:44 +0000 |
---|---|---|
committer | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2016-02-27 13:55:44 +0000 |
commit | 47ce3271b417e6d0a8fcbbbe94bd9060290e5032 (patch) | |
tree | c6da726176d1271ff0fe608db0b51b52fb4870f8 /Build/source/texk/dvisvgm/dvisvgm-src/src/Directory.cpp | |
parent | e8c2792ffc88bff8519581351d6349a84d81bebe (diff) |
dvisvgm 1.15
git-svn-id: svn://tug.org/texlive/trunk@39886 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvisvgm/dvisvgm-src/src/Directory.cpp')
-rw-r--r-- | Build/source/texk/dvisvgm/dvisvgm-src/src/Directory.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/Build/source/texk/dvisvgm/dvisvgm-src/src/Directory.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/Directory.cpp index 572c6128d3a..1a878568cae 100644 --- a/Build/source/texk/dvisvgm/dvisvgm-src/src/Directory.cpp +++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/Directory.cpp @@ -37,8 +37,8 @@ Directory::Directory () { firstread = true; memset(&fileData, 0, sizeof(WIN32_FIND_DATA)); #else - dir = 0; - dirent = 0; + _dir = 0; + _dirent = 0; #endif } @@ -49,8 +49,8 @@ Directory::Directory (string dirname) { firstread = true; memset(&fileData, 0, sizeof(WIN32_FIND_DATA)); #else - dir = 0; - dirent = 0; + _dir = 0; + _dirent = 0; #endif open(dirname); } @@ -71,8 +71,8 @@ bool Directory::open (string dname) { handle = FindFirstFile(dname.c_str(), &fileData); return handle != INVALID_HANDLE_VALUE; #else - dir = opendir(_dirname.c_str()); - return dir; + _dir = opendir(_dirname.c_str()); + return bool(_dir); #endif } @@ -81,7 +81,7 @@ void Directory::close () { #ifdef __WIN32__ FindClose(handle); #else - closedir(dir); + closedir(_dir); #endif } @@ -106,22 +106,22 @@ const char* Directory::read (EntryType type) { handle = INVALID_HANDLE_VALUE; return 0; #else - if (!dir) + if (!_dir) return 0; - while ((dirent = readdir(dir))) { - string path = string(_dirname) + "/" + dirent->d_name; + while ((_dirent = readdir(_dir))) { + string path = string(_dirname) + "/" + _dirent->d_name; struct stat stats; if (stat(path.c_str(), &stats) == 0) { if (S_ISDIR(stats.st_mode)) { if (type == ET_FILE_OR_DIR || type == ET_DIR) - return dirent->d_name; + return _dirent->d_name; } else if (type == ET_FILE_OR_DIR || type == ET_FILE) - return dirent->d_name; + return _dirent->d_name; } } - closedir(dir); - dir = 0; + closedir(_dir); + _dir = 0; return 0; #endif } |