From 6fc871b3ffed44c07b3964f58e8bf8014b2d9c39 Mon Sep 17 00:00:00 2001
From: David Oberhollenzer <goliath@infraroot.at>
Date: Thu, 31 Jan 2019 17:56:18 +0100
Subject: [PATCH] Move input file processor to main code

Signed-off-by: David Oberhollenzer <goliath@infraroot.at>
---
 Makefile.am                      |  6 +++---
 include/input_file.h             | 19 +++++++++++++++++++
 main/cmd/pack/pack.h             | 14 +-------------
 main/{cmd/pack => }/input_file.c |  7 ++++++-
 4 files changed, 29 insertions(+), 17 deletions(-)
 create mode 100644 include/input_file.h
 rename main/{cmd/pack => }/input_file.c (90%)

diff --git a/Makefile.am b/Makefile.am
index 39cbd61..098d87c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,11 +6,12 @@ AM_CFLAGS = $(WARN_CFLAGS)
 # application core
 GLOBALHDR = include/pkgformat.h include/util.h include/pkgreader.h
 GLOBALHDR += include/compressor.h include/command.h include/pkgwriter.h
-GLOBALHDR += include/image_entry.h include/pkgio.h
+GLOBALHDR += include/image_entry.h include/pkgio.h include/input_file.h
 
 MAIN = main/pkg.c main/util.c main/compressor.c main/command.c main/pkgreader.c
 MAIN += main/pkgwriter.c main/image_entry.c main/image_entry_sort.c
 MAIN += main/mkdir_p.c main/pkgio_rd_image_entry.c main/pkg_unpack.c
+MAIN += main/input_file.c
 
 pkg_SOURCES = $(GLOBALHDR) $(MAIN)
 pkg_CFLAGS = $(AM_CFLAGS)
@@ -26,8 +27,7 @@ EXTRA_DIST = autogen.sh
 pkg_SOURCES += main/cmd/pack/filelist.c main/cmd/pack/filelist_read.c
 pkg_SOURCES += main/cmd/pack/write_toc.c main/cmd/pack/write_files.c
 pkg_SOURCES += main/cmd/pack/pack.h main/cmd/pack/pack.c
-pkg_SOURCES += main/cmd/pack/input_file.c main/cmd/pack/desc.c
-pkg_SOURCES += main/cmd/pack/write_hdr.c
+pkg_SOURCES += main/cmd/pack/desc.c main/cmd/pack/write_hdr.c
 
 # dump command
 pkg_SOURCES += main/cmd/dump/dump.c main/cmd/dump/dump.h main/cmd/dump/dump_toc.c
diff --git a/include/input_file.h b/include/input_file.h
new file mode 100644
index 0000000..dbd1bd2
--- /dev/null
+++ b/include/input_file.h
@@ -0,0 +1,19 @@
+#ifndef INPUT_FILE_H
+#define INPUT_FILE_H
+
+#include <stdio.h>
+
+typedef struct {
+	FILE *f;
+	char *line;
+	const char *filename;
+	size_t linenum;
+} input_file_t;
+
+int prefetch_line(input_file_t *f);
+
+void cleanup_file(input_file_t *f);
+
+int open_file(input_file_t *f, const char *filename);
+
+#endif /* INPUT_FILE_H */
diff --git a/main/cmd/pack/pack.h b/main/cmd/pack/pack.h
index 3e44648..28a5128 100644
--- a/main/cmd/pack/pack.h
+++ b/main/cmd/pack/pack.h
@@ -15,19 +15,13 @@
 #include <fcntl.h>
 
 #include "image_entry.h"
+#include "input_file.h"
 #include "compressor.h"
 #include "pkgformat.h"
 #include "pkgwriter.h"
 #include "command.h"
 #include "util.h"
 
-typedef struct {
-	FILE *f;
-	char *line;
-	const char *filename;
-	size_t linenum;
-} input_file_t;
-
 typedef struct dependency_t {
 	struct dependency_t *next;
 	int type;
@@ -51,12 +45,6 @@ int write_toc(pkg_writer_t *wr, image_entry_t *list, compressor_t *cmp);
 
 int write_files(pkg_writer_t *wr, image_entry_t *list, compressor_t *cmp);
 
-int prefetch_line(input_file_t *f);
-
-void cleanup_file(input_file_t *f);
-
-int open_file(input_file_t *f, const char *filename);
-
 int desc_read(const char *path, pkg_desc_t *desc);
 
 void desc_free(pkg_desc_t *desc);
diff --git a/main/cmd/pack/input_file.c b/main/input_file.c
similarity index 90%
rename from main/cmd/pack/input_file.c
rename to main/input_file.c
index 75c0691..d05a5d5 100644
--- a/main/cmd/pack/input_file.c
+++ b/main/input_file.c
@@ -1,4 +1,9 @@
-#include "pack.h"
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <ctype.h>
+
+#include "input_file.h"
 
 int prefetch_line(input_file_t *f)
 {