patch logic

Author: dreamer-coding

code/logic/cstring.c

@@ -336,7 +336,12 @@ cstring fossil_io_cstring_pad_right(ccstring str, size_t total_length, char pad_
 }
 
 int fossil_io_cstring_icmp(ccstring str1, ccstring str2) {
-    if (!str1 || !str2) return (str1 == str2) ? 0 : (str1 ? 1 : -1);
+    // Handle NULL pointers: both NULL means equal, one NULL means less/greater
+    if (str1 == str2) return 0;
+    if (!str1) return (str2 && *str2) ? -1 : 0;
+    if (!str2) return (*str1) ? 1 : 0;
+
+    // Then check
     while (*str1 && *str2) {
         int c1 = tolower((unsigned char)*str1);
         int c2 = tolower((unsigned char)*str2);

code/logic/fossil/io/cstring.h

@@ -414,6 +414,22 @@ namespace fossil {
                 _str = fossil_io_cstring_create(init.c_str());
             }
 
+            /**
+             * Constructor to create a CString from an existing cstring.
+             * 
+             * @param str The cstring to wrap.
+             */
+            CString(ccstring str) {
+                _str = fossil_io_cstring_copy(str);
+            }
+
+            /**
+             * Default constructor to create an empty CString.
+             */
+            CString() {
+                _str = fossil_io_cstring_create("");
+            }
+
             /**
              * Destructor to free the memory allocated for the cstring.
              */

code/logic/soap.c

@@ -387,12 +387,23 @@ const char *fossil_io_soap_detect_tone(const char *text) {
 
 int fossil_io_soap_check_grammar(const char *text) {
     if (!text) return -1;
+    int found = 0;
     for (size_t i = 0; FOSSIL_SOAP_GRAMMAR_SUGGESTIONS[i].incorrect; i++) {
-        if (custom_strcasestr(text, FOSSIL_SOAP_GRAMMAR_SUGGESTIONS[i].incorrect)) {
-            return 1; // Grammar issue found
+        const char *incorrect = FOSSIL_SOAP_GRAMMAR_SUGGESTIONS[i].incorrect;
+        const char *ptr = text;
+        while ((ptr = custom_strcasestr(ptr, incorrect)) != NULL) {
+            // Check word boundaries
+            int before = (ptr == text) || !isalnum((unsigned char)ptr[-1]);
+            int after = !isalnum((unsigned char)ptr[strlen(incorrect)]);
+            if (before && after) {
+                found = 1;
+                break;
+            }
+            ptr += strlen(incorrect);
         }
+        if (found) break;
     }
-    return 0;
+    return found;
 }
 
 char *fossil_io_soap_normalize(const char *text) {
@@ -427,10 +438,6 @@ char *fossil_io_soap_normalize_slang(const char *text) {
     char *result = fossil_io_cstring_dup(text);
     if (!result) return NULL;
 
-    for (size_t i = 0; result[i]; i++) {
-        result[i] = tolower(result[i]);
-    }
-
     for (size_t i = 0; FOSSIL_SOAP_SUGGESTIONS[i].bad != NULL; i++) {
         const char *bad = FOSSIL_SOAP_SUGGESTIONS[i].bad;
         const char *sugg = FOSSIL_SOAP_SUGGESTIONS[i].suggested;
@@ -528,18 +535,25 @@ char *fossil_io_soap_filter_offensive(const char *text) {
         while ((found = custom_strcasestr(result, bad)) != NULL) {
             size_t offset = (size_t)(found - result);
             size_t newlen = strlen(result) - strlen(bad) + strlen(good) + 1;
-        
-            char *temp = malloc(newlen);
+
+            char *temp = (char *)malloc(newlen);
             if (!temp) {
                 free(result);
                 return NULL;
             }
-        
-            strncpy(temp, result, offset);
+
+            // Copy prefix safely
+            if (offset > 0) {
+                memcpy(temp, result, offset);
+            }
             temp[offset] = '\0';
+
+            // Append replacement
             strcat(temp, good);
+
+            // Append suffix
             strcat(temp, result + offset + strlen(bad));
-        
+
             free(result);
             result = temp;
         }

code/logic/stream.c

@@ -330,6 +330,11 @@ int32_t fossil_fstream_remove(const char *filename) {
         return FOSSIL_ERROR_OK;  // File removed successfully
     }
 
+    if (errno == ENOENT) {
+        fossil_io_fprintf(FOSSIL_STDERR, "Error: File not found when removing file %s\n", filename);
+        return FOSSIL_ERROR_FILE_NOT_FOUND;
+    }
+
     fossil_io_fprintf(FOSSIL_STDERR, "Error: IO error when removing file %s\n", filename);
     return FOSSIL_ERROR_IO;
 }