procd: fix processing of datatype specification with spaces

[openwrt.git] / package / system / procd / files / procd.sh

diff --git a/package/system/procd/files/procd.sh b/package/system/procd/files/procd.sh
index 3f1311c..2f97a5d 100644 (file)
--- a/package/system/procd/files/procd.sh
+++ b/package/system/procd/files/procd.sh
@@ -12,6 +12,7 @@
 # procd_set_param(type, [value...])
 #   Available types:
 #     command: command line (array).
+#     respawn info: array with 3 values $restart_timeout $fail_hreshold $max_fail
 #     env: environment variable (passed to the process)
 #     data: arbitrary name/value pairs for detecting config changes (table)
 #     file: configuration files (array)
@@ -67,6 +68,7 @@ _procd_open_service() {
 
 _procd_close_service() {
        json_close_object
+       service_triggers
        _procd_ubus_call set
 }
 
@@ -113,6 +115,10 @@ _procd_open_trigger() {
        json_add_array "triggers"
 }
 
+_procd_open_validate() {
+       json_add_array "validate"
+}
+
 _procd_set_param() {
        local type="$1"; shift
 
@@ -120,7 +126,7 @@ _procd_set_param() {
                env|data)
                        _procd_add_table "$type" "$@"
                ;;
-               command|netdev|file)
+               command|netdev|file|respawn)
                        _procd_add_array "$type" "$@"
                ;;
                nice)
@@ -131,7 +137,8 @@ _procd_set_param() {
 
 _procd_add_config_trigger() {
        json_add_array
-       _procd_add_array_data "config.change"
+       _procd_add_array_data "$1"
+       shift
 
        json_add_array
        _procd_add_array_data "if"
@@ -150,6 +157,21 @@ _procd_add_config_trigger() {
        json_close_array
 }
 
+_procd_add_reload_trigger() {
+       local script=$(readlink "$initscript")
+       local name=$(basename ${script:-$initscript})
+
+       _procd_open_trigger
+       _procd_add_config_trigger "config.change" $1 /etc/init.d/$name reload
+       _procd_close_trigger
+}
+
+_procd_add_validation() {
+       _procd_open_validate
+       $@
+       _procd_close_validate
+}
+
 _procd_append_param() {
        local type="$1"; shift
 
@@ -158,7 +180,7 @@ _procd_append_param() {
                env|data)
                        _procd_add_table_data "$@"
                ;;
-               command|netdev|file)
+               command|netdev|file|respawn)
                        _procd_add_array_data "$@"
                ;;
        esac
@@ -173,9 +195,13 @@ _procd_close_trigger() {
        json_close_array
 }
 
+_procd_close_validate() {
+       json_close_array
+}
+
 _procd_add_instance() {
        _procd_open_instance
-       _procd_set_command "$@"
+       _procd_set_param command "$@"
        _procd_close_instance
 }
 
@@ -184,20 +210,36 @@ _procd_kill() {
        local instance="$2"
 
        json_init
-       [ -n "$service" ] && json_add_string service "$service"
+       [ -n "$service" ] && json_add_string name "$service"
        [ -n "$instance" ] && json_add_string instance "$instance"
        _procd_ubus_call delete
 }
 
+uci_validate_section()
+{
+       local package="$1"
+       local type="$2"
+       local name="$3"
+       local error
+       shift; shift; shift
+       local result=`/sbin/validate_data "$package" "$type" "$name" "$@" 2> /dev/null`
+       error=$?
+       eval "$result"
+       [ "$error" = "0" ] || `/sbin/validate_data "$package" "$type" "$name" "$@" 1> /dev/null`
+       return $error
+}
+
 _procd_wrapper \
        procd_open_service \
        procd_close_service \
        procd_add_instance \
        procd_add_config_trigger \
+       procd_add_reload_trigger \
        procd_open_trigger \
        procd_close_trigger \
        procd_open_instance \
        procd_close_instance \
        procd_set_param \
        procd_append_param \
+       procd_add_validation \
        procd_kill