*/
#include "filesys.h"
-#include "strfnd.h"
+#include "util/string.h"
#include <iostream>
#include <stdio.h>
#include <string.h>
#include <errno.h>
-#include <sstream>
#include <fstream>
#include "log.h"
+#include "config.h"
namespace fs
{
#define _WIN32_WINNT 0x0501
#include <windows.h>
-#include <malloc.h>
-#include <tchar.h>
-#include <wchar.h>
-
-#define BUFSIZE MAX_PATH
std::vector<DirListNode> GetDirListing(std::string pathstring)
{
WIN32_FIND_DATA FindFileData;
HANDLE hFind = INVALID_HANDLE_VALUE;
DWORD dwError;
- LPTSTR DirSpec;
- INT retval;
-
- DirSpec = (LPTSTR) malloc (BUFSIZE);
-
- if( DirSpec == NULL )
- {
- errorstream<<"GetDirListing: Insufficient memory available"<<std::endl;
- retval = 1;
- goto Cleanup;
- }
-
- // Check that the input is not larger than allowed.
- if (pathstring.size() > (BUFSIZE - 2))
- {
- errorstream<<"GetDirListing: Input directory is too large."<<std::endl;
- retval = 3;
- goto Cleanup;
- }
-
- //_tprintf (TEXT("Target directory is %s.\n"), pathstring.c_str());
-
- sprintf(DirSpec, "%s", (pathstring + "\\*").c_str());
+ std::string dirSpec = pathstring + "\\*";
+
// Find the first file in the directory.
- hFind = FindFirstFile(DirSpec, &FindFileData);
+ hFind = FindFirstFile(dirSpec.c_str(), &FindFileData);
- if (hFind == INVALID_HANDLE_VALUE)
- {
- retval = (-1);
- goto Cleanup;
- }
- else
- {
+ if (hFind == INVALID_HANDLE_VALUE) {
+ dwError = GetLastError();
+ if (dwError != ERROR_FILE_NOT_FOUND && dwError != ERROR_PATH_NOT_FOUND) {
+ errorstream << "GetDirListing: FindFirstFile error."
+ << " Error is " << dwError << std::endl;
+ }
+ } else {
// NOTE:
// Be very sure to not include '..' in the results, it will
// result in an epic failure when deleting stuff.
DirListNode node;
node.name = FindFileData.cFileName;
node.dir = FindFileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY;
- if(node.name != "." && node.name != "..")
+ if (node.name != "." && node.name != "..")
listing.push_back(node);
// List all the other files in the directory.
- while (FindNextFile(hFind, &FindFileData) != 0)
- {
+ while (FindNextFile(hFind, &FindFileData) != 0) {
DirListNode node;
node.name = FindFileData.cFileName;
node.dir = FindFileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY;
dwError = GetLastError();
FindClose(hFind);
- if (dwError != ERROR_NO_MORE_FILES)
- {
- errorstream<<"GetDirListing: FindNextFile error. Error is "
- <<dwError<<std::endl;
- retval = (-1);
- goto Cleanup;
- }
+ if (dwError != ERROR_NO_MORE_FILES) {
+ errorstream << "GetDirListing: FindNextFile error."
+ << " Error is " << dwError << std::endl;
+ listing.clear();
+ return listing;
+ }
}
- retval = 0;
-
-Cleanup:
- free(DirSpec);
-
- if(retval != 0) listing.clear();
-
- //for(unsigned int i=0; i<listing.size(); i++){
- // infostream<<listing[i].name<<(listing[i].dir?" (dir)":" (file)")<<std::endl;
- //}
-
return listing;
}
{
std::vector<DirListNode> listing;
- DIR *dp;
- struct dirent *dirp;
- if((dp = opendir(pathstring.c_str())) == NULL) {
+ DIR *dp;
+ struct dirent *dirp;
+ if((dp = opendir(pathstring.c_str())) == NULL) {
//infostream<<"Error("<<errno<<") opening "<<pathstring<<std::endl;
- return listing;
- }
+ return listing;
+ }
- while ((dirp = readdir(dp)) != NULL) {
+ while ((dirp = readdir(dp)) != NULL) {
// NOTE:
// Be very sure to not include '..' in the results, it will
// result in an epic failure when deleting stuff.
- if(dirp->d_name[0]!='.'){
- DirListNode node;
- node.name = dirp->d_name;
- if(node.name == "." || node.name == "..")
- continue;
+ if(strcmp(dirp->d_name, ".") == 0 || strcmp(dirp->d_name, "..") == 0)
+ continue;
- int isdir = -1; // -1 means unknown
+ DirListNode node;
+ node.name = dirp->d_name;
- /*
- POSIX doesn't define d_type member of struct dirent and
- certain filesystems on glibc/Linux will only return
- DT_UNKNOWN for the d_type member.
+ int isdir = -1; // -1 means unknown
- Also we don't know whether symlinks are directories or not.
- */
+ /*
+ POSIX doesn't define d_type member of struct dirent and
+ certain filesystems on glibc/Linux will only return
+ DT_UNKNOWN for the d_type member.
+
+ Also we don't know whether symlinks are directories or not.
+ */
#ifdef _DIRENT_HAVE_D_TYPE
- if(dirp->d_type != DT_UNKNOWN && dirp->d_type != DT_LNK)
- isdir = (dirp->d_type == DT_DIR);
+ if(dirp->d_type != DT_UNKNOWN && dirp->d_type != DT_LNK)
+ isdir = (dirp->d_type == DT_DIR);
#endif /* _DIRENT_HAVE_D_TYPE */
- /*
- Was d_type DT_UNKNOWN, DT_LNK or nonexistent?
- If so, try stat().
- */
- if(isdir == -1)
- {
- struct stat statbuf;
- if (stat((pathstring + "/" + node.name).c_str(), &statbuf))
- continue;
- isdir = ((statbuf.st_mode & S_IFDIR) == S_IFDIR);
- }
- node.dir = isdir;
- listing.push_back(node);
+ /*
+ Was d_type DT_UNKNOWN, DT_LNK or nonexistent?
+ If so, try stat().
+ */
+ if(isdir == -1) {
+ struct stat statbuf;
+ if (stat((pathstring + "/" + node.name).c_str(), &statbuf))
+ continue;
+ isdir = ((statbuf.st_mode & S_IFDIR) == S_IFDIR);
}
- }
- closedir(dp);
+ node.dir = isdir;
+ listing.push_back(node);
+ }
+ closedir(dp);
return listing;
}
compatible with lua's os.tmpname which under the default
configuration hardcodes mkstemp("/tmp/lua_XXXXXX").
*/
- return std::string(DIR_DELIM) + "tmp";
+#ifdef __ANDROID__
+ return DIR_DELIM "sdcard" DIR_DELIM PROJECT_NAME DIR_DELIM "tmp";
+#else
+ return DIR_DELIM "tmp";
+#endif
}
#endif
const DirListNode &n = content[i];
std::string fullpath = path + DIR_DELIM + n.name;
dst.push_back(fullpath);
- GetRecursiveSubPaths(fullpath, dst);
+ if (n.dir) {
+ GetRecursiveSubPaths(fullpath, dst);
+ }
}
}
os << content;
os.flush();
os.close();
- if (os.fail())
+ if (os.fail()) {
+ remove(tmp_file.c_str());
return false;
+ }
// Copy file
-#ifdef _WIN32
remove(path.c_str());
- return (rename(tmp_file.c_str(), path.c_str()) == 0);
-#else
- return (rename(tmp_file.c_str(), path.c_str()) == 0);
-#endif
+ if(rename(tmp_file.c_str(), path.c_str())) {
+ remove(tmp_file.c_str());
+ return false;
+ } else {
+ return true;
+ }
}
} // namespace fs
projects / minetest.git / blobdiff