7.5.6 : memory complexity optimisations

Signed-off-by: Ari Archer <[email protected]>
TruncatedDinoSour · May 2, 2023 · 4f02795 · 4f02795
1 parent 93f01c2
commit 4f02795
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/baz b/baz
@@ -2,7 +2,7 @@
 
 [ "$BAZ_DEBUG" ] && set -x
 
-export BAZ_VERSION='7.5.5'
+export BAZ_VERSION='7.5.6'
 export BAZ_DIR="$HOME/.local/share/baz"
 export BAZ_CONFDIR="$HOME/.config/baz"
 export BAZ_CONF="$BAZ_CONFDIR/config.env"

diff --git a/loader/file.h b/loader/file.h
@@ -28,7 +28,7 @@ static void alloc_file(const char *path, File *f) {
 
     if (content_size > f->content_size) {
         free(f->content);
-        f->content = malloc(content_size + 2);
+        f->content = malloc(content_size + 1);
     }
 
     f->content_size = content_size;

diff --git a/loader/loader.c b/loader/loader.c
@@ -165,7 +165,7 @@ static void load_keybinds(char *path, const size_t base) {
     closedir(dp);
 }
 
-int main(int argc, char **argv) {
+int main(int argc, const char **argv) {
     static size_t path_base;
     static unsigned char stage_num;
     static stage_t stage;

diff --git a/loader/shell.h b/loader/shell.h
@@ -8,10 +8,17 @@ static void escape_quotes(File *);
 
 #ifdef SHELL_IMPL
 static void escape_quotes(File *file) {
+    size_t quotes = 0;
     char *new_content, *old_ptr, *new_ptr;
 
-    new_content = malloc((file->content_size *= 2));
-    old_ptr = file->content, new_ptr = new_content;
+    old_ptr     = file->content;
+    new_content = file->content;
+
+    while (*new_content)
+        quotes += (*new_content++ == '"');
+
+    new_content = malloc((file->content_size += quotes));
+    new_ptr     = new_content;
 
     while (*old_ptr) {
         if (*old_ptr == '"')