aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Oberhollenzer <david.oberhollenzer@tele2.at>2018-04-08 16:12:24 +0200
committerDavid Oberhollenzer <david.oberhollenzer@tele2.at>2018-04-08 16:12:24 +0200
commit6b788edfa40fd9c006f071ce764677e9dd2f9384 (patch)
treea8bb61438dfd86e6585361c04e096f42b5b175a4
parent7d8ceb810faa085650d2d74e3d1c857b8b755ca3 (diff)
Cleanup: rename/split splitkv.c
Signed-off-by: David Oberhollenzer <david.oberhollenzer@tele2.at>
-rw-r--r--lib/Makemodule.am4
-rw-r--r--lib/src/split_argv.c93
-rw-r--r--lib/src/unescape.c (renamed from lib/src/splitkv.c)71
3 files changed, 95 insertions, 73 deletions
diff --git a/lib/Makemodule.am b/lib/Makemodule.am
index 221a15b..b410ccc 100644
--- a/lib/Makemodule.am
+++ b/lib/Makemodule.am
@@ -1,8 +1,8 @@
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/splitkv.c lib/src/enum_by_name.c
-libinit_a_SOURCES += lib/src/rdsvc.c lib/src/svcscan.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_CPPFLAGS = $(AM_CPPFLAGS)
diff --git a/lib/src/split_argv.c b/lib/src/split_argv.c
new file mode 100644
index 0000000..9beec5c
--- /dev/null
+++ b/lib/src/split_argv.c
@@ -0,0 +1,93 @@
+/* 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/>.
+ */
+#include <stdlib.h>
+#include <ctype.h>
+#include <errno.h>
+
+#include "util.h"
+
+char **split_argv(char *str)
+{
+ size_t i = 0, cap = 0, new_cap;
+ char **argv = NULL, **new;
+ char *ptr;
+
+ ptr = str;
+
+ for (;;) {
+ if (*ptr == ' ') {
+ ++ptr;
+ continue;
+ }
+
+ if (i == cap) {
+ new_cap = cap ? cap * 2 : 16;
+ new = realloc(argv, sizeof(argv[0]) * new_cap);
+
+ if (new == NULL) {
+ free(argv);
+ errno = ENOMEM;
+ return NULL;
+ }
+
+ cap = new_cap;
+ argv = new;
+ }
+
+ if (*ptr == '\0') {
+ argv[i++] = NULL;
+ break;
+ }
+
+ argv[i++] = ptr;
+
+ if (*ptr == '"') {
+ ++ptr;
+ while (*ptr != '\0' && *ptr != '"') {
+ if (ptr[0] == '\\' && ptr[1] != '\0')
+ ++ptr;
+
+ ++ptr;
+ }
+
+ if (*ptr == '"')
+ ++ptr;
+
+ if (*ptr == ' ') {
+ *(ptr++) = '\0';
+ } else if (*ptr != '\0') {
+ goto fail_str;
+ }
+
+ if (unescape(argv[i - 1]))
+ goto fail_str;
+ } else {
+ while (*ptr != '\0' && *ptr != ' ')
+ ++ptr;
+
+ if (*ptr == ' ')
+ *(ptr++) = '\0';
+ }
+ }
+
+ return argv;
+fail_str:
+ free(argv);
+ errno = EINVAL;
+ return NULL;
+}
diff --git a/lib/src/splitkv.c b/lib/src/unescape.c
index 7d652d3..7508e2f 100644
--- a/lib/src/splitkv.c
+++ b/lib/src/unescape.c
@@ -88,74 +88,3 @@ int unescape(char *src)
*(dst++) = '\0';
return 0;
}
-
-char **split_argv(char *str)
-{
- size_t i = 0, cap = 0, new_cap;
- char **argv = NULL, **new;
- char *ptr;
-
- ptr = str;
-
- for (;;) {
- if (*ptr == ' ') {
- ++ptr;
- continue;
- }
-
- if (i == cap) {
- new_cap = cap ? cap * 2 : 16;
- new = realloc(argv, sizeof(argv[0]) * new_cap);
-
- if (new == NULL) {
- free(argv);
- errno = ENOMEM;
- return NULL;
- }
-
- cap = new_cap;
- argv = new;
- }
-
- if (*ptr == '\0') {
- argv[i++] = NULL;
- break;
- }
-
- argv[i++] = ptr;
-
- if (*ptr == '"') {
- ++ptr;
- while (*ptr != '\0' && *ptr != '"') {
- if (ptr[0] == '\\' && ptr[1] != '\0')
- ++ptr;
-
- ++ptr;
- }
-
- if (*ptr == '"')
- ++ptr;
-
- if (*ptr == ' ') {
- *(ptr++) = '\0';
- } else if (*ptr != '\0') {
- goto fail_str;
- }
-
- if (unescape(argv[i - 1]))
- goto fail_str;
- } else {
- while (*ptr != '\0' && *ptr != ' ')
- ++ptr;
-
- if (*ptr == ' ')
- *(ptr++) = '\0';
- }
- }
-
- return argv;
-fail_str:
- free(argv);
- errno = EINVAL;
- return NULL;
-}