[patch] pnames backport

bash-completion-_pnames.patch (text/plain), 2.06 KB, created by Nick Fortino on 2009-04-03 06:42:16 UTC

https://bugs.gentoo.org/264714
git://git.debian.org/git/bash-completion/bash-completion.git
upstream checkout id 1421e55aac075e13491cd212b796bdd453214a2c

Backport the latest upstream handling of process names to fix issues with long 
process names for bash-completion-20081219-r1.

--- bash-completion/bash_completion
+++ bash-completion-new/bash_completion
@@ -404,6 +404,33 @@
 	COMPREPLY=( $( compgen -W '$( command ps axo pgid | sed 1d )' -- $cur ))
 }
 
+# This function completes on process names.
+# AIX and SunOS prefer X/Open, all else should be BSD.
+[ $UNAME = SunOS -o $UNAME = AIX ] &&
+_pnames()
+{
+	COMPREPLY=( $( compgen -W '$( command ps -efo comm | \
+			           sed -e 1d -e "s:.*/::" -e "s/^-//" \
+				       -e "s/^<defunct>$//")' \
+			           -- $cur ) )
+} ||
+_pnames()
+{
+	# FIXME: completes "[kblockd/0]" to "0". Previously it was completed
+	# to "kblockd" which isn't correct either. "kblockd/0" would be
+	# arguably most correct, but killall from psmisc 22 treats arguments
+	# containing "/" specially unless -r is given so that wouldn't quite
+	# work either. Perhaps it'd be best to not complete these to anything
+	# for now.
+	# Not using "ps axo comm" because under some Linux kernels, it
+	# truncates command names (see e.g. http://bugs.debian.org/497540#19)
+	COMPREPLY=( $( compgen -W '$( command ps axo command | \
+			           sed -e "1d; s/ .*//; s:.*/::; s/:$//;" \
+			               -e "s/^[[(-]//; s/[])]$//" \
+				       -e "s/^<defunct>$//")' \
+			           -- $cur ) )
+}
+
 # This function completes on user IDs
 #
 _uids()
@@ -972,9 +999,7 @@
 	if [ $COMP_CWORD -eq 1 ] && [[ "$cur" == -* ]]; then
 		_signals
 	else
-		COMPREPLY=( $( compgen -W '$( command ps axo comm | \
-			      sed -ne "1d; s/^\[\?\([^-][^] ]*\).*$/\1/p" | \
-			      sed -e "s/.*\///" )' -- $cur ) )
+		_pnames
 	fi
 
 	return 0
@@ -991,9 +1016,7 @@
 	COMPREPLY=()
 	cur=`_get_cword`
 
-	COMPREPLY=( $( compgen -W '$( command ps axo command | \
-		      sed -ne "1d; s/^\[\?\([^-][^] ]*\).*$/\1/p" | \
-		      sed -e "s/.*\///" )' -- $cur ) )
+	_pnames
 
 	return 0
 }