shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-10-28 20:25:25 +03:00
Code

util: add generalization of verb parsing for command line tools

Browse Source 
We should move loginctl, timedatectl, machinectl over to use this new
API instead of a manual one.
This commit is contained in:
Lennart Poettering 2014-12-19 01:48:05 +01:00
parent e02d225b1e
commit dca59f6266
3 changed files with 114 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@ -895,7 +895,9 @@ libsystemd_shared_la_SOURCES = \
src/shared/uid-range.h \
src/shared/nss-util.h \
src/shared/btrfs-util.c \
src/shared/btrfs-util.h
src/shared/btrfs-util.h \
src/shared/verbs.c \
src/shared/verbs.h
if HAVE_UTMP
libsystemd_shared_la_SOURCES += \

77
src/shared/verbs.c Normal file
View File

@ -0,0 +1,77 @@
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
/***
This file is part of systemd.
Copyright 2014 Lennart Poettering
systemd is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
systemd 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
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
#include "util.h"
#include "verbs.h"
int dispatch_verb(int argc, char *argv[], const Verb verbs[], void *userdata) {
const Verb *verb;
const char *name;
unsigned i;
int left;
assert(verbs);
assert(verbs[0].dispatch);
assert(argc >= 0);
assert(argv);
assert(argc >= optind);
left = argc - optind;
name = argv[optind];
for (i = 0;; i++) {
bool found;
/* At the end of the list? */
if (!verbs[i].dispatch) {
if (name)
log_error("Unknown operation %s.", name);
else
log_error("Requires operation parameter.");
return -EINVAL;
}
if (!name)
found = !!(verbs[i].flags & VERB_DEFAULT);
else
found = streq(name, verbs[i].verb);
if (found) {
verb = &verbs[i];
break;
}
}
if (verb->min_args != VERB_ANY &&
(unsigned) left < verb->min_args) {
log_error("Too few arguments.");
return -EINVAL;
}
if (verb->max_args != VERB_ANY &&
(unsigned) left > verb->max_args) {
log_error("Too many argument.s");
return -EINVAL;
}
return verb->dispatch(left, argv + optind, userdata);
}

34
src/shared/verbs.h Normal file
View File

@ -0,0 +1,34 @@
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
#pragma once
/***
This file is part of systemd.
Copyright 2014 Lennart Poettering
systemd is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
systemd 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
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
#define VERB_ANY ((unsigned) -1)
#define VERB_DEFAULT 1
typedef struct {
const char *verb;
unsigned min_args, max_args;
unsigned flags;
int (* const dispatch)(int argc, char *argv[], void *userdata);
} Verb;
int dispatch_verb(int argc, char *argv[], const Verb verbs[], void *userdata);