Merge pull request #2034 from RincewindsHat/cleanup/lib

Cleanup/lib

1 files changed, 222 insertions, 229 deletions

diff --git a/lib/utils_base.c b/lib/utils_base.c
index f8592f4..90a4aaa 100644
--- a/lib/utils_base.c
+++ b/lib/utils_base.c
@@ -1,28 +1,28 @@
 /*****************************************************************************
-*
-* utils_base.c
-*
-* License: GPL
-* Copyright (c) 2006 Monitoring Plugins Development Team
-*
-* Library of useful functions for plugins
-*
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*
-*
-*****************************************************************************/
+ *
+ * utils_base.c
+ *
+ * License: GPL
+ * Copyright (c) 2006 - 2024 Monitoring Plugins Development Team
+ *
+ * Library of useful functions for plugins
+ *
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *****************************************************************************/
 
 #include "../plugins/common.h"
 #include <stdarg.h>
@@ -33,43 +33,47 @@
 #include <unistd.h>
 #include <sys/types.h>
 
-#define np_free(ptr) { if(ptr) { free(ptr); ptr = NULL; } }
+#define np_free(ptr)                                                                                                                       \
+        {                                                                                                                                      \
+                if (ptr) {                                                                                                                         \
+                        free(ptr);                                                                                                                     \
+                        ptr = NULL;                                                                                                                    \
+                }                                                                                                                                  \
+        }
 
-monitoring_plugin *this_monitoring_plugin=NULL;
+monitoring_plugin *this_monitoring_plugin = NULL;
 
 int timeout_state = STATE_CRITICAL;
 unsigned int timeout_interval = DEFAULT_SOCKET_TIMEOUT;
 
 bool _np_state_read_file(FILE *);
 
