doc/tomb.1

@@ -69,7 +69,7 @@ Linux documentation. The \fI--filesystem\fR option can be used to
 specify an alternative filesystem used to format the tomb,
 in place of the default "ext4". This operation requires root
 privileges to loopback mount, format the tomb (using LUKS and mkfs),
-then set the key in its first LUKS slot.
+then set the key in its first LUKS slot. 
 
 .RS
 Supported filesystems for \fI--filesystem\fR:
@@ -122,7 +122,7 @@ internally to enumerate processes running in one or all tombs.
 .IP "index"
 Creates or updates the search indexes of all tombs currently open:
 enables use of the \fIsearch\fR command using simple word patterns on
-file names. Indexes are created using mlocate/plocate's updatedb(8) and
+file names. Indexes are created using mlocate's updatedb(8) and
 swish-e(1) if they are found on the system. Indexes allow one to search
 very fast for filenames and contents inside a tomb, they are stored
 inside it and are not accessible if the Tomb is closed. To avoid
@@ -132,7 +132,7 @@ indexing a specific tomb simply touch a \fI.noindex\fR file in it.
 .IP "search"
 Takes any string as argument and searches for them through all tombs
 currently open and previously indexed using the \fIindex\fR command.
-The search matches filenames if mlocate/plocate is installed and then also
+The search matches filenames if mlocate is installed and then also
 file contents if swish++ is present on the system, results are listed
 on the console.
 
@@ -375,7 +375,7 @@ base root of the tomb.
 .IP "bind-hooks"
 This hook file consists of a simple text file named \fIbind-hooks\fR
 containing a two column list of paths to files or directories inside
-the tomb. The files and directories will be made directly
+the tomb. The files and directories will be be made directly
 accessible by the tomb \fIopen\fR command inside the current user's
 home directory. Tomb uses internally the "mount \-o bind" command to
 bind locations inside the tomb to locations found in $HOME. In the
@@ -383,10 +383,10 @@ first column are indicated paths relative to the tomb and in the
 second column are indicated paths relative to $HOME contents, for
 example:
 .EX
-	mail          mail
-	.gnupg        .gnupg
-	.fmrc         .fetchmailrc
-	.mozilla      .mozilla
+  mail          mail
+  .gnupg        .gnupg
+  .fmrc         .fetchmailrc
+  .mozilla      .mozilla
 .EE
 
 .B
@@ -417,8 +417,8 @@ whole system's security: just add such a line to \fI/etc/sudoers\fR:
 To avoid that tomb execution is logged by \fIsyslog\fR also add:
 
 .EX
-	Cmnd_Alias TOMB = /usr/local/bin/tomb
-	Defaults!TOMB !syslog
+Cmnd_Alias TOMB = /usr/local/bin/tomb
+Defaults!TOMB !syslog
 .EE
 
 .SH PASSWORD INPUT
@@ -469,21 +469,16 @@ prefix all invocations of tomb with a blank space, including two lines
 in ".zshrc":
 
 .EX
-	export HISTIGNORESPACE=1
-	alias tomb=' tomb'
+export HISTIGNORESPACE=1
+alias tomb=' tomb'
 .EE
 
 .SH PASSWORD INPUT
 
-Tomb uses the external program "pinentry" to let users type the key password
-into a terminal or a graphical window. This program works in conjunction with
-"gpg-agent", a daemon running in background to facilitate secret key
-management with gpg. It is recommended one runs "gpg-agent" launching it from
-the X session initialization ("~/.xsession" or "~/.xinitrc" files) with this
-command:
+Tomb uses the external program "pinentry" to let users type the key password into a terminal or a graphical window. This program works in conjunction with "gpg-agent", a daemon running in background to facilitate secret key management with gpg. It is recommended one runs "gpg-agent" launching it from the X session initialization ("~/.xsession" or "~/.xinitrc" files) with this command:
 
 .EX
-	eval $(gpg-agent --daemon --write-env-file "${HOME}/.gpg-agent-info")
+eval $(gpg-agent --daemon --write-env-file "${HOME}/.gpg-agent-info")
 .EE
 
 In the future it may become mandatory to run gpg-agent when using tomb.
@@ -505,7 +500,7 @@ commands: \fIopen\fR, \fIforge\fR \fIsetkey\fR, \fIpasswd\fR,
 Using the package libsphinx
 .UR https://github.com/stef/libsphinx
 .UE
-and its python client/daemon implementation pwdsphinx
+and its python client/daemon implementation pwdsphinx 
 .UR https://github.com/stef/pwdsphinx
 .UE
 is possible to store and retrieve safely the password that locks the
@@ -570,11 +565,11 @@ keeping all its profile data inside it:
 	cat <<EOF > /media/FOX.tomb/exec-hooks
 #!/bin/sh
 if [ "$1" = "open" ]; then
-	firefox -no-remote -profile "$2"/firefox-pro &
+  firefox -no-remote -profile "$2"/firefox-pro &
 fi
 EOF
