From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jonatan Schlag To: network@lists.ipfire.org Subject: [PATCH 1/3] header-zone: refactor hook_edit nad hook_new Date: Wed, 19 Jul 2017 16:10:20 +0200 Message-ID: <1500473422-24614-1-git-send-email-jonatan.schlag@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3194080313952626890==" List-Id: --===============3194080313952626890== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable We now return error codes and break when something important goes wrong. because of that, we have to split hook_new and hook_edit. When zone_settins-read fails in hook_edit we cannot go but it would every tim= e we would call it in hook_new. Signed-off-by: Jonatan Schlag --- src/header-zone | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/src/header-zone b/src/header-zone index 98b0ce7..219b0d6 100644 --- a/src/header-zone +++ b/src/header-zone @@ -34,17 +34,39 @@ hook_new() { assert isset zone shift =20 - zone_settings_read "${zone}" - - hook_parse_cmdline $@ + if ! hook_parse_cmdline $@; then + return ${EXIT_ERROR} + fi =20 - zone_settings_write "${zone}" + if ! zone_settings_write "${zone}"; then + log ERROR "Could not write settings for zone ${zone}" + return ${EXIT_ERROR} + fi =20 exit ${EXIT_OK} } =20 hook_edit() { - hook_new $@ + local zone=3D"${1}" + assert isset zone + shift + + if ! zone_settings_read "${zone}"; then + log ERROR "Could not read settings for zone ${zone}" + return ${EXIT_ERROR} + fi + + if ! hook_parse_cmdline $@; then + return ${EXIT_ERROR} + fi + + if ! zone_settings_write "${zone}"; then + log ERROR "Could not write settings for zone ${zone}" + return ${EXIT_ERROR} + fi + + exit ${EXIT_OK} + } =20 hook_remove() { --=20 2.6.3 --===============3194080313952626890==--