From b08f2747f7846d2634c3567dc4dc49388d50ed98 Mon Sep 17 00:00:00 2001
From: Neale Pickett <neale@woozle.org>
Date: Thu, 17 Mar 2011 21:01:21 -0600
Subject: [PATCH] Nicer argument parsing in tea

---
 src/Makefile |  2 +-
 src/tea.c    | 37 +++++++++++++++++++++++++------------
 2 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 9a5cc26..3d2d790 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,4 +1,4 @@
-TARGETS = bubblebabble arc4
+TARGETS = bubblebabble arc4 tea
 
 all: $(TARGETS)
 
diff --git a/src/tea.c b/src/tea.c
index da706ef..669cdf6 100644
--- a/src/tea.c
+++ b/src/tea.c
@@ -16,27 +16,40 @@
 
 #define min(a,b) (((a)<(b))?(a):(b))
 
-int
-usage(const char *prog)
-{
-  fprintf(stderr, "Usage: %s [-e] <PLAINTEXT\n", prog);
-  fprintf(stderr, "\n");
-  fprintf(stderr, "You must pass in a key on fd 3 or in the environment variable KEY.\n");
-  return EX_USAGE;
-}
-
 int
 main(int argc, char *argv[])
 {
-  uint8_t *buf     = NULL;
-  size_t   len     = 0;
+  uint8_t *buf    = NULL;
+  size_t   len    = 0;
   uint32_t key[4] = {0};
+  int      encode = 0;
 
+  /* Parse args */
+  {
+    int opt;
+
+    while ((opt = getopt(argc, argv, "e")) != -1) {
+      switch (opt) {
+        case 'e':
+          encode = 1;
+          break;
+        default:
+          fprintf(stderr, "Usage: %s [-e] <PLAINTEXT\n", argv[0]);
+          fprintf(stderr, "\n");
+          fprintf(stderr, "You must pass in a key on fd 3 or in the environment variable KEY.\n");
+          return EX_USAGE;
+      }
+    }
+  }
+
+  /* Read key */
   {
     char *ekey = getenv("KEY");
 
     if (ekey) {
-      memcpy(key, ekey, min(strlen(ekey), sizeof(key)));
+      size_t l = strlen(ekey);
+
+      memcpy(key, ekey, min(l, sizeof(key)));
     } else {
       read(3, key, sizeof(key));
     }