SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4522 from lucaswerkmeister/unescape-template

Browse Source 
escape: support --unescape with --template
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2018-06-25 18:48:01 +02:00
committed by GitHub
parent 5e4c5bde5c d936cddcb5
commit dfe23d4145
2 changed files with 89 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/escape/escape.c
+61 -5
View File
@@ -21,6 +21,7 @@ static enum {
static const char *arg_suffix = NULL;
static const char *arg_template = NULL;
static bool arg_path = false;
static bool arg_instance = false;
static void help(void) {
printf("%s [OPTIONS...] [NAME...]\n\n"
@@ -29,6 +30,7 @@ static void help(void) {
" --version Show package version\n"
" --suffix=SUFFIX Unit suffix to append to escaped strings\n"
" --template=TEMPLATE Insert strings as instance into template\n"
" --instance With --unescape, show just the instance part\n"
" -u --unescape Unescape strings\n"
" -m --mangle Mangle strings\n"
" -p --path When escaping/unescaping assume the string is a path\n"
@@ -51,6 +53,7 @@ static int parse_argv(int argc, char *argv[]) {
{ "unescape", no_argument, NULL, 'u' },
{ "mangle", no_argument, NULL, 'm' },
{ "path", no_argument, NULL, 'p' },
{ "instance", no_argument, NULL, 'i' },
{}
};
@@ -102,6 +105,10 @@ static int parse_argv(int argc, char *argv[]) {
arg_path = true;
break;
case 'i':
arg_instance = true;
break;
case '?':
return -EINVAL;
@@ -119,8 +126,13 @@ static int parse_argv(int argc, char *argv[]) {
return -EINVAL;
}
if ((arg_template || arg_suffix) && arg_action != ACTION_ESCAPE) {
log_error("--suffix= and --template= are not compatible with --unescape or --mangle.");
if ((arg_template || arg_suffix) && arg_action == ACTION_MANGLE) {
log_error("--suffix= and --template= are not compatible with --mangle.");
return -EINVAL;
}
if (arg_suffix && arg_action == ACTION_UNESCAPE) {
log_error("--suffix is not compatible with --unescape.");
return -EINVAL;
}
@@ -129,6 +141,16 @@ static int parse_argv(int argc, char *argv[]) {
return -EINVAL;
}
if (arg_instance && arg_action != ACTION_UNESCAPE) {
log_error("--instance must be used in conjunction with --unescape.");
return -EINVAL;
}
if (arg_instance && arg_template) {
log_error("--instance may not be combined with --template.");
return -EINVAL;
}
return 1;
}
@@ -189,17 +211,51 @@ int main(int argc, char *argv[]) {
break;
case ACTION_UNESCAPE:
case ACTION_UNESCAPE: {
_cleanup_free_ char *name = NULL;
if (arg_template || arg_instance) {
_cleanup_free_ char *template = NULL;
r = unit_name_to_instance(*i, &name);
if (r < 0) {
log_error_errno(r, "Failed to extract instance: %m");
goto finish;
}
if (isempty(name)) {
log_error("Unit %s is missing the instance name.", *i);
r = -EINVAL;
goto finish;
}
r = unit_name_template(*i, &template);
if (r < 0) {
log_error_errno(r, "Failed to extract template: %m");
goto finish;
}
if (arg_template && !streq(arg_template, template)) {
log_error("Unit %s template %s does not match specified template %s.", *i, template, arg_template);
r = -EINVAL;
goto finish;
}
} else {
name = strdup(*i);
if (!name) {
r = log_oom();
goto finish;
}
}
if (arg_path)
r = unit_name_path_unescape(*i, &e);
r = unit_name_path_unescape(name, &e);
else
r = unit_name_unescape(*i, &e);
r = unit_name_unescape(name, &e);
if (r < 0) {
log_error_errno(r, "Failed to unescape string: %m");
goto finish;
}
break;
}
case ACTION_MANGLE:
r = unit_name_mangle(*i, 0, &e);