-void np_init( char *plugin_name, int argc, char **argv ) {
-        if (this_monitoring_plugin==NULL) {
+void np_init(char *plugin_name, int argc, char **argv) {
+        if (this_monitoring_plugin == NULL) {
                 this_monitoring_plugin = calloc(1, sizeof(monitoring_plugin));
-                if (this_monitoring_plugin==NULL) {
-                        die(STATE_UNKNOWN, _("Cannot allocate memory: %s"),
-                            strerror(errno));
+                if (this_monitoring_plugin == NULL) {
+                        die(STATE_UNKNOWN, _("Cannot allocate memory: %s"), strerror(errno));
                 }
                 this_monitoring_plugin->plugin_name = strdup(plugin_name);
-                if (this_monitoring_plugin->plugin_name==NULL)
+                if (this_monitoring_plugin->plugin_name == NULL)
                         die(STATE_UNKNOWN, _("Cannot execute strdup: %s"), strerror(errno));
                 this_monitoring_plugin->argc = argc;
                 this_monitoring_plugin->argv = argv;
         }
 }
 
-void np_set_args( int argc, char **argv ) {
-        if (this_monitoring_plugin==NULL)
+void np_set_args(int argc, char **argv) {
+        if (this_monitoring_plugin == NULL)
                 die(STATE_UNKNOWN, _("This requires np_init to be called"));
 
         this_monitoring_plugin->argc = argc;
         this_monitoring_plugin->argv = argv;
 }
 
-
 void np_cleanup() {
-        if (this_monitoring_plugin!=NULL) {
-                if(this_monitoring_plugin->state!=NULL) {
-                        if(this_monitoring_plugin->state->state_data) {
+        if (this_monitoring_plugin != NULL) {
+                if (this_monitoring_plugin->state != NULL) {
+                        if (this_monitoring_plugin->state->state_data) {
                                 np_free(this_monitoring_plugin->state->state_data->data);
                                 np_free(this_monitoring_plugin->state->state_data);
                         }
@@ -79,48 +83,43 @@ void np_cleanup() {
                 np_free(this_monitoring_plugin->plugin_name);
                 np_free(this_monitoring_plugin);
         }
-        this_monitoring_plugin=NULL;
+        this_monitoring_plugin = NULL;
 }
 
 /* Hidden function to get a pointer to this_monitoring_plugin for testing */
-void _get_monitoring_plugin( monitoring_plugin **pointer ){
-        *pointer = this_monitoring_plugin;
-}
+void _get_monitoring_plugin(monitoring_plugin **pointer) { *pointer = this_monitoring_plugin; }
 
-void
-die (int result, const char *fmt, ...)
-{
-        if(fmt!=NULL) {
+void die(int result, const char *fmt, ...) {
+        if (fmt != NULL) {
                 va_list ap;
-                va_start (ap, fmt);
-                vprintf (fmt, ap);
-                va_end (ap);
+                va_start(ap, fmt);
+                vprintf(fmt, ap);
+                va_end(ap);
         }
 
-        if(this_monitoring_plugin!=NULL) {
+        if (this_monitoring_plugin != NULL) {
                 np_cleanup();
         }
-        exit (result);
+        exit(result);
 }
 
-void set_range_start (range *this, double value) {
+void set_range_start(range *this, double value) {
         this->start = value;
         this->start_infinity = false;
 }
 
-void set_range_end (range *this, double value) {
+void set_range_end(range *this, double value) {
         this->end = value;
         this->end_infinity = false;
 }
 
-range
-*parse_range_string (char *str) {
+range *parse_range_string(char *str) {
         range *temp_range;
         double start;
         double end;
         char *end_str;
 
-        temp_range = (range *) calloc(1, sizeof(range));
+        temp_range = (range *)calloc(1, sizeof(range));
 
         /* Set defaults */
         temp_range->start = 0;
@@ -140,10 +139,10 @@ range
                 if (str[0] == '~') {
                         temp_range->start_infinity = true;
                 } else {
-                        start = strtod(str, NULL);      /* Will stop at the ':' */
+                        start = strtod(str, NULL); /* Will stop at the ':' */
                         set_range_start(temp_range, start);
                 }
-                end_str++;              /* Move past the ':' */
+                end_str++; /* Move past the ':' */
         } else {
                 end_str = str;
         }
@@ -152,9 +151,7 @@ range
                 set_range_end(temp_range, end);
         }
 
-        if (temp_range->start_infinity == true ||
-                temp_range->end_infinity == true ||
-                temp_range->start <= temp_range->end) {
+        if (temp_range->start_infinity == true || temp_range->end_infinity == true || temp_range->start <= temp_range->end) {
                 return temp_range;
         }
         free(temp_range);
@@ -162,14 +159,11 @@ range
 }
 
 /* returns 0 if okay, otherwise 1 */
-int
-_set_thresholds(thresholds **my_thresholds, char *warn_string, char *critical_string)
-{
+int _set_thresholds(thresholds **my_thresholds, char *warn_string, char *critical_string) {
         thresholds *temp_thresholds = NULL;
 
         if ((temp_thresholds = calloc(1, sizeof(thresholds))) == NULL)
-                die(STATE_UNKNOWN, _("Cannot allocate memory: %s"),
-                    strerror(errno));
+                die(STATE_UNKNOWN, _("Cannot allocate memory: %s"), strerror(errno));
 
         temp_thresholds->warning = NULL;
         temp_thresholds->critical = NULL;
@@ -190,9 +184,7 @@ _set_thresholds(thresholds **my_thresholds, char *warn_string, char *critical_st
         return 0;
 }
 
-void
-set_thresholds(thresholds **my_thresholds, char *warn_string, char *critical_string)
-{
+void set_thresholds(thresholds **my_thresholds, char *warn_string, char *critical_string) {
         switch (_set_thresholds(my_thresholds, warn_string, critical_string)) {
         case 0:
                 return;
@@ -206,7 +198,7 @@ set_thresholds(thresholds **my_thresholds, char *warn_string, char *critical_str
 
 void print_thresholds(const char *threshold_name, thresholds *my_threshold) {
         printf("%s - ", threshold_name);
-        if (! my_threshold) {
+        if (!my_threshold) {
                 printf("Threshold not set");
         } else {
                 if (my_threshold->warning) {
@@ -224,8 +216,7 @@ void print_thresholds(const char *threshold_name, thresholds *my_threshold) {
 }
 
 /* Returns true if alert should be raised based on the range */
-bool check_range(double value, range *my_range)
-{
+bool check_range(double value, range *my_range) {
         bool no = false;
         bool yes = true;
 
@@ -258,9 +249,7 @@ bool check_range(double value, range *my_range)
 }
 
 /* Returns status */
-int
-get_status(double value, thresholds *my_thresholds)
-{
+int get_status(double value, thresholds *my_thresholds) {
         if (my_thresholds->critical != NULL) {
                 if (check_range(value, my_thresholds->critical) == true) {
                         return STATE_CRITICAL;
@@ -274,27 +263,27 @@ get_status(double value, thresholds *my_thresholds)
         return STATE_OK;
 }
 
-char *np_escaped_string (const char *string) {
+char *np_escaped_string(const char *string) {
         char *data;
-        int i, j=0;
+        int i, j = 0;
         data = strdup(string);
-        for (i=0; data[i]; i++) {
+        for (i = 0; data[i]; i++) {
                 if (data[i] == '\\') {
-                        switch(data[++i]) {
-                                case 'n':
-                                        data[j++] = '\n';
-                                        break;
-                                case 'r':
-                                        data[j++] = '\r';
-                                        break;
-                                case 't':
-                                        data[j++] = '\t';
-                                        break;
-                                case '\\':
-                                        data[j++] = '\\';
-                                        break;
-                                default:
-                                        data[j++] = data[i];
+                        switch (data[++i]) {
+                        case 'n':
+                                data[j++] = '\n';
+                                break;
+                        case 'r':
+                                data[j++] = '\r';
+                                break;
+                        case 't':
+                                data[j++] = '\t';
+                                break;
+                        case '\\':
+                                data[j++] = '\\';
+                                break;
+                        default:
+                                data[j++] = data[i];
                         }
                 } else {
                         data[j++] = data[i];
@@ -313,33 +302,38 @@ int np_check_if_root(void) { return (geteuid() == 0); }
  * data strings.
  */
 char *np_extract_value(const char *varlist, const char *name, char sep) {
-        char *tmp=NULL, *value=NULL;
+        char *tmp = NULL, *value = NULL;
         int i;
 
         while (1) {
                 /* Strip any leading space */
-                for (; isspace(varlist[0]); varlist++);
+                for (; isspace(varlist[0]); varlist++)
+                        ;
 
                 if (strncmp(name, varlist, strlen(name)) == 0) {
                         varlist += strlen(name);
                         /* strip trailing spaces */
-                        for (; isspace(varlist[0]); varlist++);
+                        for (; isspace(varlist[0]); varlist++)
+                                ;
 
                         if (varlist[0] == '=') {
                                 /* We matched the key, go past the = sign */
                                 varlist++;
                                 /* strip leading spaces */
-                                for (; isspace(varlist[0]); varlist++);
+                                for (; isspace(varlist[0]); varlist++)
+                                        ;
 
                                 if ((tmp = index(varlist, sep))) {
                                         /* Value is delimited by a comma */
-                                        if (tmp-varlist == 0) continue;
-                                        value = (char *)calloc(1, tmp-varlist+1);
-                                        strncpy(value, varlist, tmp-varlist);
-                                        value[tmp-varlist] = '\0';
+                                        if (tmp - varlist == 0)
+                                                continue;
+                                        value = (char *)calloc(1, tmp - varlist + 1);
+                                        strncpy(value, varlist, tmp - varlist);
+                                        value[tmp - varlist] = '\0';
                                 } else {
                                         /* Value is delimited by a \0 */
-                                        if (strlen(varlist) == 0) continue;
+                                        if (strlen(varlist) == 0)
+                                                continue;
                                         value = (char *)calloc(1, strlen(varlist) + 1);
                                         strncpy(value, varlist, strlen(varlist));
                                         value[strlen(varlist)] = '\0';
@@ -357,14 +351,14 @@ char *np_extract_value(const char *varlist, const char *name, char sep) {
         }
 
         /* Clean-up trailing spaces/newlines */
-        if (value) for (i=strlen(value)-1; isspace(value[i]); i--) value[i] = '\0';
+        if (value)
+                for (i = strlen(value) - 1; isspace(value[i]); i--)
+                        value[i] = '\0';
 
         return value;
 }
 
-const char *
-state_text (int result)
-{
+const char *state_text(int result) {
         switch (result) {
         case STATE_OK:
                 return "OK";
@@ -383,14 +377,14 @@ state_text (int result)
  * Read a string representing a state (ok, warning... or numeric: 0, 1) and
  * return the corresponding STATE_ value or ERROR)
  */
-int mp_translate_state (char *state_text) {
-        if (!strcasecmp(state_text,"OK") || !strcmp(state_text,"0"))
+int mp_translate_state(char *state_text) {
+        if (!strcasecmp(state_text, "OK") || !strcmp(state_text, "0"))
                 return STATE_OK;
-        if (!strcasecmp(state_text,"WARNING") || !strcmp(state_text,"1"))
+        if (!strcasecmp(state_text, "WARNING") || !strcmp(state_text, "1"))
                 return STATE_WARNING;
-        if (!strcasecmp(state_text,"CRITICAL") || !strcmp(state_text,"2"))
+        if (!strcasecmp(state_text, "CRITICAL") || !strcmp(state_text, "2"))
                 return STATE_CRITICAL;
-        if (!strcasecmp(state_text,"UNKNOWN") || !strcmp(state_text,"3"))
+        if (!strcasecmp(state_text, "UNKNOWN") || !strcmp(state_text, "3"))
                 return STATE_UNKNOWN;
         return ERROR;
 }
@@ -404,7 +398,7 @@ char *_np_state_generate_key() {
         int i;
         char **argv = this_monitoring_plugin->argv;
         char keyname[41];
-        char *p=NULL;
+        char *p = NULL;
 
         unsigned char result[256];
 
@@ -418,7 +412,7 @@ char *_np_state_generate_key() {
 
         EVP_DigestInit(ctx, EVP_sha256());
 
-        for(i=0; i<this_monitoring_plugin->argc; i++) {
+        for (i = 0; i < this_monitoring_plugin->argc; i++) {
                 EVP_DigestUpdate(ctx, argv[i], strlen(argv[i]));
         }
 
@@ -427,28 +421,28 @@ char *_np_state_generate_key() {
 
         struct sha256_ctx ctx;
 
-        for(i=0; i<this_monitoring_plugin->argc; i++) {
+        for (i = 0; i < this_monitoring_plugin->argc; i++) {
                 sha256_process_bytes(argv[i], strlen(argv[i]), &ctx);
         }
 
         sha256_finish_ctx(&ctx, result);
 #endif // FOUNDOPENSSL
 
-        for (i=0; i<20; ++i) {
-                sprintf(&keyname[2*i], "%02x", result[i]);
+        for (i = 0; i < 20; ++i) {
+                sprintf(&keyname[2 * i], "%02x", result[i]);
         }
 
-        keyname[40]='\0';
+        keyname[40] = '\0';
 
         p = strdup(keyname);
-        if(p==NULL) {
+        if (p == NULL) {
                 die(STATE_UNKNOWN, _("Cannot execute strdup: %s"), strerror(errno));
         }
         return p;
 }
 
 void _cleanup_state_data() {
-        if (this_monitoring_plugin->state->state_data!=NULL) {
+        if (this_monitoring_plugin->state->state_data != NULL) {
                 np_free(this_monitoring_plugin->state->state_data->data);
                 np_free(this_monitoring_plugin->state->state_data);
         }
@@ -459,18 +453,18 @@ void _cleanup_state_data() {
  *   envvar NAGIOS_PLUGIN_STATE_DIRECTORY
  *   statically compiled shared state directory
  */
-char* _np_state_calculate_location_prefix(){
+char *_np_state_calculate_location_prefix() {
         char *env_dir;
 
         /* Do not allow passing MP_STATE_PATH in setuid plugins
          * for security reasons */
         if (!mp_suid()) {
                 env_dir = getenv("MP_STATE_PATH");
-                if(env_dir && env_dir[0] != '\0')
+                if (env_dir && env_dir[0] != '\0')
                         return env_dir;
                 /* This is the former ENV, for backward-compatibility */
                 env_dir = getenv("NAGIOS_PLUGIN_STATE_DIRECTORY");
-                if(env_dir && env_dir[0] != '\0')
+                if (env_dir && env_dir[0] != '\0')
                         return env_dir;
         }
 
@@ -486,46 +480,43 @@ void np_enable_state(char *keyname, int expected_data_version) {
         state_key *this_state = NULL;
         char *temp_filename = NULL;
         char *temp_keyname = NULL;
-        char *p=NULL;
+        char *p = NULL;
         int ret;
 
-        if(this_monitoring_plugin==NULL)
+        if (this_monitoring_plugin == NULL)
                 die(STATE_UNKNOWN, _("This requires np_init to be called"));
 
-        this_state = (state_key *) calloc(1, sizeof(state_key));
-        if(this_state==NULL)
-                die(STATE_UNKNOWN, _("Cannot allocate memory: %s"),
-                    strerror(errno));
+        this_state = (state_key *)calloc(1, sizeof(state_key));
+        if (this_state == NULL)
+                die(STATE_UNKNOWN, _("Cannot allocate memory: %s"), strerror(errno));
 
-        if(keyname==NULL) {
+        if (keyname == NULL) {
                 temp_keyname = _np_state_generate_key();
         } else {
                 temp_keyname = strdup(keyname);
-                if(temp_keyname==NULL)
+                if (temp_keyname == NULL)
                         die(STATE_UNKNOWN, _("Cannot execute strdup: %s"), strerror(errno));
         }
         /* Die if invalid characters used for keyname */
         p = temp_keyname;
-        while(*p!='\0') {
-                if(! (isalnum(*p) || *p == '_')) {
+        while (*p != '\0') {
+                if (!(isalnum(*p) || *p == '_')) {
                         die(STATE_UNKNOWN, _("Invalid character for keyname - only alphanumerics or '_'"));
                 }
                 p++;
         }
-        this_state->name=temp_keyname;
-        this_state->plugin_name=this_monitoring_plugin->plugin_name;
-        this_state->data_version=expected_data_version;
-        this_state->state_data=NULL;
+        this_state->name = temp_keyname;
+        this_state->plugin_name = this_monitoring_plugin->plugin_name;
+        this_state->data_version = expected_data_version;
+        this_state->state_data = NULL;
 
         /* Calculate filename */
-        ret = asprintf(&temp_filename, "%s/%lu/%s/%s",
-            _np_state_calculate_location_prefix(), (unsigned long)geteuid(),
-            this_monitoring_plugin->plugin_name, this_state->name);
+        ret = asprintf(&temp_filename, "%s/%lu/%s/%s", _np_state_calculate_location_prefix(), (unsigned long)geteuid(),
+                                   this_monitoring_plugin->plugin_name, this_state->name);
         if (ret < 0)
-                die(STATE_UNKNOWN, _("Cannot allocate memory: %s"),
-                    strerror(errno));
+                die(STATE_UNKNOWN, _("Cannot allocate memory: %s"), strerror(errno));
 
-        this_state->_filename=temp_filename;
+        this_state->_filename = temp_filename;
 
         this_monitoring_plugin->state = this_state;
 }
@@ -538,23 +529,22 @@ void np_enable_state(char *keyname, int expected_data_version) {
  * if exceptional error.
  */
 state_data *np_state_read() {
-        state_data *this_state_data=NULL;
+        state_data *this_state_data = NULL;
         FILE *statefile;
         bool rc = false;
 
-        if(this_monitoring_plugin==NULL)
+        if (this_monitoring_plugin == NULL)
                 die(STATE_UNKNOWN, _("This requires np_init to be called"));
 
         /* Open file. If this fails, no previous state found */
-        statefile = fopen( this_monitoring_plugin->state->_filename, "r" );
-        if(statefile!=NULL) {
+        statefile = fopen(this_monitoring_plugin->state->_filename, "r");
+        if (statefile != NULL) {
 
-                this_state_data = (state_data *) calloc(1, sizeof(state_data));
-                if(this_state_data==NULL)
-                        die(STATE_UNKNOWN, _("Cannot allocate memory: %s"),
-                            strerror(errno));
+                this_state_data = (state_data *)calloc(1, sizeof(state_data));
+                if (this_state_data == NULL)
+                        die(STATE_UNKNOWN, _("Cannot allocate memory: %s"), strerror(errno));
 
-                this_state_data->data=NULL;
+                this_state_data->data = NULL;
                 this_monitoring_plugin->state->state_data = this_state_data;
 
                 rc = _np_state_read_file(statefile);
@@ -562,7 +552,7 @@ state_data *np_state_read() {
                 fclose(statefile);
         }
 
-        if(!rc) {
+        if (!rc) {
                 _cleanup_state_data();
         }
 
@@ -577,60 +567,65 @@ bool _np_state_read_file(FILE *f) {
         size_t pos;
         char *line;
         int i;
-        int failure=0;
+        int failure = 0;
         time_t current_time, data_time;
-        enum { STATE_FILE_VERSION, STATE_DATA_VERSION, STATE_DATA_TIME, STATE_DATA_TEXT, STATE_DATA_END } expected=STATE_FILE_VERSION;
+        enum {
+                STATE_FILE_VERSION,
+                STATE_DATA_VERSION,
+                STATE_DATA_TIME,
+                STATE_DATA_TEXT,
+                STATE_DATA_END
+        } expected = STATE_FILE_VERSION;
 
         time(&current_time);
 
         /* Note: This introduces a limit of 1024 bytes in the string data */
-        line = (char *) calloc(1, 1024);
-        if(line==NULL)
-                die(STATE_UNKNOWN, _("Cannot allocate memory: %s"),
-                    strerror(errno));
-
-        while(!failure && (fgets(line,1024,f))!=NULL){
-                pos=strlen(line);
-                if(line[pos-1]=='\n') {
-                        line[pos-1]='\0';
+        line = (char *)calloc(1, 1024);
+        if (line == NULL)
+                die(STATE_UNKNOWN, _("Cannot allocate memory: %s"), strerror(errno));
+
+        while (!failure && (fgets(line, 1024, f)) != NULL) {
+                pos = strlen(line);
+                if (line[pos - 1] == '\n') {
+                        line[pos - 1] = '\0';
                 }
 
-                if(line[0] == '#') continue;
+                if (line[0] == '#')
+                        continue;
 
-                switch(expected) {
-                        case STATE_FILE_VERSION:
-                                i=atoi(line);
-                                if(i!=NP_STATE_FORMAT_VERSION)
-                                        failure++;
-                                else
-                                        expected=STATE_DATA_VERSION;
-                                break;
-                        case STATE_DATA_VERSION:
-                                i=atoi(line);
-                                if(i != this_monitoring_plugin->state->data_version)
-                                        failure++;
-                                else
-                                        expected=STATE_DATA_TIME;
-                                break;
-                        case STATE_DATA_TIME:
-                                /* If time > now, error */
-                                data_time=strtoul(line,NULL,10);
-                                if(data_time > current_time)
-                                        failure++;
-                                else {
-                                        this_monitoring_plugin->state->state_data->time = data_time;
-                                        expected=STATE_DATA_TEXT;
-                                }
-                                break;
-                        case STATE_DATA_TEXT:
-                                this_monitoring_plugin->state->state_data->data = strdup(line);
-                                if(this_monitoring_plugin->state->state_data->data==NULL)
-                                        die(STATE_UNKNOWN, _("Cannot execute strdup: %s"), strerror(errno));
-                                expected=STATE_DATA_END;
-                                status=true;
-                                break;
-                        case STATE_DATA_END:
-                                ;
+                switch (expected) {
+                case STATE_FILE_VERSION:
+                        i = atoi(line);
+                        if (i != NP_STATE_FORMAT_VERSION)
+                                failure++;
+                        else
+                                expected = STATE_DATA_VERSION;
+                        break;
+                case STATE_DATA_VERSION:
+                        i = atoi(line);
+                        if (i != this_monitoring_plugin->state->data_version)
+                                failure++;
+                        else
+                                expected = STATE_DATA_TIME;
+                        break;
+                case STATE_DATA_TIME:
+                        /* If time > now, error */
+                        data_time = strtoul(line, NULL, 10);
+                        if (data_time > current_time)
+                                failure++;
+                        else {
+                                this_monitoring_plugin->state->state_data->time = data_time;
+                                expected = STATE_DATA_TEXT;
+                        }
+                        break;
+                case STATE_DATA_TEXT:
+                        this_monitoring_plugin->state->state_data->data = strdup(line);
+                        if (this_monitoring_plugin->state->state_data->data == NULL)
+                                die(STATE_UNKNOWN, _("Cannot execute strdup: %s"), strerror(errno));
+                        expected = STATE_DATA_END;
+                        status = true;
+                        break;
+                case STATE_DATA_END:;
                 }
         }
 
@@ -647,77 +642,75 @@ bool _np_state_read_file(FILE *f) {
  */
 void np_state_write_string(time_t data_time, char *data_string) {
         FILE *fp;
-        char *temp_file=NULL;
-        int fd=0, result=0;
+        char *temp_file = NULL;
+        int fd = 0, result = 0;
         time_t current_time;
-        char *directories=NULL;
-        char *p=NULL;
+        char *directories = NULL;
+        char *p = NULL;
 
-        if(data_time==0)
+        if (data_time == 0)
                 time(&current_time);
         else
-                current_time=data_time;
+                current_time = data_time;
 
         /* If file doesn't currently exist, create directories */
-        if(access(this_monitoring_plugin->state->_filename,F_OK)!=0) {
+        if (access(this_monitoring_plugin->state->_filename, F_OK) != 0) {
                 result = asprintf(&directories, "%s", this_monitoring_plugin->state->_filename);
-                if(result < 0)
-                        die(STATE_UNKNOWN, _("Cannot allocate memory: %s"),
-                            strerror(errno));
-
-                for(p=directories+1; *p; p++) {
-                        if(*p=='/') {
-                                *p='\0';
-                                if((access(directories,F_OK)!=0) && (mkdir(directories, S_IRWXU)!=0)) {
+                if (result < 0)
+                        die(STATE_UNKNOWN, _("Cannot allocate memory: %s"), strerror(errno));
+
+                for (p = directories + 1; *p; p++) {
+                        if (*p == '/') {
+                                *p = '\0';
+                                if ((access(directories, F_OK) != 0) && (mkdir(directories, S_IRWXU) != 0)) {
                                         /* Can't free this! Otherwise error message is wrong! */
                                         /* np_free(directories); */
                                         die(STATE_UNKNOWN, _("Cannot create directory: %s"), directories);
                                 }
-                                *p='/';
+                                *p = '/';
                         }
                 }
                 np_free(directories);
         }
 
-        result = asprintf(&temp_file,"%s.XXXXXX",this_monitoring_plugin->state->_filename);
-        if(result < 0)
-                die(STATE_UNKNOWN, _("Cannot allocate memory: %s"),
-                    strerror(errno));
+        result = asprintf(&temp_file, "%s.XXXXXX", this_monitoring_plugin->state->_filename);
+        if (result < 0)
+                die(STATE_UNKNOWN, _("Cannot allocate memory: %s"), strerror(errno));
 
-        if((fd=mkstemp(temp_file))==-1) {
+        if ((fd = mkstemp(temp_file)) == -1) {
                 np_free(temp_file);
                 die(STATE_UNKNOWN, _("Cannot create temporary filename"));
         }
 
-        fp=(FILE *)fdopen(fd,"w");
-        if(fp==NULL) {
+        fp = (FILE *)fdopen(fd, "w");
+        if (fp == NULL) {
                 close(fd);
                 unlink(temp_file);
                 np_free(temp_file);
                 die(STATE_UNKNOWN, _("Unable to open temporary state file"));
         }
 
-        fprintf(fp,"# NP State file\n");
-        fprintf(fp,"%d\n",NP_STATE_FORMAT_VERSION);
-        fprintf(fp,"%d\n",this_monitoring_plugin->state->data_version);
-        fprintf(fp,"%lu\n",current_time);
-        fprintf(fp,"%s\n",data_string);
+        fprintf(fp, "# NP State file\n");
+        fprintf(fp, "%d\n", NP_STATE_FORMAT_VERSION);
+        fprintf(fp, "%d\n", this_monitoring_plugin->state->data_version);
+        fprintf(fp, "%lu\n", current_time);
+        fprintf(fp, "%s\n", data_string);
 
         fchmod(fd, S_IRUSR | S_IWUSR | S_IRGRP);
 
         fflush(fp);
 
-        result=fclose(fp);
+        result = fclose(fp);
 
         fsync(fd);
 
-        if(result!=0) {
+        if (result != 0) {
                 unlink(temp_file);
                 np_free(temp_file);
                 die(STATE_UNKNOWN, _("Error writing temp file"));
         }
 
-        if(rename(temp_file, this_monitoring_plugin->state->_filename)!=0) {
+        if (rename(temp_file, this_monitoring_plugin->state->_filename) != 0) {
                 unlink(temp_file);
                 np_free(temp_file);
                 die(STATE_UNKNOWN, _("Cannot rename state temp file"));