summaryrefslogtreecommitdiffhomepage
path: root/libs/lucittpd/src/include
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2009-06-16 19:30:22 +0000
committerJo-Philipp Wich <jow@openwrt.org>2009-06-16 19:30:22 +0000
commit65cde286cc146be7dea165c2cb34732cb8953a57 (patch)
tree9fc9a7629afb9789a29c0def6266a19b86f7a426 /libs/lucittpd/src/include
parent8c359115f9d515d358403897f34c69757adf7af6 (diff)
drop obsoleted lucittpd packages
Diffstat (limited to 'libs/lucittpd/src/include')
-rw-r--r--libs/lucittpd/src/include/lib/list.h601
-rw-r--r--libs/lucittpd/src/include/lib/log.h24
-rw-r--r--libs/lucittpd/src/include/lib/luaplugin.h71
-rw-r--r--libs/lucittpd/src/include/lib/signal.h25
-rw-r--r--libs/lucittpd/src/include/lib/uci.h54
-rw-r--r--libs/lucittpd/src/include/uci.h543
-rw-r--r--libs/lucittpd/src/include/uci_config.h3
7 files changed, 0 insertions, 1321 deletions
diff --git a/libs/lucittpd/src/include/lib/list.h b/libs/lucittpd/src/include/lib/list.h
deleted file mode 100644
index 2959a061d3..0000000000
--- a/libs/lucittpd/src/include/lib/list.h
+++ /dev/null
@@ -1,601 +0,0 @@
-#ifndef _LINUX_LIST_H
-#define _LINUX_LIST_H
-
-#include <stddef.h>
-/**
- * container_of - cast a member of a structure out to the containing structure
- * @ptr: the pointer to the member.
- * @type: the type of the container struct this is embedded in.
- * @member: the name of the member within the struct.
- *
- */
-#ifndef container_of
-#define container_of(ptr, type, member) ( \
- (type *)( (char *)ptr - offsetof(type,member) ))
-#endif
-
-
-/*
- * Simple doubly linked list implementation.
- *
- * Some of the internal functions ("__xxx") are useful when
- * manipulating whole lists rather than single entries, as
- * sometimes we already know the next/prev entries and we can
- * generate better code by using them directly rather than
- * using the generic single-entry routines.
- */
-
-struct list_head {
- struct list_head *next, *prev;
-};
-
-#define LIST_HEAD_INIT(name) { &(name), &(name) }
-
-#define LIST_HEAD(name) \
- struct list_head name = LIST_HEAD_INIT(name)
-
-static inline void INIT_LIST_HEAD(struct list_head *list)
-{
- list->next = list;
- list->prev = list;
-}
-
-/*
- * Insert a new entry between two known consecutive entries.
- *
- * This is only for internal list manipulation where we know
- * the prev/next entries already!
- */
-static inline void __list_add(struct list_head *new,
- struct list_head *prev,
- struct list_head *next)
-{
- next->prev = new;
- new->next = next;
- new->prev = prev;
- prev->next = new;
-}
-
-/**
- * list_add - add a new entry
- * @new: new entry to be added
- * @head: list head to add it after
- *
- * Insert a new entry after the specified head.
- * This is good for implementing stacks.
- */
-static inline void list_add(struct list_head *new, struct list_head *head)
-{
- __list_add(new, head, head->next);
-}
-
-
-/**
- * list_add_tail - add a new entry
- * @new: new entry to be added
- * @head: list head to add it before
- *
- * Insert a new entry before the specified head.
- * This is useful for implementing queues.
- */
-static inline void list_add_tail(struct list_head *new, struct list_head *head)
-{
- __list_add(new, head->prev, head);
-}
-
-
-/*
- * Delete a list entry by making the prev/next entries
- * point to each other.
- *
- * This is only for internal list manipulation where we know
- * the prev/next entries already!
- */
-static inline void __list_del(struct list_head * prev, struct list_head * next)
-{
- next->prev = prev;
- prev->next = next;
-}
-
-/**
- * list_del - deletes entry from list.
- * @entry: the element to delete from the list.
- * Note: list_empty() on entry does not return true after this, the entry is
- * in an undefined state.
- */
-static inline void list_del(struct list_head *entry)
-{
- __list_del(entry->prev, entry->next);
- entry->next = NULL;
- entry->prev = NULL;
-}
-
-/**
- * list_replace - replace old entry by new one
- * @old : the element to be replaced
- * @new : the new element to insert
- *
- * If @old was empty, it will be overwritten.
- */
-static inline void list_replace(struct list_head *old,
- struct list_head *new)
-{
- new->next = old->next;
- new->next->prev = new;
- new->prev = old->prev;
- new->prev->next = new;
-}
-
-static inline void list_replace_init(struct list_head *old,
- struct list_head *new)
-{
- list_replace(old, new);
- INIT_LIST_HEAD(old);
-}
-
-/**
- * list_del_init - deletes entry from list and reinitialize it.
- * @entry: the element to delete from the list.
- */
-static inline void list_del_init(struct list_head *entry)
-{
- __list_del(entry->prev, entry->next);
- INIT_LIST_HEAD(entry);
-}
-
-/**
- * list_move - delete from one list and add as another's head
- * @list: the entry to move
- * @head: the head that will precede our entry
- */
-static inline void list_move(struct list_head *list, struct list_head *head)
-{
- __list_del(list->prev, list->next);
- list_add(list, head);
-}
-
-/**
- * list_move_tail - delete from one list and add as another's tail
- * @list: the entry to move
- * @head: the head that will follow our entry
- */
-static inline void list_move_tail(struct list_head *list,
- struct list_head *head)
-{
- __list_del(list->prev, list->next);
- list_add_tail(list, head);
-}
-
-/**
- * list_is_last - tests whether @list is the last entry in list @head
- * @list: the entry to test
- * @head: the head of the list
- */
-static inline int list_is_last(const struct list_head *list,
- const struct list_head *head)
-{
- return list->next == head;
-}
-
-/**
- * list_empty - tests whether a list is empty
- * @head: the list to test.
- */
-static inline int list_empty(const struct list_head *head)
-{
- return head->next == head;
-}
-
-/**
- * list_empty_careful - tests whether a list is empty and not being modified
- * @head: the list to test
- *
- * Description:
- * tests whether a list is empty _and_ checks that no other CPU might be
- * in the process of modifying either member (next or prev)
- *
- * NOTE: using list_empty_careful() without synchronization
- * can only be safe if the only activity that can happen
- * to the list entry is list_del_init(). Eg. it cannot be used
- * if another CPU could re-list_add() it.
- */
-static inline int list_empty_careful(const struct list_head *head)
-{
- struct list_head *next = head->next;
- return (next == head) && (next == head->prev);
-}
-
-static inline void __list_splice(struct list_head *list,
- struct list_head *head)
-{
- struct list_head *first = list->next;
- struct list_head *last = list->prev;
- struct list_head *at = head->next;
-
- first->prev = head;
- head->next = first;
-
- last->next = at;
- at->prev = last;
-}
-
-/**
- * list_splice - join two lists
- * @list: the new list to add.
- * @head: the place to add it in the first list.
- */
-static inline void list_splice(struct list_head *list, struct list_head *head)
-{
- if (!list_empty(list))
- __list_splice(list, head);
-}
-
-/**
- * list_splice_init - join two lists and reinitialise the emptied list.
- * @list: the new list to add.
- * @head: the place to add it in the first list.
- *
- * The list at @list is reinitialised
- */
-static inline void list_splice_init(struct list_head *list,
- struct list_head *head)
-{
- if (!list_empty(list)) {
- __list_splice(list, head);
- INIT_LIST_HEAD(list);
- }
-}
-
-/**
- * list_entry - get the struct for this entry
- * @ptr: the &struct list_head pointer.
- * @type: the type of the struct this is embedded in.
- * @member: the name of the list_struct within the struct.
- */
-#define list_entry(ptr, type, member) \
- container_of(ptr, type, member)
-
-/**
- * list_first_entry - get the first element from a list
- * @ptr: the list head to take the element from.
- * @type: the type of the struct this is embedded in.
- * @member: the name of the list_struct within the struct.
- *
- * Note, that list is expected to be not empty.
- */
-#define list_first_entry(ptr, type, member) \
- list_entry((ptr)->next, type, member)
-
-/**
- * list_for_each - iterate over a list
- * @pos: the &struct list_head to use as a loop cursor.
- * @head: the head for your list.
- */
-#define list_for_each(pos, head) \
- for (pos = (head)->next; pos != (head); \
- pos = pos->next)
-
-/**
- * __list_for_each - iterate over a list
- * @pos: the &struct list_head to use as a loop cursor.
- * @head: the head for your list.
- *
- * This variant differs from list_for_each() in that it's the
- * simplest possible list iteration code, no prefetching is done.
- * Use this for code that knows the list to be very short (empty
- * or 1 entry) most of the time.
- */
-#define __list_for_each(pos, head) \
- for (pos = (head)->next; pos != (head); pos = pos->next)
-
-/**
- * list_for_each_prev - iterate over a list backwards
- * @pos: the &struct list_head to use as a loop cursor.
- * @head: the head for your list.
- */
-#define list_for_each_prev(pos, head) \
- for (pos = (head)->prev; pos != (head); \
- pos = pos->prev)
-
-/**
- * list_for_each_safe - iterate over a list safe against removal of list entry
- * @pos: the &struct list_head to use as a loop cursor.
- * @n: another &struct list_head to use as temporary storage
- * @head: the head for your list.
- */
-#define list_for_each_safe(pos, n, head) \
- for (pos = (head)->next, n = pos->next; pos != (head); \
- pos = n, n = pos->next)
-
-/**
- * list_for_each_prev_safe - iterate over a list backwards safe against removal of list entry
- * @pos: the &struct list_head to use as a loop cursor.
- * @n: another &struct list_head to use as temporary storage
- * @head: the head for your list.
- */
-#define list_for_each_prev_safe(pos, n, head) \
- for (pos = (head)->prev, n = pos->prev; \
- pos != (head); \
- pos = n, n = pos->prev)
-
-/**
- * list_for_each_entry - iterate over list of given type
- * @pos: the type * to use as a loop cursor.
- * @head: the head for your list.
- * @member: the name of the list_struct within the struct.
- */
-#define list_for_each_entry(pos, head, member) \
- for (pos = list_entry((head)->next, typeof(*pos), member); \
- &pos->member != (head); \
- pos = list_entry(pos->member.next, typeof(*pos), member))
-
-/**
- * list_for_each_entry_reverse - iterate backwards over list of given type.
- * @pos: the type * to use as a loop cursor.
- * @head: the head for your list.
- * @member: the name of the list_struct within the struct.
- */
-#define list_for_each_entry_reverse(pos, head, member) \
- for (pos = list_entry((head)->prev, typeof(*pos), member); \
- &pos->member != (head); \
- pos = list_entry(pos->member.prev, typeof(*pos), member))
-
-/**
- * list_prepare_entry - prepare a pos entry for use in list_for_each_entry_continue()
- * @pos: the type * to use as a start point
- * @head: the head of the list
- * @member: the name of the list_struct within the struct.
- *
- * Prepares a pos entry for use as a start point in list_for_each_entry_continue().
- */
-#define list_prepare_entry(pos, head, member) \
- ((pos) ? : list_entry(head, typeof(*pos), member))
-
-/**
- * list_for_each_entry_continue - continue iteration over list of given type
- * @pos: the type * to use as a loop cursor.
- * @head: the head for your list.
- * @member: the name of the list_struct within the struct.
- *
- * Continue to iterate over list of given type, continuing after
- * the current position.
- */
-#define list_for_each_entry_continue(pos, head, member) \
- for (pos = list_entry(pos->member.next, typeof(*pos), member); \
- &pos->member != (head); \
- pos = list_entry(pos->member.next, typeof(*pos), member))
-
-/**
- * list_for_each_entry_continue_reverse - iterate backwards from the given point
- * @pos: the type * to use as a loop cursor.
- * @head: the head for your list.
- * @member: the name of the list_struct within the struct.
- *
- * Start to iterate over list of given type backwards, continuing after
- * the current position.
- */
-#define list_for_each_entry_continue_reverse(pos, head, member) \
- for (pos = list_entry(pos->member.prev, typeof(*pos), member); \
- &pos->member != (head); \
- pos = list_entry(pos->member.prev, typeof(*pos), member))
-
-/**
- * list_for_each_entry_from - iterate over list of given type from the current point
- * @pos: the type * to use as a loop cursor.
- * @head: the head for your list.
- * @member: the name of the list_struct within the struct.
- *
- * Iterate over list of given type, continuing from current position.
- */
-#define list_for_each_entry_from(pos, head, member) \
- for (; &pos->member != (head); \
- pos = list_entry(pos->member.next, typeof(*pos), member))
-
-/**
- * list_for_each_entry_safe - iterate over list of given type safe against removal of list entry
- * @pos: the type * to use as a loop cursor.
- * @n: another type * to use as temporary storage
- * @head: the head for your list.
- * @member: the name of the list_struct within the struct.
- */
-#define list_for_each_entry_safe(pos, n, head, member) \
- for (pos = list_entry((head)->next, typeof(*pos), member), \
- n = list_entry(pos->member.next, typeof(*pos), member); \
- &pos->member != (head); \
- pos = n, n = list_entry(n->member.next, typeof(*n), member))
-
-/**
- * list_for_each_entry_safe_continue
- * @pos: the type * to use as a loop cursor.
- * @n: another type * to use as temporary storage
- * @head: the head for your list.
- * @member: the name of the list_struct within the struct.
- *
- * Iterate over list of given type, continuing after current point,
- * safe against removal of list entry.
- */
-#define list_for_each_entry_safe_continue(pos, n, head, member) \
- for (pos = list_entry(pos->member.next, typeof(*pos), member), \
- n = list_entry(pos->member.next, typeof(*pos), member); \
- &pos->member != (head); \
- pos = n, n = list_entry(n->member.next, typeof(*n), member))
-
-/**
- * list_for_each_entry_safe_from
- * @pos: the type * to use as a loop cursor.
- * @n: another type * to use as temporary storage
- * @head: the head for your list.
- * @member: the name of the list_struct within the struct.
- *
- * Iterate over list of given type from current point, safe against
- * removal of list entry.
- */
-#define list_for_each_entry_safe_from(pos, n, head, member) \
- for (n = list_entry(pos->member.next, typeof(*pos), member); \
- &pos->member != (head); \
- pos = n, n = list_entry(n->member.next, typeof(*n), member))
-
-/**
- * list_for_each_entry_safe_reverse
- * @pos: the type * to use as a loop cursor.
- * @n: another type * to use as temporary storage
- * @head: the head for your list.
- * @member: the name of the list_struct within the struct.
- *
- * Iterate backwards over list of given type, safe against removal
- * of list entry.
- */
-#define list_for_each_entry_safe_reverse(pos, n, head, member) \
- for (pos = list_entry((head)->prev, typeof(*pos), member), \
- n = list_entry(pos->member.prev, typeof(*pos), member); \
- &pos->member != (head); \
- pos = n, n = list_entry(n->member.prev, typeof(*n), member))
-
-/*
- * Double linked lists with a single pointer list head.
- * Mostly useful for hash tables where the two pointer list head is
- * too wasteful.
- * You lose the ability to access the tail in O(1).
- */
-
-struct hlist_head {
- struct hlist_node *first;
-};
-
-struct hlist_node {
- struct hlist_node *next, **pprev;
-};
-
-#define HLIST_HEAD_INIT { .first = NULL }
-#define HLIST_HEAD(name) struct hlist_head name = { .first = NULL }
-#define INIT_HLIST_HEAD(ptr) ((ptr)->first = NULL)
-static inline void INIT_HLIST_NODE(struct hlist_node *h)
-{
- h->next = NULL;
- h->pprev = NULL;
-}
-
-static inline int hlist_unhashed(const struct hlist_node *h)
-{
- return !h->pprev;
-}
-
-static inline int hlist_empty(const struct hlist_head *h)
-{
- return !h->first;
-}
-
-static inline void __hlist_del(struct hlist_node *n)
-{
- struct hlist_node *next = n->next;
- struct hlist_node **pprev = n->pprev;
- *pprev = next;
- if (next)
- next->pprev = pprev;
-}
-
-static inline void hlist_del(struct hlist_node *n)
-{
- __hlist_del(n);
- n->next = NULL;
- n->pprev = NULL;
-}
-
-static inline void hlist_del_init(struct hlist_node *n)
-{
- if (!hlist_unhashed(n)) {
- __hlist_del(n);
- INIT_HLIST_NODE(n);
- }
-}
-
-
-static inline void hlist_add_head(struct hlist_node *n, struct hlist_head *h)
-{
- struct hlist_node *first = h->first;
- n->next = first;
- if (first)
- first->pprev = &n->next;
- h->first = n;
- n->pprev = &h->first;
-}
-
-
-/* next must be != NULL */
-static inline void hlist_add_before(struct hlist_node *n,
- struct hlist_node *next)
-{
- n->pprev = next->pprev;
- n->next = next;
- next->pprev = &n->next;
- *(n->pprev) = n;
-}
-
-static inline void hlist_add_after(struct hlist_node *n,
- struct hlist_node *next)
-{
- next->next = n->next;
- n->next = next;
- next->pprev = &n->next;
-
- if(next->next)
- next->next->pprev = &next->next;
-}
-
-#define hlist_entry(ptr, type, member) container_of(ptr,type,member)
-
-#define hlist_for_each(pos, head) \
- for (pos = (head)->first; pos; pos = pos->next)
-
-#define hlist_for_each_safe(pos, n, head) \
- for (pos = (head)->first; pos; pos = n)
-
-/**
- * hlist_for_each_entry - iterate over list of given type
- * @tpos: the type * to use as a loop cursor.
- * @pos: the &struct hlist_node to use as a loop cursor.
- * @head: the head for your list.
- * @member: the name of the hlist_node within the struct.
- */
-#define hlist_for_each_entry(tpos, pos, head, member) \
- for (pos = (head)->first; pos && \
- ({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \
- pos = pos->next)
-
-/**
- * hlist_for_each_entry_continue - iterate over a hlist continuing after current point
- * @tpos: the type * to use as a loop cursor.
- * @pos: the &struct hlist_node to use as a loop cursor.
- * @member: the name of the hlist_node within the struct.
- */
-#define hlist_for_each_entry_continue(tpos, pos, member) \
- for (pos = (pos)->next; pos && \
- ({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \
- pos = pos->next)
-
-/**
- * hlist_for_each_entry_from - iterate over a hlist continuing from current point
- * @tpos: the type * to use as a loop cursor.
- * @pos: the &struct hlist_node to use as a loop cursor.
- * @member: the name of the hlist_node within the struct.
- */
-#define hlist_for_each_entry_from(tpos, pos, member) \
- for (; pos && \
- ({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \
- pos = pos->next)
-
-/**
- * hlist_for_each_entry_safe - iterate over list of given type safe against removal of list entry
- * @tpos: the type * to use as a loop cursor.
- * @pos: the &struct hlist_node to use as a loop cursor.
- * @n: another &struct hlist_node to use as temporary storage
- * @head: the head for your list.
- * @member: the name of the hlist_node within the struct.
- */
-#define hlist_for_each_entry_safe(tpos, pos, n, head, member) \
- for (pos = (head)->first; \
- pos && ({ n = pos->next; 1; }) && \
- ({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \
- pos = n)
-
-#endif
diff --git a/libs/lucittpd/src/include/lib/log.h b/libs/lucittpd/src/include/lib/log.h
deleted file mode 100644
index 1199578d10..0000000000
--- a/libs/lucittpd/src/include/lib/log.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- *
- * Provided by fon.com
- * Copyright (C) 2008 John Crispin <blogic@openwrt.org>
- */
-
-#ifndef _LOG_H__
-#define _LOG_H__
-void log_printf(char *fmt, ...);
-void log_start(int daemon);
-#endif
diff --git a/libs/lucittpd/src/include/lib/luaplugin.h b/libs/lucittpd/src/include/lib/luaplugin.h
deleted file mode 100644
index fca6cb7f2c..0000000000
--- a/libs/lucittpd/src/include/lib/luaplugin.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * luaplugin - fast lua plugin indexing
- * Copyright (C) 2008 Felix Fietkau <nbd@openwrt.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation
- *
- * 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.
- */
-#ifndef __LUAPLUGIN_H
-#define __LUAPLUGIN_H
-
-#include <sys/time.h>
-#include <lualib.h>
-#include <lauxlib.h>
-#include <stdbool.h>
-#include "list.h"
-
-struct luaplugin_entry {
- struct luaplugin_ctx *ctx;
- struct list_head list;
- time_t timestamp;
- int checked;
- bool loaded;
- bool reload;
- char *name;
- char *module;
-
- /* privdata for the caller */
- void *priv;
-};
-
-struct luaplugin_ctx {
- const char *path;
- const struct luaplugin_ops *ops;
- lua_State *L;
- int checked;
- struct list_head *last;
- struct list_head entries;
-};
-
-/** luaplugin_init:
- * initialize the luaplugin context (allocates a new lua context)
- */
-extern int luaplugin_init(struct luaplugin_ctx *ctx, const char *path);
-
-/** luaplugin_scan:
- * rescan the plugin cache
- */
-extern void luaplugin_scan(struct luaplugin_ctx *ctx);
-
-/** luaplugin_call:
- * call out to a lua function.
- * to be able to use this, you need to push the function name on the lua stack (ctx->L)
- * and then narg function arguments afterwards.
- * this call pops (narg + 1) arguments from the stack
- * returns -ENOENT if the function was not found
- */
-extern int luaplugin_call(struct luaplugin_entry *e, int narg);
-
-/** luaplugin_done:
- * drop the luaplugin context (and associated lua context)
- * frees all memory allocated by the library
- */
-extern void luaplugin_done(struct luaplugin_ctx *ctx);
-
-#endif
diff --git a/libs/lucittpd/src/include/lib/signal.h b/libs/lucittpd/src/include/lib/signal.h
deleted file mode 100644
index cfcce0a167..0000000000
--- a/libs/lucittpd/src/include/lib/signal.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- *
- * Provided by fon.com
- * Copyright (C) 2008 John Crispin <blogic@openwrt.org>
- */
-
-#ifndef _SIGNAL_H__
-#define _SIGNAL_H__
-
-void setup_signals(void);
-
-#endif
diff --git a/libs/lucittpd/src/include/lib/uci.h b/libs/lucittpd/src/include/lib/uci.h
deleted file mode 100644
index 4a1a01c09c..0000000000
--- a/libs/lucittpd/src/include/lib/uci.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- *
- * Copyright (C) 2008 John Crispin <blogic@openwrt.org>
- */
-
-#ifndef _UCI_H__
-#define _UCI_H__
-#include <uci.h>
-#include <lib/list.h>
-
-struct ucilist {
- struct list_head list;
- char *val;
-};
-
-struct uci_context* ucix_init(const char *config_file);
-struct uci_context* ucix_init_path(const char *path, const char *config_file);
-void ucix_cleanup(struct uci_context *ctx);
-void ucix_save(struct uci_context *ctx);
-void ucix_save_state(struct uci_context *ctx);
-const char* ucix_get_option(struct uci_context *ctx,
- const char *p, const char *s, const char *o);
-int ucix_get_option_list(struct uci_context *ctx, const char *p,
- const char *s, const char *o, struct list_head *l);
-int ucix_get_option_int(struct uci_context *ctx,
- const char *p, const char *s, const char *o, int def);
-void ucix_add_section(struct uci_context *ctx,
- const char *p, const char *s, const char *t);
-void ucix_add_option(struct uci_context *ctx,
- const char *p, const char *s, const char *o, const char *t);
-void ucix_add_option_int(struct uci_context *ctx,
- const char *p, const char *s, const char *o, int t);
-void ucix_for_each_section_type(struct uci_context *ctx,
- const char *p, const char *t,
- void (*cb)(const char*, void*), void *priv);
-int ucix_commit(struct uci_context *ctx, const char *p);
-void ucix_revert(struct uci_context *ctx,
- const char *p, const char *s, const char *o);
-void ucix_del(struct uci_context *ctx, const char *p,
- const char *s, const char *o);
-#endif
diff --git a/libs/lucittpd/src/include/uci.h b/libs/lucittpd/src/include/uci.h
deleted file mode 100644
index d48ea7cef1..0000000000
--- a/libs/lucittpd/src/include/uci.h
+++ /dev/null
@@ -1,543 +0,0 @@
-/*
- * libuci - Library for the Unified Configuration Interface
- * Copyright (C) 2008 Felix Fietkau <nbd@openwrt.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 2.1
- * as published by the Free Software Foundation
- *
- * 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.
- */
-
-#ifndef __LIBUCI_H
-#define __LIBUCI_H
-
-#include "uci_config.h"
-
-/*
- * you can use these defines to enable debugging behavior for
- * apps compiled against libuci:
- *
- * #define UCI_DEBUG_TYPECAST:
- * enable uci_element typecast checking at run time
- *
- */
-
-#include <stdbool.h>
-#include <setjmp.h>
-#include <stdio.h>
-
-#define UCI_CONFDIR "/etc/config"
-#define UCI_SAVEDIR "/tmp/.uci"
-#define UCI_DIRMODE 0700
-#define UCI_FILEMODE 0600
-
-enum
-{
- UCI_OK = 0,
- UCI_ERR_MEM,
- UCI_ERR_INVAL,
- UCI_ERR_NOTFOUND,
- UCI_ERR_IO,
- UCI_ERR_PARSE,
- UCI_ERR_DUPLICATE,
- UCI_ERR_UNKNOWN,
- UCI_ERR_LAST
-};
-
-struct uci_list;
-struct uci_list
-{
- struct uci_list *next;
- struct uci_list *prev;
-};
-
-struct uci_ptr;
-struct uci_element;
-struct uci_package;
-struct uci_section;
-struct uci_option;
-struct uci_history;
-struct uci_context;
-struct uci_backend;
-struct uci_parse_context;
-
-
-/**
- * uci_alloc_context: Allocate a new uci context
- */
-extern struct uci_context *uci_alloc_context(void);
-
-/**
- * uci_free_context: Free the uci context including all of its data
- */
-extern void uci_free_context(struct uci_context *ctx);
-
-/**
- * uci_perror: Print the last uci error that occured
- * @ctx: uci context
- * @str: string to print before the error message
- */
-extern void uci_perror(struct uci_context *ctx, const char *str);
-
-/**
- * uci_geterror: Get an error string for the last uci error
- * @ctx: uci context
- * @dest: target pointer for the string
- * @str: prefix for the error message
- *
- * Note: string must be freed by the caller
- */
-extern void uci_get_errorstr(struct uci_context *ctx, char **dest, const char *str);
-
-/**
- * uci_import: Import uci config data from a stream
- * @ctx: uci context
- * @stream: file stream to import from
- * @name: (optional) assume the config has the given name
- * @package: (optional) store the last parsed config package in this variable
- * @single: ignore the 'package' keyword and parse everything into a single package
- *
- * the name parameter is for config files that don't explicitly use the 'package <...>' keyword
- * if 'package' points to a non-null struct pointer, enable history tracking and merge
- */
-extern int uci_import(struct uci_context *ctx, FILE *stream, const char *name, struct uci_package **package, bool single);
-
-/**
- * uci_export: Export one or all uci config packages
- * @ctx: uci context
- * @stream: output stream
- * @package: (optional) uci config package to export
- * @header: include the package header
- */
-extern int uci_export(struct uci_context *ctx, FILE *stream, struct uci_package *package, bool header);
-
-/**
- * uci_load: Parse an uci config file and store it in the uci context
- *
- * @ctx: uci context
- * @name: name of the config file (relative to the config directory)
- * @package: store the loaded config package in this variable
- */
-extern int uci_load(struct uci_context *ctx, const char *name, struct uci_package **package);
-
-/**
- * uci_unload: Unload a config file from the uci context
- *
- * @ctx: uci context
- * @package: pointer to the uci_package struct
- */
-extern int uci_unload(struct uci_context *ctx, struct uci_package *p);
-
-/**
- * uci_lookup_ptr: Split an uci tuple string and look up an element tree
- * @ctx: uci context
- * @ptr: lookup result struct
- * @str: uci tuple string to look up
- * @extended: allow extended syntax lookup
- *
- * if extended is set to true, uci_lookup_ptr supports the following
- * extended syntax:
- *
- * Examples:
- * network.@interface[0].ifname ('ifname' option of the first interface section)
- * network.@interface[-1] (last interface section)
- * Note: uci_lookup_ext will automatically load a config package if necessary
- */
-extern int uci_lookup_ptr(struct uci_context *ctx, struct uci_ptr *ptr, char *str, bool extended);
-
-/**
- * uci_add_section: Add an unnamed section
- * @ctx: uci context
- * @p: package to add the section to
- * @type: section type
- * @res: pointer to store a reference to the new section in
- */
-extern int uci_add_section(struct uci_context *ctx, struct uci_package *p, const char *type, struct uci_section **res);
-
-/**
- * uci_set: Set an element's value; create the element if necessary
- * @ctx: uci context
- * @ptr: uci pointer
- *
- * The updated/created element is stored in ptr->last
- */
-extern int uci_set(struct uci_context *ctx, struct uci_ptr *ptr);
-
-/**
- * uci_add_list: Append a string to an element list
- * @ctx: uci context
- * @ptr: uci pointer (with value)
- *
- * Note: if the given option already contains a string value,
- * it will be converted to an 1-element-list before appending the next element
- */
-extern int uci_add_list(struct uci_context *ctx, struct uci_ptr *ptr);
-
-/**
- * uci_rename: Rename an element
- * @ctx: uci context
- * @ptr: uci pointer (with value)
- */
-extern int uci_rename(struct uci_context *ctx, struct uci_ptr *ptr);
-
-/**
- * uci_delete: Delete a section or option
- * @ctx: uci context
- * @ptr: uci pointer
- */
-extern int uci_delete(struct uci_context *ctx, struct uci_ptr *ptr);
-
-/**
- * uci_save: save change history for a package
- * @ctx: uci context
- * @p: uci_package struct
- */
-extern int uci_save(struct uci_context *ctx, struct uci_package *p);
-
-/**
- * uci_commit: commit changes to a package
- * @ctx: uci context
- * @p: uci_package struct pointer
- * @overwrite: overwrite existing config data and flush history
- *
- * committing may reload the whole uci_package data,
- * the supplied pointer is updated accordingly
- */
-extern int uci_commit(struct uci_context *ctx, struct uci_package **p, bool overwrite);
-
-/**
- * uci_list_configs: List available uci config files
- * @ctx: uci context
- *
- * caller is responsible for freeing the allocated memory behind list
- */
-extern int uci_list_configs(struct uci_context *ctx, char ***list);
-
-/**
- * uci_set_savedir: override the default history save directory
- * @ctx: uci context
- * @dir: directory name
- */
-extern int uci_set_savedir(struct uci_context *ctx, const char *dir);
-
-/**
- * uci_set_savedir: override the default config storage directory
- * @ctx: uci context
- * @dir: directory name
- */
-extern int uci_set_confdir(struct uci_context *ctx, const char *dir);
-
-/**
- * uci_add_history_path: add a directory to the search path for change history files
- * @ctx: uci context
- * @dir: directory name
- *
- * This function allows you to add directories, which contain 'overlays'
- * for the active config, that will never be committed.
- */
-extern int uci_add_history_path(struct uci_context *ctx, const char *dir);
-
-/**
- * uci_revert: revert all changes to a config item
- * @ctx: uci context
- * @ptr: uci pointer
- */
-extern int uci_revert(struct uci_context *ctx, struct uci_ptr *ptr);
-
-/**
- * uci_parse_argument: parse a shell-style argument, with an arbitrary quoting style
- * @ctx: uci context
- * @stream: input stream
- * @str: pointer to the current line (use NULL for parsing the next line)
- * @result: pointer for the result
- */
-extern int uci_parse_argument(struct uci_context *ctx, FILE *stream, char **str, char **result);
-
-/**
- * uci_set_backend: change the default backend
- * @ctx: uci context
- * @name: name of the backend
- *
- * The default backend is "file", which uses /etc/config for config storage
- */
-extern int uci_set_backend(struct uci_context *ctx, const char *name);
-
-/**
- * uci_validate_text: validate a value string for uci options
- * @str: value
- *
- * this function checks whether a given string is acceptable as value
- * for uci options
- */
-extern bool uci_validate_text(const char *str);
-
-/* UCI data structures */
-enum uci_type {
- UCI_TYPE_UNSPEC = 0,
- UCI_TYPE_HISTORY = 1,
- UCI_TYPE_PACKAGE = 2,
- UCI_TYPE_SECTION = 3,
- UCI_TYPE_OPTION = 4,
- UCI_TYPE_PATH = 5,
- UCI_TYPE_BACKEND = 6,
- UCI_TYPE_ITEM = 7,
-};
-
-enum uci_option_type {
- UCI_TYPE_STRING = 0,
- UCI_TYPE_LIST = 1,
-};
-
-enum uci_flags {
- UCI_FLAG_STRICT = (1 << 0), /* strict mode for the parser */
- UCI_FLAG_PERROR = (1 << 1), /* print parser error messages */
- UCI_FLAG_EXPORT_NAME = (1 << 2), /* when exporting, name unnamed sections */
- UCI_FLAG_SAVED_HISTORY = (1 << 3), /* store the saved history in memory as well */
-};
-
-struct uci_element
-{
- struct uci_list list;
- enum uci_type type;
- char *name;
-};
-
-struct uci_backend
-{
- struct uci_element e;
- char **(*list_configs)(struct uci_context *ctx);
- struct uci_package *(*load)(struct uci_context *ctx, const char *name);
- void (*commit)(struct uci_context *ctx, struct uci_package **p, bool overwrite);
-
- /* private: */
- const void *ptr;
- void *priv;
-};
-
-struct uci_context
-{
- /* list of config packages */
- struct uci_list root;
-
- /* parser context, use for error handling only */
- struct uci_parse_context *pctx;
-
- /* backend for import and export */
- struct uci_backend *backend;
- struct uci_list backends;
-
- /* uci runtime flags */
- enum uci_flags flags;
-
- char *confdir;
- char *savedir;
-
- /* search path for history files */
- struct uci_list history_path;
-
- /* private: */
- int err;
- const char *func;
- jmp_buf trap;
- bool internal, nested;
- char *buf;
- int bufsz;
-};
-
-struct uci_package
-{
- struct uci_element e;
- struct uci_list sections;
- struct uci_context *ctx;
- bool has_history;
- char *path;
-
- /* private: */
- struct uci_backend *backend;
- void *priv;
- int n_section;
- struct uci_list history;
- struct uci_list saved_history;
-};
-
-struct uci_section
-{
- struct uci_element e;
- struct uci_list options;
- struct uci_package *package;
- bool anonymous;
- char *type;
-};
-
-struct uci_option
-{
- struct uci_element e;
- struct uci_section *section;
- enum uci_option_type type;
- union {
- struct uci_list list;
- char *string;
- } v;
-};
-
-enum uci_command {
- UCI_CMD_ADD,
- UCI_CMD_REMOVE,
- UCI_CMD_CHANGE,
- UCI_CMD_RENAME,
- UCI_CMD_LIST_ADD,
-};
-
-struct uci_history
-{
- struct uci_element e;
- enum uci_command cmd;
- char *section;
- char *value;
-};
-
-struct uci_ptr
-{
- enum uci_type target;
- enum {
- UCI_LOOKUP_DONE = (1 << 0),
- UCI_LOOKUP_COMPLETE = (1 << 1),
- UCI_LOOKUP_EXTENDED = (1 << 2),
- } flags;
-
- struct uci_package *p;
- struct uci_section *s;
- struct uci_option *o;
- struct uci_element *last;
-
- const char *package;
- const char *section;
- const char *option;
- const char *value;
-};
-
-
-/* linked list handling */
-#ifndef offsetof
-#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
-#endif
-
-/**
- * container_of - cast a member of a structure out to the containing structure
- * @ptr: the pointer to the member.
- * @type: the type of the container struct this is embedded in.
- * @member: the name of the member within the struct.
- */
-#define container_of(ptr, type, member) \
- ((type *) ((char *)ptr - offsetof(type,member)))
-
-
-/**
- * uci_list_entry: casts an uci_list pointer to the containing struct.
- * @_type: config, section or option
- * @_ptr: pointer to the uci_list struct
- */
-#define list_to_element(ptr) \
- container_of(ptr, struct uci_element, list)
-
-/**
- * uci_foreach_entry: loop through a list of uci elements
- * @_list: pointer to the uci_list struct
- * @_ptr: iteration variable, struct uci_element
- *
- * use like a for loop, e.g:
- * uci_foreach(&list, p) {
- * ...
- * }
- */
-#define uci_foreach_element(_list, _ptr) \
- for(_ptr = list_to_element((_list)->next); \
- &_ptr->list != (_list); \
- _ptr = list_to_element(_ptr->list.next))
-
-/**
- * uci_foreach_entry_safe: like uci_foreach_safe, but safe for deletion
- * @_list: pointer to the uci_list struct
- * @_tmp: temporary variable, struct uci_element *
- * @_ptr: iteration variable, struct uci_element *
- *
- * use like a for loop, e.g:
- * uci_foreach(&list, p) {
- * ...
- * }
- */
-#define uci_foreach_element_safe(_list, _tmp, _ptr) \
- for(_ptr = list_to_element((_list)->next), \
- _tmp = list_to_element(_ptr->list.next); \
- &_ptr->list != (_list); \
- _ptr = _tmp, _tmp = list_to_element(_ptr->list.next))
-
-/**
- * uci_list_empty: returns true if a list is empty
- * @list: list head
- */
-#define uci_list_empty(list) ((list)->next == (list))
-
-/* wrappers for dynamic type handling */
-#define uci_type_backend UCI_TYPE_BACKEND
-#define uci_type_history UCI_TYPE_HISTORY
-#define uci_type_package UCI_TYPE_PACKAGE
-#define uci_type_section UCI_TYPE_SECTION
-#define uci_type_option UCI_TYPE_OPTION
-
-/* element typecasting */
-#ifdef UCI_DEBUG_TYPECAST
-static const char *uci_typestr[] = {
- [uci_type_backend] = "backend",
- [uci_type_history] = "history",
- [uci_type_package] = "package",
- [uci_type_section] = "section",
- [uci_type_option] = "option",
-};
-
-static void uci_typecast_error(int from, int to)
-{
- fprintf(stderr, "Invalid typecast from '%s' to '%s'\n", uci_typestr[from], uci_typestr[to]);
-}
-
-#define BUILD_CAST(_type) \
- static inline struct uci_ ## _type *uci_to_ ## _type (struct uci_element *e) \
- { \
- if (e->type != uci_type_ ## _type) { \
- uci_typecast_error(e->type, uci_type_ ## _type); \
- } \
- return (struct uci_ ## _type *) e; \
- }
-
-BUILD_CAST(backend)
-BUILD_CAST(history)
-BUILD_CAST(package)
-BUILD_CAST(section)
-BUILD_CAST(option)
-
-#else
-#define uci_to_backend(ptr) container_of(ptr, struct uci_backend, e)
-#define uci_to_history(ptr) container_of(ptr, struct uci_history, e)
-#define uci_to_package(ptr) container_of(ptr, struct uci_package, e)
-#define uci_to_section(ptr) container_of(ptr, struct uci_section, e)
-#define uci_to_option(ptr) container_of(ptr, struct uci_option, e)
-#endif
-
-/**
- * uci_alloc_element: allocate a generic uci_element, reserve a buffer and typecast
- * @ctx: uci context
- * @type: {package,section,option}
- * @name: string containing the name of the element
- * @datasize: additional buffer size to reserve at the end of the struct
- */
-#define uci_alloc_element(ctx, type, name, datasize) \
- uci_to_ ## type (uci_alloc_generic(ctx, uci_type_ ## type, name, sizeof(struct uci_ ## type) + datasize))
-
-#define uci_dataptr(ptr) \
- (((char *) ptr) + sizeof(*ptr))
-
-#endif
diff --git a/libs/lucittpd/src/include/uci_config.h b/libs/lucittpd/src/include/uci_config.h
deleted file mode 100644
index 0dd76cc399..0000000000
--- a/libs/lucittpd/src/include/uci_config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#define UCI_PLUGIN_SUPPORT 1
-#undef UCI_DEBUG
-#undef UCI_DEBUG_TYPECAST