4 files changed, 14 insertions, 12 deletions

diff --git a/lib/output.c b/lib/output.c
index f283969f..62e1366d 100644
--- a/lib/output.c
+++ b/lib/output.c
@@ -42,7 +42,7 @@ static inline char *fmt_subcheck_perfdata(mp_subcheck check) {
 
         while (subchecks != NULL) {
                 if (added > 0) {
-                        added = asprintf(&result, "%s%s", result, fmt_subcheck_perfdata(subchecks->subcheck));
+                        added = asprintf(&result, "%s %s", result, fmt_subcheck_perfdata(subchecks->subcheck));
                 } else {
                         // TODO free previous result here?
                         added = asprintf(&result, "%s", fmt_subcheck_perfdata(subchecks->subcheck));
diff --git a/lib/parse_ini.c b/lib/parse_ini.c
index db337622..196cac79 100644
--- a/lib/parse_ini.c
+++ b/lib/parse_ini.c
@@ -352,15 +352,17 @@ static int add_option(FILE *filePointer, np_arg_list **optlst) {
         optnew->next = NULL;
 
         read_pos = 0;
-        optnew->arg = malloc(cfg_len + 1);
+        size_t arg_length = cfg_len + 1;
+        optnew->arg = malloc(arg_length);
         /* 1-character params needs only one dash */
         if (opt_len == 1) {
-                strncpy(&optnew->arg[read_pos], "-", 1);
+                strncpy(&optnew->arg[read_pos], "-", arg_length);
                 read_pos += 1;
         } else {
-                strncpy(&optnew->arg[read_pos], "--", 2);
+                strncpy(&optnew->arg[read_pos], "--", arg_length);
                 read_pos += 2;
         }
+
         strncpy(&optnew->arg[read_pos], optptr, opt_len);
         read_pos += opt_len;
         if (value) {
diff --git a/lib/utils_cmd.c b/lib/utils_cmd.c
index 42c81793..23d42168 100644
--- a/lib/utils_cmd.c
+++ b/lib/utils_cmd.c
@@ -489,14 +489,14 @@ cmd_run_result cmd_run2(const char *cmd_string, int flags) {
         cmd_run_result result = {
                 .cmd_error_code = 0,
                 .error_code = 0,
-                .stderr =
+                .err =
                         {
                                 .buf = NULL,
                                 .buflen = 0,
                                 .line = NULL,
                                 .lines = 0,
                         },
-                .stdout =
+                .out =
                         {
                                 .buf = NULL,
                                 .buflen = 0,
@@ -581,14 +581,14 @@ cmd_run_result cmd_run_array2(char *const *cmd, int flags) {
         cmd_run_result result = {
                 .cmd_error_code = 0,
                 .error_code = 0,
-                .stderr =
+                .err =
                         {
                                 .buf = NULL,
                                 .buflen = 0,
                                 .line = NULL,
                                 .lines = 0,
                         },
-                .stdout =
+                .out =
                         {
                                 .buf = NULL,
                                 .buflen = 0,
@@ -610,9 +610,9 @@ cmd_run_result cmd_run_array2(char *const *cmd, int flags) {
         int pfd_err[2] = {cmd_open_result.stderr_pipe_fd[0], cmd_open_result.stderr_pipe_fd[1]};
 
         int_cmd_fetch_output2 tmp_stdout = _cmd_fetch_output2(pfd_out[0], flags);
-        result.stdout = tmp_stdout.output_container;
+        result.out = tmp_stdout.output_container;
         int_cmd_fetch_output2 tmp_stderr = _cmd_fetch_output2(pfd_err[0], flags);
-        result.stderr = tmp_stderr.output_container;
+        result.err = tmp_stderr.output_container;
 
         result.cmd_error_code = _cmd_close(file_descriptor);
         return result;
diff --git a/lib/utils_cmd.h b/lib/utils_cmd.h
index d3a8f14f..04a624b8 100644
--- a/lib/utils_cmd.h
+++ b/lib/utils_cmd.h
@@ -24,8 +24,8 @@ int cmd_file_read(const char *, output *, int);
 typedef struct {
  int error_code;
  int cmd_error_code;
- output stdout;
- output stderr;
+ output out;
+ output err;
 } cmd_run_result;
 cmd_run_result cmd_run2(const char *cmd, int flags);
 cmd_run_result cmd_run_array2(char * const *cmd, int flags);