aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDavid Oberhollenzer <david.oberhollenzer@tele2.at>2018-05-23 22:26:17 +0200
committerDavid Oberhollenzer <david.oberhollenzer@tele2.at>2018-06-09 15:32:29 +0200
commitbf63f78b6698f33ed3acbd4aed8822a35688c1ba (patch)
tree4e7c79326dd6fd217f135234dbcf3d9bc09ebb82 /lib
parent1eb8a4c792166360137cb5c83afa75eace2b4b1d (diff)
Split configuration parser and utility library
Signed-off-by: David Oberhollenzer <david.oberhollenzer@tele2.at>
Diffstat (limited to 'lib')
-rw-r--r--lib/Makemodule.am18
-rw-r--r--lib/include/libcfg.h98
-rw-r--r--lib/include/util.h77
-rw-r--r--lib/libcfg/pack_argv.c (renamed from lib/src/split_argv.c)2
-rw-r--r--lib/libcfg/rdline.c (renamed from lib/src/rdline.c)2
-rw-r--r--lib/libcfg/unescape.c (renamed from lib/src/unescape.c)2
-rw-r--r--lib/util/del_svc_list.c (renamed from lib/src/del_svc_list.c)0
-rw-r--r--lib/util/delsvc.c (renamed from lib/src/delsvc.c)0
-rw-r--r--lib/util/enum_by_name.c (renamed from lib/src/enum_by_name.c)0
-rw-r--r--lib/util/enum_to_name.c (renamed from lib/src/enum_to_name.c)0
-rw-r--r--lib/util/opensock.c (renamed from lib/src/opensock.c)0
-rw-r--r--lib/util/rdsvc.c (renamed from lib/src/rdsvc.c)1
-rw-r--r--lib/util/svc_tsort.c (renamed from lib/src/svc_tsort.c)0
-rw-r--r--lib/util/svcmap.c (renamed from lib/src/svcmap.c)0
-rw-r--r--lib/util/svcscan.c (renamed from lib/src/svcscan.c)0
15 files changed, 113 insertions, 87 deletions
diff --git a/lib/Makemodule.am b/lib/Makemodule.am
index b410ccc..c29ad2b 100644
--- a/lib/Makemodule.am
+++ b/lib/Makemodule.am
@@ -1,13 +1,17 @@
HEADRS = lib/include/util.h lib/include/service.h lib/include/telinit.h
-libinit_a_SOURCES = lib/src/delsvc.c lib/src/rdline.c lib/src/svcmap.c
-libinit_a_SOURCES += lib/src/unescape.c lib/src/enum_by_name.c
-libinit_a_SOURCES += lib/src/rdsvc.c lib/src/svcscan.c lib/src/split_argv.c
-libinit_a_SOURCES += lib/src/del_svc_list.c lib/src/svc_tsort.c
-libinit_a_SOURCES += lib/src/opensock.c lib/src/enum_to_name.c $(HEADRS)
+libinit_a_SOURCES = lib/util/delsvc.c lib/util/svcmap.c lib/util/enum_by_name.c
+libinit_a_SOURCES += lib/util/rdsvc.c lib/util/svcscan.c
+libinit_a_SOURCES += lib/util/del_svc_list.c lib/util/svc_tsort.c
+libinit_a_SOURCES += lib/util/opensock.c lib/util/enum_to_name.c $(HEADRS)
libinit_a_CPPFLAGS = $(AM_CPPFLAGS)
libinit_a_CFLAGS = $(AM_CFLAGS)
-EXTRA_DIST += $(HEADRS)
+libcfg_a_SOURCES = lib/libcfg/rdline.c lib/libcfg/unescape.c
+libcfg_a_SOURCES += lib/libcfg/pack_argv.c lib/include/libcfg.h
+libcfg_a_CPPFLAGS = $(AM_CPPFLAGS)
+libcfg_a_CFLAGS = $(AM_CFLAGS)
-noinst_LIBRARIES += libinit.a
+EXTRA_DIST += $(HEADRS) lib/include/libcfg.h
+
+noinst_LIBRARIES += libinit.a libcfg.a
diff --git a/lib/include/libcfg.h b/lib/include/libcfg.h
new file mode 100644
index 0000000..5724bdc
--- /dev/null
+++ b/lib/include/libcfg.h
@@ -0,0 +1,98 @@
+/* SPDX-License-Identifier: GPL-3.0-or-later */
+/*
+ * Copyright (C) 2018 - David Oberhollenzer
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+#ifndef LIBCONFIG_H
+#define LIBCONFIG_H
+
+#include <stdbool.h>
+
+typedef struct {
+ int fd; /* input file descriptor */
+ const char *argstr; /* if not NULL, read from this instead */
+
+ const char *filename; /* input file name */
+ size_t lineno; /* current line number */
+
+ size_t i; /* buffer offset */
+ char buffer[256]; /* current line, null-terminated */
+
+ int argc;
+ const char *const *argv;
+
+ bool string; /* inside a string? */
+ bool escape; /* reading an escape sequence? */
+ bool comment; /* inside a comment */
+} rdline_t;
+
+/*
+ Initialize the config line scanner.
+
+ The scanner reads from the provided fd. The filename is used for
+ error reporting. An argument count and vector can be set for argument
+ substitution in rdline.
+*/
+void rdline_init(rdline_t *t, int fd, const char *filename,
+ int argc, const char *const *argv);
+
+/*
+ Read from file until end-of-file or a line feed is encountered.
+
+ Returns -1 on failure, +1 if end of file was reached,
+ 0 if data was read successfully.
+
+ The following transformations are applied:
+ - Space characters are replaced with regular white space characters.
+ - Sequences of space characters are truncated to a single space.
+ - A '#' sign is interpreted as the start of a comment and removed,
+ together with everything that follows.
+ - Padding spaces are removed from the line.
+ - If a '"' is encounterd, the above rules are disabled, until a
+ after the matching '"' is read. A '"' can be escaped by preceeding
+ it with a backslash.
+ - If a second, coresponding '"' is not found, processing fails.
+ - If a '%' character is encountered, the next character is expected
+ to be a single digit index into argv. If it is not a digit or
+ outside the bounds set by argc, processing fails. On success,
+ the argv value is inserted and processed as described above.
+ - A '%' character can be escaped by writing '%%' or, if inside
+ a double quite string, by writing \%.
+ - An attempt to use such an indexed argument inside an argument
+ expansion, results in failure.
+ - If the resulting line is empty, processing is restarted.
+*/
+int rdline(rdline_t *t);
+
+/*
+ Remove double quotes ('"') from a string and substitute escape
+ sequences in between double quotes.
+*/
+int unescape(char *src);
+
+/*
+ Replace spaces in 'str' with null bytes. Tread strings (started and
+ terminated with double-quotes which can be escaped) as a single block.
+ Such strings are run through unescap(). All elements are tightly
+ packed together and the function returns the number of consecutive
+ argument strings that are now inside 'str'.
+
+ Returns a negative value if unescape() fails, a string is not
+ termianted or two such strings touch each other without a white
+ space in between.
+*/
+int pack_argv(char *str);
+
+#endif /* LIBCONFIG_H */
diff --git a/lib/include/util.h b/lib/include/util.h
index d6b68f1..f63a0d6 100644
--- a/lib/include/util.h
+++ b/lib/include/util.h
@@ -35,83 +35,6 @@ typedef struct {
int value;
} enum_map_t;
-
-typedef struct {
- int fd; /* input file descriptor */
- const char *argstr; /* if not NULL, read from this instead */
-
- const char *filename; /* input file name */
- size_t lineno; /* current line number */
-
- size_t i; /* buffer offset */
- char buffer[256]; /* current line, null-terminated */
-
- int argc;
- const char *const *argv;
-
- bool string; /* inside a string? */
- bool escape; /* reading an escape sequence? */
- bool comment; /* inside a comment */
-} rdline_t;
-
-
-/*
- Initialize the config line scanner.
-
- The scanner reads from the provided fd. The filename is used for
- error reporting. An argument count and vector can be set for argument
- substitution in rdline.
-*/
-void rdline_init(rdline_t *t, int fd, const char *filename,
- int argc, const char *const *argv);
-
-/*
- Read from file until end-of-file or a line feed is encountered.
-
- Returns -1 on failure, +1 if end of file was reached,
- 0 if data was read successfully.
-
- The following transformations are applied:
- - Space characters are replaced with regular white space characters.
- - Sequences of space characters are truncated to a single space.
- - A '#' sign is interpreted as the start of a comment and removed,
- together with everything that follows.
- - Padding spaces are removed from the line.
- - If a '"' is encounterd, the above rules are disabled, until a
- after the matching '"' is read. A '"' can be escaped by preceeding
- it with a backslash.
- - If a second, coresponding '"' is not found, processing fails.
- - If a '%' character is encountered, the next character is expected
- to be a single digit index into argv. If it is not a digit or
- outside the bounds set by argc, processing fails. On success,
- the argv value is inserted and processed as described above.
- - A '%' character can be escaped by writing '%%' or, if inside
- a double quite string, by writing \%.
- - An attempt to use such an indexed argument inside an argument
- expansion, results in failure.
- - If the resulting line is empty, processing is restarted.
-*/
-int rdline(rdline_t *t);
-
-/*
- Remove double quotes ('"') from a string and substitute escape
- sequences in between double quotes.
-*/
-int unescape(char *src);
-
-/*
- Replace spaces in 'str' with null bytes. Tread strings (started and
- terminated with double-quotes which can be escaped) as a single block.
- Such strings are run through unescap(). All elements are tightly
- packed together and the function returns the number of consecutive
- argument strings that are now inside 'str'.
-
- Returns a negative value if unescape() fails, a string is not
- termianted or two such strings touch each other without a white
- space in between.
-*/
-int pack_argv(char *str);
-
/*
Search through an array of enum_map_t entries to resolve a string to
a numeric value. The end of the map is indicated by a sentinel entry
diff --git a/lib/src/split_argv.c b/lib/libcfg/pack_argv.c
index 5930e2d..4d90171 100644
--- a/lib/src/split_argv.c
+++ b/lib/libcfg/pack_argv.c
@@ -21,7 +21,7 @@
#include <errno.h>
#include <stdio.h>
-#include "util.h"
+#include "libcfg.h"
int pack_argv(char *str)
{
diff --git a/lib/src/rdline.c b/lib/libcfg/rdline.c
index 47a9d2a..ffbfd89 100644
--- a/lib/src/rdline.c
+++ b/lib/libcfg/rdline.c
@@ -22,7 +22,7 @@
#include <ctype.h>
#include <stdio.h>
-#include "util.h"
+#include "libcfg.h"
static int rdline_getc(rdline_t *t)
{
diff --git a/lib/src/unescape.c b/lib/libcfg/unescape.c
index 2d48c92..e2b450c 100644
--- a/lib/src/unescape.c
+++ b/lib/libcfg/unescape.c
@@ -19,7 +19,7 @@
#include <ctype.h>
#include <errno.h>
-#include "util.h"
+#include "libcfg.h"
static int xdigit(int x)
{
diff --git a/lib/src/del_svc_list.c b/lib/util/del_svc_list.c
index 553a701..553a701 100644
--- a/lib/src/del_svc_list.c
+++ b/lib/util/del_svc_list.c
diff --git a/lib/src/delsvc.c b/lib/util/delsvc.c
index 9ab51f1..9ab51f1 100644
--- a/lib/src/delsvc.c
+++ b/lib/util/delsvc.c
diff --git a/lib/src/enum_by_name.c b/lib/util/enum_by_name.c
index 95f306f..95f306f 100644
--- a/lib/src/enum_by_name.c
+++ b/lib/util/enum_by_name.c
diff --git a/lib/src/enum_to_name.c b/lib/util/enum_to_name.c
index 43fd4dc..43fd4dc 100644
--- a/lib/src/enum_to_name.c
+++ b/lib/util/enum_to_name.c
diff --git a/lib/src/opensock.c b/lib/util/opensock.c
index 0c2bf56..0c2bf56 100644
--- a/lib/src/opensock.c
+++ b/lib/util/opensock.c
diff --git a/lib/src/rdsvc.c b/lib/util/rdsvc.c
index 546962d..6a964f7 100644
--- a/lib/src/rdsvc.c
+++ b/lib/util/rdsvc.c
@@ -26,6 +26,7 @@
#include <ctype.h>
#include "service.h"
+#include "libcfg.h"
#include "util.h"
static int try_unescape(char *arg, rdline_t *rd)
diff --git a/lib/src/svc_tsort.c b/lib/util/svc_tsort.c
index 5f83fa0..5f83fa0 100644
--- a/lib/src/svc_tsort.c
+++ b/lib/util/svc_tsort.c
diff --git a/lib/src/svcmap.c b/lib/util/svcmap.c
index 5df8ca9..5df8ca9 100644
--- a/lib/src/svcmap.c
+++ b/lib/util/svcmap.c
diff --git a/lib/src/svcscan.c b/lib/util/svcscan.c
index f4c7ef1..f4c7ef1 100644
--- a/lib/src/svcscan.c
+++ b/lib/util/svcscan.c