chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
networkd: run as unpriviliged "systemd-network" user
[elogind.git]
/
src
/
shared
/
unit-name.c
diff --git
a/src/shared/unit-name.c
b/src/shared/unit-name.c
index 832b9268133f2e1b06a5c3c499cb1be850df9500..6c167b4331d995a9d9bc8b054611d8d905632859 100644
(file)
--- a/
src/shared/unit-name.c
+++ b/
src/shared/unit-name.c
@@
-23,8
+23,8
@@
#include <string.h>
#include <assert.h>
#include <string.h>
#include <assert.h>
-#include "sd-bus.h"
#include "path-util.h"
#include "path-util.h"
+#include "bus-label.h"
#include "util.h"
#include "unit-name.h"
#include "def.h"
#include "util.h"
#include "unit-name.h"
#include "def.h"
@@
-62,7
+62,7
@@
static const char* const unit_load_state_table[_UNIT_LOAD_STATE_MAX] = {
DEFINE_STRING_TABLE_LOOKUP(unit_load_state, UnitLoadState);
DEFINE_STRING_TABLE_LOOKUP(unit_load_state, UnitLoadState);
-bool unit_name_is_valid(const char *n,
bool
template_ok) {
+bool unit_name_is_valid(const char *n,
enum template_valid
template_ok) {
const char *e, *i, *at;
/* Valid formats:
const char *e, *i, *at;
/* Valid formats:
@@
-72,6
+72,7
@@
bool unit_name_is_valid(const char *n, bool template_ok) {
*/
assert(n);
*/
assert(n);
+ assert(IN_SET(template_ok, TEMPLATE_VALID, TEMPLATE_INVALID));
if (strlen(n) >= UNIT_NAME_MAX)
return false;
if (strlen(n) >= UNIT_NAME_MAX)
return false;
@@
-96,7
+97,7
@@
bool unit_name_is_valid(const char *n, bool template_ok) {
if (at == n)
return false;
if (at == n)
return false;
- if (!template_ok && at+1 == e)
+ if (!template_ok
== TEMPLATE_VALID
&& at+1 == e)
return false;
}
return false;
}
@@
-186,7
+187,7
@@
char *unit_name_change_suffix(const char *n, const char *suffix) {
size_t a, b;
assert(n);
size_t a, b;
assert(n);
- assert(unit_name_is_valid(n,
true
));
+ assert(unit_name_is_valid(n,
TEMPLATE_VALID
));
assert(suffix);
assert(suffix[0] == '.');
assert(suffix);
assert(suffix[0] == '.');
@@
-293,7
+294,7
@@
char *unit_name_unescape(const char *f) {
}
char *unit_name_path_escape(const char *f) {
}
char *unit_name_path_escape(const char *f) {
-
char *p, *e
;
+
_cleanup_free_ char *p
;
assert(f);
assert(f);
@@
-303,15
+304,10
@@
char *unit_name_path_escape(const char *f) {
path_kill_slashes(p);
path_kill_slashes(p);
- if (streq(p, "/") || streq(p, "")) {
- free(p);
+ if (streq(p, "/") || streq(p, ""))
return strdup("-");
return strdup("-");
- }
-
- e = unit_name_escape(p[0] == '/' ? p + 1 : p);
- free(p);
- return
e
;
+ return
unit_name_escape(p[0] == '/' ? p + 1 : p)
;
}
char *unit_name_path_unescape(const char *f) {
}
char *unit_name_path_unescape(const char *f) {
@@
-409,7
+405,7
@@
char *unit_name_template(const char *f) {
}
char *unit_name_from_path(const char *path, const char *suffix) {
}
char *unit_name_from_path(const char *path, const char *suffix) {
-
char *p, *r
;
+
_cleanup_free_ char *p = NULL
;
assert(path);
assert(suffix);
assert(path);
assert(suffix);
@@
-418,14
+414,11
@@
char *unit_name_from_path(const char *path, const char *suffix) {
if (!p)
return NULL;
if (!p)
return NULL;
- r = strappend(p, suffix);
- free(p);
-
- return r;
+ return strappend(p, suffix);
}
char *unit_name_from_path_instance(const char *prefix, const char *path, const char *suffix) {
}
char *unit_name_from_path_instance(const char *prefix, const char *path, const char *suffix) {
-
char *p, *r
;
+
_cleanup_free_ char *p = NULL
;
assert(prefix);
assert(path);
assert(prefix);
assert(path);
@@
-435,10
+428,7
@@
char *unit_name_from_path_instance(const char *prefix, const char *path, const c
if (!p)
return NULL;
if (!p)
return NULL;
- r = strjoin(prefix, "@", p, suffix, NULL);
- free(p);
-
- return r;
+ return strjoin(prefix, "@", p, suffix, NULL);
}
char *unit_name_to_path(const char *name) {
}
char *unit_name_to_path(const char *name) {
@@
-458,7
+448,7
@@
char *unit_dbus_path_from_name(const char *name) {
assert(name);
assert(name);
- e =
sd_
bus_label_escape(name);
+ e = bus_label_escape(name);
if (!e)
return NULL;
if (!e)
return NULL;
@@
-473,7
+463,7
@@
int unit_name_from_dbus_path(const char *path, char **name) {
if (!e)
return -EINVAL;
if (!e)
return -EINVAL;
- n =
sd_
bus_label_unescape(e);
+ n = bus_label_unescape(e);
if (!n)
return -ENOMEM;
if (!n)
return -ENOMEM;
@@
-486,12
+476,13
@@
int unit_name_from_dbus_path(const char *path, char **name) {
* Try to turn a string that might not be a unit name into a
* sensible unit name.
*/
* Try to turn a string that might not be a unit name into a
* sensible unit name.
*/
-char *unit_name_mangle(const char *name,
bool
allow_globs) {
+char *unit_name_mangle(const char *name,
enum unit_name_mangle
allow_globs) {
char *r, *t;
const char *f;
char *r, *t;
const char *f;
- const char* valid_chars = allow_globs ? "@" VALID_CHARS "[]!-*?" : "@" VALID_CHARS;
+ const char* valid_chars = allow_globs
== MANGLE_GLOB
? "@" VALID_CHARS "[]!-*?" : "@" VALID_CHARS;
assert(name);
assert(name);
+ assert(IN_SET(allow_globs, MANGLE_GLOB, MANGLE_NOGLOB));
if (is_device_path(name))
return unit_name_from_path(name, ".device");
if (is_device_path(name))
return unit_name_from_path(name, ".device");
@@
-502,7
+493,7
@@
char *unit_name_mangle(const char *name, bool allow_globs) {
/* We'll only escape the obvious characters here, to play
* safe. */
/* We'll only escape the obvious characters here, to play
* safe. */
- r = new(char, strlen(name) * 4 +
1 + sizeof(".service")-
1);
+ r = new(char, strlen(name) * 4 +
strlen(".service") +
1);
if (!r)
return NULL;
if (!r)
return NULL;
@@
-528,7
+519,7
@@
char *unit_name_mangle(const char *name, bool allow_globs) {
* Similar to unit_name_mangle(), but is called when we know
* that this is about a specific unit type.
*/
* Similar to unit_name_mangle(), but is called when we know
* that this is about a specific unit type.
*/
-char *unit_name_mangle_with_suffix(const char *name,
bool
allow_globs, const char *suffix) {
+char *unit_name_mangle_with_suffix(const char *name,
enum unit_name_mangle
allow_globs, const char *suffix) {
char *r, *t;
const char *f;
char *r, *t;
const char *f;