fix: 'hw version' - identifing os on unknown..

This commit is contained in:
iceman1001 2019-08-29 09:53:28 +02:00
commit 6e54adcb7c

View file

@ -627,53 +627,58 @@ void pm3_version(bool verbose, bool oneliner) {
#if defined(__APPLE__) || defined(__MACH__) #if defined(__APPLE__) || defined(__MACH__)
#ifndef PM3HOSTOS #ifndef PM3HOSTOS
# define PM3HOSTOS "OS X" # define PM3HOSTOS "on OS X"
#endif #endif
#elif defined(_MINGW_) #elif defined(_MINGW_)
#ifndef PM3HOSTOS #ifndef PM3HOSTOS
# define PM3HOSTOS "MingW" # define PM3HOSTOS "on MingW"
#endif #endif
#elif defined(__LINUX__) #elif defined(__LINUX__)
#ifndef PM3HOSTOS #ifndef PM3HOSTOS
# define PM3HOSTOS "linux" # define PM3HOSTOS "on linux"
#endif #endif
#elif defined(__FreeBSd__) #elif defined(__FreeBSd__)
#ifndef PM3HOSTOS #ifndef PM3HOSTOS
# define PM3HOSTOS "FreeBSD" # define PM3HOSTOS "on FreeBSD"
#endif #endif
#elif defined(__NetBSD__) #elif defined(__NetBSD__)
#ifndef PM3HOSTOS #ifndef PM3HOSTOS
# define PM3HOSTOS "NetBSD" # define PM3HOSTOS "on NetBSD"
#endif #endif
#elif defined(__OpenBSD__) #elif defined(__OpenBSD__)
#ifndef PM3HOSTOS #ifndef PM3HOSTOS
# define PM3HOSTOS "OpenBSD" # define PM3HOSTOS "on OpenBSD"
#endif #endif
#elif defined(_WIN32) | defined(__WIN32__) #elif defined(_WIN32) | defined(__WIN32__)
#ifndef PM3HOSTOS #ifndef PM3HOSTOS
# define PM3HOSTOS "Windows (32b)" # define PM3HOSTOS "on Windows (32b)"
#endif #endif
#elif defined(_WIN64) | defined(__WIN64__) #elif defined(_WIN64) | defined(__WIN64__)
#ifndef PM3HOSTOS #ifndef PM3HOSTOS
# define PM3HOSTOS "Windows (64b)" # define PM3HOSTOS "on Windows (64b)"
#endif #endif
#elif defined(__ANDROID__) || defined(ANDROID) #elif defined(__ANDROID__) || defined(ANDROID)
#ifndef PM3HOSTOS #ifndef PM3HOSTOS
# define PM3HOSTOS "Android" # define PM3HOSTOS "on Android"
#endif #endif
#endif #endif
#ifndef PM3HOSTOS
# define PM3HOSTOS ""
#endif
if (oneliner) { if (oneliner) {
PrintAndLogEx(NORMAL, "Client: RRG/Iceman compiled with " _YELLOW_(PM3CLIENTCOMPILER __VERSION__) " on " _YELLOW_(PM3HOSTOS)); PrintAndLogEx(NORMAL, "Client: RRG/Iceman compiled with " _YELLOW_(PM3CLIENTCOMPILER __VERSION__) " %s", _YELLOW_(PM3HOSTOS));
return; return;
} }