along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include <assert.h>
#include <stdlib.h>
#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;
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;
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.
assert(i);
assert(format);
+ assert(ret);
- return specifier_printf(format, table, i);
+ return specifier_printf(format, table, i, ret);
}