aboutsummaryrefslogtreecommitdiffstats
path: root/mkinstalldirs
diff options
context:
space:
mode:
authorDaniel Veillard <veillard@src.gnome.org>2003-09-18 10:05:56 +0000
committerDaniel Veillard <veillard@src.gnome.org>2003-09-18 10:05:56 +0000
commit536fad5aad1b45ba8650f6d6dddc0848d23766d8 (patch)
tree33b3463176e6bea9cf1106201c4f17184dddb80b /mkinstalldirs
parentf6bc7c249e4e4a4189bedb5ef756c980491d08d8 (diff)
downloadandroid_external_libxml2-536fad5aad1b45ba8650f6d6dddc0848d23766d8.tar.gz
android_external_libxml2-536fad5aad1b45ba8650f6d6dddc0848d23766d8.tar.bz2
android_external_libxml2-536fad5aad1b45ba8650f6d6dddc0848d23766d8.zip
valgrind found a newly introduced bug Daniel
* dict.c: valgrind found a newly introduced bug Daniel
Diffstat (limited to 'mkinstalldirs')
-rwxr-xr-xmkinstalldirs73
1 files changed, 66 insertions, 7 deletions
diff --git a/mkinstalldirs b/mkinstalldirs
index d0fd194f..8ab885ec 100755
--- a/mkinstalldirs
+++ b/mkinstalldirs
@@ -4,9 +4,53 @@
# Created: 1993-05-16
# Public domain
-# $Id$
-
errstatus=0
+dirmode=""
+
+usage="\
+Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
+
+# process command line arguments
+while test $# -gt 0 ; do
+ case "${1}" in
+ -h | --help | --h* ) # -h for help
+ echo "${usage}" 1>&2; exit 0 ;;
+ -m ) # -m PERM arg
+ shift
+ test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; }
+ dirmode="${1}"
+ shift ;;
+ -- ) shift; break ;; # stop option processing
+ -* ) echo "${usage}" 1>&2; exit 1 ;; # unknown option
+ * ) break ;; # first non-opt arg
+ esac
+done
+
+for file
+do
+ if test -d "$file"; then
+ shift
+ else
+ break
+ fi
+done
+
+case $# in
+0) exit 0 ;;
+esac
+
+case $dirmode in
+'')
+ if mkdir -p -- . 2>/dev/null; then
+ echo "mkdir -p -- $*"
+ exec mkdir -p -- "$@"
+ fi ;;
+*)
+ if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
+ echo "mkdir -m $dirmode -p -- $*"
+ exec mkdir -m "$dirmode" -p -- "$@"
+ fi ;;
+esac
for file
do
@@ -22,13 +66,24 @@ do
esac
if test ! -d "$pathcomp"; then
- echo "mkdir $pathcomp" 1>&2
+ echo "mkdir $pathcomp"
+
+ mkdir "$pathcomp" || lasterr=$?
+
+ if test ! -d "$pathcomp"; then
+ errstatus=$lasterr
+ else
+ if test ! -z "$dirmode"; then
+ echo "chmod $dirmode $pathcomp"
- mkdir "$pathcomp" || lasterr=$?
+ lasterr=""
+ chmod "$dirmode" "$pathcomp" || lasterr=$?
- if test ! -d "$pathcomp"; then
- errstatus=$lasterr
- fi
+ if test ! -z "$lasterr"; then
+ errstatus=$lasterr
+ fi
+ fi
+ fi
fi
pathcomp="$pathcomp/"
@@ -37,4 +92,8 @@ done
exit $errstatus
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 3
+# End:
# mkinstalldirs ends here