Merge branch 'master' into check_dig_flags_feature

1 files changed, 9 insertions, 1 deletions

diff --git a/lib/utils_cmd.h b/lib/utils_cmd.h
index 3672cdc9..d3a8f14f 100644
--- a/lib/utils_cmd.h
+++ b/lib/utils_cmd.h
@@ -13,7 +13,6 @@ typedef struct {
         char *buf;     /* output buffer */
         size_t buflen; /* output buffer content length */
         char **line;   /* array of lines (points to buf) */
-        size_t *lens;  /* string lengths */
         size_t lines;  /* lines of output */
 } output;
 
@@ -22,6 +21,15 @@ int cmd_run(const char *, output *, output *, int);
 int cmd_run_array(char *const *, output *, output *, int);
 int cmd_file_read(const char *, output *, int);
 
+typedef struct {
+ int error_code;
+ int cmd_error_code;
+ output stdout;
+ output stderr;
+} cmd_run_result;
+cmd_run_result cmd_run2(const char *cmd, int flags);
+cmd_run_result cmd_run_array2(char * const *cmd, int flags);
+
 /* only multi-threaded plugins need to bother with this */
 void cmd_init(void);
 #define CMD_INIT cmd_init()