X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=utility.cpp;h=43bd6fa8d5d2a0cc00263ef3eda570d0bb6cfb39;hb=bcade6c14a06cfc842b41df91fdc5b9577cd68f1;hp=7cd81ca14aa4e6117bf00c114e67c919a21b6842;hpb=74669bdc0bdf558c1cc8d6e52c6b79b7783e8d23;p=mirror_smartmontools-debian.git diff --git a/utility.cpp b/utility.cpp index 7cd81ca..43bd6fa 100644 --- a/utility.cpp +++ b/utility.cpp @@ -1,10 +1,10 @@ /* * utility.cpp * - * Home page of code is: http://smartmontools.sourceforge.net + * Home page of code is: http://www.smartmontools.org * - * Copyright (C) 2002-12 Bruce Allen - * Copyright (C) 2008-13 Christian Franke + * Copyright (C) 2002-12 Bruce Allen + * Copyright (C) 2008-16 Christian Franke * Copyright (C) 2000 Michael Cornwell * * This program is free software; you can redistribute it and/or modify @@ -52,7 +52,7 @@ #include "atacmds.h" #include "dev_interface.h" -const char * utility_cpp_cvsid = "$Id: utility.cpp 3838 2013-07-21 16:32:27Z chrfranke $" +const char * utility_cpp_cvsid = "$Id: utility.cpp 4194 2016-01-01 13:46:00Z chrfranke $" UTILITY_H_CVSID INT64_H_CVSID; const char * packet_types[] = { @@ -83,14 +83,14 @@ const char * packet_types[] = { std::string format_version_info(const char * prog_name, bool full /*= false*/) { std::string info = strprintf( - "%s "PACKAGE_VERSION" " + "%s " PACKAGE_VERSION " " #ifdef SMARTMONTOOLS_SVN_REV - SMARTMONTOOLS_SVN_DATE" r"SMARTMONTOOLS_SVN_REV + SMARTMONTOOLS_SVN_DATE " r" SMARTMONTOOLS_SVN_REV #else - "(build date "__DATE__")" // checkout without expansion of Id keywords + "(build date " __DATE__ ")" // checkout without expansion of Id keywords #endif - " [%s] "BUILD_INFO"\n" - "Copyright (C) 2002-13, Bruce Allen, Christian Franke, www.smartmontools.org\n", + " [%s] " BUILD_INFO "\n" + "Copyright (C) 2002-16, Bruce Allen, Christian Franke, www.smartmontools.org\n", prog_name, smi()->get_os_version_str().c_str() ); if (!full) @@ -106,21 +106,21 @@ std::string format_version_info(const char * prog_name, bool full /*= false*/) "\n", prog_name ); - info += strprintf( - "smartmontools release "PACKAGE_VERSION - " dated "SMARTMONTOOLS_RELEASE_DATE" at "SMARTMONTOOLS_RELEASE_TIME"\n" + info += + "smartmontools release " PACKAGE_VERSION + " dated " SMARTMONTOOLS_RELEASE_DATE " at " SMARTMONTOOLS_RELEASE_TIME "\n" #ifdef SMARTMONTOOLS_SVN_REV - "smartmontools SVN rev "SMARTMONTOOLS_SVN_REV - " dated "SMARTMONTOOLS_SVN_DATE" at "SMARTMONTOOLS_SVN_TIME"\n" + "smartmontools SVN rev " SMARTMONTOOLS_SVN_REV + " dated " SMARTMONTOOLS_SVN_DATE " at " SMARTMONTOOLS_SVN_TIME "\n" #else "smartmontools SVN rev is unknown\n" #endif - "smartmontools build host: "SMARTMONTOOLS_BUILD_HOST"\n" - "smartmontools build configured: "SMARTMONTOOLS_CONFIGURE_DATE "\n" - "%s compile dated "__DATE__" at "__TIME__"\n" - "smartmontools configure arguments: ", - prog_name - ); + "smartmontools build host: " SMARTMONTOOLS_BUILD_HOST "\n" +#if defined(__GNUC__) && defined(__VERSION__) // works also with CLang + "smartmontools build with: GCC " __VERSION__ "\n" +#endif + "smartmontools configure arguments: " + ; info += (sizeof(SMARTMONTOOLS_CONFIGURE_ARGS) > 1 ? SMARTMONTOOLS_CONFIGURE_ARGS : "[no arguments given]"); info += '\n'; @@ -265,7 +265,7 @@ const char *packetdevicetype(int type){ } // Runtime check of byte ordering, throws if different from isbigendian(). -void check_endianness() +static void check_endianness() { union { // Force compile error if int type is not 32bit. @@ -291,9 +291,6 @@ void dateandtimezoneepoch(char *buffer, time_t tval){ const char *timezonename; char datebuffer[DATEANDEPOCHLEN]; int lenm1; -#ifdef _WIN32 - char tzfixbuf[6+1]; -#endif FixGlibcTimeZoneBug(); @@ -323,6 +320,8 @@ void dateandtimezoneepoch(char *buffer, time_t tval){ #ifdef _WIN32 // Fix long non-ascii timezone names + // cppcheck-suppress variableScope + char tzfixbuf[6+1] = ""; if (!getenv("TZ")) timezonename=fixtzname(tzfixbuf, sizeof(tzfixbuf), timezonename); #endif @@ -651,35 +650,15 @@ int64_t bytes = 0; // Helps debugging. If the second argument is non-negative, then // decrement bytes by that amount. Else decrement bytes by (one plus) // length of null terminated string. -void *FreeNonZero1(void *address, int size, int line, const char* file){ +void *FreeNonZero(void *address, int size, int /*line*/, const char* /*file*/){ if (address) { if (size<0) bytes-=1+strlen((char*)address); else bytes-=size; - return CheckFree1(address, line, file); - } - return NULL; -} - -// To help with memory checking. Use when it is known that address is -// NOT null. -void *CheckFree1(void *address, int /*whatline*/, const char* /*file*/){ - if (address){ free(address); - return NULL; } - throw std::runtime_error("Internal error in CheckFree()"); -} - -// A custom version of calloc() that tracks memory use -void *Calloc(size_t nmemb, size_t size) { - void *ptr=calloc(nmemb, size); - - if (ptr) - bytes+=nmemb*size; - - return ptr; + return NULL; } // A custom version of strdup() that keeps track of how much memory is @@ -735,7 +714,7 @@ const char * format_with_thousands_sep(char * str, int strsize, uint64_t val, } char num[64]; - snprintf(num, sizeof(num), "%"PRIu64, val); + snprintf(num, sizeof(num), "%" PRIu64, val); int numlen = strlen(num); int i = 0, j = 0; @@ -783,12 +762,12 @@ const char * format_capacity(char * str, int strsize, uint64_t val, if (i == 0) snprintf(str, strsize, "%u B", (unsigned)n); else if (n >= 100) // "123 xB" - snprintf(str, strsize, "%"PRIu64" %cB", n, prefixes[i]); + snprintf(str, strsize, "%" PRIu64 " %cB", n, prefixes[i]); else if (n >= 10) // "12.3 xB" - snprintf(str, strsize, "%"PRIu64"%s%u %cB", n, decimal_point, + snprintf(str, strsize, "%" PRIu64 "%s%u %cB", n, decimal_point, (unsigned)(((val % d) * 10) / d), prefixes[i]); else // "1.23 xB" - snprintf(str, strsize, "%"PRIu64"%s%02u %cB", n, decimal_point, + snprintf(str, strsize, "%" PRIu64 "%s%02u %cB", n, decimal_point, (unsigned)(((val % d) * 100) / d), prefixes[i]); return str; @@ -814,8 +793,8 @@ std::string strprintf(const char * fmt, ...) #ifndef HAVE_WORKING_SNPRINTF -// Some versions of (v)snprintf() don't append null char on overflow (MSVCRT.DLL), -// and/or return -1 on overflow (old Linux). +// Some versions of (v)snprintf() don't append null char (MSVCRT.DLL), +// and/or return -1 on output truncation (glibc <= 2.0.6). // Below are sane replacements substituted by #define in utility.h. #undef vsnprintf @@ -844,5 +823,25 @@ int safe_snprintf(char *buf, int size, const char *fmt, ...) return i; } -#endif +#else // HAVE_WORKING_SNPRINTF +static void check_snprintf() +{ + char buf[] = "ABCDEFGHI"; + int n1 = snprintf(buf, 8, "123456789"); + int n2 = snprintf(buf, 0, "X"); + if (!(!strcmp(buf, "1234567") && n1 == 9 && n2 == 1)) + throw std::logic_error("Function snprintf() does not conform to C99,\n" + "please contact " PACKAGE_BUGREPORT); +} + +#endif // HAVE_WORKING_SNPRINTF + +// Runtime check of ./configure result, throws on error. +void check_config() +{ + check_endianness(); +#ifdef HAVE_WORKING_SNPRINTF + check_snprintf(); +#endif +}