minor cleanup and root Makefile now triggers pinentry Makefile

13 files changed, 60 insertions, 7 deletions

diff --git a/Makefile b/Makefile
index 307006b..6d69863 100644
--- a/Makefile
+++ b/Makefile
@@ -24,12 +24,16 @@ config.h:
 
 ${OBJ}: config.h config.mk drw.h
 
-spine: spine.o drw.o util.o
+pinentry:
+	$(MAKE) -C pinentry
+
+spine: pinentry spine.o drw.o util.o
 	@echo CC -o $@
 	@${CC} -o $@ spine.o drw.o util.o pinentry/pinentry.o pinentry/util.o pinentry/password-cache.o pinentry/argparse.o pinentry/secmem.o ${LDFLAGS} -lassuan -lgpgme -lgpg-error
 
 clean:
 	@echo cleaning
 	@rm -f spine ${OBJ}
+	$(MAKE) -C pinentry/ clean
 
-.PHONY: all options clean
+.PHONY: all options clean pinentry
diff --git a/drw.o b/drw.o
deleted file mode 100644
index 884041e..0000000
--- a/drw.o
+++ /dev/null
diff --git a/pinentry/Makefile b/pinentry/Makefile
index 71fce25..eace1bf 100644
--- a/pinentry/Makefile
+++ b/pinentry/Makefile
@@ -1,6 +1,6 @@
 include ../config.mk
 
-SRC = pinentry.c argparse.c password-cache.c
+SRC = util.c pinentry.c argparse.c password-cache.c
 OBJ = ${SRC:.c=.o}
 
 all: pinentry
@@ -9,9 +9,9 @@ all: pinentry
 	@echo CC $<
 	@${CC} -c ${CFLAGS} $<
 
-${OBJ}: pinentry.h argparse.h password-cache.h memory.h
+${OBJ}: pinentry.h argparse.h password-cache.h memory.h util.h
 
-pinentry: pinentry.o argparse.o password-cache.o secmem.o
+pinentry: pinentry.o argparse.o password-cache.o secmem.o util.o
 
 clean:
 	@echo cleaning
diff --git a/pinentry/argparse.o b/pinentry/argparse.o
deleted file mode 100644
index a15adb5..0000000
--- a/pinentry/argparse.o
+++ /dev/null
diff --git a/pinentry/password-cache.o b/pinentry/password-cache.o
deleted file mode 100644
index 6558449..0000000
--- a/pinentry/password-cache.o
+++ /dev/null
diff --git a/pinentry/pinentry.o b/pinentry/pinentry.o
deleted file mode 100644
index bc03a54..0000000
--- a/pinentry/pinentry.o
+++ /dev/null
diff --git a/pinentry/secmem.o b/pinentry/secmem.o
deleted file mode 100644
index 125208a..0000000
--- a/pinentry/secmem.o
+++ /dev/null
diff --git a/pinentry/util.o b/pinentry/util.o
deleted file mode 100644
index ad4cb28..0000000
--- a/pinentry/util.o
+++ /dev/null
diff --git a/pinentry_t b/pinentry_t
new file mode 100644
index 0000000..d25bab0
--- /dev/null
+++ b/pinentry_t
@@ -0,0 +1,49 @@
+struct pinentry
+{
+  char *title;
+  char *description;
+  char *error;
+  char *prompt;
+  char *ok;
+  char *notok;
+  char *cancel;
+  char *pin;
+  int pin_len;
+  int pin_from_cache;
+  char *display;
+  char *ttyname;
+  char *ttytype;
+  char *lc_ctype;
+  char *lc_messages;
+  int debug;
+  int timeout;
+  int grab;
+  int parent_wid;
+  char *touch_file;
+  int result;
+  int canceled;
+  int locale_err;
+  int specific_err;
+  int close_button;
+  int one_button;
+  char *repeat_passphrase;
+  char *repeat_error_string;
+  int repeat_okay;
+  char *quality_bar;
+  char *quality_bar_tt;
+  pinentry_color_t color_fg;
+  int color_fg_bright;
+  pinentry_color_t color_bg;
+  pinentry_color_t color_so;
+  int color_so_bright;
+  char *default_ok;
+  char *default_cancel;
+  char *default_prompt;
+  char *default_pwmngr;
+  int allow_external_password_cache;
+  int tried_password_cache;
+  char *keyinfo;
+  int may_cache_password;
+  void *ctx_assuan;
+};
+typedef struct pinentry *pinentry_t;
diff --git a/spine b/spine
deleted file mode 100755
index 4c723eb..0000000
--- a/spine
+++ /dev/null
diff --git a/spine.c b/spine.c
index cfcff16..d7dc8d7 100644
--- a/spine.c
+++ b/spine.c
@@ -297,7 +297,7 @@ catchsig(int sig)
     timed_out = 1;
 }
 
-int
+static int
 password (void) {
 	promptwin();
 	char *buf = secmem_malloc(strlen(text));
@@ -306,7 +306,7 @@ password (void) {
 	return 1;
 }
 
-int
+static int
 confirm(void) {
 	return 1;
 }
diff --git a/spine.o b/spine.o
deleted file mode 100644
index 8047c55..0000000
--- a/spine.o
+++ /dev/null
diff --git a/util.o b/util.o
deleted file mode 100644
index 2238cd0..0000000
--- a/util.o
+++ /dev/null