-	chmod +x /media/FOX.tomb/exec-hooks
-	mkdir /media/FOX.tomb/firefox-pro
+	chmod +x     /media/FOX.tomb/exec-hooks
+        mkdir /media/FOX.tomb/firefox-pro
 .EE
 
 .IP \(bu
@@ -585,13 +580,13 @@ Script a tomb to archive Pictures using Shotwell, launching it on open:
 	cat <<EOF > /media/Pictures.tomb/bind-hooks
 Pictures Pictures
 EOF
-	cat <<EOF > /media/Pictures.tomb/exec-hooks
+        cat <<EOF > /media/Pictures.tomb/exec-hooks
 #!/bin/sh
 if [ "$1" = "open" ]; then
-	which shotwell > /dev/null
-	if [ "$?" = "0" ]; then
-		shotwell -d "$2"/Pictures/.shotwell &
-	fi
+  which shotwell > /dev/null
+  if [ "$?" = "0" ]; then
+    shotwell -d "$2"/Pictures/.shotwell &
+  fi
 fi
 EOF
 	chmod +x /media/Pictures.tomb/exec-hooks

extras/translations/tomb.pot

@@ -1,6 +1,6 @@
 
 # Tomb - The Crypto Undertaker.
-# Copyright (C) 2007-2024 Dyne.org Foundation
+# Copyright (C) 2007-2014 Dyne.org Foundation
 # Denis Roio <jaromil@dyne.org>, 2013.
 #
 #, fuzzy
@@ -1123,7 +1123,7 @@ msgid "Tomb ::1 version:: - a strong and gentle undertaker for your secrets"
 msgstr ""
 
 #: tomb:Main routine:main:2806
-msgid " Copyright (C) 2007-2024 Dyne.org Foundation, License GNU GPL v3+"
+msgid " Copyright (C) 2007-2017 Dyne.org Foundation, License GNU GPL v3+"
 msgstr ""
 
 #: tomb:Main routine:main:2807

tomb

@@ -7,7 +7,7 @@
 
 # {{{ License
 
-# Copyright (C) 2007-2024 Dyne.org Foundation
+# Copyright (C) 2007-2023 Dyne.org Foundation
 #
 # Tomb is designed, written and maintained by Denis Roio <jaromil@dyne.org>
 #
@@ -3192,8 +3192,10 @@ umount_tomb() {
 
 list_processes() {
 	# $1 = (optional) name of tomb
-	# runs lsof on the mounted_tombs
+	# returns a list of process UIDs, one per line
 	local mounted_tombs i
+	local pnum puid pcmd powner found
+	found=0
 	mounted_tombs=(`list_tomb_mounts $1`)
 	if [[ "${#mounted_tombs}" -gt 0 ]]; then
 		if [[ -z $1 ]]; then
@@ -3205,9 +3207,21 @@ list_processes() {
 		for i in ${mounted_tombs}; do
 			_verbose "scanning tomb: ::1 tombmount::" $i
 			tombmount="${i[(ws:;:)2]}"
-			_sudo lsof +D "${i[(ws:;:)2]}"
+			tombname=${i[(ws:;:)5]}
+			for pnum in ${(f)"$(_sudo lsof -t +D "$tombmount")"}; do
+				found=$(($found + 1))
+				_verbose "process found: $pnum"
+				puid=$(cat /proc/${pnum}/loginuid)
+				pcmd=$(cat /proc/${pnum}/cmdline)
+				powner=`_get_username $puid`
+				_verbose "process found: $pnum $pcmd ($powner)"
+				_message "::1 tombname:: ::2 cmd:: (::3 owner::)" \
+						 $tombname $pcmd $powner
+			done
 		done
 	fi
+	_message "::1 foundproc:: running processes found inside ::2 numtombs:: open tombs" \
+			 $found ${#mounted_tombs}
 	return 0
 }
 
@@ -3321,6 +3335,7 @@ main() {
 	subcommands_opts[index]=""
 	subcommands_opts[search]=""
 
+	subcommands_opts[help]=""
 	subcommands_opts[bury]="k: -tomb-pwd: r: R: -sphx-host: -sphx-user: "
 	subcommands_opts[exhume]="k: -tomb-pwd: r: R: -sphx-host: -sphx-user: "
 	subcommands_opts[cloak]="k: "
@@ -3575,7 +3590,7 @@ main() {
 		__default)
 			_print "Tomb ::1 version:: - a strong and gentle undertaker for your secrets" $VERSION
 			echo
-			_print " Copyright (C) 2007-2024 Dyne.org Foundation, License GNU GPL v3+"
+			_print " Copyright (C) 2007-2021 Dyne.org Foundation, License GNU GPL v3+"
 			_print " This is free software: you are free to change and redistribute it"
 			_print " For the latest sourcecode go to <http://dyne.org/software/tomb>"
 			echo