From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 12 Dec 2008 22:49:35 +0000 (-0000)
Subject: Detect problems with arguments and return non-zero when appropriate.
X-Git-Tag: v2.1.6.1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ff1ac22226f24663fe054807440c4fecde6015a1;p=portage.git

Detect problems with arguments and return non-zero when appropriate.
(trunk r12248)

svn path=/main/branches/2.1.6/; revision=12249
---

diff --git a/bin/dosed b/bin/dosed
index 97fca715f..abcb15a79 100755
--- a/bin/dosed
+++ b/bin/dosed
@@ -3,13 +3,20 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+if [[ $# -lt 1 ]] ; then
+	echo "!!! ${0##*/}: at least one argument needed" >&2
+	exit 1
+fi
+
 ret=0
+file_found=0
 mysed="s:${D}::g"
 
 for x in "$@" ; do
-	y="${D}${x}"
+	y=$D${x#/}
 	if [ -e "${y}" ] ; then
 		if [ -f "${y}" ] ; then
+			file_found=1
 			sed -i -e "${mysed}" "${y}"
 		else
 			echo "${y} is not a regular file!" >&2
@@ -21,4 +28,9 @@ for x in "$@" ; do
 	fi
 done
 
+if [ $file_found = 0 ] ; then
+	echo "!!! ${0##*/}: $y does not exist" 1>&2
+	((ret+=1))
+fi
+
 exit $ret