X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/2ae8a312e058f71d0f02be4f2f9cc6f284ebbf34..be6e909c5bda0ae2d1ff2ea057127e099356c232:/client/loclass/fileutils.c?ds=sidebyside diff --git a/client/loclass/fileutils.c b/client/loclass/fileutils.c index 6d990171..e5e5c5b0 100644 --- a/client/loclass/fileutils.c +++ b/client/loclass/fileutils.c @@ -35,6 +35,7 @@ * * ****************************************************************************/ +#ifndef ON_DEVICE #include #include @@ -49,14 +50,20 @@ * @return */ int fileExists(const char *filename) { - struct _stat fileStat; - int result = _stat(filename, &fileStat); + +#ifdef _WIN32 + struct _stat st; + int result = _stat(filename, &st); +#else + struct stat st; + int result = stat(filename, &st); +#endif return result == 0; } int saveFile(const char *preferredName, const char *suffix, const void* data, size_t datalen) { - int size = sizeof(char) * (strlen(preferredName)+strlen(suffix)+5); + int size = sizeof(char) * (strlen(preferredName)+strlen(suffix)+10); char * fileName = malloc(size); memset(fileName,0,size); @@ -73,6 +80,7 @@ int saveFile(const char *preferredName, const char *suffix, const void* data, si FILE *fileHandle=fopen(fileName,"wb"); if(!fileHandle) { prnlog("Failed to write to file '%s'", fileName); + free(fileName); return 1; } fwrite(data, 1, datalen, fileHandle); @@ -83,17 +91,6 @@ int saveFile(const char *preferredName, const char *suffix, const void* data, si return 0; } -int loadFile(const char *fileName, void* data, size_t datalen) -{ - FILE *filehandle = fopen(fileName, "rb"); - if(!filehandle) { - prnlog("Failed to read from file '%s'", fileName); - return 1; - } - fread(data,datalen,1,filehandle); - fclose(filehandle); - return 0; -} /** * Utility function to print to console. This is used consistently within the library instead * of printf, but it actually only calls printf (and adds a linebreak). @@ -104,11 +101,18 @@ int loadFile(const char *fileName, void* data, size_t datalen) */ void prnlog(char *fmt, ...) { - + char buffer[2048] = {0}; va_list args; va_start(args,fmt); - PrintAndLog(fmt, args); - //vprintf(fmt,args); + vsprintf (buffer,fmt, args); va_end(args); - //printf("\n"); + PrintAndLog(buffer); + } +#else //if we're on ARM +void prnlog(char *fmt,...) +{ + return; +} + +#endif