tsubstituted echo with print in code - tomb - the crypto undertaker HTML git clone git://parazyd.org/tomb.git DIR Log DIR Files DIR Refs DIR README DIR LICENSE --- DIR commit cb9a6bf730979a8d8dc1a23551a4af4306597187 DIR parent 052549a4f9ab400b3e8c46da566833a3c710b53a HTML Author: Jaromil <jaromil@dyne.org> Date: Mon, 9 May 2011 11:00:47 +0200 substituted echo with print in code tthis will avoid spawning an extra echo process each time print is a zsh builtin, an alternative to the use of <<< suggested by anathema Diffstat: M src/tomb | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) --- DIR diff --git a/src/tomb b/src/tomb t@@ -92,8 +92,8 @@ safe_dir() { return fi dir="/dev/shm/$1.$RANDOM.$RANDOM.$$" - (umask 077 && mkdir "$dir") || echo "-1" - echo "$dir" + (umask 077 && mkdir "$dir") || print "-1" + print "$dir" } # we use pinentry now t@@ -220,8 +220,14 @@ Commands: list list all open tombs or the one called FILE close close the open tomb called FILE (or all) slam close tomb FILE and kill all pids using it +EOF +if [ "$STEGHIDE" = 1 ]; then + cat <<EOF bury hide a tomb key FILE inside a jpeg PLACE - exhume extract a tomb key FILE from a jpeg PLACE + exhume extract a tomb key FILE from a jpeg PL +EOF +fi +cat <<EOF Options: t@@ -346,7 +352,7 @@ create_tomb() { fi - echo "${tombpass}" | gpg \ + print "${tombpass}" | gpg \ --openpgp --batch --no-options --no-tty --passphrase-fd 0 2>/dev/null \ -o "${tombdir}/${tombname}.tomb.key" -c -a ${keytmp}/tomb.tmp t@@ -455,7 +461,7 @@ mount_tomb() { else tombpass=`exec_as_user ${TOMBEXEC} askpass "$keyname (retry $c)"` fi - echo "${tombpass}" \ + print "${tombpass}" \ | gpg --batch --passphrase-fd 0 --no-tty --no-options \ -d "${tombkey}" 2> /dev/null \ | cryptsetup --key-file - luksOpen ${nstloop} ${mapper} t@@ -693,7 +699,7 @@ umount_tomb() { if [ "${pathmap}" = "/dev/mapper" ]; then mapper="$1" # argument is the mapper (or none which autofills mapper) - tombname="`echo $mapper | cut -d. -f2`" + tombname="`print $mapper | cut -d. -f2`" tombmount=`mount -l | \ awk -vtomb="[$tombname]" '/^\/dev\/mapper\/tomb/ { if($7==tomb) print $3 } '` t@@ -709,7 +715,7 @@ umount_tomb() { tombmount="$1" # argument should be the mount mapper=`mount | awk -vmnt="$tombmount" '/^\/dev\/mapper\/tomb/ { if($3==mnt) print $1 }'` - tombname="`echo $mapper | cut -d. -f2`" + tombname="`print $mapper | cut -d. -f2`" fi t@@ -941,7 +947,7 @@ EOF } main () { - echo $@ | grep '\-D' 2>&1 > /dev/null + print $@ | grep '\-D' 2>&1 > /dev/null # ????? if [ $? = 0 ]; then fi t@@ -965,8 +971,8 @@ main () { exit 0 ;; -q) QUIET=1; shift 1 ;; -D) - echo "[D] Tomb invoked with args \"${(f)@}\" " - echo "[D] running on `date`" + print "[D] Tomb invoked with args \"${(f)@}\" " + print "[D] running on `date`" DEBUG=1; shift 1 ;; -s) SIZE=$2; shift 2 ;; -k) KEY=$2; shift 2 ;;