* 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>
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);
}
} 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,