cscvs to tla changeset 93

[onak.git] / onak.c

diff --git a/onak.c b/onak.c
index 220483d196e211dc14ce4211cbaf122dbb384604..903c8f0f7c16b56e1168e1e1a1f302be1f24265f 100644 (file)
--- a/onak.c
+++ b/onak.c
@@ -6,6 +6,8 @@
  * Jonathan McDowell <noodles@earth.li>
  * 
  * Copyright 2002 Project Purple
+ *
+ * $Id: onak.c,v 1.15 2003/09/28 20:33:34 noodles Exp $
  */
 
 #include <stdio.h>
@@ -26,13 +28,15 @@
 
 int stdin_getchar(void *ctx, size_t count, unsigned char *c)
 {
-       int ic;
+       int ic = 0;
 
-       do {
+       while ((count > 0) && (ic != EOF)) {
                ic = getchar();
                *c = ic;
                c++;
-       } while ((ic != EOF) && (--count > 0));
+               count--;
+       }
+
        return (ic == EOF);
 }
 
@@ -191,11 +195,15 @@ int main(int argc, char *argv[])
                } else if (!strcmp("delete", argv[optind])) {
                        delete_key(getfullkeyid(keyid), false);
                } else if (!strcmp("get", argv[optind])) {
-                       if (fetch_key(keyid, &keys, false)) {
+                       if (!ishex) {
+                               puts("Can't get a key on uid text."
+                                       " You must supply a keyid.");
+                       } else if (fetch_key(keyid, &keys, false)) {
                                logthing(LOGTHING_INFO, "Got key.");
                                flatten_publickey(keys,
                                                &packets,
                                                &list_end);
+                               free_publickey(keys);
                                armor_openpgp_stream(stdout_putchar,
                                                NULL,
                                                packets);