progs/mkphrase.c: Fix trailing spaces in usage message.

[catacomb] / key / key-misc.c

diff --git a/key/key-misc.c b/key/key-misc.c
index c3442f2..0afad76 100644 (file)
--- a/key/key-misc.c
+++ b/key/key-misc.c
@@ -34,6 +34,7 @@
 
 #include <mLib/bits.h>
 #include <mLib/hash.h>
+#include <mLib/macros.h>
 #include <mLib/sub.h>
 #include <mLib/sym.h>
 
@@ -159,14 +160,29 @@ key *key_bytag(key_file *f, const char *tag)
   time_t t = time(0);
   char *p;
   uint32 id;
-  key_ref *kr = sym_find(&f->bytag, tag, -1, 0, 0);
+  enum { GUESS = -1, TAG, ID, TYPE }; int lookup;
+  key_ref *kr;
+  key *k;
 
-  if (kr && !(KEY_EXPIRED(t, kr->k->exp) && KEY_EXPIRED(t, kr->k->del)))
+  if (STRNCMP(tag, ==, "tag:", 4)) { lookup = TAG; tag += 4; }
+  else if (STRNCMP(tag, ==, "id:", 3)) { lookup = ID; tag += 3; }
+  else if (STRNCMP(tag, ==, "type:", 5)) { lookup = TYPE; tag += 5; }
+  else lookup = GUESS;
+
+  if ((lookup == GUESS || lookup == TAG) &&
+      (kr = sym_find(&f->bytag, tag, -1, 0, 0)) != 0 &&
+      !(KEY_EXPIRED(t, kr->k->exp) && KEY_EXPIRED(t, kr->k->del)))
     return (kr->k);
-  id = strtoul(tag, &p, 16);
-  if (!*p)
-    return (key_byid(f, id));
-  return (key_bytype(f, tag));
+
+  if (lookup == GUESS || lookup == ID) {
+    id = strtoul(tag, &p, 16);
+    if (!*p && (k = key_byid(f, id)) != 0) return (k);
+  }
+
+  if ((lookup == GUESS || lookup == TYPE) && (k = key_bytype(f, tag)) != 0)
+    return (k);
+
+  return (0);
 }
 
 /* --- @key_qtag@ --- *