Reorganise src directory

2024-10-06 12:54:04 +01:00
parent e9451f10f8
commit a48002996e
20 changed files with 7 additions and 6 deletions
@@ -0,0 +1,118 @@
+#include "commander.h"
+#include "aliases.h"
+#include "shell_utils.h"
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define CMD_BUF_LEN 8192
+#define OUT_BUF_LEN 4096
+
+internal inline CMDError build_command_from_args(char *cmd, u64 buf_len, va_list args);
+internal inline CMDResult execute_command(const char *cmd, CMDOutHandling out_handling, char *out_buf,
+                                          u64 buf_size);
+internal inline CMDError get_command_output(FILE *fp, CMDOutHandling out_handling, char *out_buf,
+                                            u64 buf_size);
+
+CMDResult run_command(CMDOutHandling out_handling, char *out_buf, u64 buf_size, ...) {
+  va_list args;
+  va_start(args, buf_size);
+
+  char cmd[CMD_BUF_LEN] = {0};
+  CMDError err = build_command_from_args(cmd, CMD_BUF_LEN, args);
+  if (err > SHELL_ERR_NO_ERROR) {
+    va_end(args);
+    return CMD_NO_EXIT(err);
+  }
+
+  va_end(args);
+
+  return execute_command(cmd, out_handling, out_buf, buf_size);
+}
+
+internal inline CMDError build_command_from_args(char *cmd, u64 buf_len,
+                                                 va_list args) {
+  u64 size = 0;
+  u64 arg_len = 0;
+
+  const char *arg = va_arg(args, const char *);
+  while (arg) {
+    arg_len = strlen(arg);
+    if (arg_len >= buf_len - size) {
+      return SHELL_ERR_CMD_BUF_FULL;
+    }
+
+    strcat(cmd, arg);
+    cmd[size + arg_len] = ' ';
+
+    size += arg_len + 1;
+
+    arg = va_arg(args, const char *);
+  }
+
+  return SHELL_ERR_NO_ERROR;
+}
+
+internal inline CMDResult execute_command(const char *cmd,
+                                          CMDOutHandling out_handling,
+                                          char *out_buf, u64 buf_size) {
+  FILE *fp = wapp_shell_utils_popen(cmd, "r");
+  if (!fp) {
+    return CMD_NO_EXIT(SHELL_ERR_PROC_START_FAIL);
+  }
+
+  CMDResult output;
+
+  CMDError err = get_command_output(fp, out_handling, out_buf, buf_size);
+  if (err > SHELL_ERR_NO_ERROR) {
+    output = CMD_NO_EXIT(err);
+    goto EXECUTE_COMMAND_CLOSE;
+  }
+
+  i32 st = EXIT_SUCCESS;
+  err = get_output_status(fp, &st);
+  if (err > SHELL_ERR_NO_ERROR) {
+    output = CMD_NO_EXIT(err);
+    goto EXECUTE_COMMAND_CLOSE;
+  }
+
+  // Process is already closed in get_output_status
+  fp = NULL;
+
+  output = (CMDResult){
+      .exited = true,
+      .exit_code = st,
+      .error = SHELL_ERR_NO_ERROR,
+  };
+
+EXECUTE_COMMAND_CLOSE:
+  if (fp) {
+    wapp_shell_utils_pclose(fp);
+  }
+  return output;
+}
+
+internal inline CMDError get_command_output(FILE *fp,
+                                            CMDOutHandling out_handling,
+                                            char *out_buf, u64 buf_size) {
+  char out[OUT_BUF_LEN] = {0};
+  u64 max_out_length = OUT_BUF_LEN - 1;
+
+  u64 buf_filled = 0;
+  while (fgets(out, (i32)max_out_length, fp)) {
+    if (out_handling == SHELL_OUTPUT_CAPTURE && out_buf != NULL) {
+      buf_filled += strlen(out);
+      if (buf_filled >= buf_size) {
+        return SHELL_ERR_OUT_BUF_FULL;
+      }
+
+      strcat(out_buf, out);
+    } else if (out_handling == SHELL_OUTPUT_PRINT) {
+      printf("%s", out);
+    }
+  }
+
+  return SHELL_ERR_NO_ERROR;
+}
@@ -0,0 +1,26 @@
+#ifndef COMMANDER_H
+#define COMMANDER_H
+
+#include "aliases.h"
+#include "commander_output.h"
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#ifdef __cplusplus
+BEGIN_C_LINKAGE
+#endif // __cplusplus
+
+#define CMD_NO_EXIT(ERR) ((CMDResult){.exited = false, .exit_code = EXIT_FAILURE, .error = ERR})
+#define wapp_shell_commander_execute(HANDLE_OUTPUT, OUT_BUF, BUF_SIZE, ...)    \
+  run_command(HANDLE_OUTPUT, OUT_BUF, BUF_SIZE, __VA_ARGS__, "2>&1", NULL)
+
+CMDResult run_command(CMDOutHandling out_handling, char *out_buf, u64 buf_size, ...);
+
+external CMDError get_output_status(FILE *fp, i32 *status_out);
+
+#ifdef __cplusplus
+END_C_LINKAGE
+#endif // __cplusplus
+
+#endif // !COMMANDER_H
@@ -0,0 +1,42 @@
+#ifndef COMMANDER_OUTPUT_H
+#define COMMANDER_OUTPUT_H
+
+#include "aliases.h"
+#include "platform.h"
+#include <stdbool.h>
+
+#ifdef __cplusplus
+BEGIN_C_LINKAGE
+#endif // __cplusplus
+
+typedef enum {
+  SHELL_OUTPUT_DISCARD,
+  SHELL_OUTPUT_PRINT,
+  SHELL_OUTPUT_CAPTURE,
+} CMDOutHandling;
+
+typedef enum {
+  SHELL_ERR_NO_ERROR,
+  SHELL_ERR_CMD_BUF_FULL,
+  SHELL_ERR_PROC_START_FAIL,
+  SHELL_ERR_OUT_BUF_FULL,
+  SHELL_ERR_PROC_EXIT_FAIL,
+} CMDError;
+
+typedef struct commander_result CMDResult;
+struct commander_result {
+  i32 exit_code;
+  CMDError error;
+  bool exited;
+
+#ifdef WAPP_PLATFORM_WINDOWS
+  #include "misc_utils.h"
+  wapp_misc_utils_padding_size(sizeof(bool) + sizeof(i32) + sizeof(CMDError));
+#endif // !WAPP_PLATFORM_WINDOWS
+};
+
+#ifdef __cplusplus
+END_C_LINKAGE
+#endif // __cplusplus
+
+#endif // !COMMANDER_OUTPUT_H
@@ -0,0 +1,23 @@
+#include "aliases.h"
+#include "platform.h"
+
+#ifdef WAPP_PLATFORM_POSIX
+
+#include "commander_output.h"
+#include "shell_utils.h"
+#include <stdio.h>
+#include <stdlib.h>
+
+CMDError get_output_status(FILE *fp, i32 *status_out) {
+  *status_out = wapp_shell_utils_pclose(fp);
+
+  if (!WIFEXITED(*status_out)) {
+    return SHELL_ERR_PROC_EXIT_FAIL;
+  }
+
+  *status_out = WEXITSTATUS(*status_out);
+
+  return SHELL_ERR_NO_ERROR;
+}
+
+#endif // !WAPP_PLATFORM_POSIX
@@ -0,0 +1,22 @@
+#include "aliases.h"
+#include "platform.h"
+
+#ifdef WAPP_PLATFORM_WINDOWS
+
+#include "commander_output.h"
+#include "shell_utils.h"
+#include <stdio.h>
+
+CMDError get_output_status(FILE *fp, i32 *status_out) {
+  if (!feof(fp)) {
+    // Ensure process is closed on failure
+    wapp_shell_utils_pclose(fp);
+    return SHELL_ERR_PROC_EXIT_FAIL;
+  }
+
+  *status_out = wapp_shell_utils_pclose(fp);
+
+  return SHELL_ERR_NO_ERROR;
+}
+
+#endif // !WAPP_PLATFORM_WINDOWS