aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Ferrell <major@homeonderanged.org>2012-07-10 09:28:28 -0500
committerMark Ferrell <major@homeonderanged.org>2012-07-10 09:28:28 -0500
commitdb598a34588eec7198f49f8066756b8d6d17a1fa (patch)
tree42df9e1a1b446e0027ca53f1e45d9423d811c3d8
parentc5d9005c9fdee5c769370e0b4daa4ec06a0696be (diff)
Protect against % in filenames
* When parsing filenames we need to protect printf from the possibility that % exists in the filename.
-rwxr-xr-xscripts/builder/build-fetch10
-rwxr-xr-xscripts/builder/build-query8
2 files changed, 9 insertions, 9 deletions
diff --git a/scripts/builder/build-fetch b/scripts/builder/build-fetch
index f54be71..d5e35c1 100755
--- a/scripts/builder/build-fetch
+++ b/scripts/builder/build-fetch
@@ -13,13 +13,13 @@ build_fetch_clean()
build_fetch_uri()
{
- printf "${1%%\?*}"
+ printf '%s' "${1%%\?*}"
}
build_fetch_args()
{
set -- $(echo "${1##$(build_fetch_uri "${1}")\?}"|sed -e 's/&/ /')
- printf "${@}"
+ printf '%s' "${*}"
}
build_fetch_name()
@@ -38,7 +38,7 @@ build_fetch_name()
esac
if [ "${build_fetch_name_complete}" -eq "1" ]; then
- printf "${build_fetch_name_var}"
+ printf '%s' "${build_fetch_name_var}"
unset build_fetch_name_var
return
fi
@@ -56,13 +56,13 @@ build_fetch_name()
die "do not know how to store source from '${1}'"
fi
- printf "${build_fetch_name_var}"
+ printf '%s' "${build_fetch_name_var}"
unset build_fetch_name_var
}
build_fetch_var()
{
- printf "$(build_fetch_name "${1}" | sed -e 's/[+.-]/_/g')"
+ printf '%s' "$(build_fetch_name "${1}" | sed -e 's/[+.-]/_/g')"
}
build_fetch_git()
diff --git a/scripts/builder/build-query b/scripts/builder/build-query
index f25f1e7..7398a4a 100755
--- a/scripts/builder/build-query
+++ b/scripts/builder/build-query
@@ -8,9 +8,9 @@ parse_pkg_name()
fi
if [ "2${1#*/}" != "2${1}" ]; then
- printf "${1}"
+ printf '%s' "${1}"
else
- printf "${PROJECT}/${1}"
+ printf '%s' "${PROJECT}/${1}"
fi
}
@@ -21,7 +21,7 @@ parse_name()
fi
set -- "$(parse_pkg_name "${1}")"
- printf "${1#*/}"
+ printf '%s' "${1#*/}"
}
parse_category()
@@ -31,7 +31,7 @@ parse_category()
fi
set -- "$(parse_pkg_name "${1}")"
- printf "${1%/*}"
+ printf '%s' "${1%/*}"
}
QUERY_ACTION="summary"