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

better detection of directory (@doegox)

Browse source
This commit is contained in:
iceman1001 2019-09-21 11:12:36 +02:00
parent 93915858ea
commit f7510dc6aa
1 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
client/fileutils.c
View file

@ -69,6 +69,23 @@ int fileExists(const char *filename) {
return result == 0; return result == 0;
} }
/**
* @brief checks if path is file or directory.
* @param filename
* @return
*/
int is_regular_file(const char *filename) {
#ifdef _WIN32
struct _stat st;
_stat(filename, &st);
return S_ISREG(_st.st_mode);
#else
struct stat st;
stat(filename, &st);
return S_ISREG(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;
if (suffix == NULL) return NULL; if (suffix == NULL) return NULL;
@ -1016,9 +1033,11 @@ int searchFile(char **foundpath, const char *pm3dir, const char *searchname, con
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 (searchname[ strlen(searchname)-1] == '/')
if (is_regular_file(searchname) == 0)
return PM3_EINVARG; return PM3_EINVARG;
char *filename = filenamemcopy(searchname, suffix); char *filename = filenamemcopy(searchname, suffix);
if (filename == NULL || strlen(filename) == 0) if (filename == NULL || strlen(filename) == 0)
return PM3_EMALLOC; return PM3_EMALLOC;