From ded581f0704a16de52c675169d70ce4b3db37022 Mon Sep 17 00:00:00 2001
From: Neale Pickett <neale@lanl.gov>
Date: Fri, 14 Oct 2011 22:10:25 -0600
Subject: [PATCH] printf working

---
 packages/printf/printf.mk                 |  1 +
 packages/printf/service/printf/run-printf |  2 +-
 packages/printf/src/printf.c              | 31 ++++++++++++++++++-----
 packages/printf/tokens.txt                |  5 ++++
 4 files changed, 31 insertions(+), 8 deletions(-)
 create mode 100644 packages/printf/tokens.txt

diff --git a/packages/printf/printf.mk b/packages/printf/printf.mk
index 520985d..cc22d75 100644
--- a/packages/printf/printf.mk
+++ b/packages/printf/printf.mk
@@ -7,6 +7,7 @@ printf-install: printf-build
 	$(MAKE) -C packages/printf/src install DESTDIR=$(CURDIR)/$(PRINTF_PKGDIR)
 
 	$(call COPYTREE, packages/printf/service, $(PRINTF_PKGDIR)/service)
+	cp packages/printf/tokens.txt $(PRINTF_PKGDIR)/
 
 printf-clean:
 	rm -rf $(PRINTF_PKGDIR)
diff --git a/packages/printf/service/printf/run-printf b/packages/printf/service/printf/run-printf
index 0f6bd9b..49789b9 100755
--- a/packages/printf/service/printf/run-printf
+++ b/packages/printf/service/printf/run-printf
@@ -1,3 +1,3 @@
 #! /bin/sh
 
-exec chpst -u 9001 -/ /opt/printf/bin ./printf
+exec chpst -u 9001 -/ /opt/printf/bin ./printf 3</opt/printf/tokens.txt
diff --git a/packages/printf/src/printf.c b/packages/printf/src/printf.c
index f28a113..f8dda67 100644
--- a/packages/printf/src/printf.c
+++ b/packages/printf/src/printf.c
@@ -19,13 +19,7 @@ record(char *buf) {
 }
 
 /* Storage space for tokens */
-char *token[5] = {
-  "printf:xylep-radar-nanox",
-  "printf:xylep-radar-nanox",
-  "printf:xylep-radar-nanox",
-  "printf:xylep-radar-nanox",
-  "printf:xylep-radar-nanox"
-};
+char token[5][100];
 
 /* Make this global so the stack isn't gigantic */
 char global_fmt[8000] = {0};
@@ -41,6 +35,29 @@ main(int argc, char *argv[], char *env[])
   int   token4_flag = 0;
   int   i;
 
+  /* Read in tokens */
+  {
+    FILE *tf = fdopen(3, "r");
+
+    if (! tf) {
+      fprintf(stderr, "No tokens on fd3\n");
+      return 1;
+    }
+
+    for (i = 0; i < 5; i += 1) {
+      char *p = fgets(token[i], sizeof(token[i]), tf);
+
+      if (! p) {
+        fprintf(stderr, "Cannot read token %d\n", i);
+        return 1;
+      }
+
+      /* Replace newline with null */
+      for (; *p && (*p != '\n'); p += 1);
+      *p = 0;
+    }
+  }
+
   /* Make stderr buffer until lines */
   setlinebuf(stderr);
 
diff --git a/packages/printf/tokens.txt b/packages/printf/tokens.txt
new file mode 100644
index 0000000..17f373d
--- /dev/null
+++ b/packages/printf/tokens.txt
@@ -0,0 +1,5 @@
+net:xenid-divik-vyhux
+net:xodib-recop-zycux
+net:xugep-zanuc-fetux
+net:ximac-pucaz-zonox
+net:xetab-kozyl-megex