Merge pull request #457 from mkilgore/libqb-refactor-part-4

libqb refactor - Part 4

internal/c/libqb.h

@@ -5,7 +5,6 @@
 #include "cmem.h"
 #include "qbs.h"
 
-void sub_shell4(qbs *, int32); //_DONTWAIT & _HIDE
 int32 func__source();
 int32 func_pos(int32 ignore);
 void sub__printimage(int32 i);

internal/c/libqb/build.mk

@@ -4,6 +4,7 @@ libqb-objs-y += $(PATH_LIBQB)/src/buffer.o
 libqb-objs-y += $(PATH_LIBQB)/src/bitops.o
 libqb-objs-y += $(PATH_LIBQB)/src/command.o
 libqb-objs-y += $(PATH_LIBQB)/src/environ.o
+libqb-objs-y += $(PATH_LIBQB)/src/file-fields.o
 libqb-objs-y += $(PATH_LIBQB)/src/filepath.o
 libqb-objs-y += $(PATH_LIBQB)/src/filesystem.o
 libqb-objs-y += $(PATH_LIBQB)/src/datetime.o
@@ -13,6 +14,7 @@ libqb-objs-y += $(PATH_LIBQB)/src/qblist.o
 libqb-objs-y += $(PATH_LIBQB)/src/mem.o
 libqb-objs-y += $(PATH_LIBQB)/src/math.o
 libqb-objs-y += $(PATH_LIBQB)/src/rounding.o
+libqb-objs-y += $(PATH_LIBQB)/src/shell.o
 libqb-objs-y += $(PATH_LIBQB)/src/qbs.o
 libqb-objs-y += $(PATH_LIBQB)/src/qbs_str.o
 libqb-objs-y += $(PATH_LIBQB)/src/qbs_cmem.o

internal/c/libqb/include/file-fields.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#include <stdint.h>
+
+#include "qbs.h"
+
+void lrset_field(qbs *str);
+void field_free(qbs *str);
+void field_new(int32_t fileno);
+void field_update(int32_t fileno);
+void lrset_field(qbs *str);
+void field_free(qbs *str);
+void field_add(qbs *str, int64_t size);
+void field_get(int32_t fileno, int64_t offset, int32_t passed);
+void field_put(int32_t fileno, int64_t offset, int32_t passed);

internal/c/libqb/include/qbs.h

@@ -103,8 +103,4 @@ qbs *qbs__trim(qbs *str);
 int32_t func__str_nc_compare(qbs *s1, qbs *s2);
 int32_t func__str_compare(qbs *s1, qbs *s2);
 
-// FIXME: Maybe put this in a gfs related header?
-void lrset_field(qbs *str);
-void field_free(qbs *str);
-
 #endif

internal/c/libqb/include/shell.h

@@ -0,0 +1,13 @@
+#pragma once
+
+#include <stdint.h>
+#include "qbs.h"
+
+extern int32_t shell_call_in_progress;
+
+int64_t func_shell(qbs *str);
+int64_t func__shellhide(qbs *str);
+void sub_shell(qbs *str, int32_t passed);
+void sub_shell2(qbs *str, int32_t passed);
+void sub_shell3(qbs *str, int32_t passed);
+void sub_shell4(qbs *str, int32_t passed);