diff --git a/Makefile.in b/Makefile.in index d51f5ee7..933883d3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -43,7 +43,7 @@ SUBDIRS = lib apps include etc .PHONY: doc all clean depend $(SUBDIRS) install loc TAGS .config.status docker -all: $(SUBDIRS) clicon.conf.cpp clicon.mk +all: $(SUBDIRS) clixon.conf.cpp clixon.mk $(SUBDIRS): (cd $@ && $(MAKE) $(MFLAGS) all) @@ -52,19 +52,19 @@ depend: for i in $(SUBDIRS) doc example; \ do (cd $$i && $(MAKE) $(MFLAGS) depend); done -# template clicon.conf file -clicon.conf.cpp: clicon.conf.cpp.cpp +# template clixon.conf file +clixon.conf.cpp: clixon.conf.cpp.cpp $(CPP) -P -x assembler-with-cpp -Dprefix=$(prefix) -Dlocalstatedir=$(localstatedir) -Dsysconfdir=$(sysconfdir) -Ddatadir=$(datadir) -Dlibdir=$(libdir) $< > $@ -clicon.mk: clicon.mk.cpp +clixon.mk: clixon.mk.cpp $(CPP) -P -traditional-cpp -x assembler-with-cpp -Dprefix=$(prefix) -Dlocalstatedir=$(localstatedir) -Dsysconfdir=$(sysconfdir) -Ddatadir=$(datadir) -Dlibdir=$(libdir) $< > $@ -install: clicon.conf.cpp clicon.mk +install: clixon.conf.cpp clixon.mk for i in $(SUBDIRS) doc; \ do (cd $$i && $(MAKE) $(MFLAGS) $@); done; \ - install -d -m 755 $(DESTDIR)$(datadir)/clicon - install -m 755 clicon.conf.cpp $(DESTDIR)$(datadir)/clicon - install -m 755 clicon.mk $(DESTDIR)$(datadir)/clicon + install -d -m 755 $(DESTDIR)$(datadir)/clixon + install -m 755 clixon.conf.cpp $(DESTDIR)$(datadir)/clixon + install -m 755 clixon.mk $(DESTDIR)$(datadir)/clixon echo "Install for compilation by: make install-include" install-include: @@ -75,8 +75,8 @@ install-include: uninstall: for i in $(SUBDIRS) doc example; \ do (cd $$i && $(MAKE) $(MFLAGS) $@); done; - rm -f $(datadir)/clicon/clicon.conf.cpp - rm -f $(datadir)/clicon/clicon.mk + rm -f $(datadir)/clixon/clixon.conf.cpp + rm -f $(datadir)/clixon/clixon.mk doc: cd $@; $(MAKE) $(MFLAGS) $@ @@ -94,7 +94,7 @@ clean: distclean: rm -f Makefile TAGS config.status config.log *~ .depend rm -rf Makefile autom4te.cache - rm -rf clicon.conf.cpp clicon.mk + rm -rf clixon.conf.cpp clixon.mk for i in $(SUBDIRS) doc example; \ do (cd $$i && $(MAKE) $(MFLAGS) $@); done diff --git a/README b/README deleted file mode 100644 index 86a25e7b..00000000 --- a/README +++ /dev/null @@ -1,72 +0,0 @@ -This README contains information for developers: -1. How to document the code -2. How to work in git (branching) -3. How the meta-configure stuff works - -1. How to document the code -+++++++++++++++++++++++++++ - -Create documentation: -cd doc -make doc -make graphs # callgraphs - -/*! This is a small comment on one line - * - * This is a detailed description - * spanning several lines. - * - * Example usage: - * @code - * fn(a, &b); - * @endcode - * - * @param[in] src This is a description of the first parameter - * @param[in,out] dest This is a description of the second parameter - * @retval TRUE This is a description of the return value - * @retval FALSE This is a description of another return value - * @see See also this function - */ - -2. How to work in git (branching) -+++++++++++++++++++++++++++++++++ -Baically follows: http://nvie.com/posts/a-successful-git-branching-model/ -only somewhat simplified: - -Do commits in develop branch. When done, merge with master. -($ git checkout -b develop master # create develop) - -$ git checkout develop -Switch to branch develop -$ git add .. -$ git commit .. -$ git push origin develop -Add/commit stuff here (and push) - -Ready for tagging ------------------ -(This is somewhat simplified - no release branch) -$ ./bump-version.sh 3.6.0 -Files modified successfully, version bumped to 3.6.0 -$ git checkout master -Switch to master -$ git merge --no-ff develop -Merge made by recursive. -(Summary of changes) -$ git tag -a 3.6.0 - -3. How the meta-configure stuff works -+++++++++++++++++++++++++++++++++++++ -configure.ac --. - | .------> autoconf* -----> configure - [aclocal.m4] --+---+ - | `-----> [autoheader*] --> [config.h.in] - [acsite.m4] ---' - - .-------------> [config.cache] - configure* ------------+-------------> config.log - | - [config.h.in] -. v .-> [config.h] -. - +--> config.status* -+ +--> make* - Makefile.in ---' `-> Makefile ---' - diff --git a/apps/backend/Makefile.in b/apps/backend/Makefile.in index db963c7e..e36d7645 100644 --- a/apps/backend/Makefile.in +++ b/apps/backend/Makefile.in @@ -36,19 +36,19 @@ sysconfdir = @sysconfdir@ includedir = @includedir@ SH_SUFFIX = @SH_SUFFIX@ -CLICON_MAJOR = @CLICON_VERSION_MAJOR@ -CLICON_MINOR = @CLICON_VERSION_MINOR@ +CLIXON_MAJOR = @CLIXON_VERSION_MAJOR@ +CLIXON_MINOR = @CLIXON_VERSION_MINOR@ -# Use this clicon lib for linking -CLICON_LIB = libclicon.so.$(CLICON_MAJOR).$(CLICON_MINOR) +# Use this clixon lib for linking +CLIXON_LIB = libclixon.so.$(CLIXON_MAJOR).$(CLIXON_MINOR) # Location of system plugins -CLICON_BACKEND_SYSDIR = $(libdir)/clicon/plugins/backend +CLIXON_BACKEND_SYSDIR = $(libdir)/clixon/plugins/backend # For dependency. A little strange that we rely on it being built in the src dir # even though it may exist in $(libdir). But the new version may not have been installed yet. -LIBDEPS = $(top_srcdir)/lib/src/$(CLICON_LIB) +LIBDEPS = $(top_srcdir)/lib/src/$(CLIXON_LIB) -LIBS = -L$(top_srcdir)/lib/src @LIBS@ -l:$(CLICON_LIB) -lpthread +LIBS = -L$(top_srcdir)/lib/src @LIBS@ -l:$(CLIXON_LIB) -lpthread CPPFLAGS = @CPPFLAGS@ -fPIC INCLUDES = -I. -I$(top_srcdir)/lib/src -I$(top_srcdir)/lib -I$(top_srcdir)/include -I$(top_srcdir) @INCLUDES@ @@ -57,16 +57,16 @@ APPSRC = backend_main.c backend_socket.c backend_client.c \ backend_lock.c backend_commit.c backend_plugin.c APPOBJ = $(APPSRC:.c=.o) -APPL = clicon_backend +APPL = clixon_backend -#SHLIB = clicon_backend -MYNAME = clicon_backend +#SHLIB = clixon_backend +MYNAME = clixon_backend MYLIBLINK = lib$(MYNAME)$(SH_SUFFIX) -MYLIB = $(MYLIBLINK).$(CLICON_MAJOR).$(CLICON_MINOR) -MYLIBSO = $(MYLIBLINK).$(CLICON_MAJOR) +MYLIB = $(MYLIBLINK).$(CLIXON_MAJOR).$(CLIXON_MINOR) +MYLIBSO = $(MYLIBLINK).$(CLIXON_MAJOR) # Accessible from plugin -LIBSRC = clicon_backend_transaction.c clicon_backend_handle.c +LIBSRC = clixon_backend_transaction.c clixon_backend_handle.c LIBOBJ = $(LIBSRC:.c=.o) all: $(MYLIB) $(APPL) test @@ -88,24 +88,24 @@ install: install-lib $(APPL) install-lib: $(MYLIB) install -d $(DESTDIR)$(libdir) install $(MYLIB) $(DESTDIR)$(libdir) - ln -sf $(MYLIB) $(DESTDIR)$(libdir)/$(MYLIBSO) # -l:libclicon_config.so.2 - ln -sf $(MYLIBSO) $(DESTDIR)$(libdir)/$(MYLIBLINK) # -l:libclicon_config.so - install -d $(DESTDIR)$(libdir)/clicon/plugins/backend + ln -sf $(MYLIB) $(DESTDIR)$(libdir)/$(MYLIBSO) # -l:libclixon_config.so.2 + ln -sf $(MYLIBSO) $(DESTDIR)$(libdir)/$(MYLIBLINK) # -l:libclixon_config.so + install -d $(DESTDIR)$(libdir)/clixon/plugins/backend uninstall: rm -f $(sbindir)/$(APPL) rm -f $(libdir)/$(MYLIB) - rm -f $(includedir)/clicon/* + rm -f $(includedir)/clixon/* -install-include: clicon_backend.h clicon_backend_handle.h clicon_backend_transaction.h - install -d $(DESTDIR)$(includedir)/clicon - install -m 644 $^ $(DESTDIR)$(includedir)/clicon +install-include: clixon_backend.h clixon_backend_handle.h clixon_backend_transaction.h + install -d $(DESTDIR)$(includedir)/clixon + install -m 644 $^ $(DESTDIR)$(includedir)/clixon .SUFFIXES: .SUFFIXES: .c .o .c.o: - $(CC) $(INCLUDES) -D__PROGRAM__=\"$(APPL)\" -DCLICON_BACKEND_SYSDIR=\"$(CLICON_BACKEND_SYSDIR)\" $(CPPFLAGS) $(CFLAGS) -c $< + $(CC) $(INCLUDES) -D__PROGRAM__=\"$(APPL)\" -DCLIXON_BACKEND_SYSDIR=\"$(CLIXON_BACKEND_SYSDIR)\" $(CPPFLAGS) $(CFLAGS) -c $< # Just link test programs test.c : @@ -120,7 +120,7 @@ $(APPL) : $(APPOBJ) $(MYLIBLINK) $(LIBDEPS) $(MYLIB): $(LIBOBJ) $(CC) $(LDFLAGS) -shared -Wl,-soname,$(MYLIBSO) -o $@ -lc $(LIBOBJ) -Wl,-soname=$(MYLIBSO) -# link-name is needed for application linking, eg for clicon_cli and clicon_backend +# link-name is needed for application linking, eg for clixon_cli and clixon_backend $(MYLIBLINK) : $(MYLIB) # ln -sf $(MYLIB) $(MYLIBSO) # ln -sf $(MYLIB) $@ diff --git a/apps/backend/backend_client.c b/apps/backend/backend_client.c index bc42f89b..c028a3ad 100644 --- a/apps/backend/backend_client.c +++ b/apps/backend/backend_client.c @@ -2,26 +2,26 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . */ #ifdef HAVE_CONFIG_H -#include "clicon_config.h" /* generated by config & autoconf */ +#include "clixon_config.h" /* generated by config & autoconf */ #endif #include @@ -48,7 +48,7 @@ #include /* clicon */ -#include +#include #include "backend_commit.h" #include "backend_lock.h" diff --git a/apps/backend/backend_client.h b/apps/backend/backend_client.h index 9749738e..bc21ef25 100644 --- a/apps/backend/backend_client.h +++ b/apps/backend/backend_client.h @@ -2,20 +2,20 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . */ diff --git a/apps/backend/backend_commit.c b/apps/backend/backend_commit.c index 7b168b17..b82151a9 100644 --- a/apps/backend/backend_commit.c +++ b/apps/backend/backend_commit.c @@ -2,26 +2,26 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . */ #ifdef HAVE_CONFIG_H -#include "clicon_config.h" /* generated by config & autoconf */ +#include "clixon_config.h" /* generated by config & autoconf */ #endif #include @@ -49,9 +49,9 @@ #include /* clicon */ -#include +#include -#include "clicon_backend_transaction.h" +#include "clixon_backend_transaction.h" #include "backend_plugin.h" #include "backend_handle.h" #include "backend_commit.h" diff --git a/apps/backend/backend_commit.h b/apps/backend/backend_commit.h index 6c83df1a..81c2f814 100644 --- a/apps/backend/backend_commit.h +++ b/apps/backend/backend_commit.h @@ -2,20 +2,20 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . */ diff --git a/apps/backend/backend_handle.h b/apps/backend/backend_handle.h index 414ac74b..dbdcf8f4 100644 --- a/apps/backend/backend_handle.h +++ b/apps/backend/backend_handle.h @@ -2,20 +2,20 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . * diff --git a/apps/backend/backend_lock.c b/apps/backend/backend_lock.c index 2d581fec..c3de4bfc 100644 --- a/apps/backend/backend_lock.c +++ b/apps/backend/backend_lock.c @@ -2,26 +2,26 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . */ #ifdef HAVE_CONFIG_H -#include "clicon_config.h" /* generated by config & autoconf */ +#include "clixon_config.h" /* generated by config & autoconf */ #endif #include @@ -48,7 +48,7 @@ #include /* clicon */ -#include +#include #include "backend_lock.h" diff --git a/apps/backend/backend_lock.h b/apps/backend/backend_lock.h index 924d957f..f498e553 100644 --- a/apps/backend/backend_lock.h +++ b/apps/backend/backend_lock.h @@ -2,20 +2,20 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . * diff --git a/apps/backend/backend_main.c b/apps/backend/backend_main.c index d484b4ab..0f3423d5 100644 --- a/apps/backend/backend_main.c +++ b/apps/backend/backend_main.c @@ -2,26 +2,26 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . */ #ifdef HAVE_CONFIG_H -#include "clicon_config.h" /* generated by config & autoconf */ +#include "clixon_config.h" /* generated by config & autoconf */ #endif #include @@ -49,9 +49,9 @@ #include /* clicon */ -#include +#include -#include "clicon_backend_handle.h" +#include "clixon_backend_handle.h" #include "backend_socket.h" #include "backend_client.h" #include "backend_commit.h" diff --git a/apps/backend/backend_plugin.c b/apps/backend/backend_plugin.c index e8e40a37..3e187309 100644 --- a/apps/backend/backend_plugin.c +++ b/apps/backend/backend_plugin.c @@ -2,27 +2,27 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . * */ #ifdef HAVE_CONFIG_H -#include "clicon_config.h" /* generated by config & autoconf */ +#include "clixon_config.h" /* generated by config & autoconf */ #endif #include @@ -45,9 +45,9 @@ #include /* clicon */ -#include +#include -#include "clicon_backend_transaction.h" +#include "clixon_backend_transaction.h" #include "backend_plugin.h" #include "backend_commit.h" @@ -422,7 +422,7 @@ plugin_initiate(clicon_handle h) char *dir; /* First load CLICON system plugins */ - if (config_plugin_load_dir(h, CLICON_BACKEND_SYSDIR) < 0) + if (config_plugin_load_dir(h, CLIXON_BACKEND_SYSDIR) < 0) return -1; /* Then load application plugins */ diff --git a/apps/backend/backend_plugin.h b/apps/backend/backend_plugin.h index daa21dd5..155fc1a4 100644 --- a/apps/backend/backend_plugin.h +++ b/apps/backend/backend_plugin.h @@ -2,20 +2,20 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . */ diff --git a/apps/backend/backend_socket.c b/apps/backend/backend_socket.c index e8b2b16e..6d87b5d0 100644 --- a/apps/backend/backend_socket.c +++ b/apps/backend/backend_socket.c @@ -2,26 +2,26 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . */ #ifdef HAVE_CONFIG_H -#include "clicon_config.h" /* generated by config & autoconf */ +#include "clixon_config.h" /* generated by config & autoconf */ #endif #include @@ -54,7 +54,7 @@ #include /* clicon */ -#include +#include #include "backend_socket.h" #include "backend_client.h" diff --git a/apps/backend/backend_socket.h b/apps/backend/backend_socket.h index 526b998f..0cd48523 100644 --- a/apps/backend/backend_socket.h +++ b/apps/backend/backend_socket.h @@ -2,20 +2,20 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . */ diff --git a/apps/backend/clicon_transaction_api.o b/apps/backend/clicon_transaction_api.o deleted file mode 100644 index 3075b019..00000000 Binary files a/apps/backend/clicon_transaction_api.o and /dev/null differ diff --git a/apps/backend/clicon_backend.h b/apps/backend/clixon_backend.h similarity index 85% rename from apps/backend/clicon_backend.h rename to apps/backend/clixon_backend.h index 31713839..44e82ec2 100644 --- a/apps/backend/clicon_backend.h +++ b/apps/backend/clixon_backend.h @@ -2,20 +2,20 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . * @@ -24,8 +24,8 @@ * Internal code should not include this file */ -#ifndef _CLICON_BACKEND_H_ -#define _CLICON_BACKEND_H_ +#ifndef _CLIXON_BACKEND_H_ +#define _CLIXON_BACKEND_H_ /* * Use this constant to disable some prototypes that should not be visible outside the lib. @@ -33,8 +33,8 @@ */ /* Common code (API and Backend daemon) */ -#include -#include +#include +#include /*! Clicon Backend plugin callbacks: use these in your backend plugin code */ @@ -89,4 +89,4 @@ int transaction_end(clicon_handle h, transaction_data td); */ int transaction_abort(clicon_handle h, transaction_data td); -#endif /* _CLICON_BACKEND_H_ */ +#endif /* _CLIXON_BACKEND_H_ */ diff --git a/apps/backend/clicon_backend_handle.c b/apps/backend/clixon_backend_handle.c similarity index 96% rename from apps/backend/clicon_backend_handle.c rename to apps/backend/clixon_backend_handle.c index 87137650..de034e88 100644 --- a/apps/backend/clicon_backend_handle.c +++ b/apps/backend/clixon_backend_handle.c @@ -2,26 +2,26 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . */ #ifdef HAVE_CONFIG_H -#include "clicon_config.h" /* generated by config & autoconf */ +#include "clixon_config.h" /* generated by config & autoconf */ #endif #include @@ -43,9 +43,9 @@ #include /* clicon */ -#include +#include -#include "clicon_backend_handle.h" +#include "clixon_backend_handle.h" #include "backend_client.h" #include "backend_handle.h" diff --git a/apps/backend/clicon_backend_handle.h b/apps/backend/clixon_backend_handle.h similarity index 87% rename from apps/backend/clicon_backend_handle.h rename to apps/backend/clixon_backend_handle.h index 9ec6fa15..bd7b0bde 100644 --- a/apps/backend/clicon_backend_handle.h +++ b/apps/backend/clixon_backend_handle.h @@ -2,20 +2,20 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . * @@ -24,8 +24,8 @@ * Internal code should include this */ -#ifndef _CLICON_BACKEND_HANDLE_H_ -#define _CLICON_BACKEND_HANDLE_H_ +#ifndef _CLIXON_BACKEND_HANDLE_H_ +#define _CLIXON_BACKEND_HANDLE_H_ /* * Types @@ -68,4 +68,4 @@ int subscription_delete(clicon_handle h, char *stream, struct handle_subscription *subscription_each(clicon_handle h, struct handle_subscription *hprev); -#endif /* _CLICON_BACKEND_HANDLE_H_ */ +#endif /* _CLIXON_BACKEND_HANDLE_H_ */ diff --git a/apps/backend/clicon_backend_transaction.c b/apps/backend/clixon_backend_transaction.c similarity index 93% rename from apps/backend/clicon_backend_transaction.c rename to apps/backend/clixon_backend_transaction.c index 28f18af6..c85188b4 100644 --- a/apps/backend/clicon_backend_transaction.c +++ b/apps/backend/clixon_backend_transaction.c @@ -2,20 +2,20 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . */ @@ -23,7 +23,7 @@ * Note that the functions in this file are accessible from the plugins */ #ifdef HAVE_CONFIG_H -#include "clicon_config.h" /* generated by config & autoconf */ +#include "clixon_config.h" /* generated by config & autoconf */ #endif #include @@ -42,9 +42,9 @@ #include /* clicon */ -#include +#include -#include "clicon_backend_transaction.h" +#include "clixon_backend_transaction.h" #include "backend_plugin.h" /* Access functions for transaction-data handle in callbacks diff --git a/apps/backend/clicon_backend_transaction.h b/apps/backend/clixon_backend_transaction.h similarity index 83% rename from apps/backend/clicon_backend_transaction.h rename to apps/backend/clixon_backend_transaction.h index ddfe9bb6..68d810d1 100644 --- a/apps/backend/clicon_backend_transaction.h +++ b/apps/backend/clixon_backend_transaction.h @@ -2,20 +2,20 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . * @@ -24,8 +24,8 @@ * Internal code should include this */ -#ifndef _CLICON_BACKEND_TRANSACTION_H_ -#define _CLICON_BACKEND_TRANSACTION_H_ +#ifndef _CLIXON_BACKEND_TRANSACTION_H_ +#define _CLIXON_BACKEND_TRANSACTION_H_ /* * Types @@ -57,4 +57,4 @@ size_t transaction_clen(transaction_data td); int transaction_print(FILE *f, transaction_data th); -#endif /* _CLICON_BACKEND_TRANSACTION_H_ */ +#endif /* _CLIXON_BACKEND_TRANSACTION_H_ */ diff --git a/apps/cli/Makefile.in b/apps/cli/Makefile.in index 6f6b90ce..a6e5b421 100644 --- a/apps/cli/Makefile.in +++ b/apps/cli/Makefile.in @@ -37,30 +37,30 @@ sysconfdir = @sysconfdir@ includedir = @includedir@ SH_SUFFIX = @SH_SUFFIX@ -CLICON_MAJOR = @CLICON_VERSION_MAJOR@ -CLICON_MINOR = @CLICON_VERSION_MINOR@ +CLIXON_MAJOR = @CLIXON_VERSION_MAJOR@ +CLIXON_MINOR = @CLIXON_VERSION_MINOR@ -# Use this clicon lib for linking -CLICON_LIB = libclicon.so.$(CLICON_MAJOR).$(CLICON_MINOR) +# Use this clixon lib for linking +CLIXON_LIB = libclixon.so.$(CLIXON_MAJOR).$(CLIXON_MINOR) # Location of system plugins -CLICON_CLI_SYSDIR = $(libdir)/clicon/plugins/cli +CLIXON_CLI_SYSDIR = $(libdir)/clixon/plugins/cli # For dependency. A little strange that we rely on it being built in the src dir # even though it may exist in $(libdir). But the new version may not have been installed yet. -LIBDEPS = $(top_srcdir)/lib/src/$(CLICON_LIB) +LIBDEPS = $(top_srcdir)/lib/src/$(CLIXON_LIB) -LIBS = -L$(top_srcdir)/lib/src @LIBS@ -l:$(CLICON_LIB) -lpthread +LIBS = -L$(top_srcdir)/lib/src @LIBS@ -l:$(CLIXON_LIB) -lpthread CPPFLAGS = @CPPFLAGS@ -fPIC INCLUDES = -I. -I$(top_srcdir)/lib -I$(top_srcdir)/include -I$(top_srcdir) @INCLUDES@ -APPL = clicon_cli +APPL = clixon_cli SRC = cli_main.c OBJS = $(SRC:.c=.o) -MYNAME = clicon_cli +MYNAME = clixon_cli MYLIBLINK = lib$(MYNAME)$(SH_SUFFIX) -MYLIB = $(MYLIBLINK).$(CLICON_MAJOR).$(CLICON_MINOR) -MYLIBSO = $(MYLIBLINK).$(CLICON_MAJOR) +MYLIB = $(MYLIBLINK).$(CLIXON_MAJOR).$(CLIXON_MINOR) +MYLIBSO = $(MYLIBLINK).$(CLIXON_MAJOR) LIBSRC = cli_plugin.c cli_common.c cli_handle.c cli_generate.c LIBOBJS = $(LIBSRC:.c=.o) @@ -84,24 +84,24 @@ install: install-lib $(APPL) install-lib: $(MYLIB) install -d $(DESTDIR)$(libdir) install $(MYLIB) $(DESTDIR)$(libdir) - ln -sf $(MYLIB) $(DESTDIR)$(libdir)/$(MYLIBSO) # -l:libclicon_cli.so.2 - ln -sf $(MYLIBSO) $(DESTDIR)$(libdir)/$(MYLIBLINK) # -l:libclicon_cli.so - install -d $(DESTDIR)$(libdir)/clicon/plugins/cli + ln -sf $(MYLIB) $(DESTDIR)$(libdir)/$(MYLIBSO) # -l:libclixon_cli.so.2 + ln -sf $(MYLIBSO) $(DESTDIR)$(libdir)/$(MYLIBLINK) # -l:libclixon_cli.so + install -d $(DESTDIR)$(libdir)/clixon/plugins/cli -install-include: clicon_cli.h clicon_cli_api.h - install -d $(DESTDIR)$(includedir)/clicon - install -m 644 $^ $(DESTDIR)$(includedir)/clicon +install-include: clixon_cli.h clixon_cli_api.h + install -d $(DESTDIR)$(includedir)/clixon + install -m 644 $^ $(DESTDIR)$(includedir)/clixon uninstall: rm -f $(bindir)/$(APPL) rm -f $(libdir)/$(MYLIB) - rm -f $(includedir)/clicon/* + rm -f $(includedir)/clixon/* .SUFFIXES: .SUFFIXES: .c .o .c.o: - $(CC) $(INCLUDES) $(CPPFLAGS) -D__PROGRAM__=\"$(APPL)\" -DCLICON_CLI_SYSDIR=\"$(CLICON_CLI_SYSDIR)\" $(CFLAGS) -c $< + $(CC) $(INCLUDES) $(CPPFLAGS) -D__PROGRAM__=\"$(APPL)\" -DCLIXON_CLI_SYSDIR=\"$(CLIXON_CLI_SYSDIR)\" $(CFLAGS) -c $< # Just link test programs test.c : @@ -116,7 +116,7 @@ $(APPL): $(OBJS) $(MYLIBLINK) $(LIBDEPS) $(MYLIB) : $(LIBOBJS) $(CC) -shared -Wl,-soname,$(MYLIBSO) -o $@ $(LIBOBJS) $(LIBS) -Wl,-soname=$(MYLIBSO) -# link-name is needed for application linking, eg for clicon_cli and clicon_config +# link-name is needed for application linking, eg for clixon_cli and clixon_config $(MYLIBLINK) : $(MYLIB) # ln -sf $(MYLIB) $(MYLIBSO) # ln -sf $(MYLIB) $@ diff --git a/apps/cli/cli_common.c b/apps/cli/cli_common.c index ad12eb71..cdb7a964 100644 --- a/apps/cli/cli_common.c +++ b/apps/cli/cli_common.c @@ -2,27 +2,27 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . * */ #ifdef HAVE_CONFIG_H -#include "clicon_config.h" /* generated by config & autoconf */ +#include "clixon_config.h" /* generated by config & autoconf */ #endif #include @@ -55,9 +55,9 @@ #include /* clicon */ -#include +#include -#include "clicon_cli_api.h" +#include "clixon_cli_api.h" #include "cli_common.h" diff --git a/apps/cli/cli_common.h b/apps/cli/cli_common.h index 2fab5708..ce154371 100644 --- a/apps/cli/cli_common.h +++ b/apps/cli/cli_common.h @@ -2,20 +2,20 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . * diff --git a/apps/cli/cli_generate.c b/apps/cli/cli_generate.c index 4c51e3f0..86f2c607 100644 --- a/apps/cli/cli_generate.c +++ b/apps/cli/cli_generate.c @@ -2,20 +2,20 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . * @@ -27,7 +27,7 @@ * +-------------+ <------------ +-------------+ +-------------+ */ #ifdef HAVE_CONFIG_H -#include "clicon_config.h" /* generated by config & autoconf */ +#include "clixon_config.h" /* generated by config & autoconf */ #endif @@ -44,9 +44,9 @@ #include /* clicon */ -#include +#include -#include "clicon_cli_api.h" +#include "clixon_cli_api.h" #include "cli_plugin.h" #include "cli_generate.h" diff --git a/apps/cli/cli_generate.h b/apps/cli/cli_generate.h index fd4d622e..a73f4016 100644 --- a/apps/cli/cli_generate.h +++ b/apps/cli/cli_generate.h @@ -2,20 +2,20 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . */ diff --git a/apps/cli/cli_handle.c b/apps/cli/cli_handle.c index 7deb36b8..0c90b477 100644 --- a/apps/cli/cli_handle.c +++ b/apps/cli/cli_handle.c @@ -2,27 +2,27 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . * */ #ifdef HAVE_CONFIG_H -#include "clicon_config.h" /* generated by config & autoconf */ +#include "clixon_config.h" /* generated by config & autoconf */ #endif #include @@ -45,9 +45,9 @@ #include /* clicon */ -#include +#include -#include "clicon_cli_api.h" +#include "clixon_cli_api.h" #include "cli_plugin.h" #include "cli_handle.h" diff --git a/apps/cli/cli_handle.h b/apps/cli/cli_handle.h index 93658c5d..5e20744e 100644 --- a/apps/cli/cli_handle.h +++ b/apps/cli/cli_handle.h @@ -2,20 +2,20 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . * diff --git a/apps/cli/cli_main.c b/apps/cli/cli_main.c index 846da8f6..9660d59b 100644 --- a/apps/cli/cli_main.c +++ b/apps/cli/cli_main.c @@ -2,27 +2,27 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . * */ #ifdef HAVE_CONFIG_H -#include "clicon_config.h" /* generated by config & autoconf */ +#include "clixon_config.h" /* generated by config & autoconf */ #endif #include @@ -46,9 +46,9 @@ #include /* clicon */ -#include +#include -#include "clicon_cli_api.h" +#include "clixon_cli_api.h" #include "cli_plugin.h" #include "cli_generate.h" diff --git a/apps/cli/cli_plugin.c b/apps/cli/cli_plugin.c index 06ef1734..57326aab 100644 --- a/apps/cli/cli_plugin.c +++ b/apps/cli/cli_plugin.c @@ -2,27 +2,27 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . * */ #ifdef HAVE_CONFIG_H -#include "clicon_config.h" /* generated by config & autoconf */ +#include "clixon_config.h" /* generated by config & autoconf */ #endif #include @@ -46,10 +46,10 @@ #include /* clicon */ -#include +#include /* clicon_cli */ -#include "clicon_cli_api.h" +#include "clixon_cli_api.h" #include "cli_plugin.h" #include "cli_handle.h" @@ -557,9 +557,9 @@ cli_syntax_load (clicon_handle h) cli_syntax_set(h, stx); - /* First load CLICON system plugins. CLICON_CLI_SYSDIR is defined + /* First load CLICON system plugins. CLIXON_CLI_SYSDIR is defined in Makefile*/ - if (cli_plugin_load_dir(h, CLICON_CLI_SYSDIR, stx) < 0) + if (cli_plugin_load_dir(h, CLIXON_CLI_SYSDIR, stx) < 0) goto quit; /* Then load application plugins */ diff --git a/apps/cli/cli_plugin.h b/apps/cli/cli_plugin.h index 9bb034bd..7e00ccc3 100644 --- a/apps/cli/cli_plugin.h +++ b/apps/cli/cli_plugin.h @@ -2,20 +2,20 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . */ diff --git a/apps/cli/clicon_cli.h b/apps/cli/clixon_cli.h similarity index 82% rename from apps/cli/clicon_cli.h rename to apps/cli/clixon_cli.h index a39b8db6..d887057b 100644 --- a/apps/cli/clicon_cli.h +++ b/apps/cli/clixon_cli.h @@ -2,31 +2,31 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . */ -#ifndef _CLICON_CLI_H_ -#define _CLICON_CLI_H_ +#ifndef _CLIXON_CLI_H_ +#define _CLIXON_CLI_H_ #include /* Common code (API and clicon_cli) */ -#include +#include /*! Clicon Cli plugin callbacks: use these in your cli plugin code */ @@ -56,4 +56,4 @@ char *plugin_parse_hook(clicon_handle h, char *cmd, char *name); /* Called if ^Z entered. Can modify cli command buffer and position */ int plugin_susp_hook(clicon_handle h, char *buf, int prompt_width, int *cursor_loc); -#endif /* _CLICON_CLI_H_ */ +#endif /* _CLIXON_CLI_H_ */ diff --git a/apps/cli/clicon_cli_api.h b/apps/cli/clixon_cli_api.h similarity index 93% rename from apps/cli/clicon_cli_api.h rename to apps/cli/clixon_cli_api.h index 1df3dbb9..a12eced6 100644 --- a/apps/cli/clicon_cli_api.h +++ b/apps/cli/clixon_cli_api.h @@ -2,27 +2,27 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . * Note, this is a CLICON API file, only exprorted function prototypes should appear here */ -#ifndef _CLICON_CLI_API_H_ -#define _CLICON_CLI_API_H_ +#ifndef _CLIXON_CLI_API_H_ +#define _CLIXON_CLI_API_H_ /* * Constants @@ -110,4 +110,4 @@ int cli_notification_register(clicon_handle h, char *stream, enum format_enum fo char *filter, int status, int (*fn)(int, void*), void *arg); -#endif /* _CLICON_CLI_API_H_ */ +#endif /* _CLIXON_CLI_API_H_ */ diff --git a/apps/dbctrl/Makefile.in b/apps/dbctrl/Makefile.in index fb0058a1..420adb92 100644 --- a/apps/dbctrl/Makefile.in +++ b/apps/dbctrl/Makefile.in @@ -32,16 +32,16 @@ localstatedir = @localstatedir@ sysconfdir = @sysconfdir@ SH_SUFFIX = @SH_SUFFIX@ -CLICON_MAJOR = @CLICON_VERSION_MAJOR@ -CLICON_MINOR = @CLICON_VERSION_MINOR@ +CLIXON_MAJOR = @CLIXON_VERSION_MAJOR@ +CLIXON_MINOR = @CLIXON_VERSION_MINOR@ -# Use this clicon lib for linking -CLICON_LIB = libclicon.so.$(CLICON_MAJOR).$(CLICON_MINOR) +# Use this clixon lib for linking +CLIXON_LIB = libclixon.so.$(CLIXON_MAJOR).$(CLIXON_MINOR) # For dependency -LIBDEPS = $(top_srcdir)/lib/src/$(CLICON_LIB) +LIBDEPS = $(top_srcdir)/lib/src/$(CLIXON_LIB) -LIBS = -L$(top_srcdir)/lib/src @LIBS@ -l:$(CLICON_LIB) +LIBS = -L$(top_srcdir)/lib/src @LIBS@ -l:$(CLIXON_LIB) CPPFLAGS = @CPPFLAGS@ @@ -53,7 +53,7 @@ OBJS = $(SRC:.c=.o) APPSRC = dbctrl_main.c APPOBJ = $(APPSRC:.c=.o) -APPL = clicon_dbctrl +APPL = clixon_dbctrl all: $(APPL) diff --git a/apps/dbctrl/dbctrl_main.c b/apps/dbctrl/dbctrl_main.c index 31bc97b1..dc5964f6 100644 --- a/apps/dbctrl/dbctrl_main.c +++ b/apps/dbctrl/dbctrl_main.c @@ -2,26 +2,26 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . */ #ifdef HAVE_CONFIG_H -#include "clicon_config.h" /* generated by config & autoconf */ +#include "clixon_config.h" /* generated by config & autoconf */ #endif #include @@ -47,7 +47,7 @@ #include /* clicon */ -#include +#include /* Command line options to be passed to getopt(3) */ #define DBCTRL_OPTS "hDd:pbn:r:m:Zi" diff --git a/apps/netconf/Makefile.in b/apps/netconf/Makefile.in index 1784e120..69f3c008 100644 --- a/apps/netconf/Makefile.in +++ b/apps/netconf/Makefile.in @@ -36,27 +36,27 @@ sysconfdir = @sysconfdir@ includedir = @includedir@ SH_SUFFIX = @SH_SUFFIX@ -CLICON_MAJOR = @CLICON_VERSION_MAJOR@ -CLICON_MINOR = @CLICON_VERSION_MINOR@ +CLIXON_MAJOR = @CLIXON_VERSION_MAJOR@ +CLIXON_MINOR = @CLIXON_VERSION_MINOR@ -# Use this clicon lib for linking -CLICON_LIB = libclicon.so.$(CLICON_MAJOR).$(CLICON_MINOR) +# Use this clixon lib for linking +CLIXON_LIB = libclixon.so.$(CLIXON_MAJOR).$(CLIXON_MINOR) # For dependency -LIBDEPS = $(top_srcdir)/lib/src/$(CLICON_LIB) +LIBDEPS = $(top_srcdir)/lib/src/$(CLIXON_LIB) -LIBS = -L$(top_srcdir)/lib/src @LIBS@ -l:$(CLICON_LIB) +LIBS = -L$(top_srcdir)/lib/src @LIBS@ -l:$(CLIXON_LIB) CPPFLAGS = @CPPFLAGS@ -fPIC INCLUDES = -I. -I$(top_srcdir)/lib/src -I$(top_srcdir)/lib -I$(top_srcdir)/include -I$(top_srcdir) @INCLUDES@ -APPL = clicon_netconf +APPL = clixon_netconf SRC = netconf_main.c OBJS = $(SRC:.c=.o) -MYNAME = clicon_netconf +MYNAME = clixon_netconf MYLIBLINK = lib$(MYNAME)$(SH_SUFFIX) -MYLIB = $(MYLIBLINK).$(CLICON_MAJOR).$(CLICON_MINOR) -MYLIBSO = $(MYLIBLINK).$(CLICON_MAJOR) +MYLIB = $(MYLIBLINK).$(CLIXON_MAJOR).$(CLIXON_MINOR) +MYLIBSO = $(MYLIBLINK).$(CLIXON_MAJOR) LIBSRC = netconf_hello.c netconf_rpc.c netconf_filter.c netconf_lib.c netconf_plugin.c LIBOBJS = $(LIBSRC:.c=.o) @@ -80,17 +80,17 @@ install: install-lib $(APPL) install-lib: $(MYLIB) install -d $(DESTDIR)$(libdir) install $(MYLIB) $(DESTDIR)$(libdir) - ln -sf $(MYLIB) $(DESTDIR)$(libdir)/$(MYLIBSO) # -l:libclicon_netconf.so.2 - ln -sf $(MYLIBSO) $(DESTDIR)$(libdir)/$(MYLIBLINK) # -l:libclicon_netconf.so + ln -sf $(MYLIB) $(DESTDIR)$(libdir)/$(MYLIBSO) # -l:libclixon_netconf.so.2 + ln -sf $(MYLIBSO) $(DESTDIR)$(libdir)/$(MYLIBLINK) # -l:libclixon_netconf.so -install-include: clicon_netconf.h - install -d $(DESTDIR)$(includedir)/clicon - install -m 644 $^ $(DESTDIR)$(includedir)/clicon +install-include: clixon_netconf.h + install -d $(DESTDIR)$(includedir)/clixon + install -m 644 $^ $(DESTDIR)$(includedir)/clixon uninstall: rm -f $(bindir)/$(APPL) rm -f $(libdir)/$(MYLIB) - rm -f $(includedir)/clicon/* + rm -f $(includedir)/clixon/* .SUFFIXES: .SUFFIXES: .c .o @@ -104,7 +104,7 @@ $(APPL) : $(OBJS) $(MYLIBLINK) $(LIBDEPS) $(MYLIB) : $(LIBOBJS) $(CC) -shared -Wl,-soname,$(MYLIBSO) -o $@ $(LIBOBJS) $(LIBS) -Wl,-soname=$(MYLIBSO) -# link-name is needed for application linking, eg for clicon_cli and clicon_config +# link-name is needed for application linking, eg for clixon_cli and clixon_config $(MYLIBLINK) : $(MYLIB) # ln -sf $(MYLIB) $(MYLIBSO) # ln -sf $(MYLIB) $@ diff --git a/apps/netconf/clicon_netconf.h b/apps/netconf/clixon_netconf.h similarity index 86% rename from apps/netconf/clicon_netconf.h rename to apps/netconf/clixon_netconf.h index 86cdd0b3..326c9452 100644 --- a/apps/netconf/clicon_netconf.h +++ b/apps/netconf/clixon_netconf.h @@ -2,20 +2,20 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . * @@ -23,8 +23,8 @@ * should only include this file (not the netconf_*.h) */ -#ifndef _CLICON_NETCONF_H_ -#define _CLICON_NETCONF_H_ +#ifndef _CLIXON_NETCONF_H_ +#define _CLIXON_NETCONF_H_ /* * Types @@ -70,4 +70,4 @@ int netconf_xpath(cxobj *xsearch, cxobj *xt); -#endif /* _CLICON_NETCONF_H_ */ +#endif /* _CLIXON_NETCONF_H_ */ diff --git a/apps/netconf/netconf_filter.c b/apps/netconf/netconf_filter.c index a6328103..b3761376 100644 --- a/apps/netconf/netconf_filter.c +++ b/apps/netconf/netconf_filter.c @@ -2,27 +2,27 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . * * netconf match & selection: get and edit operations *****************************************************************************/ #ifdef HAVE_CONFIG_H -#include "clicon_config.h" /* generated by config & autoconf */ +#include "clixon_config.h" /* generated by config & autoconf */ #endif #include @@ -46,7 +46,7 @@ #include /* clicon */ -#include +#include #include "netconf_rpc.h" #include "netconf_lib.h" diff --git a/apps/netconf/netconf_filter.h b/apps/netconf/netconf_filter.h index 1a4a52a3..8b4208a2 100644 --- a/apps/netconf/netconf_filter.h +++ b/apps/netconf/netconf_filter.h @@ -2,20 +2,20 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . * diff --git a/apps/netconf/netconf_hello.c b/apps/netconf/netconf_hello.c index 34d8cac0..f6a07054 100644 --- a/apps/netconf/netconf_hello.c +++ b/apps/netconf/netconf_hello.c @@ -2,20 +2,20 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . * @@ -37,7 +37,7 @@ #ifdef HAVE_CONFIG_H -#include "clicon_config.h" /* generated by config & autoconf */ +#include "clixon_config.h" /* generated by config & autoconf */ #endif #include @@ -61,7 +61,7 @@ #include /* clicon */ -#include +#include #include "netconf_lib.h" #include "netconf_hello.h" diff --git a/apps/netconf/netconf_hello.h b/apps/netconf/netconf_hello.h index dabe7803..c78abac8 100644 --- a/apps/netconf/netconf_hello.h +++ b/apps/netconf/netconf_hello.h @@ -2,20 +2,20 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . * diff --git a/apps/netconf/netconf_lib.c b/apps/netconf/netconf_lib.c index 66ed567b..45f7a36d 100644 --- a/apps/netconf/netconf_lib.c +++ b/apps/netconf/netconf_lib.c @@ -2,27 +2,27 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . * * netconf lib *****************************************************************************/ #ifdef HAVE_CONFIG_H -#include "clicon_config.h" /* generated by config & autoconf */ +#include "clixon_config.h" /* generated by config & autoconf */ #endif #include @@ -47,7 +47,7 @@ #include /* clicon */ -#include +#include #include "netconf_rpc.h" #include "netconf_lib.h" diff --git a/apps/netconf/netconf_lib.h b/apps/netconf/netconf_lib.h index 4412e8e3..871f6dc0 100644 --- a/apps/netconf/netconf_lib.h +++ b/apps/netconf/netconf_lib.h @@ -2,20 +2,20 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . * diff --git a/apps/netconf/netconf_main.c b/apps/netconf/netconf_main.c index 1784f17b..6f4fd642 100644 --- a/apps/netconf/netconf_main.c +++ b/apps/netconf/netconf_main.c @@ -2,26 +2,26 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . */ #ifdef HAVE_CONFIG_H -#include "clicon_config.h" /* generated by config & autoconf */ +#include "clixon_config.h" /* generated by config & autoconf */ #endif #include @@ -48,9 +48,9 @@ #include /* clicon */ -#include +#include -#include "clicon_netconf.h" +#include "clixon_netconf.h" #include "netconf_lib.h" #include "netconf_hello.h" #include "netconf_plugin.h" diff --git a/apps/netconf/netconf_plugin.c b/apps/netconf/netconf_plugin.c index 2c151a74..fc127ced 100644 --- a/apps/netconf/netconf_plugin.c +++ b/apps/netconf/netconf_plugin.c @@ -2,20 +2,20 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . * @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include "clicon_config.h" /* generated by config & autoconf */ +#include "clixon_config.h" /* generated by config & autoconf */ #endif #include @@ -46,10 +46,10 @@ #include /* clicon */ -#include +#include /* clicon netconf*/ -#include "clicon_netconf.h" +#include "clixon_netconf.h" #include "netconf_lib.h" #include "netconf_plugin.h" diff --git a/apps/netconf/netconf_plugin.h b/apps/netconf/netconf_plugin.h index 1d35c512..d009e25e 100644 --- a/apps/netconf/netconf_plugin.h +++ b/apps/netconf/netconf_plugin.h @@ -2,20 +2,20 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . * diff --git a/apps/netconf/netconf_rpc.c b/apps/netconf/netconf_rpc.c index 88b42f94..2bb864ce 100644 --- a/apps/netconf/netconf_rpc.c +++ b/apps/netconf/netconf_rpc.c @@ -2,27 +2,27 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . * * Code for handling netconf rpc messages *****************************************************************************/ #ifdef HAVE_CONFIG_H -#include "clicon_config.h" /* generated by config & autoconf */ +#include "clixon_config.h" /* generated by config & autoconf */ #endif #include @@ -47,9 +47,9 @@ #include /* clicon */ -#include +#include -#include "clicon_netconf.h" +#include "clixon_netconf.h" #include "netconf_lib.h" #include "netconf_filter.h" #include "netconf_plugin.h" diff --git a/apps/netconf/netconf_rpc.h b/apps/netconf/netconf_rpc.h index 420d98f1..f0b01ba1 100644 --- a/apps/netconf/netconf_rpc.h +++ b/apps/netconf/netconf_rpc.h @@ -2,20 +2,20 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . * diff --git a/clicon.conf.cpp.cpp b/clixon.conf.cpp.cpp similarity index 84% rename from clicon.conf.cpp.cpp rename to clixon.conf.cpp.cpp index cc6f8d4f..f68ae253 100644 --- a/clicon.conf.cpp.cpp +++ b/clixon.conf.cpp.cpp @@ -19,12 +19,12 @@ # # -# CLICON options - Default values +# CLIXON options - Default values # The origin of this file is run a _first_ time through a pre-processor at -# clicon make install time causing autoconf constants (such as "prefix" and +# clixon make install time causing autoconf constants (such as "prefix" and # "localstatedir") to be replaced with their installed values. # It should be run a _second_ time as a part of installation of the application, -# in case clicon.mk is included in the application include file, and +# in case clixon.mk is included in the application include file, and # "$(APPNAME).conf" rule is accessed. # # See clicon_tutorial for more documentation @@ -70,31 +70,25 @@ CLICON_ARCHIVE_DIR localstatedir/APPNAME/archive # XXX Name of startup configuration file (in XML) CLICON_STARTUP_CONFIG localstatedir/APPNAME/startup-config -# Address family for communicating with clicon_backend (UNIX|IPv4|IPv6) +# Address family for communicating with clixon_backend (UNIX|IPv4|IPv6) CLICON_SOCK_FAMILY UNIX -# If family above is AF_UNIX: Unix socket for communicating with clicon_backend +# If family above is AF_UNIX: Unix socket for communicating with clixon_backend # If family above is AF_INET: IPv4 address CLICON_SOCK localstatedir/APPNAME/APPNAME.sock -# Inet socket port for communicating with clicon_backend (only IPv4|IPv6) +# Inet socket port for communicating with clixon_backend (only IPv4|IPv6) CLICON_SOCK_PORT 4535 # Process-id file CLICON_BACKEND_PIDFILE localstatedir/APPNAME/APPNAME.pidfile -# Group membership to access clicon_config unix socket +# Group membership to access clixon_backend unix socket # CLICON_SOCK_GROUP clicon # Set if all configuration changes are committed directly, commit command unnecessary # CLICON_AUTOCOMMIT 0 -# Clicon backend callback order. There are two dimensions: operation (del/add/change) -# and priority -# 0: all callbacks in (rising) priority order -# 1: first delete operations in declining prio order; then add/change in prio order -# 2: like (1) but CHANGE is replaced by (DEL;ADD) -# XXX OBSOLETE? # CLICON_COMMIT_ORDER 0 # Name of master plugin (both frontend and backend). Master plugin has special diff --git a/clicon.mk.cpp b/clixon.mk.cpp similarity index 78% rename from clicon.mk.cpp rename to clixon.mk.cpp index 1d30956c..11d3cee4 100644 --- a/clicon.mk.cpp +++ b/clixon.mk.cpp @@ -20,28 +20,28 @@ # # Include this file in your application Makefile using eg: -# -include $(datarootdir)/clicon/clicon.mk +# -include $(datarootdir)/clixon/clixon.mk # then you can use the DIRS below in your install rules. # You also get rules for the application configure file. # NOTE: APPNAME must be defined in the local Makefile -clicon_DBSPECDIR=prefix/share/$(APPNAME) -clicon_SYSCONFDIR=sysconfdir -clicon_LOCALSTATEDIR=localstatedir/$(APPNAME) -clicon_LIBDIR=libdir/$(APPNAME) -clicon_DATADIR=datadir/clicon +clixon_DBSPECDIR=prefix/share/$(APPNAME) +clixon_SYSCONFDIR=sysconfdir +clixon_LOCALSTATEDIR=localstatedir/$(APPNAME) +clixon_LIBDIR=libdir/$(APPNAME) +clixon_DATADIR=datadir/clicon # Rules for the clicon application configuration file. # The clicon applications should be started with this fileas its -f argument. # Typically installed in sysconfdir -# Example: APPNAME=myapp --> clicon_cli -f /usr/local/etc/myapp.conf +# Example: APPNAME=myapp --> clixon_cli -f /usr/local/etc/myapp.conf # The two variants are if there is a .conf.local file or not .PHONY: $(APPNAME).conf ifneq (,$(wildcard ${APPNAME}.conf.local)) -${APPNAME}.conf: ${clicon_DATADIR}/clicon.conf.cpp ${APPNAME}.conf.local +${APPNAME}.conf: ${clixon_DATADIR}/clicon.conf.cpp ${APPNAME}.conf.local $(CPP) -P -x assembler-with-cpp -DAPPNAME=$(APPNAME) $< > $@ cat ${APPNAME}.conf.local >> $@ else -${APPNAME}.conf: ${clicon_DATADIR}/clicon.conf.cpp +${APPNAME}.conf: ${clixon_DATADIR}/clicon.conf.cpp $(CPP) -P -x assembler-with-cpp -DAPPNAME=$(APPNAME) $< > $@ endif diff --git a/configure b/configure index 60d8ec60..5ab61f29 100755 --- a/configure +++ b/configure @@ -582,7 +582,7 @@ PACKAGE_STRING= PACKAGE_BUGREPORT= PACKAGE_URL= -ac_unique_file="lib/clicon/clicon.h.in" +ac_unique_file="lib/clixon/clixon.h.in" # Factoring default headers for most tests. ac_includes_default="\ #include @@ -632,7 +632,6 @@ CPP OBJEXT EXEEXT ac_ct_CC -CLICON__LIBDIR RANLIB AR EXE_SUFFIX @@ -657,10 +656,10 @@ build_vendor build_cpu build CLIGEN_VERSION -CLICON_VERSION_MINOR -CLICON_VERSION_MAJOR -CLICON_VERSION_STRING -CLICON_VERSION +CLIXON_VERSION_MINOR +CLIXON_VERSION_MAJOR +CLIXON_VERSION_STRING +CLIXON_VERSION target_alias host_alias build_alias @@ -2128,34 +2127,38 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # Default CFLAGS unless set by environment. : ${CFLAGS="-O2"} -CLICON_VERSION_MAJOR="3" -CLICON_VERSION_MINOR="2" -CLICON_VERSION_PATCH="0" -CLICON_VERSION="\"${CLICON_VERSION_MAJOR}.${CLICON_VERSION_MINOR}.${CLICON_VERSION_PATCH}\"" +CLIXON_VERSION_MAJOR="3" +CLIXON_VERSION_MINOR="2" +CLIXON_VERSION_PATCH="0" +CLIXON_VERSION="\"${CLIXON_VERSION_MAJOR}.${CLIXON_VERSION_MINOR}.${CLIXON_VERSION_PATCH}\"" # Fix to specific version (eg 3.5) or head (3) CLIGEN_VERSION="3" -ac_config_headers="$ac_config_headers include/clicon_config.h lib/clicon/clicon.h" +ac_config_headers="$ac_config_headers include/clixon_config.h lib/clixon/clixon.h" + cat >>confdefs.h <<_ACEOF -#define CLICON_VERSION_STRING $CLICON_VERSION +#define CLIXON_VERSION_STRING $CLIXON_VERSION _ACEOF + cat >>confdefs.h <<_ACEOF -#define CLICON_VERSION_MAJOR $CLICON_VERSION_MAJOR +#define CLIXON_VERSION_MAJOR $CLIXON_VERSION_MAJOR _ACEOF + cat >>confdefs.h <<_ACEOF -#define CLICON_VERSION_MINOR $CLICON_VERSION_MINOR +#define CLIXON_VERSION_MINOR $CLIXON_VERSION_MINOR _ACEOF + cat >>confdefs.h <<_ACEOF -#define CLICON_VERSION_PATCH $CLICON_VERSION_PATCH +#define CLIXON_VERSION_PATCH $CLIXON_VERSION_PATCH _ACEOF -# clicon versions spread to Makefile's (.so files) and variable in build.c +# clixon versions spread to Makefile's (.so files) and variable in build.c @@ -2163,8 +2166,8 @@ _ACEOF # Bind to specific CLIgen version -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: CLICON version is ${CLICON_VERSION}_PRE1" >&5 -$as_echo "CLICON version is ${CLICON_VERSION}_PRE1" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: CLIXON version is ${CLIXON_VERSION}_PRE1" >&5 +$as_echo "CLIXON version is ${CLIXON_VERSION}_PRE1" >&6; } ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -2317,7 +2320,6 @@ test -n "$target_alias" && - # Clicon application director. Eg /hello. # Some stuff installed in /usr/local/. Such as qdbm LIBS="-L /usr/local/lib" @@ -3466,10 +3468,10 @@ rm -f conftest.l $LEX_OUTPUT_ROOT.c fi if test "$LEX" = ":"; then - as_fn_error $? "CLICON does not find lex or flex." "$LINENO" 5 + as_fn_error $? "CLIXON does not find lex or flex." "$LINENO" 5 fi if test "$YACC" != "bison -y"; then - as_fn_error $? "CLICON does not find bison. There are several problems with yacc and byacc. Please install bison." "$LINENO" 5 + as_fn_error $? "CLIXON does not find bison. There are several problems with yacc and byacc. Please install bison." "$LINENO" 5 fi if test "$prefix" = "NONE"; then @@ -4191,7 +4193,7 @@ fi -ac_config_files="$ac_config_files Makefile lib/Makefile lib/src/Makefile lib/clicon/Makefile apps/Makefile apps/cli/Makefile apps/backend/Makefile apps/netconf/Makefile apps/dbctrl/Makefile include/Makefile etc/Makefile etc/cliconrc example/Makefile example/docker/Makefile docker/Makefile docker/cli/Makefile docker/cli/Dockerfile docker/backend/Makefile docker/backend/Dockerfile docker/netconf/Makefile docker/netconf/Dockerfile doc/Makefile" +ac_config_files="$ac_config_files Makefile lib/Makefile lib/src/Makefile lib/clixon/Makefile apps/Makefile apps/cli/Makefile apps/backend/Makefile apps/netconf/Makefile apps/dbctrl/Makefile include/Makefile etc/Makefile etc/clixonrc example/Makefile example/docker/Makefile docker/Makefile docker/cli/Makefile docker/cli/Dockerfile docker/backend/Makefile docker/backend/Dockerfile docker/netconf/Makefile docker/netconf/Dockerfile doc/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -4882,12 +4884,12 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 for ac_config_target in $ac_config_targets do case $ac_config_target in - "include/clicon_config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/clicon_config.h" ;; - "lib/clicon/clicon.h") CONFIG_HEADERS="$CONFIG_HEADERS lib/clicon/clicon.h" ;; + "include/clixon_config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/clixon_config.h" ;; + "lib/clixon/clixon.h") CONFIG_HEADERS="$CONFIG_HEADERS lib/clixon/clixon.h" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;; "lib/src/Makefile") CONFIG_FILES="$CONFIG_FILES lib/src/Makefile" ;; - "lib/clicon/Makefile") CONFIG_FILES="$CONFIG_FILES lib/clicon/Makefile" ;; + "lib/clixon/Makefile") CONFIG_FILES="$CONFIG_FILES lib/clixon/Makefile" ;; "apps/Makefile") CONFIG_FILES="$CONFIG_FILES apps/Makefile" ;; "apps/cli/Makefile") CONFIG_FILES="$CONFIG_FILES apps/cli/Makefile" ;; "apps/backend/Makefile") CONFIG_FILES="$CONFIG_FILES apps/backend/Makefile" ;; @@ -4895,7 +4897,7 @@ do "apps/dbctrl/Makefile") CONFIG_FILES="$CONFIG_FILES apps/dbctrl/Makefile" ;; "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; "etc/Makefile") CONFIG_FILES="$CONFIG_FILES etc/Makefile" ;; - "etc/cliconrc") CONFIG_FILES="$CONFIG_FILES etc/cliconrc" ;; + "etc/clixonrc") CONFIG_FILES="$CONFIG_FILES etc/clixonrc" ;; "example/Makefile") CONFIG_FILES="$CONFIG_FILES example/Makefile" ;; "example/docker/Makefile") CONFIG_FILES="$CONFIG_FILES example/docker/Makefile" ;; "docker/Makefile") CONFIG_FILES="$CONFIG_FILES docker/Makefile" ;; diff --git a/configure.ac b/configure.ac index 4848c8a0..e6061263 100644 --- a/configure.ac +++ b/configure.ac @@ -23,34 +23,34 @@ # in the directory containing this script. # -AC_INIT(lib/clicon/clicon.h.in) +AC_INIT(lib/clixon/clixon.h.in) # Default CFLAGS unless set by environment. : ${CFLAGS="-O2"} -CLICON_VERSION_MAJOR="3" -CLICON_VERSION_MINOR="2" -CLICON_VERSION_PATCH="0" -CLICON_VERSION="\"${CLICON_VERSION_MAJOR}.${CLICON_VERSION_MINOR}.${CLICON_VERSION_PATCH}\"" +CLIXON_VERSION_MAJOR="3" +CLIXON_VERSION_MINOR="2" +CLIXON_VERSION_PATCH="0" +CLIXON_VERSION="\"${CLIXON_VERSION_MAJOR}.${CLIXON_VERSION_MINOR}.${CLIXON_VERSION_PATCH}\"" # Fix to specific version (eg 3.5) or head (3) CLIGEN_VERSION="3" -AC_CONFIG_HEADERS([include/clicon_config.h lib/clicon/clicon.h]) +AC_CONFIG_HEADERS([include/clixon_config.h lib/clixon/clixon.h]) -AC_DEFINE_UNQUOTED(CLICON_VERSION_STRING, $CLICON_VERSION) -AC_DEFINE_UNQUOTED(CLICON_VERSION_MAJOR, $CLICON_VERSION_MAJOR) -AC_DEFINE_UNQUOTED(CLICON_VERSION_MINOR, $CLICON_VERSION_MINOR) -AC_DEFINE_UNQUOTED(CLICON_VERSION_PATCH, $CLICON_VERSION_PATCH) +AC_DEFINE_UNQUOTED(CLIXON_VERSION_STRING, $CLIXON_VERSION, [Clixon version string]) +AC_DEFINE_UNQUOTED(CLIXON_VERSION_MAJOR, $CLIXON_VERSION_MAJOR, [Clixon major release]) +AC_DEFINE_UNQUOTED(CLIXON_VERSION_MINOR, $CLIXON_VERSION_MINOR, [Clixon minor release]) +AC_DEFINE_UNQUOTED(CLIXON_VERSION_PATCH, $CLIXON_VERSION_PATCH, [Clixon path version]) -# clicon versions spread to Makefile's (.so files) and variable in build.c -AC_SUBST(CLICON_VERSION) -AC_SUBST(CLICON_VERSION_STRING) -AC_SUBST(CLICON_VERSION_MAJOR) -AC_SUBST(CLICON_VERSION_MINOR) +# clixon versions spread to Makefile's (.so files) and variable in build.c +AC_SUBST(CLIXON_VERSION) +AC_SUBST(CLIXON_VERSION_STRING) +AC_SUBST(CLIXON_VERSION_MAJOR) +AC_SUBST(CLIXON_VERSION_MINOR) AC_SUBST(CLIGEN_VERSION) # Bind to specific CLIgen version -AC_MSG_RESULT(CLICON version is ${CLICON_VERSION}_PRE1) +AC_MSG_RESULT(CLIXON version is ${CLIXON_VERSION}_PRE1) AC_CANONICAL_TARGET AC_SUBST(CC) @@ -65,7 +65,6 @@ AC_SUBST(SH_SUFFIX) AC_SUBST(EXE_SUFFIX) AC_SUBST(AR) AC_SUBST(RANLIB) -AC_SUBST(CLICON__LIBDIR) # Clicon application director. Eg /hello. # Some stuff installed in /usr/local/. Such as qdbm LIBS="-L /usr/local/lib" @@ -86,10 +85,10 @@ AC_MSG_RESULT(CFLAGS is $CFLAGS) AC_PROG_YACC AC_PROG_LEX if test "$LEX" = ":"; then - AC_MSG_ERROR(CLICON does not find lex or flex.) + AC_MSG_ERROR(CLIXON does not find lex or flex.) fi if test "$YACC" != "bison -y"; then - AC_MSG_ERROR(CLICON does not find bison. There are several problems with yacc and byacc. Please install bison.) + AC_MSG_ERROR(CLIXON does not find bison. There are several problems with yacc and byacc. Please install bison.) fi if test "$prefix" = "NONE"; then @@ -153,12 +152,12 @@ if test "$ac_enable_keycontent" = "yes"; then AC_DEFINE(DB_KEYCONTENT) fi -AH_BOTTOM([#include ]) +AH_BOTTOM([#include ]) AC_OUTPUT(Makefile lib/Makefile lib/src/Makefile - lib/clicon/Makefile + lib/clixon/Makefile apps/Makefile apps/cli/Makefile apps/backend/Makefile @@ -166,7 +165,7 @@ AC_OUTPUT(Makefile apps/dbctrl/Makefile include/Makefile etc/Makefile - etc/cliconrc + etc/clixonrc example/Makefile example/docker/Makefile docker/Makefile diff --git a/docker/backend/Dockerfile.in b/docker/backend/Dockerfile.in index 6dbd28c1..06307a15 100644 --- a/docker/backend/Dockerfile.in +++ b/docker/backend/Dockerfile.in @@ -1,15 +1,35 @@ +# +# Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren +# +# This file is part of CLIXON. +# +# CLIXON 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 3 of the License, or +# (at your option) any later version. +# +# CLIXON 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 CLIXON; see the file LICENSE. If not, see +# . +# + FROM ubuntu:14.04 # 12.04 MAINTAINER Olof Hagsand ENV DEBIAN_FRONTEND noninteractive RUN apt-get update && apt-get install -y libqdbm-dev COPY libcligen.so.@CLIGEN_VERSION@ /usr/lib/ -COPY libclicon.so.@CLICON_VERSION_MAJOR@ /usr/lib/ -COPY libclicon_backend.so.@CLICON_VERSION_MAJOR@ /usr/lib/ -COPY clicon_backend /usr/sbin/ +COPY libclixon.so.@CLIXON_VERSION_MAJOR@ /usr/lib/ +COPY libclixon_backend.so.@CLIXON_VERSION_MAJOR@ /usr/lib/ +COPY clixon_backend /usr/sbin/ RUN ldconfig -RUN sudo groupadd clicon -CMD ["/usr/sbin/clicon_backend", "-D", "1", "-F", "-f", "/data/clicon.conf"] +RUN sudo groupadd clixon +CMD ["/usr/sbin/clixon_backend", "-D", "1", "-F", "-f", "/data/clixon.conf"] diff --git a/docker/backend/Makefile.in b/docker/backend/Makefile.in index ef7f2496..a2121118 100644 --- a/docker/backend/Makefile.in +++ b/docker/backend/Makefile.in @@ -29,22 +29,22 @@ libdir = @libdir@ includedir = @includedir@ datarootdir = @datarootdir@ # You may consider changing this -image = olofhagsand/clicon_backend +image = olofhagsand/clixon_backend all: @echo "Run make docker to build docker image" clean: distclean: clean - rm -f Makefile *~ .depend libcligen* libclicon* clicon_backend Dockerfile + rm -f Makefile *~ .depend libcligen* libclixon* clixon_backend Dockerfile # Kind of reverse install, could have copied from src dir,... .PHONY: docker push docker: cp $(DESTDIR)$(libdir)/libcligen.so.@CLIGEN_VERSION@ . - cp $(DESTDIR)$(libdir)/libclicon.so.@CLICON_VERSION_MAJOR@ . - cp $(DESTDIR)$(libdir)/libclicon_backend.so.@CLICON_VERSION_MAJOR@ . - cp $(DESTDIR)$(sbindir)/clicon_backend . + cp $(DESTDIR)$(libdir)/libclixon.so.@CLIXON_VERSION_MAJOR@ . + cp $(DESTDIR)$(libdir)/libclixon_backend.so.@CLIXON_VERSION_MAJOR@ . + cp $(DESTDIR)$(sbindir)/clixon_backend . sudo docker build -t $(image) . push: diff --git a/docker/backend/README b/docker/backend/README index f2763a0c..d452c07a 100644 --- a/docker/backend/README +++ b/docker/backend/README @@ -1,4 +1,4 @@ -Ensure that cligen and clicon has been built and installed. +Ensure that cligen and clixon has been built and installed. sudo make docker make push diff --git a/docker/cli/Dockerfile.in b/docker/cli/Dockerfile.in index 92f6aa32..ea7606b1 100644 --- a/docker/cli/Dockerfile.in +++ b/docker/cli/Dockerfile.in @@ -1,14 +1,34 @@ +# +# Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren +# +# This file is part of CLIXON. +# +# CLIXON 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 3 of the License, or +# (at your option) any later version. +# +# CLIXON 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 CLIXON; see the file LICENSE. If not, see +# . +# + FROM ubuntu:14.04 # 12.04 MAINTAINER Olof Hagsand ENV DEBIAN_FRONTEND noninteractive RUN apt-get update && apt-get install -y libqdbm-dev COPY libcligen.so.@CLIGEN_VERSION@ /usr/lib/ -COPY libclicon.so.@CLICON_VERSION_MAJOR@ /usr/lib/ -COPY libclicon_cli.so.@CLIGEN_VERSION@ /usr/lib/ -COPY clicon_cli /usr/bin/ +COPY libclixon.so.@CLIXON_VERSION_MAJOR@ /usr/lib/ +COPY libclixon_cli.so.@CLIXON_VERSION_MAJOR@ /usr/lib/ +COPY clixon_cli /usr/bin/ RUN ldconfig -CMD ["/usr/bin/clicon_cli", "-f", "/data/clicon.conf"] +CMD ["/usr/bin/clixon_cli", "-f", "/data/clixon.conf"] diff --git a/docker/cli/Makefile.in b/docker/cli/Makefile.in index af9b1b18..db205d7c 100644 --- a/docker/cli/Makefile.in +++ b/docker/cli/Makefile.in @@ -29,22 +29,22 @@ libdir = @libdir@ includedir = @includedir@ datarootdir = @datarootdir@ # You may consider changing this -image = olofhagsand/clicon_cli +image = olofhagsand/clixon_cli all: @echo "Run make docker to build docker image" clean: distclean: clean - rm -f Makefile *~ .depend libcligen* libclicon* clicon_cli Dockerfile + rm -f Makefile *~ .depend libcligen* libclixon* clixon_cli Dockerfile # Kind of reverse install, could have copied from src dir,... .PHONY: docker push docker: cp $(DESTDIR)$(libdir)/libcligen.so.@CLIGEN_VERSION@ . - cp $(DESTDIR)$(libdir)/libclicon.so.@CLICON_VERSION_MAJOR@ . - cp $(DESTDIR)$(libdir)/libclicon_cli.so.@CLICON_VERSION_MAJOR@ . - cp $(DESTDIR)$(bindir)/clicon_cli . + cp $(DESTDIR)$(libdir)/libclixon.so.@CLIXON_VERSION_MAJOR@ . + cp $(DESTDIR)$(libdir)/libclixon_cli.so.@CLIXON_VERSION_MAJOR@ . + cp $(DESTDIR)$(bindir)/clixon_cli . sudo docker build -t $(image) . push: diff --git a/docker/cli/README b/docker/cli/README index f2763a0c..d452c07a 100644 --- a/docker/cli/README +++ b/docker/cli/README @@ -1,4 +1,4 @@ -Ensure that cligen and clicon has been built and installed. +Ensure that cligen and clixon has been built and installed. sudo make docker make push diff --git a/docker/netconf/Dockerfile.in b/docker/netconf/Dockerfile.in index 4b0306ef..a245f841 100644 --- a/docker/netconf/Dockerfile.in +++ b/docker/netconf/Dockerfile.in @@ -1,14 +1,34 @@ +# +# Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren +# +# This file is part of CLIXON. +# +# CLIXON 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 3 of the License, or +# (at your option) any later version. +# +# CLIXON 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 CLIXON; see the file LICENSE. If not, see +# . +# + FROM ubuntu:14.04 # 12.04 MAINTAINER Olof Hagsand ENV DEBIAN_FRONTEND noninteractive RUN apt-get update && apt-get install -y libqdbm-dev COPY libcligen.so.@CLIGEN_VERSION@ /usr/lib/ -COPY libclicon.so.@CLICON_VERSION_MAJOR@ /usr/lib/ -COPY libclicon_netconf.so.@CLIGEN_VERSION@ /usr/lib/ -COPY clicon_netconf /usr/bin/ +COPY libclixon.so.@CLIXON_VERSION_MAJOR@ /usr/lib/ +COPY libclixon_netconf.so.@CLIXON_VERSION_MAJOR@ /usr/lib/ +COPY clixon_netconf /usr/bin/ RUN ldconfig -CMD ["/usr/bin/clicon_netconf", "-f", "/data/clicon.conf"] +CMD ["/usr/bin/clixon_netconf", "-f", "/data/clixon.conf"] diff --git a/docker/netconf/Makefile.in b/docker/netconf/Makefile.in index 6df1a267..30e241f7 100644 --- a/docker/netconf/Makefile.in +++ b/docker/netconf/Makefile.in @@ -29,22 +29,22 @@ libdir = @libdir@ includedir = @includedir@ datarootdir = @datarootdir@ # You may consider changing this -image = olofhagsand/clicon_netconf +image = olofhagsand/clixon_netconf all: @echo "Run make docker to build docker image" clean: distclean: clean - rm -f Makefile *~ .depend libcligen* libclicon* clicon_netconf Dockerfile + rm -f Makefile *~ .depend libcligen* libclixon* clixon_netconf Dockerfile # Kind of reverse install, could have copied from src dir,... .PHONY: docker push docker: cp $(DESTDIR)$(libdir)/libcligen.so.@CLIGEN_VERSION@ . - cp $(DESTDIR)$(libdir)/libclicon.so.@CLICON_VERSION_MAJOR@ . - cp $(DESTDIR)$(libdir)/libclicon_netconf.so.@CLICON_VERSION_MAJOR@ . - cp $(DESTDIR)$(bindir)/clicon_netconf . + cp $(DESTDIR)$(libdir)/libclixon.so.@CLIXON_VERSION_MAJOR@ . + cp $(DESTDIR)$(libdir)/libclixon_netconf.so.@CLIXON_VERSION_MAJOR@ . + cp $(DESTDIR)$(bindir)/clixon_netconf . sudo docker build -t $(image) . push: diff --git a/docker/netconf/README b/docker/netconf/README index f2763a0c..d452c07a 100644 --- a/docker/netconf/README +++ b/docker/netconf/README @@ -1,4 +1,4 @@ -Ensure that cligen and clicon has been built and installed. +Ensure that cligen and clixon has been built and installed. sudo make docker make push diff --git a/etc/Makefile.in b/etc/Makefile.in index 63ae8c35..f1bd3dce 100644 --- a/etc/Makefile.in +++ b/etc/Makefile.in @@ -32,11 +32,11 @@ all: clean: distclean: clean - rm -f Makefile *~ .depend cliconrc + rm -f Makefile *~ .depend clixonrc -install: cliconrc +install: clixonrc install -m 755 -d $(DESTDIR)$(sysconfdir) - install -m 755 cliconrc $(DESTDIR)$(sysconfdir) + install -m 755 clixonrc $(DESTDIR)$(sysconfdir) install-include: diff --git a/etc/cliconrc.in b/etc/clixonrc.in similarity index 100% rename from etc/cliconrc.in rename to etc/clixonrc.in diff --git a/example/Makefile.in b/example/Makefile.in index ac256940..cb7f3ca4 100644 --- a/example/Makefile.in +++ b/example/Makefile.in @@ -39,9 +39,9 @@ PLUGINS = $(BE_PLUGIN) $(CLI_PLUGIN) $(NETCONF_PLUGIN) all: $(PLUGINS) $(APPNAME).conf -# Note: clicon.mk has a rule for: +# Note: clixon.mk has a rule for: # $(APPNAME.conf) --include $(DESTDIR)$(datarootdir)/clicon/clicon.mk +-include $(DESTDIR)$(datarootdir)/clixon/clixon.mk CLISPECS = routing_cli.cli @@ -82,25 +82,25 @@ distclean: clean rm -f Makefile *~ .depend install: $(YANGSPECS) $(CLISPECS) $(BE_PLUGIN) $(CLI_PLUGIN) $(NETCONF_PLUGIN) $(APPNAME).conf - install -d $(DESTDIR)$(clicon_SYSCONFDIR) - install $(APPNAME).conf $(DESTDIR)$(clicon_SYSCONFDIR) - install -d $(DESTDIR)$(clicon_DBSPECDIR)/yang - install $(YANGSPECS) $(DESTDIR)$(clicon_DBSPECDIR)/yang - install -d $(DESTDIR)$(clicon_LIBDIR)/cli - install $(CLI_PLUGIN) $(DESTDIR)$(clicon_LIBDIR)/cli; - install -d $(DESTDIR)$(clicon_LIBDIR)/backend - install $(BE_PLUGIN) $(DESTDIR)$(clicon_LIBDIR)/backend; - install -d $(DESTDIR)$(clicon_LIBDIR)/netconf - install $(NETCONF_PLUGIN) $(DESTDIR)$(clicon_LIBDIR)/netconf; - install -d $(DESTDIR)$(clicon_LIBDIR)/clispec - install $(CLISPECS) $(DESTDIR)$(clicon_LIBDIR)/clispec; - install -d $(DESTDIR)$(clicon_LOCALSTATEDIR) + install -d $(DESTDIR)$(clixon_SYSCONFDIR) + install $(APPNAME).conf $(DESTDIR)$(clixon_SYSCONFDIR) + install -d $(DESTDIR)$(clixon_DBSPECDIR)/yang + install $(YANGSPECS) $(DESTDIR)$(clixon_DBSPECDIR)/yang + install -d $(DESTDIR)$(clixon_LIBDIR)/cli + install $(CLI_PLUGIN) $(DESTDIR)$(clixon_LIBDIR)/cli; + install -d $(DESTDIR)$(clixon_LIBDIR)/backend + install $(BE_PLUGIN) $(DESTDIR)$(clixon_LIBDIR)/backend; + install -d $(DESTDIR)$(clixon_LIBDIR)/netconf + install $(NETCONF_PLUGIN) $(DESTDIR)$(clixon_LIBDIR)/netconf; + install -d $(DESTDIR)$(clixon_LIBDIR)/clispec + install $(CLISPECS) $(DESTDIR)$(clixon_LIBDIR)/clispec; + install -d $(DESTDIR)$(clixon_LOCALSTATEDIR) uninstall: - rm -rf $(DESTDIR)$(clicon_SYSCONFDIR)/$(APPNAME).conf - rm -rf $(DESTDIR)$(clicon_DBSPECDIR) - rm -rf $(DESTDIR)$(clicon_LOCALSTATEDIR) - rm -rf $(DESTDIR)$(clicon_LIBDIR) + rm -rf $(DESTDIR)$(clixon_SYSCONFDIR)/$(APPNAME).conf + rm -rf $(DESTDIR)$(clixon_DBSPECDIR) + rm -rf $(DESTDIR)$(clixon_LOCALSTATEDIR) + rm -rf $(DESTDIR)$(clixon_LIBDIR) install-include: diff --git a/example/docker/Makefile.in b/example/docker/Makefile.in index dfddc255..493e68d4 100644 --- a/example/docker/Makefile.in +++ b/example/docker/Makefile.in @@ -48,6 +48,7 @@ docker: $(APPNAME).conf install ../*.cli data/clispec clean: + rm -f $(APPNAME).conf distclean: clean rm -f Makefile *~ .depend diff --git a/example/docker/routing.conf.local b/example/docker/routing.conf.local index da86e7f3..a5f96dd2 100644 --- a/example/docker/routing.conf.local +++ b/example/docker/routing.conf.local @@ -1,7 +1,7 @@ # Main YANG module first parsed by parser (in CLICON_YANG_DIR). eg clicon.yang. # Location of configuration-file for default values (this file) -CLICON_CONFIGFILE /data/clicon.conf +CLICON_CONFIGFILE /data/clixon.conf # Location of YANG module and submodule files. Only if CLICON_DBSPEC_TYPE is YANG CLICON_YANG_DIR /data/yang # Option used to construct initial yang file: @@ -29,17 +29,16 @@ CLICON_CLISPEC_DIR /data/clispec CLICON_ARCHIVE_DIR /data # XXX Name of startup configuration file (in XML) CLICON_STARTUP_CONFIG /data/startup-config -# Address family for communicating with clicon_backend (UNIX|IPv4|IPv6) +# Address family for communicating with clixon_backend (UNIX|IPv4|IPv6) CLICON_SOCK_FAMILY UNIX -# If family above is AF_UNIX: Unix socket for communicating with clicon_backend +# If family above is AF_UNIX: Unix socket for communicating with clixon_backend # If family above is AF_INET: IPv4 address CLICON_SOCK /data/routing.sock -# Inet socket port for communicating with clicon_backend (only IPv4|IPv6) +# Inet socket port for communicating with clixon_backend (only IPv4|IPv6) CLICON_SOCK_PORT 4535 # Process-id file CLICON_BACKEND_PIDFILE /data/routing.pidfile - # Save values as XML in database instead of lvec:s. # This is optimized for yang specified applications # But not compatible with key-based application (eg Rost) diff --git a/example/routing_backend.c b/example/routing_backend.c index 73126415..0b74e07e 100644 --- a/example/routing_backend.c +++ b/example/routing_backend.c @@ -35,10 +35,10 @@ #include /* Clicon library functions. */ -#include +#include /* These include signatures for plugin and transaction callbacks. */ -#include +#include /*! This is called on validate (and commit). Check validity of candidate */ diff --git a/example/routing_cli.c b/example/routing_cli.c index c91811b7..adecda19 100644 --- a/example/routing_cli.c +++ b/example/routing_cli.c @@ -2,20 +2,20 @@ * Copyright (C) 2009-2013 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . * @@ -38,8 +38,8 @@ /* clicon */ #include -#include -#include +#include +#include /* * Plugin initialization diff --git a/example/routing_netconf.c b/example/routing_netconf.c index 024c8241..e5534301 100644 --- a/example/routing_netconf.c +++ b/example/routing_netconf.c @@ -30,8 +30,8 @@ #include #include -#include -#include +#include +#include /* diff --git a/include/Makefile.in b/include/Makefile.in index a2975cb1..64fc1550 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -34,7 +34,7 @@ all: clean: distclean: clean - rm -f clicon_config.h Makefile *~ .depend + rm -f clixon_config.h Makefile *~ .depend install: diff --git a/include/clicon_config.h.in b/include/clixon_config.h.in similarity index 91% rename from include/clicon_config.h.in rename to include/clixon_config.h.in index 5435233a..0947033a 100644 --- a/include/clicon_config.h.in +++ b/include/clixon_config.h.in @@ -1,4 +1,16 @@ -/* include/clicon_config.h.in. Generated from configure.ac by autoheader. */ +/* include/clixon_config.h.in. Generated from configure.ac by autoheader. */ + +/* Clixon major release */ +#undef CLIXON_VERSION_MAJOR + +/* Clixon minor release */ +#undef CLIXON_VERSION_MINOR + +/* Clixon path version */ +#undef CLIXON_VERSION_PATCH + +/* Clixon version string */ +#undef CLIXON_VERSION_STRING /* Check if extra keys inserted for database lists containing content. Eg A.n.foo = 3 means A.3 $!a=foo exists */ @@ -119,4 +131,4 @@ `char[]'. */ #undef YYTEXT_POINTER -#include +#include diff --git a/include/clicon_custom.h b/include/clixon_custom.h similarity index 75% rename from include/clicon_custom.h rename to include/clixon_custom.h index 8733eba7..404378c1 100644 --- a/include/clicon_custom.h +++ b/include/clixon_custom.h @@ -2,23 +2,23 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . - Custom file as boilerplate appended by clicon_config.h + Custom file as boilerplate appended by clixon_config.h */ #ifndef HAVE_STRNDUP diff --git a/lib/Makefile.in b/lib/Makefile.in index 958f9bf8..bfd2859e 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -28,7 +28,7 @@ LIBS = @LIBS@ SHELL = /bin/sh -SUBDIRS = src clicon +SUBDIRS = src clixon .PHONY: all clean depend $(SUBDIRS) install @@ -48,7 +48,7 @@ install: install-include: for i in $(SUBDIRS); \ do (cd $$i; $(MAKE) $(MFLAGS) $@); done; \ - (cd clicon; $(MAKE) $(MFLAGS) $@) + (cd clixon; $(MAKE) $(MFLAGS) $@) uninstall: for i in $(SUBDIRS); \ @@ -65,7 +65,7 @@ distclean: clean rm -f Makefile *~ .depend for i in $(SUBDIRS); \ do (cd $$i; $(MAKE) $(MFLAGS) distclean); done; \ - (cd clicon; $(MAKE) $(MFLAGS) $@) + (cd clixon; $(MAKE) $(MFLAGS) $@) tags: find $(srcdir) -name '*.[chyl]' -print | etags - diff --git a/lib/clicon/clicon.h.in b/lib/clicon/clicon.h.in deleted file mode 100644 index 201aa1a9..00000000 --- a/lib/clicon/clicon.h.in +++ /dev/null @@ -1,79 +0,0 @@ -/* - * - Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - - This file is part of CLICON. - - CLICON 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 3 of the License, or - (at your option) any later version. - - CLICON 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 CLICON; see the file LICENSE. If not, see - . - - - * Meta-include file that includes all sub-files in control-lib - * Note: this include files is for external purposes. Do not include this - * file in clicon lib-routines. - */ - -/* This include file requires the following include file dependencies */ -#include -#include -#include -#include -#include -#include - -/* - * CLICON version macros - */ - -#undef CLICON_VERSION_STRING -#undef CLICON_VERSION_MAJOR -#undef CLICON_VERSION_MINOR -#undef CLICON_VERSION_PATCH - -/* - * Use this constant to disable some prototypes that should not be visible outside the lib. - * This is an alternative to use separate internal include files. - */ -#define LIBCLICON_API 1 - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/* - * Global variables generated by Makefile - */ -extern const char CLICON_BUILDSTR[]; -extern const char CLICON_VERSION[]; diff --git a/lib/clicon/Makefile.in b/lib/clixon/Makefile.in similarity index 85% rename from lib/clicon/Makefile.in rename to lib/clixon/Makefile.in index e7fe3d35..2411cc10 100644 --- a/lib/clicon/Makefile.in +++ b/lib/clixon/Makefile.in @@ -31,14 +31,14 @@ depend: install: install-include: - install -m 755 -d $(DESTDIR)$(includedir)/clicon - install -m 644 *.h $(DESTDIR)$(includedir)/clicon + install -m 755 -d $(DESTDIR)$(includedir)/clixon + install -m 644 *.h $(DESTDIR)$(includedir)/clixon uninstall: - rm -f $(includedir)/clicon + rm -f $(includedir)/clixon clean: distclean: - rm -f Makefile clicon.h + rm -f Makefile clixon.h diff --git a/lib/clixon/clixon.h.in b/lib/clixon/clixon.h.in new file mode 100644 index 00000000..00d7aca7 --- /dev/null +++ b/lib/clixon/clixon.h.in @@ -0,0 +1,79 @@ +/* + * + Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren + + This file is part of CLIXON. + + CLIXON 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 3 of the License, or + (at your option) any later version. + + CLIXON 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 CLIXON; see the file LICENSE. If not, see + . + + + * Meta-include file that includes all sub-files in control-lib + * Note: this include files is for external purposes. Do not include this + * file in clicon lib-routines. + */ + +/* This include file requires the following include file dependencies */ +#include +#include +#include +#include +#include +#include + +/* + * CLIXON version macros + */ + +#undef CLIXON_VERSION_STRING +#undef CLIXON_VERSION_MAJOR +#undef CLIXON_VERSION_MINOR +#undef CLIXON_VERSION_PATCH + +/* + * Use this constant to disable some prototypes that should not be visible outside the lib. + * This is an alternative to use separate internal include files. + */ +#define LIBCLIXON_API 1 + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/* + * Global variables generated by Makefile + */ +extern const char CLIXON_BUILDSTR[]; +extern const char CLIXON_VERSION[]; diff --git a/lib/clicon/clicon_chunk.h b/lib/clixon/clixon_chunk.h similarity index 93% rename from lib/clicon/clicon_chunk.h rename to lib/clixon/clixon_chunk.h index dc86001b..b466aa96 100644 --- a/lib/clicon/clicon_chunk.h +++ b/lib/clixon/clixon_chunk.h @@ -2,28 +2,28 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . * * Copyright (C) 2002 Benny Holmgren, All rights reserved */ -#ifndef _CLICON_CHUNK_H_ -#define _CLICON_CHUNK_H_ +#ifndef _CLIXON_CHUNK_H_ +#define _CLIXON_CHUNK_H_ /* @@ -163,4 +163,4 @@ void chunk_check (FILE *, const char *); size_t chunksize (void *); -#endif /* _CLICON_CHUNK_H_ */ +#endif /* _CLIXON_CHUNK_H_ */ diff --git a/lib/clicon/clicon_err.h b/lib/clixon/clixon_err.h similarity index 87% rename from lib/clicon/clicon_err.h rename to lib/clixon/clixon_err.h index d1bc8207..42ef9f78 100644 --- a/lib/clicon/clicon_err.h +++ b/lib/clixon/clixon_err.h @@ -2,20 +2,20 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . * @@ -25,8 +25,8 @@ * clicon_errno, clicon_suberrno, clicon_err_reason. */ -#ifndef _CLICON_ERR_H_ -#define _CLICON_ERR_H_ +#ifndef _CLIXON_ERR_H_ +#define _CLIXON_ERR_H_ /* * Constants @@ -77,4 +77,4 @@ char *clicon_strerror(int err); void *clicon_err_save(void); int clicon_err_restore(void *handle); -#endif /* _CLICON_ERR_H_ */ +#endif /* _CLIXON_ERR_H_ */ diff --git a/lib/clicon/clicon_event.h b/lib/clixon/clixon_event.h similarity index 76% rename from lib/clicon/clicon_event.h rename to lib/clixon/clixon_event.h index 27ff10ca..62c33872 100644 --- a/lib/clicon/clicon_event.h +++ b/lib/clixon/clixon_event.h @@ -2,28 +2,28 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . * * Event handling and loop */ -#ifndef _CLICON_EVENT_H_ -#define _CLICON_EVENT_H_ +#ifndef _CLIXON_EVENT_H_ +#define _CLIXON_EVENT_H_ /* * Prototypes @@ -43,4 +43,4 @@ int event_unreg_timeout(int (*fn)(int, void*), void *arg); int event_loop(void); -#endif /* _CLICON_EVENT_H_ */ +#endif /* _CLIXON_EVENT_H_ */ diff --git a/lib/clicon/clicon_file.h b/lib/clixon/clixon_file.h similarity index 73% rename from lib/clicon/clicon_file.h rename to lib/clixon/clixon_file.h index 20f10917..4e9d134c 100644 --- a/lib/clicon/clicon_file.h +++ b/lib/clixon/clixon_file.h @@ -2,26 +2,26 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . */ -#ifndef _CLICON_FILE_H_ -#define _CLICON_FILE_H_ +#ifndef _CLIXON_FILE_H_ +#define _CLIXON_FILE_H_ char **clicon_realpath(const char *cwd, char *path, const char *label); @@ -33,4 +33,4 @@ char *clicon_tmpfile(const char *label); int file_cp(char *src, char *target); -#endif /* _CLICON_FILE_H_ */ +#endif /* _CLIXON_FILE_H_ */ diff --git a/lib/clicon/clicon_handle.h b/lib/clixon/clixon_handle.h similarity index 83% rename from lib/clicon/clicon_handle.h rename to lib/clixon/clixon_handle.h index 4410bc3c..8e2e5d2e 100644 --- a/lib/clicon/clicon_handle.h +++ b/lib/clixon/clixon_handle.h @@ -2,27 +2,27 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . */ -#ifndef _CLICON_HANDLE_H_ -#define _CLICON_HANDLE_H_ +#ifndef _CLIXON_HANDLE_H_ +#define _CLIXON_HANDLE_H_ /* * Types @@ -58,4 +58,4 @@ clicon_hash_t *clicon_options(clicon_handle h); /* Return internal clicon data (hash-array) given a handle.*/ clicon_hash_t *clicon_data(clicon_handle h); -#endif /* _CLICON_HANDLE_H_ */ +#endif /* _CLIXON_HANDLE_H_ */ diff --git a/lib/clicon/clicon_hash.h b/lib/clixon/clixon_hash.h similarity index 86% rename from lib/clicon/clicon_hash.h rename to lib/clixon/clixon_hash.h index a80c7003..2be7d77b 100644 --- a/lib/clicon/clicon_hash.h +++ b/lib/clixon/clixon_hash.h @@ -2,26 +2,26 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . */ -#ifndef _CLICON_HASH_H_ -#define _CLICON_HASH_H_ +#ifndef _CLIXON_HASH_H_ +#define _CLIXON_HASH_H_ struct clicon_hash { qelem_t h_qelem; @@ -67,4 +67,4 @@ char **hash_keys(clicon_hash_t *hash, size_t *nkeys); #define hash_each_end(__hash__) if (__k__) free(__k__); } } -#endif /* _CLICON_HASH_H_ */ +#endif /* _CLIXON_HASH_H_ */ diff --git a/lib/clicon/clicon_log.h b/lib/clixon/clixon_log.h similarity index 81% rename from lib/clicon/clicon_log.h rename to lib/clixon/clixon_log.h index a290342a..24ae811d 100644 --- a/lib/clicon/clicon_log.h +++ b/lib/clixon/clixon_log.h @@ -2,28 +2,28 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . * * Regular logging and debugging. Syslog using levels. */ -#ifndef _CLICON_LOG_H_ -#define _CLICON_LOG_H_ +#ifndef _CLIXON_LOG_H_ +#define _CLIXON_LOG_H_ /* * Constants @@ -54,4 +54,4 @@ int clicon_debug_init(int dbglevel, FILE *f); int clicon_debug(int dbglevel, char *format, ...); char *mon2name(int md); -#endif /* _CLICON_LOG_H_ */ +#endif /* _CLIXON_LOG_H_ */ diff --git a/lib/clicon/clicon_options.h b/lib/clixon/clixon_options.h similarity index 90% rename from lib/clicon/clicon_options.h rename to lib/clixon/clixon_options.h index 876145f3..d25730c1 100644 --- a/lib/clicon/clicon_options.h +++ b/lib/clixon/clixon_options.h @@ -2,28 +2,28 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . * * Configuration file and Options. */ -#ifndef _CLICON_OPTIONS_H_ -#define _CLICON_OPTIONS_H_ +#ifndef _CLIXON_OPTIONS_H_ +#define _CLIXON_OPTIONS_H_ /* * Constants @@ -103,12 +103,10 @@ enum genmodel_type clicon_cli_genmodel_type(clicon_handle h); int clicon_autocommit(clicon_handle h); int clicon_autocommit_set(clicon_handle h, int val); -int clicon_commit_order(clicon_handle h); - yang_spec * clicon_dbspec_yang(clicon_handle h); int clicon_dbspec_yang_set(clicon_handle h, struct yang_spec *ys); char *clicon_dbspec_name(clicon_handle h); int clicon_dbspec_name_set(clicon_handle h, char *name); -#endif /* _CLICON_OPTIONS_H_ */ +#endif /* _CLIXON_OPTIONS_H_ */ diff --git a/lib/clicon/clicon_plugin.h b/lib/clixon/clixon_plugin.h similarity index 85% rename from lib/clicon/clicon_plugin.h rename to lib/clixon/clixon_plugin.h index 2957188e..9c13f0d8 100644 --- a/lib/clicon/clicon_plugin.h +++ b/lib/clixon/clixon_plugin.h @@ -2,28 +2,28 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . */ /* * Internal prototypes, not accessed by plugin client code */ -#ifndef _CLICON_PLUGIN_H_ -#define _CLICON_PLUGIN_H_ +#ifndef _CLIXON_PLUGIN_H_ +#define _CLIXON_PLUGIN_H_ /* * Types @@ -64,4 +64,4 @@ typedef int (plgexit_t)(clicon_handle); /* Plugin exit */ /* Find a function in global namespace or a plugin. XXX clicon internal */ void *clicon_find_func(clicon_handle h, char *plugin, char *func); -#endif /* _CLICON_PLUGIN_H_ */ +#endif /* _CLIXON_PLUGIN_H_ */ diff --git a/lib/clicon/clicon_proc.h b/lib/clixon/clixon_proc.h similarity index 70% rename from lib/clicon/clicon_proc.h rename to lib/clixon/clixon_proc.h index 9aa7ced7..f19601de 100644 --- a/lib/clicon/clicon_proc.h +++ b/lib/clixon/clixon_proc.h @@ -2,26 +2,26 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . */ -#ifndef _CLICON_PROC_H_ -#define _CLICON_PROC_H_ +#ifndef _CLIXON_PROC_H_ +#define _CLIXON_PROC_H_ /* * Prototypes @@ -30,4 +30,4 @@ int clicon_proc_run (char *, void (outcb)(char *), int doerr); int clicon_proc_daemon (char *); int group_name2gid(char *name, gid_t *gid); -#endif /* _CLICON_PROC_H_ */ +#endif /* _CLIXON_PROC_H_ */ diff --git a/lib/clicon/clicon_proto.h b/lib/clixon/clixon_proto.h similarity index 95% rename from lib/clicon/clicon_proto.h rename to lib/clixon/clixon_proto.h index 256dc996..fa11aa2c 100644 --- a/lib/clicon/clicon_proto.h +++ b/lib/clixon/clixon_proto.h @@ -2,28 +2,28 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . * * Protocol to communicate with CLICON config daemon */ -#ifndef _CLICON_PROTO_H_ -#define _CLICON_PROTO_H_ +#ifndef _CLIXON_PROTO_H_ +#define _CLIXON_PROTO_H_ /* * Types @@ -180,4 +180,4 @@ int send_msg_err(int s, int err, int suberr, char *format, ...); -#endif /* _CLICON_PROTO_H_ */ +#endif /* _CLIXON_PROTO_H_ */ diff --git a/lib/clicon/clicon_proto_client.h b/lib/clixon/clixon_proto_client.h similarity index 86% rename from lib/clicon/clicon_proto_client.h rename to lib/clixon/clixon_proto_client.h index 45c66b5b..a1406b92 100644 --- a/lib/clicon/clicon_proto_client.h +++ b/lib/clixon/clixon_proto_client.h @@ -2,20 +2,20 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . * @@ -24,8 +24,8 @@ * it should (is?) be general enough to be used by other applications. */ -#ifndef _CLICON_PROTO_CLIENT_H_ -#define _CLICON_PROTO_CLIENT_H_ +#ifndef _CLIXON_PROTO_CLIENT_H_ +#define _CLIXON_PROTO_CLIENT_H_ int clicon_rpc_commit(clicon_handle h, char *running_db, char *db, int snapshot, int startup); @@ -54,4 +54,4 @@ int clicon_rpc_subscription(clicon_handle h, int status, char *stream, enum format_enum format, char *filter, int *s); -#endif /* _CLICON_PROTO_CLIENT_H_ */ +#endif /* _CLIXON_PROTO_CLIENT_H_ */ diff --git a/lib/clicon/clicon_proto_encode.h b/lib/clixon/clixon_proto_encode.h similarity index 94% rename from lib/clicon/clicon_proto_encode.h rename to lib/clixon/clixon_proto_encode.h index 9dca05d2..eb92355c 100644 --- a/lib/clicon/clicon_proto_encode.h +++ b/lib/clixon/clixon_proto_encode.h @@ -2,20 +2,20 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . * @@ -23,8 +23,8 @@ * and server (clicon_backend) */ -#ifndef _CLICON_PROTO_ENCODE_H_ -#define _CLICON_PROTO_ENCODE_H_ +#ifndef _CLIXON_PROTO_ENCODE_H_ +#define _CLIXON_PROTO_ENCODE_H_ /* * Prototypes @@ -186,4 +186,4 @@ struct clicon_msg *clicon_msg_err_encode(uint32_t err, uint32_t suberr, int clicon_msg_err_decode(struct clicon_msg *msg, uint32_t *err, uint32_t *suberr, char **reason, const char *label); -#endif /* _CLICON_PROTO_ENCODE_H_ */ +#endif /* _CLIXON_PROTO_ENCODE_H_ */ diff --git a/lib/clicon/clicon_qdb.h b/lib/clixon/clixon_qdb.h similarity index 81% rename from lib/clicon/clicon_qdb.h rename to lib/clixon/clixon_qdb.h index d42dec31..135e8ca9 100644 --- a/lib/clicon/clicon_qdb.h +++ b/lib/clixon/clixon_qdb.h @@ -2,26 +2,26 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . */ -#ifndef _CLICON_QDB_H_ -#define _CLICON_QDB_H_ +#ifndef _CLIXON_QDB_H_ +#define _CLIXON_QDB_H_ /* @@ -55,4 +55,4 @@ int db_regexp(char *file, char *regexp, const char *label, char *db_sanitize(char *rx, const char *label); -#endif /* _CLICON_QDB_H_ */ +#endif /* _CLIXON_QDB_H_ */ diff --git a/lib/clicon/clicon_queue.h b/lib/clixon/clixon_queue.h similarity index 87% rename from lib/clicon/clicon_queue.h rename to lib/clixon/clixon_queue.h index 182aa523..7c802455 100644 --- a/lib/clicon/clicon_queue.h +++ b/lib/clixon/clixon_queue.h @@ -2,28 +2,28 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . * * Copyright (C) 2002 Benny Holmgren, All rights reserved */ -#ifndef _CLICON_QUEUE_H_ -#define _CLICON_QUEUE_H_ +#ifndef _CLIXON_QUEUE_H_ +#define _CLIXON_QUEUE_H_ /* * Circular queue structure for use as first entry in a parent structure. @@ -86,4 +86,4 @@ typedef struct _qelem_t { #define NEXTQ(type, elem) ((type)((elem)?((qelem_t *)(elem))->q_next:NULL)) -#endif /* _CLICON_QUEUE_H_ */ +#endif /* _CLIXON_QUEUE_H_ */ diff --git a/lib/clicon/clicon_sha1.h b/lib/clixon/clixon_sha1.h similarity index 67% rename from lib/clicon/clicon_sha1.h rename to lib/clixon/clixon_sha1.h index 9626b62a..281825fe 100644 --- a/lib/clicon/clicon_sha1.h +++ b/lib/clixon/clixon_sha1.h @@ -2,29 +2,29 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . */ -#ifndef _CLICON_SHA1_H_ -#define _CLICON_SHA1_H_ +#ifndef _CLIXON_SHA1_H_ +#define _CLIXON_SHA1_H_ /* * Function Prototypes */ char *clicon_sha1hex(const char *str); -#endif /* _CLICON_SHA1_H_ */ +#endif /* _CLIXON_SHA1_H_ */ diff --git a/lib/clicon/clicon_sig.h b/lib/clixon/clixon_sig.h similarity index 74% rename from lib/clicon/clicon_sig.h rename to lib/clixon/clixon_sig.h index c317d8bc..c16148a6 100644 --- a/lib/clicon/clicon_sig.h +++ b/lib/clixon/clixon_sig.h @@ -2,26 +2,26 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . */ -#ifndef _CLICON_SIG_H_ -#define _CLICON_SIG_H_ +#ifndef _CLIXON_SIG_H_ +#define _CLIXON_SIG_H_ /* * Types @@ -39,4 +39,4 @@ int pidfile_get(char *pidfile, pid_t *pid0); int pidfile_write(char *pidfile); int pidfile_zapold(pid_t pid); -#endif /* _CLICON_SIG_H_ */ +#endif /* _CLIXON_SIG_H_ */ diff --git a/lib/clicon/clicon_string.h b/lib/clixon/clixon_string.h similarity index 83% rename from lib/clicon/clicon_string.h rename to lib/clixon/clixon_string.h index 33163188..ce6e5088 100644 --- a/lib/clicon/clicon_string.h +++ b/lib/clixon/clixon_string.h @@ -2,26 +2,26 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . */ -#ifndef _CLICON_STRING_H_ -#define _CLICON_STRING_H_ +#ifndef _CLIXON_STRING_H_ +#define _CLIXON_STRING_H_ /*! A malloc version that aligns on 4 bytes. To avoid warning from valgrind */ #define align4(s) (((s)/4)*4 + 4) @@ -53,4 +53,4 @@ int clicon_strmatch(const char *str, const char *regexp, char **match); char *clicon_strsub(char *str, char *from, char *to); -#endif /* _CLICON_STRING_H_ */ +#endif /* _CLIXON_STRING_H_ */ diff --git a/lib/clicon/clicon_xml.h b/lib/clixon/clixon_xml.h similarity index 92% rename from lib/clicon/clicon_xml.h rename to lib/clixon/clixon_xml.h index 3120c3c9..ab8493d2 100644 --- a/lib/clicon/clicon_xml.h +++ b/lib/clixon/clixon_xml.h @@ -2,26 +2,26 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . * XML support functions. */ -#ifndef _CLICON_XML_H -#define _CLICON_XML_H +#ifndef _CLIXON_XML_H +#define _CLIXON_XML_H /* * Types @@ -108,4 +108,4 @@ int cxvec_append(cxobj *x, cxobj ***vec, size_t *len); int xml_apply(cxobj *xn, enum cxobj_type type, xml_applyfn_t fn, void *arg); int xml_apply_ancestor(cxobj *xn, xml_applyfn_t fn, void *arg); -#endif /* _CLICON_XML_H */ +#endif /* _CLIXON_XML_H */ diff --git a/lib/clicon/clicon_xml_db.h b/lib/clixon/clixon_xml_db.h similarity index 80% rename from lib/clicon/clicon_xml_db.h rename to lib/clixon/clixon_xml_db.h index c0a02246..9fadcec2 100644 --- a/lib/clicon/clicon_xml_db.h +++ b/lib/clixon/clixon_xml_db.h @@ -2,26 +2,26 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . * XML support functions. */ -#ifndef _CLICON_XML_DB_H -#define _CLICON_XML_DB_H +#ifndef _CLIXON_XML_DB_H +#define _CLIXON_XML_DB_H /* * Prototypes @@ -39,4 +39,4 @@ int xmldb_put( char *dbname, cxobj *xt, int xmldb_put_xkey(char *dbname, char *xkey, char *val, yang_spec *yspec, enum operation_type op); -#endif /* _CLICON_XML_DB_H */ +#endif /* _CLIXON_XML_DB_H */ diff --git a/lib/clicon/clicon_xml_map.h b/lib/clixon/clixon_xml_map.h similarity index 82% rename from lib/clicon/clicon_xml_map.h rename to lib/clixon/clixon_xml_map.h index 10da0d36..6af247ad 100644 --- a/lib/clicon/clicon_xml_map.h +++ b/lib/clixon/clixon_xml_map.h @@ -2,28 +2,28 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . * * XML code */ -#ifndef _CLICON_XML_MAP_H_ -#define _CLICON_XML_MAP_H_ +#ifndef _CLIXON_XML_MAP_H_ +#define _CLIXON_XML_MAP_H_ /* * lvmap_xml op codes @@ -50,4 +50,4 @@ int xml_diff(yang_spec *yspec, cxobj *xt1, cxobj *xt2, cxobj ***second, size_t *secondlen, cxobj ***changed1, cxobj ***changed2, size_t *changedlen); -#endif /* _CLICON_XML_MAP_H_ */ +#endif /* _CLIXON_XML_MAP_H_ */ diff --git a/lib/clicon/clicon_xsl.h b/lib/clixon/clixon_xsl.h similarity index 74% rename from lib/clicon/clicon_xsl.h rename to lib/clixon/clixon_xsl.h index f4e053e0..c71150d8 100644 --- a/lib/clicon/clicon_xsl.h +++ b/lib/clixon/clixon_xsl.h @@ -2,26 +2,26 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . * XML XPATH and XSLT functions. */ -#ifndef _CLICON_XSL_H -#define _CLICON_XSL_H +#ifndef _CLIXON_XSL_H +#define _CLIXON_XSL_H /* * Prototypes @@ -31,4 +31,4 @@ cxobj *xpath_each(cxobj *xn_top, char *xpath, cxobj *prev); cxobj **xpath_vec(cxobj *xn_top, char *xpath, size_t *xv_len); cxobj **xpath_vec_flag(cxobj *cxtop, char *xpath, uint16_t flags, size_t *veclen); -#endif /* _CLICON_XSL_H */ +#endif /* _CLIXON_XSL_H */ diff --git a/lib/clicon/clicon_yang.h b/lib/clixon/clixon_yang.h similarity index 95% rename from lib/clicon/clicon_yang.h rename to lib/clixon/clixon_yang.h index 44850627..dbede926 100644 --- a/lib/clicon/clicon_yang.h +++ b/lib/clixon/clixon_yang.h @@ -2,26 +2,26 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . */ -#ifndef _CLICON_YANG_H_ -#define _CLICON_YANG_H_ +#ifndef _CLIXON_YANG_H_ +#define _CLIXON_YANG_H_ /* @@ -203,4 +203,4 @@ int yang_spec_main(clicon_handle h, FILE *f, int printspec); cvec *yang_arg2cvec(yang_stmt *ys, char *delimi); int yang_key_match(yang_node *yn, char *name); -#endif /* _CLICON_YANG_H_ */ +#endif /* _CLIXON_YANG_H_ */ diff --git a/lib/clicon/clicon_yang_type.h b/lib/clixon/clixon_yang_type.h similarity index 87% rename from lib/clicon/clicon_yang_type.h rename to lib/clixon/clixon_yang_type.h index c05b2bf8..1752be35 100644 --- a/lib/clicon/clicon_yang_type.h +++ b/lib/clixon/clixon_yang_type.h @@ -2,26 +2,26 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . */ -#ifndef _CLICON_YANG_TYPE_H_ -#define _CLICON_YANG_TYPE_H_ +#ifndef _CLIXON_YANG_TYPE_H_ +#define _CLIXON_YANG_TYPE_H_ /* * Constants @@ -65,4 +65,4 @@ int yang_type_resolve(yang_stmt *ys, yang_stmt *ytype, char **pattern, uint8_t *fraction); -#endif /* _CLICON_YANG_TYPE_H_ */ +#endif /* _CLIXON_YANG_TYPE_H_ */ diff --git a/lib/src/Makefile.in b/lib/src/Makefile.in index fabe8c88..95d527ef 100644 --- a/lib/src/Makefile.in +++ b/lib/src/Makefile.in @@ -31,9 +31,9 @@ localstatedir = @localstatedir@ sysconfdir = @sysconfdir@ SH_SUFFIX = @SH_SUFFIX@ -CLICON_VERSION = @CLICON_VERSION@ -CLICON_MAJOR = @CLICON_VERSION_MAJOR@ -CLICON_MINOR = @CLICON_VERSION_MINOR@ +CLIXON_VERSION = @CLIXON_VERSION@ +CLIXON_MAJOR = @CLIXON_VERSION_MAJOR@ +CLIXON_MINOR = @CLIXON_VERSION_MINOR@ VPATH = @srcdir@ CC = @CC@ @@ -46,19 +46,19 @@ LEX = @LEX@ CPPFLAGS = @CPPFLAGS@ -INCLUDES = -I. @INCLUDES@ -I$(top_srcdir)/lib/clicon -I$(top_srcdir)/include -I$(top_srcdir) +INCLUDES = -I. @INCLUDES@ -I$(top_srcdir)/lib/clixon -I$(top_srcdir)/include -I$(top_srcdir) -SRC = clicon_sig.c clicon_qdb.c clicon_log.c clicon_err.c clicon_event.c \ - clicon_chunk.c clicon_proc.c \ - clicon_string.c clicon_handle.c \ - clicon_xml.c clicon_xml_map.c clicon_file.c \ - clicon_yang.c clicon_yang_type.c \ - clicon_hash.c clicon_options.c clicon_plugin.c \ - clicon_proto.c clicon_proto_encode.c clicon_proto_client.c \ - clicon_xsl.c clicon_sha1.c clicon_xml_db.c +SRC = clixon_sig.c clixon_qdb.c clixon_log.c clixon_err.c clixon_event.c \ + clixon_chunk.c clixon_proc.c \ + clixon_string.c clixon_handle.c \ + clixon_xml.c clixon_xml_map.c clixon_file.c \ + clixon_yang.c clixon_yang_type.c \ + clixon_hash.c clixon_options.c clixon_plugin.c \ + clixon_proto.c clixon_proto_encode.c clixon_proto_client.c \ + clixon_xsl.c clixon_sha1.c clixon_xml_db.c -YACCOBJS := lex.clicon_xml_parse.o clicon_xml_parse.tab.o \ - lex.clicon_yang_parse.o clicon_yang_parse.tab.o +YACCOBJS := lex.clixon_xml_parse.o clixon_xml_parse.tab.o \ + lex.clixon_yang_parse.o clixon_yang_parse.tab.o # Logically, the below 4 should be in YACCOBJS? @@ -68,24 +68,24 @@ GENSRC = build.c OBJS = $(YACCOBJS) $(SRC:.c=.o) GENOBJS = $(GENSRC:.c=.o) -# Linker-name: libclicon.so -# so-name: libclicon.so.2 -# real-name: libclicon.so.2.0 -MYLIB = libclicon$(SH_SUFFIX).$(CLICON_MAJOR).$(CLICON_MINOR) -MYLIBSO = libclicon$(SH_SUFFIX).$(CLICON_MAJOR) -MYLIBLINK = libclicon$(SH_SUFFIX) +# Linker-name: libclixon.so +# so-name: libclixon.so.2 +# real-name: libclixon.so.2.0 +MYLIB = libclixon$(SH_SUFFIX).$(CLIXON_MAJOR).$(CLIXON_MINOR) +MYLIBSO = libclixon$(SH_SUFFIX).$(CLIXON_MAJOR) +MYLIBLINK = libclixon$(SH_SUFFIX) all: $(MYLIB) $(MYLIBLINK) clean: rm -f $(OBJS) $(MYLIB) $(MYLIBLINK) $(GENOBJS) $(GENSRC) *.core - rm -f clicon_xml_parse.tab.[ch] clicon_xml_parse.yy.[co] - rm -f clicon_yang_parse.tab.[ch] clicon_yang_parse.[co] - rm -f lex.clicon_yang_parse.c - rm -f lex.clicon_xml_parse.c -# disabled when USE_DBSPEC_PT is disabled in clicon_config.h.in -# rm -f clicon_dbspec.tab.[ch] clicon_dbspec.[co] -# rm -f lex.clicon_dbspec.c + rm -f clixon_xml_parse.tab.[ch] clixon_xml_parse.yy.[co] + rm -f clixon_yang_parse.tab.[ch] clixon_yang_parse.[co] + rm -f lex.clixon_yang_parse.c + rm -f lex.clixon_xml_parse.c +# disabled when USE_DBSPEC_PT is disabled in clixon_config.h.in +# rm -f clixon_dbspec.tab.[ch] clixon_dbspec.[co] +# rm -f lex.clixon_dbspec.c ############################################################################# # Implicit rules for lex and yacc. @@ -100,27 +100,27 @@ clean: %.c : %.l # cancel implicit lex rule # xml parser -lex.clicon_xml_parse.c : clicon_xml_parse.l clicon_xml_parse.tab.h - $(LEX) -Pclicon_xml_parse clicon_xml_parse.l # -d is debug +lex.clixon_xml_parse.c : clixon_xml_parse.l clixon_xml_parse.tab.h + $(LEX) -Pclixon_xml_parse clixon_xml_parse.l # -d is debug -clicon_xml_parse.tab.c clicon_xml_parse.tab.h: clicon_xml_parse.y - $(YACC) -l -d -p clicon_xml_parse clicon_xml_parse.y # -t is debug - mv y.tab.c clicon_xml_parse.tab.c - mv y.tab.h clicon_xml_parse.tab.h +clixon_xml_parse.tab.c clixon_xml_parse.tab.h: clixon_xml_parse.y + $(YACC) -l -d -p clixon_xml_parse clixon_xml_parse.y # -t is debug + mv y.tab.c clixon_xml_parse.tab.c + mv y.tab.h clixon_xml_parse.tab.h -lex.clicon_xml_parse.o : lex.clicon_xml_parse.c clicon_xml_parse.tab.h # special rule to for make clean to work +lex.clixon_xml_parse.o : lex.clixon_xml_parse.c clixon_xml_parse.tab.h # special rule to for make clean to work $(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -Wno-error -c $< -# clicon_yang parser -lex.clicon_yang_parse.c : clicon_yang_parse.l clicon_yang_parse.tab.h - $(LEX) -Pclicon_yang_parse clicon_yang_parse.l # -d is debug +# clixon_yang parser +lex.clixon_yang_parse.c : clixon_yang_parse.l clixon_yang_parse.tab.h + $(LEX) -Pclixon_yang_parse clixon_yang_parse.l # -d is debug -clicon_yang_parse.tab.c clicon_yang_parse.tab.h: clicon_yang_parse.y - $(YACC) -l -d -p clicon_yang_parse clicon_yang_parse.y # -t is debug - mv y.tab.c clicon_yang_parse.tab.c - mv y.tab.h clicon_yang_parse.tab.h +clixon_yang_parse.tab.c clixon_yang_parse.tab.h: clixon_yang_parse.y + $(YACC) -l -d -p clixon_yang_parse clixon_yang_parse.y # -t is debug + mv y.tab.c clixon_yang_parse.tab.c + mv y.tab.h clixon_yang_parse.tab.h -lex.clicon_yang_parse.o : lex.clicon_yang_parse.c clicon_yang_parse.tab.h +lex.clixon_yang_parse.o : lex.clixon_yang_parse.c clixon_yang_parse.tab.h $(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -Wno-error -c $< distclean: clean @@ -134,13 +134,13 @@ distclean: clean .PHONY: build.c build.c: - date +"const char CLICON_BUILDSTR[64]=\"%Y.%m.%d %H:%M by `whoami` on `hostname`"\"\; > build.c; - echo "const char CLICON_VERSION[64]=\"$(CLICON_VERSION)\""\; >> build.c; + date +"const char CLIXON_BUILDSTR[64]=\"%Y.%m.%d %H:%M by `whoami` on `hostname`"\"\; > build.c; + echo "const char CLIXON_VERSION[64]=\"$(CLIXON_VERSION)\""\; >> build.c; $(MYLIB) : $(GENOBJS) $(OBJS) $(CC) -shared -Wl,-soname,$(MYLIBSO) -o $@ $(GENOBJS) $(OBJS) $(LIBS) -Wl,-soname=$(MYLIBSO) -# link-name is needed for application linking, eg for clicon_cli and clicon_config +# link-name is needed for application linking, eg for clixon_cli and clixon_config $(MYLIBLINK) : $(MYLIB) # ln -sf $(MYLIB) $@ @@ -154,8 +154,8 @@ install-include: install-lib: $(MYLIB) install -m 755 -d $(DESTDIR)$(libdir) install -m 755 $(MYLIB) $(DESTDIR)$(libdir) - ln -sf $(MYLIB) $(DESTDIR)$(libdir)/$(MYLIBSO) # -l:libclicon.so.2 - ln -sf $(MYLIBSO) $(DESTDIR)$(libdir)/$(MYLIBLINK) # -l:libclicon.so + ln -sf $(MYLIB) $(DESTDIR)$(libdir)/$(MYLIBSO) # -l:libclixon.so.3 + ln -sf $(MYLIBSO) $(DESTDIR)$(libdir)/$(MYLIBLINK) # -l:libclixon.so uninstall: rm -f $(libdir)/$(MYLIB) diff --git a/lib/src/clicon_xml_parse.h b/lib/src/clicon_xml_parse.h deleted file mode 100644 index 7e70f0d7..00000000 --- a/lib/src/clicon_xml_parse.h +++ /dev/null @@ -1,50 +0,0 @@ -/* - * - Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - - This file is part of CLICON. - - CLICON 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 3 of the License, or - (at your option) any later version. - - CLICON 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 CLICON; see the file LICENSE. If not, see - . - - * XML parser - */ -#ifndef _CLICON_XML_PARSE_H_ -#define _CLICON_XML_PARSE_H_ - -/* - * Types - */ -struct xml_parse_yacc_arg{ - char *ya_parse_string; /* original (copy of) parse string */ - int ya_linenum; /* Number of \n in parsed buffer */ - void *ya_lexbuf; /* internal parse buffer from lex */ - - cxobj *ya_xelement; /* xml active element */ - cxobj *ya_xparent; /* xml parent element*/ -}; - -extern char *clicon_xml_parsetext; - -/* - * Prototypes - */ -int clicon_xml_parsel_init(struct xml_parse_yacc_arg *ya); -int clicon_xml_parsel_exit(struct xml_parse_yacc_arg *ya); - -int clicon_xml_parsel_linenr(void); -int clicon_xml_parselex(void *); -int clicon_xml_parseparse(void *); - -#endif /* _CLICON_XML_PARSE_H_ */ diff --git a/lib/src/clicon_chunk.c b/lib/src/clixon_chunk.c similarity index 98% rename from lib/src/clicon_chunk.c rename to lib/src/clixon_chunk.c index b6a2921d..19ff658a 100644 --- a/lib/src/clicon_chunk.c +++ b/lib/src/clixon_chunk.c @@ -2,20 +2,20 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . * @@ -34,8 +34,8 @@ #include /* clicon */ -#include "clicon_queue.h" -#include "clicon_chunk.h" +#include "clixon_queue.h" +#include "clixon_chunk.h" /* * The chunk head array for the predefined chunk sizes. diff --git a/lib/src/clicon_err.c b/lib/src/clixon_err.c similarity index 93% rename from lib/src/clicon_err.c rename to lib/src/clixon_err.c index f611b096..8e1a21b1 100644 --- a/lib/src/clicon_err.c +++ b/lib/src/clixon_err.c @@ -2,20 +2,20 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . * @@ -26,7 +26,7 @@ */ #ifdef HAVE_CONFIG_H -#include "clicon_config.h" /* generated by config & autoconf */ +#include "clixon_config.h" /* generated by config & autoconf */ #endif #include @@ -42,10 +42,10 @@ #include #include -#include "clicon_log.h" -#include "clicon_queue.h" -#include "clicon_chunk.h" -#include "clicon_err.h" +#include "clixon_log.h" +#include "clixon_queue.h" +#include "clixon_chunk.h" +#include "clixon_err.h" /* * Types diff --git a/lib/src/clicon_event.c b/lib/src/clixon_event.c similarity index 95% rename from lib/src/clicon_event.c rename to lib/src/clixon_event.c index 6fc482d3..76a48076 100644 --- a/lib/src/clicon_event.c +++ b/lib/src/clixon_event.c @@ -2,20 +2,20 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . * @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include "clicon_config.h" /* generated by config & autoconf */ +#include "clixon_config.h" /* generated by config & autoconf */ #endif #include @@ -37,10 +37,10 @@ #include #include -#include "clicon_queue.h" -#include "clicon_log.h" -#include "clicon_err.h" -#include "clicon_event.h" +#include "clixon_queue.h" +#include "clixon_log.h" +#include "clixon_err.h" +#include "clixon_event.h" /* * Constants diff --git a/lib/src/clicon_file.c b/lib/src/clixon_file.c similarity index 95% rename from lib/src/clicon_file.c rename to lib/src/clixon_file.c index cb2c1b07..64ecd256 100644 --- a/lib/src/clicon_file.c +++ b/lib/src/clixon_file.c @@ -2,26 +2,26 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . * */ #ifdef HAVE_CONFIG_H -#include "clicon_config.h" +#include "clixon_config.h" #endif #include @@ -43,11 +43,11 @@ #include /* clicon */ -#include "clicon_err.h" -#include "clicon_queue.h" -#include "clicon_chunk.h" -#include "clicon_string.h" -#include "clicon_file.h" +#include "clixon_err.h" +#include "clixon_queue.h" +#include "clixon_chunk.h" +#include "clixon_string.h" +#include "clixon_file.h" /* * Resolve the real path of a given 'path', following symbolic links and '../'. diff --git a/lib/src/clicon_handle.c b/lib/src/clixon_handle.c similarity index 89% rename from lib/src/clicon_handle.c rename to lib/src/clixon_handle.c index 94afea33..f1945d88 100644 --- a/lib/src/clicon_handle.c +++ b/lib/src/clixon_handle.c @@ -2,26 +2,26 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . * */ #ifdef HAVE_CONFIG_H -#include "clicon_config.h" +#include "clixon_config.h" #endif #include @@ -34,12 +34,12 @@ #include /* clicon */ -#include "clicon_queue.h" -#include "clicon_hash.h" -#include "clicon_handle.h" -#include "clicon_err.h" -#include "clicon_yang.h" -#include "clicon_options.h" +#include "clixon_queue.h" +#include "clixon_hash.h" +#include "clixon_handle.h" +#include "clixon_err.h" +#include "clixon_yang.h" +#include "clixon_options.h" #define CLICON_MAGIC 0x99aafabe diff --git a/lib/src/clicon_hash.c b/lib/src/clixon_hash.c similarity index 94% rename from lib/src/clicon_hash.c rename to lib/src/clixon_hash.c index b0920f80..93c83bef 100644 --- a/lib/src/clicon_hash.c +++ b/lib/src/clixon_hash.c @@ -2,20 +2,20 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . */ @@ -66,7 +66,7 @@ */ #ifdef HAVE_CONFIG_H -#include "clicon_config.h" /* generated by config & autoconf */ +#include "clixon_config.h" /* generated by config & autoconf */ #endif #include @@ -76,9 +76,9 @@ #include /* clicon */ -#include "clicon_queue.h" -#include "clicon_err.h" -#include "clicon_hash.h" +#include "clixon_queue.h" +#include "clixon_err.h" +#include "clixon_hash.h" #define HASH_SIZE 1031 /* Number of hash buckets. Should be a prime */ diff --git a/lib/src/clicon_log.c b/lib/src/clixon_log.c similarity index 96% rename from lib/src/clicon_log.c rename to lib/src/clixon_log.c index f24019da..8f107a12 100644 --- a/lib/src/clicon_log.c +++ b/lib/src/clixon_log.c @@ -2,20 +2,20 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . * @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include "clicon_config.h" /* generated by config & autoconf */ +#include "clixon_config.h" /* generated by config & autoconf */ #endif #include @@ -40,8 +40,8 @@ #include /* clicon */ -#include "clicon_err.h" -#include "clicon_log.h" +#include "clixon_err.h" +#include "clixon_log.h" /* The global debug level. 0 means no debug */ int debug = 0; diff --git a/lib/src/clicon_options.c b/lib/src/clixon_options.c similarity index 93% rename from lib/src/clicon_options.c rename to lib/src/clixon_options.c index 6085368f..9ec65124 100644 --- a/lib/src/clicon_options.c +++ b/lib/src/clixon_options.c @@ -2,20 +2,20 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . * @@ -24,7 +24,7 @@ * options */ #ifdef HAVE_CONFIG_H -#include "clicon_config.h" /* generated by config & autoconf */ +#include "clixon_config.h" /* generated by config & autoconf */ #endif #include @@ -44,14 +44,14 @@ #include /* clicon */ -#include "clicon_err.h" -#include "clicon_queue.h" -#include "clicon_hash.h" -#include "clicon_handle.h" -#include "clicon_chunk.h" -#include "clicon_log.h" -#include "clicon_yang.h" -#include "clicon_options.h" +#include "clixon_err.h" +#include "clixon_queue.h" +#include "clixon_hash.h" +#include "clixon_handle.h" +#include "clixon_chunk.h" +#include "clixon_log.h" +#include "clixon_yang.h" +#include "clixon_options.h" /* * clicon_option_dump @@ -174,10 +174,6 @@ clicon_option_default(clicon_hash_t *copt) if (hash_add(copt, "CLICON_AUTOCOMMIT", "0", strlen("0")+1) < 0) goto catch; } - if (!hash_lookup(copt, "CLICON_COMMIT_ORDER")){ - if (hash_add(copt, "CLICON_COMMIT_ORDER", "0", strlen("0")+1) < 0) - goto catch; - } /* Legacy is 1 but default should really be 0. New apps should use 0 */ if (!hash_lookup(copt, "CLICON_CLI_VARONLY")){ if (hash_add(copt, "CLICON_CLI_VARONLY", "1", strlen("1")+1) < 0) @@ -582,23 +578,6 @@ clicon_autocommit_set(clicon_handle h, int val) return clicon_option_int_set(h, "CLICON_AUTOCOMMIT", val); } -/*! Get backend callback order. - * 0: all callbacks in (rising) priority order - * 1: first delete operations in declining prio order; then add/change in prio order - * 2: like (1) but CHANGE is replaced by (DEL;ADD) - */ -int -clicon_commit_order(clicon_handle h) -{ - char const *opt = "CLICON_COMMIT_ORDER"; - - if (clicon_option_exists(h, opt)) - return clicon_option_int(h, opt); - else - return 0; -} - - /*! Dont include keys in cvec in cli vars callbacks */ int diff --git a/lib/src/clicon_plugin.c b/lib/src/clixon_plugin.c similarity index 79% rename from lib/src/clicon_plugin.c rename to lib/src/clixon_plugin.c index 35cd8ca9..04050705 100644 --- a/lib/src/clicon_plugin.c +++ b/lib/src/clixon_plugin.c @@ -2,25 +2,25 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . */ #ifdef HAVE_CONFIG_H -#include "clicon_config.h" /* generated by config & autoconf */ +#include "clixon_config.h" /* generated by config & autoconf */ #endif #include @@ -29,11 +29,11 @@ #include #include -#include "clicon_err.h" -#include "clicon_queue.h" -#include "clicon_hash.h" -#include "clicon_handle.h" -#include "clicon_plugin.h" +#include "clixon_err.h" +#include "clixon_queue.h" +#include "clixon_hash.h" +#include "clixon_handle.h" +#include "clixon_plugin.h" static find_plugin_t * diff --git a/lib/src/clicon_proc.c b/lib/src/clixon_proc.c similarity index 94% rename from lib/src/clicon_proc.c rename to lib/src/clixon_proc.c index 3770eee8..15fb9979 100644 --- a/lib/src/clicon_proc.c +++ b/lib/src/clixon_proc.c @@ -2,26 +2,26 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . */ #ifdef HAVE_CONFIG_H -#include "clicon_config.h" +#include "clixon_config.h" #endif #include @@ -42,13 +42,13 @@ #include /* clicon */ -#include "clicon_err.h" -#include "clicon_log.h" -#include "clicon_sig.h" -#include "clicon_string.h" -#include "clicon_queue.h" -#include "clicon_chunk.h" -#include "clicon_proc.h" +#include "clixon_err.h" +#include "clixon_log.h" +#include "clixon_sig.h" +#include "clixon_string.h" +#include "clixon_queue.h" +#include "clixon_chunk.h" +#include "clixon_proc.h" /* * Macros diff --git a/lib/src/clicon_proto.c b/lib/src/clixon_proto.c similarity index 96% rename from lib/src/clicon_proto.c rename to lib/src/clixon_proto.c index 2b003ada..4f6d78d0 100644 --- a/lib/src/clicon_proto.c +++ b/lib/src/clixon_proto.c @@ -2,20 +2,20 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . * @@ -24,7 +24,7 @@ */ #ifdef HAVE_CONFIG_H -#include "clicon_config.h" /* generated by config & autoconf */ +#include "clixon_config.h" /* generated by config & autoconf */ #endif #include @@ -50,13 +50,13 @@ #include /* clicon */ -#include "clicon_err.h" -#include "clicon_log.h" -#include "clicon_queue.h" -#include "clicon_chunk.h" -#include "clicon_sig.h" -#include "clicon_proto.h" -#include "clicon_proto_encode.h" +#include "clixon_err.h" +#include "clixon_log.h" +#include "clixon_queue.h" +#include "clixon_chunk.h" +#include "clixon_sig.h" +#include "clixon_proto.h" +#include "clixon_proto_encode.h" static int _atomicio_sig = 0; diff --git a/lib/src/clicon_proto_client.c b/lib/src/clixon_proto_client.c similarity index 96% rename from lib/src/clicon_proto_client.c rename to lib/src/clixon_proto_client.c index 7b4dbc56..816a4948 100644 --- a/lib/src/clicon_proto_client.c +++ b/lib/src/clixon_proto_client.c @@ -2,20 +2,20 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . * @@ -25,7 +25,7 @@ */ #ifdef HAVE_CONFIG_H -#include "clicon_config.h" /* generated by config & autoconf */ +#include "clixon_config.h" /* generated by config & autoconf */ #endif #include @@ -41,17 +41,17 @@ #include /* clicon */ -#include "clicon_queue.h" -#include "clicon_chunk.h" -#include "clicon_hash.h" -#include "clicon_handle.h" -#include "clicon_yang.h" -#include "clicon_options.h" -#include "clicon_proto.h" -#include "clicon_err.h" -#include "clicon_xml.h" -#include "clicon_proto_encode.h" -#include "clicon_proto_client.h" +#include "clixon_queue.h" +#include "clixon_chunk.h" +#include "clixon_hash.h" +#include "clixon_handle.h" +#include "clixon_yang.h" +#include "clixon_options.h" +#include "clixon_proto.h" +#include "clixon_err.h" +#include "clixon_xml.h" +#include "clixon_proto_encode.h" +#include "clixon_proto_client.h" /*! Internal rpc function * @param[in] h CLICON handle diff --git a/lib/src/clicon_proto_encode.c b/lib/src/clixon_proto_encode.c similarity index 98% rename from lib/src/clicon_proto_encode.c rename to lib/src/clixon_proto_encode.c index d557cac8..409f7bfb 100644 --- a/lib/src/clicon_proto_encode.c +++ b/lib/src/clixon_proto_encode.c @@ -2,20 +2,20 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . * @@ -24,7 +24,7 @@ */ #ifdef HAVE_CONFIG_H -#include "clicon_config.h" /* generated by config & autoconf */ +#include "clixon_config.h" /* generated by config & autoconf */ #endif #include @@ -48,15 +48,15 @@ #include /* clicon */ -#include "clicon_err.h" -#include "clicon_log.h" -#include "clicon_queue.h" -#include "clicon_chunk.h" -#include "clicon_sig.h" -#include "clicon_hash.h" -#include "clicon_handle.h" -#include "clicon_proto.h" -#include "clicon_proto_encode.h" +#include "clixon_err.h" +#include "clixon_log.h" +#include "clixon_queue.h" +#include "clixon_chunk.h" +#include "clixon_sig.h" +#include "clixon_hash.h" +#include "clixon_handle.h" +#include "clixon_proto.h" +#include "clixon_proto_encode.h" /* Generic encode/decode functions for exactly one C-string (str) */ diff --git a/lib/src/clicon_qdb.c b/lib/src/clixon_qdb.c similarity index 96% rename from lib/src/clicon_qdb.c rename to lib/src/clixon_qdb.c index ca554548..9f01e9a6 100644 --- a/lib/src/clicon_qdb.c +++ b/lib/src/clixon_qdb.c @@ -2,26 +2,26 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . */ #ifdef HAVE_CONFIG_H -#include "clicon_config.h" +#include "clixon_config.h" #endif #include @@ -46,11 +46,11 @@ #include /* clicon */ -#include "clicon_log.h" -#include "clicon_err.h" -#include "clicon_queue.h" -#include "clicon_chunk.h" -#include "clicon_qdb.h" +#include "clixon_log.h" +#include "clixon_err.h" +#include "clixon_queue.h" +#include "clixon_chunk.h" +#include "clixon_qdb.h" /*! Initialize database * @param[in] file database file diff --git a/lib/src/clicon_sha1.c b/lib/src/clixon_sha1.c similarity index 99% rename from lib/src/clicon_sha1.c rename to lib/src/clixon_sha1.c index f43e1ee7..3bb7596a 100644 --- a/lib/src/clicon_sha1.c +++ b/lib/src/clixon_sha1.c @@ -58,8 +58,8 @@ #include /* clicon */ -#include "clicon_log.h" -#include "clicon_err.h" +#include "clixon_log.h" +#include "clixon_err.h" /* diff --git a/lib/src/clicon_sig.c b/lib/src/clixon_sig.c similarity index 91% rename from lib/src/clicon_sig.c rename to lib/src/clixon_sig.c index 7d9e78a9..61fff33e 100644 --- a/lib/src/clicon_sig.c +++ b/lib/src/clixon_sig.c @@ -2,26 +2,26 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . */ #ifdef HAVE_CONFIG_H -#include "clicon_config.h" /* generated by config & autoconf */ +#include "clixon_config.h" /* generated by config & autoconf */ #endif #include @@ -34,9 +34,9 @@ #include /* clicon */ -#include "clicon_err.h" -#include "clicon_log.h" -#include "clicon_sig.h" +#include "clixon_err.h" +#include "clixon_log.h" +#include "clixon_sig.h" /* * Set a signal handler. diff --git a/lib/src/clicon_string.c b/lib/src/clixon_string.c similarity index 95% rename from lib/src/clicon_string.c rename to lib/src/clixon_string.c index 290a4714..e038f929 100644 --- a/lib/src/clicon_string.c +++ b/lib/src/clixon_string.c @@ -2,20 +2,20 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . */ @@ -23,7 +23,7 @@ ensure errno is set and return -1/NULL */ #ifdef HAVE_CONFIG_H -#include "clicon_config.h" +#include "clixon_config.h" #endif #include @@ -35,10 +35,10 @@ #include /* clicon */ -#include "clicon_queue.h" -#include "clicon_chunk.h" -#include "clicon_string.h" -#include "clicon_err.h" +#include "clixon_queue.h" +#include "clixon_chunk.h" +#include "clixon_string.h" +#include "clixon_err.h" /*! Split string into a vector based on character delimiters * diff --git a/lib/src/clicon_xml.c b/lib/src/clixon_xml.c similarity index 98% rename from lib/src/clicon_xml.c rename to lib/src/clixon_xml.c index 52d74249..5acd904a 100644 --- a/lib/src/clicon_xml.c +++ b/lib/src/clixon_xml.c @@ -2,20 +2,20 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . * XML support functions. @@ -35,12 +35,12 @@ #include /* clicon */ -#include "clicon_err.h" -#include "clicon_log.h" -#include "clicon_queue.h" -#include "clicon_chunk.h" -#include "clicon_xml.h" -#include "clicon_xml_parse.h" +#include "clixon_err.h" +#include "clixon_log.h" +#include "clixon_queue.h" +#include "clixon_chunk.h" +#include "clixon_xml.h" +#include "clixon_xml_parse.h" /* * Constants @@ -750,14 +750,14 @@ xml_parse(char **str, cxobj *x_up) return -1; } ya.ya_xparent = x_up; - if (clicon_xml_parsel_init(&ya) < 0) + if (clixon_xml_parsel_init(&ya) < 0) goto done; - if (clicon_xml_parseparse(&ya) != 0) /* yacc returns 1 on error */ + if (clixon_xml_parseparse(&ya) != 0) /* yacc returns 1 on error */ goto done; retval = 0; done: - clicon_xml_parsel_exit(&ya); + clixon_xml_parsel_exit(&ya); if(ya.ya_parse_string != NULL) free(ya.ya_parse_string); return retval; diff --git a/lib/src/clicon_xml_db.c b/lib/src/clixon_xml_db.c similarity index 98% rename from lib/src/clicon_xml_db.c rename to lib/src/clixon_xml_db.c index fe071a01..920c0b41 100644 --- a/lib/src/clicon_xml_db.c +++ b/lib/src/clixon_xml_db.c @@ -2,20 +2,20 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . * XML database @@ -23,7 +23,7 @@ * TODO: xmldb_get: xpath: only load partial tree */ #ifdef HAVE_CONFIG_H -#include "clicon_config.h" /* generated by config & autoconf */ +#include "clixon_config.h" /* generated by config & autoconf */ #endif #include @@ -41,20 +41,20 @@ #include /* clicon */ -#include "clicon_err.h" -#include "clicon_log.h" -#include "clicon_queue.h" -#include "clicon_string.h" -#include "clicon_chunk.h" -#include "clicon_hash.h" -#include "clicon_handle.h" -#include "clicon_qdb.h" -#include "clicon_yang.h" -#include "clicon_handle.h" -#include "clicon_xml.h" -#include "clicon_xsl.h" -#include "clicon_xml_parse.h" -#include "clicon_xml_db.h" +#include "clixon_err.h" +#include "clixon_log.h" +#include "clixon_queue.h" +#include "clixon_string.h" +#include "clixon_chunk.h" +#include "clixon_hash.h" +#include "clixon_handle.h" +#include "clixon_qdb.h" +#include "clixon_yang.h" +#include "clixon_handle.h" +#include "clixon_xml.h" +#include "clixon_xsl.h" +#include "clixon_xml_parse.h" +#include "clixon_xml_db.h" /* * An xml database consists of key-value pairs for xml-trees. diff --git a/lib/src/clicon_xml_map.c b/lib/src/clixon_xml_map.c similarity index 97% rename from lib/src/clicon_xml_map.c rename to lib/src/clixon_xml_map.c index afd32c2b..94a140b2 100644 --- a/lib/src/clicon_xml_map.c +++ b/lib/src/clixon_xml_map.c @@ -2,20 +2,20 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . * @@ -39,7 +39,7 @@ * +---------+ */ #ifdef HAVE_CONFIG_H -#include "clicon_config.h" /* generated by config & autoconf */ +#include "clixon_config.h" /* generated by config & autoconf */ #endif #include @@ -59,20 +59,20 @@ /* clicon */ -#include "clicon_string.h" -#include "clicon_queue.h" -#include "clicon_hash.h" -#include "clicon_chunk.h" -#include "clicon_handle.h" -#include "clicon_yang.h" -#include "clicon_yang_type.h" -#include "clicon_options.h" -#include "clicon_qdb.h" -#include "clicon_xml.h" -#include "clicon_xsl.h" -#include "clicon_log.h" -#include "clicon_err.h" -#include "clicon_xml_map.h" +#include "clixon_string.h" +#include "clixon_queue.h" +#include "clixon_hash.h" +#include "clixon_chunk.h" +#include "clixon_handle.h" +#include "clixon_yang.h" +#include "clixon_yang_type.h" +#include "clixon_options.h" +#include "clixon_qdb.h" +#include "clixon_xml.h" +#include "clixon_xsl.h" +#include "clixon_log.h" +#include "clixon_err.h" +#include "clixon_xml_map.h" /* Something to do with reverse engineering of junos syntax? */ #undef SPECIAL_TREATMENT_OF_NAME diff --git a/lib/src/clixon_xml_parse.h b/lib/src/clixon_xml_parse.h new file mode 100644 index 00000000..abb43a2c --- /dev/null +++ b/lib/src/clixon_xml_parse.h @@ -0,0 +1,50 @@ +/* + * + Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren + + This file is part of CLIXON. + + CLIXON 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 3 of the License, or + (at your option) any later version. + + CLIXON 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 CLIXON; see the file LICENSE. If not, see + . + + * XML parser + */ +#ifndef _CLIXON_XML_PARSE_H_ +#define _CLIXON_XML_PARSE_H_ + +/* + * Types + */ +struct xml_parse_yacc_arg{ + char *ya_parse_string; /* original (copy of) parse string */ + int ya_linenum; /* Number of \n in parsed buffer */ + void *ya_lexbuf; /* internal parse buffer from lex */ + + cxobj *ya_xelement; /* xml active element */ + cxobj *ya_xparent; /* xml parent element*/ +}; + +extern char *clixon_xml_parsetext; + +/* + * Prototypes + */ +int clixon_xml_parsel_init(struct xml_parse_yacc_arg *ya); +int clixon_xml_parsel_exit(struct xml_parse_yacc_arg *ya); + +int clixon_xml_parsel_linenr(void); +int clixon_xml_parselex(void *); +int clixon_xml_parseparse(void *); + +#endif /* _CLIXON_XML_PARSE_H_ */ diff --git a/lib/src/clicon_xml_parse.l b/lib/src/clixon_xml_parse.l similarity index 61% rename from lib/src/clicon_xml_parse.l rename to lib/src/clixon_xml_parse.l index 50238a4a..139beadb 100644 --- a/lib/src/clicon_xml_parse.l +++ b/lib/src/clixon_xml_parse.l @@ -23,23 +23,23 @@ %{ -#include "clicon_config.h" +#include "clixon_config.h" #include #include #include -#include "clicon_xml_parse.tab.h" /* generated file */ +#include "clixon_xml_parse.tab.h" /* generated file */ /* cligen */ #include /* clicon */ -#include "clicon_xml.h" -#include "clicon_xml_parse.h" +#include "clixon_xml.h" +#include "clixon_xml_parse.h" /* Redefine main lex function so that you can send arguments to it: _ya is added to arg list */ -#define YY_DECL int clicon_xml_parselex(void *_ya) +#define YY_DECL int clixon_xml_parselex(void *_ya) /* Dont use input function (use user-buffer) */ #define YY_NO_INPUT @@ -47,8 +47,8 @@ /* typecast macro */ #define _YA ((struct xml_parse_yacc_arg *)_ya) -#undef clicon_xml_parsewrap -int clicon_xml_parsewrap(void) +#undef clixon_xml_parsewrap +int clixon_xml_parsewrap(void) { return 1; } @@ -64,57 +64,57 @@ int clicon_xml_parsewrap(void) %s STRSQ %% -[0-9A-Za-z_\-]+ { clicon_xml_parselval.string = strdup(yytext); +[0-9A-Za-z_\-]+ { clixon_xml_parselval.string = strdup(yytext); return NAME; /* rather be catch-all */ } [ \t]+ ; -\: return *clicon_xml_parsetext; +\: return *clixon_xml_parsetext; \n { _YA->ya_linenum++;} ""/>" { BEGIN(STATEA); return ESLASH; } "" { BEGIN(START); return ECOMMENT; } \n _YA->ya_linenum++; . encoding return ENC; version return VER; -"=" return *clicon_xml_parsetext; +"=" return *clixon_xml_parsetext; "?>" { BEGIN(START);return ETEXT;} -\" { BEGIN(STRDQ); return *clicon_xml_parsetext; } -\' { BEGIN(STRSQ); return *clicon_xml_parsetext; } +\" { BEGIN(STRDQ); return *clixon_xml_parsetext; } +\' { BEGIN(STRSQ); return *clixon_xml_parsetext; } -[^\"]+ { clicon_xml_parselval.string = strdup(yytext); return CHAR; } -\" { BEGIN(START); return *clicon_xml_parsetext; } +[^\"]+ { clixon_xml_parselval.string = strdup(yytext); return CHAR; } +\" { BEGIN(START); return *clixon_xml_parsetext; } -1\.[0-9]+ { clicon_xml_parselval.string = strdup(yytext); return CHAR; } -[^\"]+ { clicon_xml_parselval.string = strdup(yytext); return CHAR; } -\" { BEGIN(TEXTDECL); return *clicon_xml_parsetext; } +1\.[0-9]+ { clixon_xml_parselval.string = strdup(yytext); return CHAR; } +[^\"]+ { clixon_xml_parselval.string = strdup(yytext); return CHAR; } +\" { BEGIN(TEXTDECL); return *clixon_xml_parsetext; } -1\.[0-9]+ { clicon_xml_parselval.string = strdup(yytext); return CHAR; } -[^\']+ { clicon_xml_parselval.string = strdup(yytext); return CHAR; } -\' { BEGIN(TEXTDECL); return *clicon_xml_parsetext; } +1\.[0-9]+ { clixon_xml_parselval.string = strdup(yytext); return CHAR; } +[^\']+ { clixon_xml_parselval.string = strdup(yytext); return CHAR; } +\' { BEGIN(TEXTDECL); return *clixon_xml_parsetext; } %% /*! Initialize XML scanner. */ int -clicon_xml_parsel_init(struct xml_parse_yacc_arg *ya) +clixon_xml_parsel_init(struct xml_parse_yacc_arg *ya) { BEGIN(START); ya->ya_lexbuf = yy_scan_string (ya->ya_parse_string); @@ -125,11 +125,11 @@ clicon_xml_parsel_init(struct xml_parse_yacc_arg *ya) /*! Exit xml scanner */ int -clicon_xml_parsel_exit(struct xml_parse_yacc_arg *ya) +clixon_xml_parsel_exit(struct xml_parse_yacc_arg *ya) { yy_delete_buffer(ya->ya_lexbuf); #if defined(YY_FLEX_SUBMINOR_VERSION) && YY_FLEX_SUBMINOR_VERSION >= 9 - clicon_xml_parselex_destroy(); /* modern */ + clixon_xml_parselex_destroy(); /* modern */ #else yy_init = 1; /* This does not quite free all buffers */ #endif diff --git a/lib/src/clicon_xml_parse.y b/lib/src/clixon_xml_parse.y similarity index 95% rename from lib/src/clicon_xml_parse.y rename to lib/src/clixon_xml_parse.y index 6148b4a5..02ca991a 100644 --- a/lib/src/clicon_xml_parse.y +++ b/lib/src/clixon_xml_parse.y @@ -2,20 +2,20 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . * XML parser @@ -53,16 +53,16 @@ #include /* clicon */ -#include "clicon_err.h" -#include "clicon_log.h" -#include "clicon_xml.h" -#include "clicon_xml_parse.h" +#include "clixon_err.h" +#include "clixon_log.h" +#include "clixon_xml.h" +#include "clixon_xml_parse.h" void -clicon_xml_parseerror(void *_ya, char *s) +clixon_xml_parseerror(void *_ya, char *s) { clicon_err(OE_XML, 0, "xml_parse: line %d: %s: at or before: %s", - _YA->ya_linenum, s, clicon_xml_parsetext); + _YA->ya_linenum, s, clixon_xml_parsetext); return; } diff --git a/lib/src/clicon_xpath b/lib/src/clixon_xpath similarity index 100% rename from lib/src/clicon_xpath rename to lib/src/clixon_xpath diff --git a/lib/src/clicon_xsl.c b/lib/src/clixon_xsl.c similarity index 98% rename from lib/src/clicon_xsl.c rename to lib/src/clixon_xsl.c index 0e2d2765..dfe4a229 100644 --- a/lib/src/clicon_xsl.c +++ b/lib/src/clixon_xsl.c @@ -2,20 +2,20 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . * Limited XML XPATH and XSLT functions. @@ -73,10 +73,10 @@ to the xml standards: #include /* clicon */ -#include "clicon_err.h" -#include "clicon_log.h" -#include "clicon_xml.h" -#include "clicon_xsl.h" +#include "clixon_err.h" +#include "clixon_log.h" +#include "clixon_xml.h" +#include "clixon_xsl.h" /* Constants */ #define XPATH_VEC_START 128 diff --git a/lib/src/clicon_yang.c b/lib/src/clixon_yang.c similarity index 98% rename from lib/src/clicon_yang.c rename to lib/src/clixon_yang.c index 1fea56e8..8f610afb 100644 --- a/lib/src/clicon_yang.c +++ b/lib/src/clixon_yang.c @@ -2,27 +2,27 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . * Yang functions */ #ifdef HAVE_CONFIG_H -#include "clicon_config.h" /* generated by config & autoconf */ +#include "clixon_config.h" /* generated by config & autoconf */ #endif #include @@ -44,19 +44,19 @@ #include /* clicon */ -#include "clicon_log.h" -#include "clicon_err.h" -#include "clicon_string.h" -#include "clicon_queue.h" -#include "clicon_hash.h" -#include "clicon_handle.h" -#include "clicon_file.h" -#include "clicon_yang.h" -#include "clicon_hash.h" -#include "clicon_chunk.h" -#include "clicon_options.h" -#include "clicon_yang_type.h" -#include "clicon_yang_parse.h" +#include "clixon_log.h" +#include "clixon_err.h" +#include "clixon_string.h" +#include "clixon_queue.h" +#include "clixon_hash.h" +#include "clixon_handle.h" +#include "clixon_file.h" +#include "clixon_yang.h" +#include "clixon_hash.h" +#include "clixon_chunk.h" +#include "clixon_options.h" +#include "clixon_yang_type.h" +#include "clixon_yang_parse.h" /* Instead of using dynamic type lookup, use a cache that is evaluated early for static scope type binding */ @@ -1201,7 +1201,7 @@ yang_expand(yang_node *yn) * yang_parse2 # Find file from yang (sub)module * yang_parse_file # Read yang file into a string * yang_parse_str # Set up yacc parser and call it given a string - * clicon_yang_parseparse # Actual yang parsing using yacc + * clixon_yang_parseparse # Actual yang parsing using yacc */ static yang_stmt * yang_parse_str(clicon_handle h, @@ -1226,7 +1226,7 @@ yang_parse_str(clicon_handle h, goto done; if (yang_parse_init(&yy, yspec) < 0) goto done; - if (clicon_yang_parseparse(&yy) != 0) { /* yacc returns 1 on error */ + if (clixon_yang_parseparse(&yy) != 0) { /* yacc returns 1 on error */ clicon_log(LOG_NOTICE, "Yang error: %s on line %d", name, yy.yy_linenum); if (clicon_errno == 0) clicon_err(OE_YANG, 0, "yang parser error with no error code (should not happen)"); @@ -1263,7 +1263,7 @@ yang_parse_str(clicon_handle h, * yang_parse2 # Find file from yang (sub)module * yang_parse_file # Read yang file into a string * yang_parse_str # Set up yacc parser and call it given a string - * clicon_yang_parseparse # Actual yang parsing using yacc + * clixon_yang_parseparse # Actual yang parsing using yacc */ static yang_stmt * yang_parse_file(clicon_handle h, @@ -1371,7 +1371,7 @@ yang_parse_find_match(clicon_handle h, * yang_parse2 # Find file from yang (sub)module * yang_parse_file # Read yang file into a string * yang_parse_str # Set up yacc parser and call it given a string - * clicon_yang_parseparse # Actual yang parsing using yacc + * clixon_yang_parseparse # Actual yang parsing using yacc */ static yang_stmt * yang_parse2(clicon_handle h, @@ -1437,7 +1437,7 @@ yang_parse2(clicon_handle h, * yang_parse2 # Find file from yang (sub)module * yang_parse_file # Read yang file into a string * yang_parse_str # Set up yacc parser and call it given a string - * clicon_yang_parseparse # Actual yang parsing using yacc + * clixon_yang_parseparse # Actual yang parsing using yacc */ static yang_stmt * yang_parse1(clicon_handle h, @@ -1490,7 +1490,7 @@ yang_parse1(clicon_handle h, * yang_parse2 # Find file from yang (sub)module * yang_parse_file # Read yang file into a string * yang_parse_str # Set up yacc parser and call it given a string - * clicon_yang_parseparse # Actual yang parsing using yacc + * clixon_yang_parseparse # Actual yang parsing using yacc */ int yang_parse(clicon_handle h, diff --git a/lib/src/clicon_yang_parse.h b/lib/src/clixon_yang_parse.h similarity index 84% rename from lib/src/clicon_yang_parse.h rename to lib/src/clixon_yang_parse.h index 240c28f0..ae8971cd 100644 --- a/lib/src/clicon_yang_parse.h +++ b/lib/src/clixon_yang_parse.h @@ -2,27 +2,27 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . * Database specification parser cli syntax * (Cloned from cligen parser) */ -#ifndef _CLICON_YANG_PARSE_H_ -#define _CLICON_YANG_PARSE_H_ +#ifndef _CLIXON_YANG_PARSE_H_ +#define _CLIXON_YANG_PARSE_H_ /* * Types @@ -64,7 +64,7 @@ struct yang_userdata{ /* * Variables */ -extern char *clicon_yang_parsetext; +extern char *clixon_yang_parsetext; /* * Prototypes @@ -75,11 +75,11 @@ int yang_scan_exit(struct clicon_yang_yacc_arg *ya); int yang_parse_init(struct clicon_yang_yacc_arg *ya, yang_spec *ysp); int yang_parse_exit(struct clicon_yang_yacc_arg *ya); -int clicon_yang_parselex(void *_ya); -int clicon_yang_parseparse(void *); -void clicon_yang_parseerror(void *_ya, char*); +int clixon_yang_parselex(void *_ya); +int clixon_yang_parseparse(void *); +void clixon_yang_parseerror(void *_ya, char*); int ystack_pop(struct clicon_yang_yacc_arg *ya); struct ys_stack *ystack_push(struct clicon_yang_yacc_arg *ya, yang_node *yn); -#endif /* _CLICON_YANG_PARSE_H_ */ +#endif /* _CLIXON_YANG_PARSE_H_ */ diff --git a/lib/src/clicon_yang_parse.l b/lib/src/clixon_yang_parse.l similarity index 89% rename from lib/src/clicon_yang_parse.l rename to lib/src/clixon_yang_parse.l index cbfc8b7f..0aeb8769 100644 --- a/lib/src/clicon_yang_parse.l +++ b/lib/src/clixon_yang_parse.l @@ -2,20 +2,20 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . * Database specification parser cli syntax @@ -24,7 +24,7 @@ %{ -#include "clicon_config.h" +#include "clixon_config.h" #include #include @@ -32,18 +32,18 @@ #include #include -#include "clicon_yang_parse.tab.h" /* generated */ +#include "clixon_yang_parse.tab.h" /* generated */ #include -#include "clicon_queue.h" -#include "clicon_hash.h" -#include "clicon_handle.h" -#include "clicon_yang.h" -#include "clicon_yang_parse.h" +#include "clixon_queue.h" +#include "clixon_hash.h" +#include "clixon_handle.h" +#include "clixon_yang.h" +#include "clixon_yang_parse.h" /* Redefine main lex function so that you can send arguments to it: _yy is added to arg list */ -#define YY_DECL int clicon_yang_parselex(void *_yy) +#define YY_DECL int clixon_yang_parselex(void *_yy) /* Dont use input function (use user-buffer) */ #define YY_NO_INPUT @@ -56,9 +56,9 @@ #define MAX(x,y) ((x)>(y)?(x):(y)) #define MIN(x,y) ((x)<(y)?(x):(y)) -#undef clicon_yang_parsewrap +#undef clixon_yang_parsewrap int -clicon_yang_parsewrap(void) +clixon_yang_parsewrap(void) { return 1; } @@ -189,7 +189,7 @@ stripdup(char *s0) \' { _YY->yy_lex_string_state =ARGUMENT; BEGIN(STRING2); return DQ; } \+ { return *yytext; /* many arg rules dont like this */ } : { return *yytext; /* many arg rules dont like this */ } -. { clicon_yang_parselval.string = strdup(yytext); +. { clixon_yang_parselval.string = strdup(yytext); return CHAR;} \{ { BEGIN(KEYWORD); return *yytext; } @@ -197,24 +197,24 @@ stripdup(char *s0) \" { _YY->yy_lex_string_state =STRING0; BEGIN(STRING1); return DQ; } \' { _YY->yy_lex_string_state =STRING0; BEGIN(STRING2); return DQ; } \+ { return *yytext; } -. { clicon_yang_parselval.string = strdup(yytext); +. { clixon_yang_parselval.string = strdup(yytext); return CHAR;} \\ { _YY->yy_lex_state = STRING1; BEGIN(ESCAPE); } \" { BEGIN(_YY->yy_lex_string_state); return DQ; } -\n { _YY->yy_linenum++; clicon_yang_parselval.string = strdup(yytext); return CHAR;} -. { clicon_yang_parselval.string = strdup(yytext); +\n { _YY->yy_linenum++; clixon_yang_parselval.string = strdup(yytext); return CHAR;} +. { clixon_yang_parselval.string = strdup(yytext); return CHAR;} \\ { _YY->yy_lex_state = STRING2; BEGIN(ESCAPE); } \' { BEGIN(_YY->yy_lex_string_state); return DQ; } -\n { _YY->yy_linenum++; clicon_yang_parselval.string = strdup(yytext); return CHAR;} -. { clicon_yang_parselval.string = strdup(yytext); +\n { _YY->yy_linenum++; clixon_yang_parselval.string = strdup(yytext); return CHAR;} +. { clixon_yang_parselval.string = strdup(yytext); return CHAR;} . { BEGIN(_YY->yy_lex_state); - clicon_yang_parselval.string = strdup(yytext); + clixon_yang_parselval.string = strdup(yytext); return CHAR; } [^*\n]* /* eat anything that's not a '*' */ "*"+[^*/\n]* /* eat up '*'s not followed by '/'s */ @@ -251,7 +251,7 @@ yang_scan_exit(struct clicon_yang_yacc_arg *yy) { yy_delete_buffer(yy->yy_lexbuf); #if defined(YY_FLEX_SUBMINOR_VERSION) && YY_FLEX_SUBMINOR_VERSION >= 9 - clicon_yang_parselex_destroy(); /* modern */ + clixon_yang_parselex_destroy(); /* modern */ #else yy_init = 1; /* This does not quite free all buffers */ #endif diff --git a/lib/src/clicon_yang_parse.y b/lib/src/clixon_yang_parse.y similarity index 98% rename from lib/src/clicon_yang_parse.y rename to lib/src/clixon_yang_parse.y index 74c52e0a..0442d4d5 100644 --- a/lib/src/clicon_yang_parse.y +++ b/lib/src/clixon_yang_parse.y @@ -2,20 +2,20 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . */ @@ -125,12 +125,12 @@ /* typecast macro */ #define _YY ((struct clicon_yang_yacc_arg *)_yy) -#define _YYERROR(msg) {clicon_debug(2, "YYERROR %s '%s' %d", (msg), clicon_yang_parsetext, _YY->yy_linenum); YYERROR;} +#define _YYERROR(msg) {clicon_debug(2, "YYERROR %s '%s' %d", (msg), clixon_yang_parsetext, _YY->yy_linenum); YYERROR;} /* add _yy to error paramaters */ #define YY_(msgid) msgid -#include "clicon_config.h" +#include "clixon_config.h" #include #include @@ -146,15 +146,15 @@ #include -#include "clicon_queue.h" -#include "clicon_hash.h" -#include "clicon_handle.h" -#include "clicon_err.h" -#include "clicon_log.h" -#include "clicon_yang.h" -#include "clicon_yang_parse.h" +#include "clixon_queue.h" +#include "clixon_hash.h" +#include "clixon_handle.h" +#include "clixon_err.h" +#include "clixon_log.h" +#include "clixon_yang.h" +#include "clixon_yang_parse.h" -extern int clicon_yang_parseget_lineno (void); +extern int clixon_yang_parseget_lineno (void); int clicon_yang_debug(int d) @@ -164,17 +164,17 @@ clicon_yang_debug(int d) } /* - clicon_yang_parseerror + clixon_yang_parseerror also called from yacc generated code * */ void -clicon_yang_parseerror(void *_yy, char *s) +clixon_yang_parseerror(void *_yy, char *s) { clicon_err(OE_YANG, 0, "%s on line %d: %s at or before: '%s'", _YY->yy_name, _YY->yy_linenum , s, - clicon_yang_parsetext); + clixon_yang_parsetext); return; } @@ -306,7 +306,7 @@ file : module_stmt MY_EOF { clicon_debug(2,"file->submodule-stmt"); YYACCEPT; } ; -unknown_stmt : K_UNKNOWN { clicon_yang_parseerror(_yy, "unknown statement");clicon_debug(2,"unknown-stmt"); _YYERROR("0"); } +unknown_stmt : K_UNKNOWN { clixon_yang_parseerror(_yy, "unknown statement");clicon_debug(2,"unknown-stmt"); _YYERROR("0"); } ; /* module */ diff --git a/lib/src/clicon_yang_type.c b/lib/src/clixon_yang_type.c similarity index 97% rename from lib/src/clicon_yang_type.c rename to lib/src/clixon_yang_type.c index f9939551..6c1b8f8a 100644 --- a/lib/src/clicon_yang_type.c +++ b/lib/src/clixon_yang_type.c @@ -2,27 +2,27 @@ * Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren - This file is part of CLICON. + This file is part of CLIXON. - CLICON is free software; you can redistribute it and/or modify + CLIXON 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 3 of the License, or (at your option) any later version. - CLICON is distributed in the hope that it will be useful, + CLIXON 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 CLICON; see the file LICENSE. If not, see + along with CLIXON; see the file LICENSE. If not, see . * Yang type related functions */ #ifdef HAVE_CONFIG_H -#include "clicon_config.h" /* generated by config & autoconf */ +#include "clixon_config.h" /* generated by config & autoconf */ #endif #include @@ -42,18 +42,18 @@ #include /* clicon */ -#include "clicon_log.h" -#include "clicon_err.h" -#include "clicon_string.h" -#include "clicon_queue.h" -#include "clicon_hash.h" -#include "clicon_handle.h" -#include "clicon_yang.h" -#include "clicon_hash.h" -#include "clicon_chunk.h" -#include "clicon_options.h" -#include "clicon_yang.h" -#include "clicon_yang_type.h" +#include "clixon_log.h" +#include "clixon_err.h" +#include "clixon_string.h" +#include "clixon_queue.h" +#include "clixon_hash.h" +#include "clixon_handle.h" +#include "clixon_yang.h" +#include "clixon_hash.h" +#include "clixon_chunk.h" +#include "clixon_options.h" +#include "clixon_yang.h" +#include "clixon_yang_type.h" /* * Local types and variables