swap old input functions with new input functions

Author: dreamer-coding

code/logic/input.c

@@ -18,38 +18,140 @@
 #include <stdlib.h>
 #include <string.h>
 
+// Function to trim leading and trailing spaces from a string
+void fossil_io_trim(char *str) {
+    if (str == NULL) return;
+
+    // Trim leading spaces
+    char *start = str;
+    while (*start == ' ' || *start == '\t' || *start == '\n' || *start == '\r') {
+        start++;
+    }
+
+    // Move the trimmed string to the beginning
+    if (start != str) {
+        memmove(str, start, strlen(start) + 1);
+    }
+
+    // Trim trailing spaces
+    size_t len = strlen(str);
+    while (len > 0 && (str[len - 1] == ' ' || str[len - 1] == '\t' || str[len - 1] == '\n' || str[len - 1] == '\r')) {
+        str[--len] = '\0';
+    }
+}
+
 // Function to get a sanitized line of input from a provided stream (or stdin by default)
 char *fossil_io_gets_from_stream(char *buf, size_t size, FILE *input_stream) {
     if (buf == NULL || size == 0 || input_stream == NULL) {
+        fprintf(stderr, "Error: Invalid buffer or stream\n");
+        return NULL;
+    }
+
+    // Use fgets to get the input from the stream
+    if (fgets(buf, size, input_stream) == NULL) {
+        if (feof(input_stream)) {
+            return NULL; // End of file reached
+        }
+        fprintf(stderr, "Error: Failed to read from input stream\n");
+        return NULL;
+    }
+
+    // Ensure the string is null-terminated
+    size_t len = strlen(buf);
+    if (len > 0 && buf[len - 1] == '\n') {
+        buf[len - 1] = '\0'; // Remove the newline character
+    }
+
+    // Sanitize the input buffer
+    fossil_soap_sanitize(buf);
+
+    // Trim any leading or trailing whitespace
+    fossil_io_trim(buf);
+
+    return buf;
+}
+
+char *fossil_io_gets_from_stream_ex(char *buf, size_t size, FILE *input_stream, int *error_code) {
+    if (buf == NULL || size == 0 || input_stream == NULL || error_code == NULL) {
+        fprintf(stderr, "Error: Invalid buffer, stream, or error code\n");
         return NULL;
     }
 
+    // Use fgets to get the input from the stream
     if (fgets(buf, size, input_stream) == NULL) {
+        if (feof(input_stream)) {
+            *error_code = EOF;
+            return NULL; // End of file reached
+        }
+        *error_code = ferror(input_stream);
+        fprintf(stderr, "Error: Failed to read from input stream\n");
         return NULL;
     }
 
+    // Ensure the string is null-terminated
     size_t len = strlen(buf);
     if (len > 0 && buf[len - 1] == '\n') {
-        buf[len - 1] = '\0';
+        buf[len - 1] = '\0'; // Remove the newline character
     }
 
     // Sanitize the input buffer
     fossil_soap_sanitize(buf);
 
+    // Trim any leading or trailing whitespace
+    fossil_io_trim(buf);
+
     return buf;
 }
 
-// Default version that uses stdin
-char *fossil_io_gets(char *buf, size_t size) {
-    return fossil_io_gets_from_stream(buf, size, stdin);
+int fossil_io_scanf(const char *format, ...) {
+    va_list args;
+    va_start(args, format);
+    int result = vscanf(format, args);
+    va_end(args);
+    return result;
+}
+
+int fossil_io_fscanf(FILE *input_stream, const char *format, ...) {
+    va_list args;
+    va_start(args, format);
+    int result = vfscanf(input_stream, format, args);
+    va_end(args);
+    return result;
 }
 
-// Function to get a sanitized line of input with a dialog prompt
-char *fossil_io_gets_with_dialog(char *buf, size_t size, const char *dialog)
-{
-    if (dialog != NULL) {
-        fossil_io_puts(dialog); // Print the dialog before input
+int fossil_io_validate_input_buffer(const char *buf, size_t size) {
+    if (buf == NULL || size == 0) {
+        fprintf(stderr, "Error: Invalid buffer or size\n");
+        return 0;
+    }
+    return 1;
+}
+
+char *fossil_io_gets_utf8(char *buf, size_t size, FILE *input_stream) {
+    if (!fossil_io_validate_input_buffer(buf, size)) {
+        return NULL;
     }
 
-    return fossil_io_gets(buf, size);
+    // Use fgets to get the input from the stream
+    if (fgets(buf, size, input_stream) == NULL) {
+        if (feof(input_stream)) {
+            return NULL; // End of file reached
+        }
+        fprintf(stderr, "Error: Failed to read from input stream\n");
+        return NULL;
+    }
+
+    // Ensure the string is null-terminated
+    size_t len = strlen(buf);
+    if (len > 0 && buf[len - 1] == '\n') {
+        buf[len - 1] = '\0'; // Remove the newline character
+    }
+
+    // Sanitize the input buffer
+    fossil_soap_sanitize(buf);
+
+    // Trim any leading or trailing whitespace
+    fossil_io_trim(buf);
+
+    return buf;
 }