From c39523fff4a46822c64dc7a8eeab4f1a529cf509 Mon Sep 17 00:00:00 2001
From: DTB <trinity@trinity.moe>
Date: Tue, 12 Sep 2023 22:05:20 -0400
Subject: [PATCH] separate out libpsargs

---
 libpsargs/Makefile                      |  1 +
 pscat/psargs.c => libpsargs/libpsargs.c |  6 ++++--
 pscat/psargs.h => libpsargs/libpsargs.h |  5 -----
 pscat/Makefile                          | 10 +++++-----
 pscat/pscat.c                           |  2 +-
 5 files changed, 11 insertions(+), 13 deletions(-)
 create mode 100644 libpsargs/Makefile
 rename pscat/psargs.c => libpsargs/libpsargs.c (94%)
 rename pscat/psargs.h => libpsargs/libpsargs.h (94%)

diff --git a/libpsargs/Makefile b/libpsargs/Makefile
new file mode 100644
index 0000000..b166d43
--- /dev/null
+++ b/libpsargs/Makefile
@@ -0,0 +1 @@
+libpsargs.o:
diff --git a/pscat/psargs.c b/libpsargs/libpsargs.c
similarity index 94%
rename from pscat/psargs.c
rename to libpsargs/libpsargs.c
index 06d3974..2fcabda 100644
--- a/pscat/psargs.c
+++ b/libpsargs/libpsargs.c
@@ -1,6 +1,6 @@
-#include <stddef.h>
+#include <stddef.h> /* size_t */
 
-#include "psargs.h"
+#include "libpsargs.h"
 
 /* Test string containing { c, '\0' } without iteration.
  * Theoretically saves a little bit of time compared to strcmp(3). */
@@ -54,3 +54,5 @@ corresponding_arg(char **arg, char l, char r){
 
 	return arg;
 }
+
+#undef SCMPFLAT
diff --git a/pscat/psargs.h b/libpsargs/libpsargs.h
similarity index 94%
rename from pscat/psargs.h
rename to libpsargs/libpsargs.h
index 2ca4600..ca4f5ae 100644
--- a/pscat/psargs.h
+++ b/libpsargs/libpsargs.h
@@ -1,6 +1,3 @@
-#if !defined _PSARGS_H
-#	define _PSARGS_H
-
 /* pscat(1) and pspipe(1) arguments are flanked by { '[', '\0' } and
  * { ']', '\0' }. Nesting is allowed to facilitate nesting of pscat(1) and
  * pspipe(1). This checks to make sure grouping symbols in args are balanced.
@@ -18,5 +15,3 @@ int check_arg(char **args, char l, char r);
  * Returns the location of the argument with the corresponding left grouping
  * symbol within argv. */
 char **corresponding_arg(char **arg, char l, char r);
-
-#endif
diff --git a/pscat/Makefile b/pscat/Makefile
index c9a0cb0..3ddfb84 100644
--- a/pscat/Makefile
+++ b/pscat/Makefile
@@ -1,11 +1,11 @@
-pscat: pscat.o psargs.o
-	$(CC) $(CFLAGS) -g -o pscat psargs.o pscat.o
+pscat: pscat.o ../libpsargs/libpsargs.o
+	$(CC) $(CFLAGS) -g -o pscat ../libpsargs/libpsargs.o pscat.o
 
 pscat.o: pscat.c
-	$(CC) $(CFLAGS) -c -o pscat.o pscat.c
+	$(CC) $(CFLAGS) -c -I../libpsargs -o pscat.o pscat.c
 
-psargs.o: psargs.c
-	$(CC) $(CFLAGS) -c -o psargs.o psargs.c
+../libpsargs/libpsargs.o:
+	$(MAKE) -C ../libpsargs
 
 clean:
 	rm -f *.o pscat
diff --git a/pscat/pscat.c b/pscat/pscat.c
index 6203e84..3502595 100644
--- a/pscat/pscat.c
+++ b/pscat/pscat.c
@@ -4,7 +4,7 @@
 #include <sys/types.h> /* <sys/wait.h> */
 #include <sys/wait.h> /* wait(2) */
 
-#include "psargs.h"
+#include "libpsargs.h"
 
 static char *program_name = "pscat";