Issue 2 move folders and use deep path include file names to prevent collisions (#4)

* moving folders and files and adjust server demo build * Fix Makefile for apps/server on Linux * fix unit test source file folders * fix datetime convert UTC functions. Add Code::Blocks project for datetime testing * added some ignore extensions * disable parallel make option * fix build for abort, dcc, and epics apps * fix build for dcc, epics, error, and getevent apps. * Fixed building of all apps * fix the ipv4 to ipv6 router app build * Change indent style from Google to Webkit * make pretty to re-format style * removed common Makefile since we already had one and two was too many * remove scripts from root folder that are no longer maintained or used * remove mercurial EOL and ignore files for git repo * remove .vscodeconfig files from repo * tweak clang-format style * clang-format src and apps with tweaked style * added clang-tidy to fix readability if braces in src * result of make tidy for src and apps * fix clang-tidy mangling * Added code::blocks project for BACnet server simulation * added code::blocks linux project for WhoIs app * update text files for EOL * fix EOL in some files * fixed make win32 apps for older gcc * Removed Borland C++ Makefile in apps. Unable to maintain support for Borland C++ compiler. * created codeblocks project for apps/epics for Windows * fixing ports/xplained to work with new data structure. * fix ports/xplained example for Atmel Studio compile * fix ports/stm32f10x example for gcc Makefile compile * fix ports/stm32f10x example for IAR EWARM compile * fix ports/xplained timer callback * fix ports/bdk_atxx_mspt build with subdirs * fix ports/bdk_atxx_mspt build with subdirs * updated git ignore for IAR build artifacts * updated gitignore for non-tracked files and folders * fixed bdk-atxx4-mstp port for Rowley Crossworks project file * fixed bdk-atxx4-mstp port for GCC AVR Makefile * fixed atmega168 port for IAR AVR and GCC AVR Makefile * fixed at91sam7s port for IAR ARM and GCC ARM Makefile * removed unmaintainable DOS, RTOS32, and atmega8 ports. Updated rx62n (untested). * changed arm7 to uip port
2019-12-13 15:19:10 -06:00
parent 8a38dbe2cf
commit d50c190957
912 changed files with 36206 additions and 52502 deletions
@@ -0,0 +1,200 @@
+/*
+ *   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>
+ */
+
+#include <stdbool.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include <uci_config.h>
+#include <uci.h>
+#include "bacnet/basic/ucix/ucix.h"
+/*#include "log.h" */
+
+static struct uci_ptr ptr;
+
+static inline int ucix_get_ptr(struct uci_context *ctx,
+    const char *p,
+    const char *s,
+    const char *o,
+    const char *t)
+{
+    memset(&ptr, 0, sizeof(ptr));
+    ptr.package = p;
+    ptr.section = s;
+    ptr.option = o;
+    ptr.value = t;
+    return uci_lookup_ptr(ctx, &ptr, NULL, true);
+}
+
+struct uci_context *ucix_init(const char *config_file)
+{
+    struct uci_context *ctx = uci_alloc_context();
+    /*      uci_add_history_path(ctx, "/var/state"); */
+    uci_add_delta_path(ctx, "/var/state");
+    if (uci_load(ctx, config_file, NULL) != UCI_OK) {
+        fprintf(
+            stderr, "%s/%s is missing or corrupt\n", ctx->savedir, config_file);
+        return NULL;
+    }
+    return ctx;
+}
+
+struct uci_context *ucix_init_path(const char *path, const char *config_file)
+{
+    struct uci_context *ctx = uci_alloc_context();
+    if (path) {
+        uci_set_confdir(ctx, path);
+    }
+    if (uci_load(ctx, config_file, NULL) != UCI_OK) {
+        fprintf(
+            stderr, "%s/%s is missing or corrupt\n", ctx->savedir, config_file);
+        return NULL;
+    }
+    return ctx;
+}
+
+void ucix_cleanup(struct uci_context *ctx)
+{
+    uci_free_context(ctx);
+}
+
+void ucix_save(struct uci_context *ctx)
+{
+    uci_set_savedir(ctx, "/tmp/.uci/");
+    uci_save(ctx, NULL);
+}
+
+void ucix_save_state(struct uci_context *ctx)
+{
+    uci_set_savedir(ctx, "/var/state/");
+    uci_save(ctx, NULL);
+}
+
+const char *ucix_get_option(
+    struct uci_context *ctx, const char *p, const char *s, const char *o)
+{
+    struct uci_element *e = NULL;
+    const char *value = NULL;
+    if (ucix_get_ptr(ctx, p, s, o, NULL)) {
+        return NULL;
+    }
+    if (!(ptr.flags & UCI_LOOKUP_COMPLETE))
+        return NULL;
+    e = ptr.last;
+    switch (e->type) {
+        case UCI_TYPE_SECTION:
+            value = uci_to_section(e)->type;
+            break;
+        case UCI_TYPE_OPTION:
+            switch (ptr.o->type) {
+                case UCI_TYPE_STRING:
+                    value = ptr.o->v.string;
+                    break;
+                default:
+                    value = NULL;
+                    break;
+            }
+            break;
+        default:
+            return 0;
+    }
+
+    return value;
+}
+
+int ucix_get_option_int(struct uci_context *ctx,
+    const char *p,
+    const char *s,
+    const char *o,
+    int def)
+{
+    const char *tmp = ucix_get_option(ctx, p, s, o);
+    int ret = def;
+
+    if (tmp) {
+        ret = atoi(tmp);
+    }
+    return ret;
+}
+
+void ucix_add_section(
+    struct uci_context *ctx, const char *p, const char *s, const char *t)
+{
+    if (ucix_get_ptr(ctx, p, s, NULL, t)) {
+        return;
+    }
+    uci_set(ctx, &ptr);
+}
+
+void ucix_add_option(struct uci_context *ctx,
+    const char *p,
+    const char *s,
+    const char *o,
+    const char *t)
+{
+    if (ucix_get_ptr(ctx, p, s, o, (t) ? (t) : (""))) {
+        return;
+    }
+    uci_set(ctx, &ptr);
+}
+
+void ucix_add_option_int(
+    struct uci_context *ctx, const char *p, const char *s, const char *o, int t)
+{
+    char tmp[64];
+    snprintf(tmp, 64, "%d", t);
+    ucix_add_option(ctx, p, s, o, tmp);
+}
+
+void ucix_del(
+    struct uci_context *ctx, const char *p, const char *s, const char *o)
+{
+    if (!ucix_get_ptr(ctx, p, s, o, NULL)) {
+        uci_delete(ctx, &ptr);
+    }
+}
+
+void ucix_revert(
+    struct uci_context *ctx, const char *p, const char *s, const char *o)
+{
+    if (!ucix_get_ptr(ctx, p, s, o, NULL)) {
+        uci_revert(ctx, &ptr);
+    }
+}
+
+void ucix_for_each_section_type(struct uci_context *ctx,
+    const char *p,
+    const char *t,
+    void (*cb)(const char *, void *),
+    void *priv)
+{
+    struct uci_element *e;
+    if (ucix_get_ptr(ctx, p, NULL, NULL, NULL)) {
+        return;
+    }
+    uci_foreach_element(&ptr.p->sections,
+        e) if (!strcmp(t, uci_to_section(e)->type)) cb(e->name, priv);
+}
+
+int ucix_commit(struct uci_context *ctx, const char *p)
+{
+    if (ucix_get_ptr(ctx, p, NULL, NULL, NULL)) {
+        return 1;
+    }
+    return uci_commit(ctx, &ptr.p, false);
+}
@@ -0,0 +1,73 @@
+/*
+ *   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__
+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_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);
+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