chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prep v230: Move musl_missing and parse-printf-format to libshared.
[elogind.git]
/
src
/
basic
/
unit-name.c
diff --git
a/src/basic/unit-name.c
b/src/basic/unit-name.c
index e1af224c7b3a60ab61d047d27e7804bcd44e93b6..463301eebffdac579a9ebe3d1a978f7071b620bb 100644
(file)
--- a/
src/basic/unit-name.c
+++ b/
src/basic/unit-name.c
@@
-1,5
+1,3
@@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
/***
This file is part of systemd.
/***
This file is part of systemd.
@@
-27,6
+25,7
@@
#include "alloc-util.h"
#include "bus-label.h"
#include "alloc-util.h"
#include "bus-label.h"
+//#include "glob-util.h"
#include "hexdecoct.h"
#include "macro.h"
#include "path-util.h"
#include "hexdecoct.h"
#include "macro.h"
#include "path-util.h"
@@
-35,10
+34,22
@@
#include "strv.h"
#include "unit-name.h"
#include "strv.h"
#include "unit-name.h"
+/* Characters valid in a unit name. */
#define VALID_CHARS \
#define VALID_CHARS \
- DIGITS LETTERS \
+ DIGITS \
+ LETTERS \
":-_.\\"
":-_.\\"
+/* The same, but also permits the single @ character that may appear */
+#define VALID_CHARS_WITH_AT \
+ "@" \
+ VALID_CHARS
+
+/* All chars valid in a unit name glob */
+#define VALID_CHARS_GLOB \
+ VALID_CHARS_WITH_AT \
+ "[]!-*?"
+
bool unit_name_is_valid(const char *n, UnitNameFlags flags) {
const char *e, *i, *at;
bool unit_name_is_valid(const char *n, UnitNameFlags flags) {
const char *e, *i, *at;
@@
-640,7
+651,7
@@
static char *do_escape_mangle(const char *f, UnitNameMangle allow_globs, char *t
/* We'll only escape the obvious characters here, to play
* safe. */
/* We'll only escape the obvious characters here, to play
* safe. */
- valid_chars = allow_globs == UNIT_NAME_GLOB ?
"@" VALID_CHARS "[]!-*?" : "@" VALID_CHARS
;
+ valid_chars = allow_globs == UNIT_NAME_GLOB ?
VALID_CHARS_GLOB : VALID_CHARS_WITH_AT
;
for (; *f; f++) {
if (*f == '/')
for (; *f; f++) {
if (*f == '/')
@@
-675,15
+686,15
@@
int unit_name_mangle_with_suffix(const char *name, UnitNameMangle allow_globs, c
if (!unit_suffix_is_valid(suffix))
return -EINVAL;
if (!unit_suffix_is_valid(suffix))
return -EINVAL;
- if (unit_name_is_valid(name, UNIT_NAME_ANY)) {
- /* No mangling necessary... */
- s = strdup(name);
- if (!s)
- return -ENOMEM;
+ /* Already a fully valid unit name? If so, no mangling is necessary... */
+ if (unit_name_is_valid(name, UNIT_NAME_ANY))
+ goto good;
- *ret = s;
- return 0;
- }
+ /* Already a fully valid globbing expression? If so, no mangling is necessary either... */
+ if (allow_globs == UNIT_NAME_GLOB &&
+ string_is_glob(name) &&
+ in_charset(name, VALID_CHARS_GLOB))
+ goto good;
if (is_device_path(name)) {
r = unit_name_from_path(name, ".device", ret);
if (is_device_path(name)) {
r = unit_name_from_path(name, ".device", ret);
@@
-708,11
+719,21
@@
int unit_name_mangle_with_suffix(const char *name, UnitNameMangle allow_globs, c
t = do_escape_mangle(name, allow_globs, s);
*t = 0;
t = do_escape_mangle(name, allow_globs, s);
*t = 0;
- if (unit_name_to_type(s) < 0)
+ /* Append a suffix if it doesn't have any, but only if this is not a glob, so that we can allow "foo.*" as a
+ * valid glob. */
+ if ((allow_globs != UNIT_NAME_GLOB || !string_is_glob(s)) && unit_name_to_type(s) < 0)
strcpy(t, suffix);
*ret = s;
return 1;
strcpy(t, suffix);
*ret = s;
return 1;
+
+good:
+ s = strdup(name);
+ if (!s)
+ return -ENOMEM;
+
+ *ret = s;
+ return 0;
}
int slice_build_parent_slice(const char *slice, char **ret) {
}
int slice_build_parent_slice(const char *slice, char **ret) {
@@
-740,7
+761,7
@@
int slice_build_parent_slice(const char *slice, char **ret) {
else {
r = free_and_strdup(&s, "-.slice");
if (r < 0) {
else {
r = free_and_strdup(&s, "-.slice");
if (r < 0) {
- free(s);
+
free(s);
return r;
}
}
return r;
}
}