Fix crash when /etc/{fstab,hosts} is unreadable.

This commit is contained in:
Kenneth Vestergaard 2013-02-15 01:41:49 +01:00 committed by ridiculousfish
parent c9b4163e23
commit 286bef5eb7

View file

@ -4,11 +4,11 @@ function __fish_print_hostnames -d "Print a list of known hostnames"
# Print all hosts from /etc/hosts # Print all hosts from /etc/hosts
if test -x /usr/bin/getent if test -x /usr/bin/getent
getent hosts | tr -s ' ' ' ' | cut -d ' ' -f 2- | tr ' ' '\n' getent hosts | tr -s ' ' ' ' | cut -d ' ' -f 2- | tr ' ' '\n'
else if test -f /etc/hosts else if test -r /etc/hosts
tr -s ' \t' ' ' < /etc/hosts | sed 's/ *#.*//' | cut -s -d ' ' -f 2- | sgrep -o '[^ ]*' tr -s ' \t' ' ' < /etc/hosts | sed 's/ *#.*//' | cut -s -d ' ' -f 2- | sgrep -o '[^ ]*'
end end
# Print nfs servers from /etc/fstab # Print nfs servers from /etc/fstab
if test -f /etc/fstab if test -r /etc/fstab
sgrep </etc/fstab "^\([0-9]*\.[0-9]*\.[0-9]*\.[0-9]*\|[a-zA-Z.]*\):"|cut -d : -f 1 sgrep </etc/fstab "^\([0-9]*\.[0-9]*\.[0-9]*\.[0-9]*\|[a-zA-Z.]*\):"|cut -d : -f 1
end end