X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/distorted-keys/blobdiff_plain/a22ca62ecefb34f14713c9e8adb753d6f7d1f05b..015c302c208a6267050cc8b6db31bfb09dfbffd5:/cryptop.list

diff --git a/cryptop.list b/cryptop.list
index d5f448f..abb51af 100755
--- a/cryptop.list
+++ b/cryptop.list
@@ -85,7 +85,7 @@ col_label () {
   label=$1
 
   case $all,$label in
-    nil,$USERV_USER*) plabel=${label#*/} ;;
+    nil,"$user"/*) plabel=${label#*/} ;;
     t,*) plabel=${label%%/*}:${label#*/} ;;
   esac
   echo "$plabel"
@@ -131,7 +131,18 @@ while getopts "HaC:u:" opt; do
 done
 shift $(( $OPTIND - 1 ))
 case $# in 0) set "*" ;; esac
+
+## Find where to look for keys, and check that there might be some.
+case $all in
+  t) dir=store ;;
+  nil) dir=store/$user ;;
+esac
+if [ ! -d $KEYS/$dir ]; then echo >&2 "$quis: no keys"; exit 1; fi
+
+## Find the metadata files.  This tells us where the keys are.
 cd $KEYS
+metas=$(find $dir -type f -name meta | sort)
+case "x$metas" in x) echo >&2 "$quis: no keys"; exit 1 ;; esac
 
 ## First pass: validate the column specifications.  Translate all bare column
 ## names into explicit `NAME+0' forms.  Decide whether we need a width-
@@ -181,13 +192,6 @@ while :; do
   ## passes, because it may contribute to width.)
   doheader=$header
 
-  ## Find the metadata files.  This tells us where the keys are.
-  case $all in
-    t) dir=store ;;
-    nil) dir=store/$user ;;
-  esac
-  metas=$(find $dir -type f -name meta | sort)
-
   ## Work through the keys we found.
   while :; do