Too obviously cloned. Ooops.

[u/mdw/catacomb] / pixie.c

diff --git a/pixie.c b/pixie.c
index 2ce007d..b7083f3 100644 (file)
--- a/pixie.c
+++ b/pixie.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: pixie.c,v 1.14 2004/04/08 01:36:15 mdw Exp $
+ * $Id$
  *
  * Passphrase pixie for Catacomb
  *
@@ -154,7 +154,7 @@ static void p_free(phrase *p)
 {
   if (p->t)
     sel_rmtimer(&p->timer);
-  free(p->tag);
+  xfree(p->tag);
   l_free(&lm, p->p);
   p->next->prev = p->prev;
   p->prev->next = p->next;
@@ -385,7 +385,7 @@ static int p_request(const char *msg, const char *tag, char *buf, size_t sz)
       if (dup2(fd[1], STDOUT_FILENO) < 0)
        _exit(127);
       close(fd[0]);
-      execl("/bin/sh", "sh", "-c", d.buf, (void *)0);
+      execl("/bin/sh", "sh", "-c", d.buf, (char *)0);
       _exit(127);
     }
 
@@ -1120,8 +1120,8 @@ static void usage(FILE *fp)
 {
   pquis(fp, "\
 Usage:\n\
-       $ [-qvfidl] [-c command] [-t timeout] [-s socket]\n\
-       $ [-s socket] -C [command args...]\n\
+       $ [-qvfidl] [-c COMMAND] [-t TIMEOUT] [-s SOCKET]\n\
+       $ [-s SOCKET] -C [COMMAND ARGS...]\n\
 ");
 }