From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jonatan Schlag To: network@lists.ipfire.org Subject: [PATCH v3 1/5] util: refactor fwrite Date: Mon, 17 Jul 2017 21:05:14 +0200 Message-ID: <1500318318-18852-1-git-send-email-jonatan.schlag@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8559590772700262773==" List-Id: --===============8559590772700262773== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit This functions now: - return an error when the destination is a directory - creates the destination if the destination not exist Signed-off-by: Jonatan Schlag --- src/functions/functions.util | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/functions/functions.util b/src/functions/functions.util index 381208c..dd223f9 100644 --- a/src/functions/functions.util +++ b/src/functions/functions.util @@ -179,12 +179,21 @@ fwrite() { assert isset file shift - if [ ! -w "${file}" ]; then - log ERROR "${file}: No such file" + if [ -d "${file}" ]; then + log ERROR "${file} is a directory" return ${EXIT_ERROR} fi - print "%s" "$@" >> ${file} 2>/dev/null + if [ -f "${file}" ]; then + if [ -w "${file}" ]; then + print "%s" "$@" >> ${file} 2>/dev/null + else + log ERROR "${file} is not writeable" + return ${EXIT_ERROR} + fi + else + print "%s" "$@" >> ${file} 2>/dev/null + fi } make_parent_dir() { -- 2.6.3 --===============8559590772700262773==--