From: Jo-Philipp Wich <jow@openwrt.org>
Date: Mon, 17 May 2010 19:31:05 +0000 (+0000)
Subject: uci: add uci_get() and uci_get_state() wrappers to shell api (#7312)
X-Git-Tag: reboot~19863
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6efb515be1251b3a6dbb3ac1547070f8e57e68da;p=oweals%2Fopenwrt.git

uci: add uci_get() and uci_get_state() wrappers to shell api (#7312)

SVN-Revision: 21489
---

diff --git a/package/uci/files/lib/config/uci.sh b/package/uci/files/lib/config/uci.sh
index 851a0d779b..d759615bd5 100644
--- a/package/uci/files/lib/config/uci.sh
+++ b/package/uci/files/lib/config/uci.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 # Shell script compatibility wrappers for /sbin/uci
 #
+# Copyright (C) 2008-2010  OpenWrt.org
 # Copyright (C) 2008  Felix Fietkau <nbd@openwrt.org>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -41,9 +42,9 @@ uci_load() {
 
 uci_set_default() {
 	local PACKAGE="$1"
-	/sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} -q show "$1" > /dev/null && return 0
-	/sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} import "$1"
-	/sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} commit "$1"
+	/sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} -q show "$PACKAGE" > /dev/null && return 0
+	/sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} import "$PACKAGE"
+	/sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} commit "$PACKAGE"
 }
 
 uci_revert_state() {
@@ -73,6 +74,23 @@ uci_set() {
 	/sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} set "$PACKAGE.$CONFIG.$OPTION=$VALUE"
 }
 
+uci_get_state() {
+	uci_get "$1" "$2" "$3" "$4" "/var/state"
+}
+
+uci_get() {
+	local PACKAGE="$1"
+	local CONFIG="$2"
+	local OPTION="$3"
+	local DEFAULT="$4"
+	local STATE="$5"
+
+	/sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} ${STATE:+-P $STATE} -q get "$PACKAGE${CONFIG:+.$CONFIG}${OPTION:+.$OPTION}"
+	RET="$?"
+	[ "$RET" -ne 0 ] && [ -n "$DEFAULT" ] && echo "$DEFAULT"
+	return "$RET"
+}
+
 uci_add() {
 	local PACKAGE="$1"
 	local TYPE="$2"