Add filesystem-textfile.c, a standardized way to read a filehandle as…

… multiple lines separated by newlines.
mywave82 · Mar 29, 2024 · 930a25a · 930a25a
1 parent f7a901c
commit 930a25a
Show file tree

Hide file tree

Showing 6 changed files with 502 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -38,6 +38,7 @@ filesel/filesystem-bzip2-test
 filesel/filesystem-filehandle-cache-test
 filesel/filesystem-gzip-test
 filesel/filesystem-tar-test
+filesel/filesystem-textfile-test
 filesel/mdb-test
 goodies/helpc/ocphhc
 goodies/helpc/Makefile

diff --git a/filesel/Makefile b/filesel/Makefile
@@ -2,21 +2,21 @@ TOPDIR=../
 include $(TOPDIR)Rules.make
 include Makefile-static
 
-
 ifeq ($(STATIC_CORE),1)
 all: $(cdrom_so) $(pfilesel_so)
 else
 all: $(CDROM_SO) pfilesel$(LIB_SUFFIX)
 endif
 	$(MAKE) -C cdfs TOPDIR=../$(TOPDIR)
 
-test: adbmeta-test$(EXE_SUFFIX) dirdb-test$(EXE_SUFFIX) filesystem-bzip2-test$(EXE_SUFFIX) filesystem-filehandle-cache-test$(EXE_SUFFIX) filesystem-gzip-test$(EXE_SUFFIX) filesystem-tar-test$(EXE_SUFFIX) mdb-test$(EXE_SUFFIX)
+test: adbmeta-test$(EXE_SUFFIX) dirdb-test$(EXE_SUFFIX) filesystem-bzip2-test$(EXE_SUFFIX) filesystem-filehandle-cache-test$(EXE_SUFFIX) filesystem-gzip-test$(EXE_SUFFIX) filesystem-tar-test$(EXE_SUFFIX) filesystem-textfile-test$(EXE_SUFFIX) mdb-test$(EXE_SUFFIX)
 	@echo "" && echo "adbmeta-test:"                       && ./adbmeta-test
 	@echo "" && echo "dirdb-test:"                         && ./dirdb-test
 	@echo "" && echo "filesystem-bzip2-test:"              && ./filesystem-bzip2-test
 	@echo "" && echo "filesystem-filehandle-cache-test:"   && ./filesystem-filehandle-cache-test
 	@echo "" && echo "filesystem-gzip-test:"               && ./filesystem-gzip-test
 	@echo "" && echo "filesystem-tar-test:"                && ./filesystem-tar-test
+	@echo "" && echo "filesystem-textfile-test:"           && ./filesystem-textfile-test
 	@echo "" && echo "mdb-test:"                           && ./mdb-test
 
 cdrom$(LIB_SUFFIX): $(cdrom_so)
@@ -27,7 +27,7 @@ pfilesel$(LIB_SUFFIX): $(pfilesel_so)
 
 clean:
 	$(MAKE) -C cdfs TOPDIR=../$(TOPDIR) clean
-	rm -f *.o *$(LIB_SUFFIX) adbmeta-test$(EXE_SUFFIX) dirdb-test$(EXE_SUFFIX) filesystem-bzip2-test$(EXE_SUFFIX) filesystem-filehandle-cache-test$(EXE_SUFFIX) filesystem-gzip-test$(EXE_SUFFIX) filesystem-tar-test$(EXE_SUFFIX) mdb-test$(EXE_SUFFIX)
+	rm -f *.o *$(LIB_SUFFIX) adbmeta-test$(EXE_SUFFIX) dirdb-test$(EXE_SUFFIX) filesystem-bzip2-test$(EXE_SUFFIX) filesystem-filehandle-cache-test$(EXE_SUFFIX) filesystem-gzip-test$(EXE_SUFFIX) filesystem-tar-test$(EXE_SUFFIX) filesystem-textfile-test$(EXE_SUFFIX) mdb-test$(EXE_SUFFIX)
 
 ifeq ($(STATIC_CORE),1)
 install:
@@ -328,6 +328,27 @@ filesystem-tar-test$(EXE_SUFFIX): filesystem-tar-test.c \
 	filesystem-file-mem-nocache.o
 	$(CC) $< filesystem-dir-mem-nocache.o filesystem-file-mem-nocache.o -o $@
 
+filesystem-textfile.o: filesystem-textfile.c \
+	../config.h \
+	../types.h \
+	dirdb.h \
+	filesystem.h \
+	filesystem-textfile.h
+	$(CC) $< -o $@ -c
+
+filesystem-textfile-test$(EXE_SUFFIX): filesystem-textfile-test.c \
+	filesystem-textfile.c \
+	../config.h \
+	../types.h \
+	dirdb.h \
+	filesystem.h \
+	filesystem-textfile.h \
+	filesystem-dir-mem.h \
+	filesystem-file-mem.h \
+	filesystem-dir-mem-nocache.o \
+	filesystem-file-mem-nocache.o
+	$(CC) $< filesystem-dir-mem-nocache.o filesystem-file-mem-nocache.o -o $@
+
 filesystem-unix.o: filesystem-unix.c \
 	../config.h \
 	../types.h \

diff --git a/filesel/Makefile-static b/filesel/Makefile-static
@@ -24,6 +24,7 @@ filesystem-playlist-pls.o     \
 filesystem-setup.o            \
 filesystem-rpg.o              \
 filesystem-tar.o              \
+filesystem-textfile.o         \
 filesystem-z.o                \
 filesystem-zip.o              \
 fsptype.o                     \