pygos/init
1
0
Fork 0
mirror of https://github.com/pygos/init.git synced 2024-05-19 12:16:14 +02:00
Code Issues Releases Wiki Activity

Add file with service enum conversion functions

Browse source 
Signed-off-by: David Oberhollenzer <david.oberhollenzer@tele2.at>
This commit is contained in:
David Oberhollenzer 2018-03-25 01:55:08 +01:00
parent 9257f12e68
commit f97add9041
6 changed files with 113 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/Makemodule.am
View file

@ -1,10 +1,10 @@
HEADRS = lib/include/util.h lib/include/service.h lib/include/telinit.h
libinit_a_SOURCES = lib/src/delsrv.c lib/src/rdline.c
libinit_a_SOURCES = lib/src/delsrv.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/strexpand.c lib/src/rdsrv.c lib/src/srvscan.c
libinit_a_SOURCES += lib/src/del_srv_list.c lib/src/srv_tsort.c
libinit_a_SOURCES += lib/src/opensock.c $(HEADRS)
libinit_a_SOURCES += lib/src/opensock.c lib/src/enum_to_name.c $(HEADRS)
libinit_a_CPPFLAGS = $(AM_CPPFLAGS)
libinit_a_CFLAGS = $(AM_CFLAGS)

8
lib/include/service.h
View file

@ -91,5 +91,13 @@ void del_srv_list(service_list_t *list);
*/
service_t *srv_tsort(service_t *list);
const char *svc_type_to_string(int type);
int svc_type_from_string(const char *type);
const char *svc_target_to_string(int target);
int svc_target_from_string(const char *target);
#endif /* SERVICE_H */

7
lib/include/util.h
View file

@ -69,6 +69,13 @@ int splitkv(char *line, char **key, char **value);
*/
const enum_map_t *enum_by_name(const enum_map_t *map, const char *name);
/*
Search through an array of enum_map_t entries to resolve a numeric
value to a string name. The end of the map is indicated by a sentinel
entry with the name set to NULL.
*/
const char *enum_to_name(const enum_map_t *map, int value);
/*
Create a copy of the input string inp, but replace all occourances
of %<number> with argv[number] if the number is within the bounds

32
lib/src/enum_to_name.c Normal file
View file

@ -0,0 +1,32 @@
/* 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 <string.h>
#include "util.h"
const char *enum_to_name(const enum_map_t *map, int value)
{
size_t i;
for (i = 0; map[i].name != NULL; ++i) {
if (map[i].value == value)
return map[i].name;
}
return NULL;
}

27
lib/src/rdsrv.c
View file

@ -27,21 +27,6 @@
#include "service.h"
#include "util.h"
static const enum_map_t type_map[] = {
{ "once", SVC_ONCE },
{ "wait", SVC_WAIT },
{ "respawn", SVC_RESPAWN },
{ NULL, 0 },
};
static const enum_map_t target_map[] = {
{ "boot", TGT_BOOT },
{ "shutdown", TGT_SHUTDOWN },
{ "reboot", TGT_REBOOT },
{ "ctrlaltdel", TGT_CAD },
{ NULL, 0 },
};
static int srv_name(service_t *srv, char *arg,
const char *filename, size_t lineno)
{
@ -118,15 +103,15 @@ static int srv_after(service_t *srv, char *arg,
static int srv_type(service_t *srv, char *arg,
const char *filename, size_t lineno)
{
const enum_map_t *ent = enum_by_name(type_map, arg);
int type = svc_type_from_string(arg);
if (ent == NULL) {
if (type == -1) {
fprintf(stderr, "%s: %zu: unknown service type '%s'\n",
filename, lineno, arg);
return -1;
}
srv->type = ent->value;
srv->type = type;
free(arg);
return 0;
}
@ -134,15 +119,15 @@ static int srv_type(service_t *srv, char *arg,
static int srv_target(service_t *srv, char *arg,
const char *filename, size_t lineno)
{
const enum_map_t *ent = enum_by_name(target_map, arg);
int target = svc_target_from_string(arg);
if (ent == NULL) {
if (target == -1) {
fprintf(stderr, "%s: %zu: unknown service target '%s'\n",
filename, lineno, arg);
return -1;
}
srv->target = ent->value;
srv->target = target;
free(arg);
return 0;
}

58
lib/src/svcmap.c Normal file
View file

@ -0,0 +1,58 @@
/* 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 "service.h"
#include "util.h"
static const enum_map_t type_map[] = {
{ "once", SVC_ONCE },
{ "wait", SVC_WAIT },
{ "respawn", SVC_RESPAWN },
{ NULL, 0 },
};
static const enum_map_t target_map[] = {
{ "boot", TGT_BOOT },
{ "shutdown", TGT_SHUTDOWN },
{ "reboot", TGT_REBOOT },
{ "ctrlaltdel", TGT_CAD },
{ NULL, 0 },
};
const char *svc_type_to_string(int type)
{
return enum_to_name(type_map, type);
}
int svc_type_from_string(const char *type)
{
const enum_map_t *ent = enum_by_name(type_map, type);
return ent == NULL ? -1 : ent->value;
}
const char *svc_target_to_string(int target)
{
return enum_to_name(target_map, target);
}
int svc_target_from_string(const char *target)
{
const enum_map_t *ent = enum_by_name(target_map, target);
return ent == NULL ? -1 : ent->value;
}