key/key-io.c: Add low-level `key_mergeline' and `key_extractline' functions.

[catacomb] / progs / pixie.c

diff --git a/progs/pixie.c b/progs/pixie.c
index 4380703..3fd3208 100644 (file)
--- a/progs/pixie.c
+++ b/progs/pixie.c
@@ -775,7 +775,7 @@ OK\n\
          goto close;
       } else {
        p_flush(tag);
-       p_add(tag, s, t);
+       p_add(tag, s ? s : "", t);
        if (pixserv_write(px, "OK\n")) goto close;
       }
     }
@@ -1244,7 +1244,7 @@ int main(int argc, char *argv[])
   /* --- Set up the locked memory area --- */
 
   l_init(&lm, 16384);
-  setuid(getuid());
+  if (setuid(getuid())) _exit(125);
 
   /* --- Parse command line arguments --- */