RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-02-16 04:09:10 +08:00
Code Issues Projects Releases Packages Wiki Activity

fix for checking directory

Browse source
This commit is contained in:
iceman1001 2019-09-21 16:31:45 +02:00
parent 862bf1b793
commit e7d67fc2b0
1 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
client/fileutils.c
View file

@ -70,7 +70,7 @@ int fileExists(const char *filename) {
} }
/** /**
* @brief checks if path is file or directory. * @brief checks if path is file.
* @param filename * @param filename
* @return * @return
*/ */
@ -85,6 +85,23 @@ int is_regular_file(const char *filename) {
return S_ISREG(st.st_mode); return S_ISREG(st.st_mode);
#endif #endif
} }
/**
* @brief checks if path is directory.
* @param filename
* @return
*/
int is_directory(const char *filename) {
#ifdef _WIN32
struct _stat st;
_stat(filename, &st);
return S_ISDIR(st.st_mode);
#else
struct stat st;
stat(filename, &st);
return S_ISDIR(st.st_mode);
#endif
}
static char *filenamemcopy(const char *preferredName, const char *suffix) { static char *filenamemcopy(const char *preferredName, const char *suffix) {
if (preferredName == NULL) return NULL; if (preferredName == NULL) return NULL;
@ -1029,12 +1046,14 @@ out:
} }
int searchFile(char **foundpath, const char *pm3dir, const char *searchname, const char *suffix, bool silent) { int searchFile(char **foundpath, const char *pm3dir, const char *searchname, const char *suffix, bool silent) {
if (foundpath == NULL) if (foundpath == NULL)
return PM3_EINVARG; return PM3_EINVARG;
if (searchname == NULL || strlen(searchname) == 0) if (searchname == NULL || strlen(searchname) == 0)
return PM3_EINVARG; return PM3_EINVARG;
if (is_regular_file(searchname) == 0) if (is_directory(searchname) != 0)
return PM3_EINVARG; return PM3_EINVARG;