* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * GNU Lesser General Public License for more details.
*/
static void uci_list_set_pos(struct uci_list *head, struct uci_list *ptr, int pos)
uci_free_element(&s->e);
}
-__plugin struct uci_package *
+__private struct uci_package *
uci_alloc_package(struct uci_context *ctx, const char *name)
{
struct uci_package *p;
int uci_rename(struct uci_context *ctx, struct uci_ptr *ptr)
{
/* NB: UCI_INTERNAL use means without delta tracking */
- bool internal = ctx->internal;
+ bool internal = ctx && ctx->internal;
struct uci_element *e;
struct uci_package *p;
char *n;
int uci_add_section(struct uci_context *ctx, struct uci_package *p, const char *type, struct uci_section **res)
{
- bool internal = ctx->internal;
+ bool internal = ctx && ctx->internal;
struct uci_section *s;
UCI_HANDLE_ERR(ctx);
int uci_delete(struct uci_context *ctx, struct uci_ptr *ptr)
{
/* NB: pass on internal flag to uci_del_element */
- bool internal = ctx->internal;
+ bool internal = ctx && ctx->internal;
struct uci_package *p;
- struct uci_element *e;
+ struct uci_element *e1, *e2, *tmp;
+ int index;
UCI_HANDLE_ERR(ctx);
- e = uci_expand_ptr(ctx, ptr, true);
+ e1 = uci_expand_ptr(ctx, ptr, true);
p = ptr->p;
UCI_ASSERT(ctx, ptr->s);
+ if (ptr->value && *ptr->value && ptr->o && ptr->o->type == UCI_TYPE_LIST) {
+ if (!sscanf(ptr->value, "%d", &index))
+ return 1;
+
+ uci_foreach_element_safe(&ptr->o->v.list, tmp, e2) {
+ if (index == 0) {
+ if (!internal && p->has_delta)
+ uci_add_delta(ctx, &p->delta, UCI_CMD_REMOVE, ptr->section, ptr->option, ptr->value);
+ uci_free_option(uci_to_option(e2));
+ return 0;
+ }
+ index--;
+ }
+
+ return 0;
+ }
+
if (!internal && p->has_delta)
uci_add_delta(ctx, &p->delta, UCI_CMD_REMOVE, ptr->section, ptr->option, NULL);
- uci_free_any(&e);
+ uci_free_any(&e1);
if (ptr->option)
ptr->o = NULL;
int uci_add_list(struct uci_context *ctx, struct uci_ptr *ptr)
{
/* NB: UCI_INTERNAL use means without delta tracking */
- bool internal = ctx->internal;
+ bool internal = ctx && ctx->internal;
struct uci_option *prev = NULL;
const char *value2 = NULL;
return 0;
}
+int uci_del_list(struct uci_context *ctx, struct uci_ptr *ptr)
+{
+ /* NB: pass on internal flag to uci_del_element */
+ bool internal = ctx && ctx->internal;
+ struct uci_element *e, *tmp;
+ struct uci_package *p;
+
+ UCI_HANDLE_ERR(ctx);
+
+ uci_expand_ptr(ctx, ptr, false);
+ UCI_ASSERT(ctx, ptr->s);
+ UCI_ASSERT(ctx, ptr->value);
+
+ if (!(ptr->o && ptr->option))
+ return 0;
+
+ if ((ptr->o->type != UCI_TYPE_LIST))
+ return 0;
+
+ p = ptr->p;
+ if (!internal && p->has_delta)
+ uci_add_delta(ctx, &p->delta, UCI_CMD_LIST_DEL, ptr->section, ptr->option, ptr->value);
+
+ uci_foreach_element_safe(&ptr->o->v.list, tmp, e) {
+ if (!strcmp(ptr->value, uci_to_option(e)->e.name)) {
+ uci_free_option(uci_to_option(e));
+ }
+ }
+
+ return 0;
+}
+
int uci_set(struct uci_context *ctx, struct uci_ptr *ptr)
{
/* NB: UCI_INTERNAL use means without delta tracking */
- bool internal = ctx->internal;
+ bool internal = ctx && ctx->internal;
UCI_HANDLE_ERR(ctx);
uci_expand_ptr(ctx, ptr, false);