experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

renamed .h and libs clicon->clixon

Browse source
This commit is contained in:
Olof Hagsand 2016-02-28 15:27:36 +01:00
parent baa5611616
commit 79b77943f9
132 changed files with 1240 additions and 1268 deletions
Download patch file Download diff file Expand all files Collapse all files

40
apps/cli/Makefile.in
View file

@ -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) $@

14
apps/cli/cli_common.c
View file

@ -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
<http://www.gnu.org/licenses/>.
*
*/
#ifdef HAVE_CONFIG_H
#include "clicon_config.h" /* generated by config & autoconf */
#include "clixon_config.h" /* generated by config & autoconf */
#endif
#include <stdlib.h>
@ -55,9 +55,9 @@
#include <cligen/cligen.h>
/* clicon */
#include <clicon/clicon.h>
#include <clixon/clixon.h>
#include "clicon_cli_api.h"
#include "clixon_cli_api.h"
#include "cli_common.h"

8
apps/cli/cli_common.h
View file

@ -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
<http://www.gnu.org/licenses/>.
*

14
apps/cli/cli_generate.c
View file

@ -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
<http://www.gnu.org/licenses/>.
*
@ -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 <cligen/cligen.h>
/* clicon */
#include <clicon/clicon.h>
#include <clixon/clixon.h>
#include "clicon_cli_api.h"
#include "clixon_cli_api.h"
#include "cli_plugin.h"
#include "cli_generate.h"

8
apps/cli/cli_generate.h
View file

@ -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
<http://www.gnu.org/licenses/>.
*/

14
apps/cli/cli_handle.c
View file

@ -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
<http://www.gnu.org/licenses/>.
*
*/
#ifdef HAVE_CONFIG_H
#include "clicon_config.h" /* generated by config & autoconf */
#include "clixon_config.h" /* generated by config & autoconf */
#endif
#include <stdio.h>
@ -45,9 +45,9 @@
#include <cligen/cligen.h>
/* clicon */
#include <clicon/clicon.h>
#include <clixon/clixon.h>
#include "clicon_cli_api.h"
#include "clixon_cli_api.h"
#include "cli_plugin.h"
#include "cli_handle.h"

8
apps/cli/cli_handle.h
View file

@ -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
<http://www.gnu.org/licenses/>.
*

14
apps/cli/cli_main.c
View file

@ -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
<http://www.gnu.org/licenses/>.
*
*/
#ifdef HAVE_CONFIG_H
#include "clicon_config.h" /* generated by config & autoconf */
#include "clixon_config.h" /* generated by config & autoconf */
#endif
#include <stdio.h>
@ -46,9 +46,9 @@
#include <cligen/cligen.h>
/* clicon */
#include <clicon/clicon.h>
#include <clixon/clixon.h>
#include "clicon_cli_api.h"
#include "clixon_cli_api.h"
#include "cli_plugin.h"
#include "cli_generate.h"

18
apps/cli/cli_plugin.c
View file

@ -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
<http://www.gnu.org/licenses/>.
*
*/
#ifdef HAVE_CONFIG_H
#include "clicon_config.h" /* generated by config & autoconf */
#include "clixon_config.h" /* generated by config & autoconf */
#endif
#include <stdio.h>
@ -46,10 +46,10 @@
#include <cligen/cligen.h>
/* clicon */
#include <clicon/clicon.h>
#include <clixon/clixon.h>
/* 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 */

8
apps/cli/cli_plugin.h
View file

@ -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
<http://www.gnu.org/licenses/>.
*/

16
apps/cli/clicon_cli.h → apps/cli/clixon_cli.h
View file

@ -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
<http://www.gnu.org/licenses/>.
*/
#ifndef _CLICON_CLI_H_
#define _CLICON_CLI_H_
#ifndef _CLIXON_CLI_H_
#define _CLIXON_CLI_H_
#include <sys/types.h>
/* Common code (API and clicon_cli) */
#include <clicon/clicon_cli_api.h>
#include <clixon/clixon_cli_api.h>
/*! 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_ */

14
apps/cli/clicon_cli_api.h → apps/cli/clixon_cli_api.h
View file

@ -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
<http://www.gnu.org/licenses/>.
* 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_ */