X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Finstall-printf.c;h=cbe984d2fba3ec4ea1333ca6b7414f285a432823;hb=30ab6a0fc1bb950c4dcd90dcd3dfe00a810c7fc1;hp=1157ea989beb2b34169fdff593e2ebb80de93f0f;hpb=6aaa8c2f783cd1b3ac27c5ce40625d032e7e3d71;p=elogind.git
diff --git a/src/shared/install-printf.c b/src/shared/install-printf.c
index 1157ea989..cbe984d2f 100644
--- a/src/shared/install-printf.c
+++ b/src/shared/install-printf.c
@@ -19,30 +19,32 @@
along with systemd; If not, see .
***/
-#include
#include
#include "specifier.h"
#include "unit-name.h"
#include "util.h"
#include "install-printf.h"
+#include "formats-util.h"
+
+static int specifier_prefix_and_instance(char specifier, void *data, void *userdata, char **ret) {
+ UnitFileInstallInfo *i = userdata;
-static char *specifier_prefix_and_instance(char specifier, void *data, void *userdata) {
- InstallInfo *i = userdata;
assert(i);
- return unit_name_to_prefix_and_instance(i->name);
+ return unit_name_to_prefix_and_instance(i->name, ret);
}
-static char *specifier_prefix(char specifier, void *data, void *userdata) {
- InstallInfo *i = userdata;
+static int specifier_prefix(char specifier, void *data, void *userdata, char **ret) {
+ UnitFileInstallInfo *i = userdata;
+
assert(i);
- return unit_name_to_prefix(i->name);
+ return unit_name_to_prefix(i->name, ret);
}
-static char *specifier_instance(char specifier, void *data, void *userdata) {
- InstallInfo *i = userdata;
+static int specifier_instance(char specifier, void *data, void *userdata, char **ret) {
+ UnitFileInstallInfo *i = userdata;
char *instance;
int r;
@@ -50,15 +52,20 @@ static char *specifier_instance(char specifier, void *data, void *userdata) {
r = unit_name_to_instance(i->name, &instance);
if (r < 0)
- return NULL;
- if (instance != NULL)
- return instance;
- else
- return strdup("");
+ return r;
+
+ if (!instance) {
+ instance = strdup("");
+ if (!instance)
+ return -ENOMEM;
+ }
+
+ *ret = instance;
+ return 0;
}
-static char *specifier_user_name(char specifier, void *data, void *userdata) {
- InstallInfo *i = userdata;
+static int specifier_user_name(char specifier, void *data, void *userdata, char **ret) {
+ UnitFileInstallInfo *i = userdata;
const char *username;
_cleanup_free_ char *tmp = NULL;
char *printed = NULL;
@@ -82,18 +89,20 @@ static char *specifier_user_name(char specifier, void *data, void *userdata) {
r = get_user_creds(&username, &uid, NULL, NULL, NULL);
if (r < 0)
- return NULL;
+ return r;
- if (asprintf(&printed, "%d", uid) < 0)
- return NULL;
+ if (asprintf(&printed, UID_FMT, uid) < 0)
+ return -ENOMEM;
break;
}}
- return printed;
+
+ *ret = printed;
+ return 0;
}
-char *install_full_printf(InstallInfo *i, const char *format) {
+int install_full_printf(UnitFileInstallInfo *i, const char *format, char **ret) {
/* This is similar to unit_full_printf() but does not support
* anything path-related.
@@ -129,6 +138,7 @@ char *install_full_printf(InstallInfo *i, const char *format) {
assert(i);
assert(format);
+ assert(ret);
- return specifier_printf(format, table, i);
+ return specifier_printf(format, table, i, ret);
}