chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Compiling.
[elogind.git]
/
src
/
shared
/
install-printf.c
diff --git
a/src/shared/install-printf.c
b/src/shared/install-printf.c
index 10b0cf379bcda5ea5c1747b1ef5bc82e53db211d..f62a0321e65c922db75e68ac64c9271607907cb8 100644
(file)
--- a/
src/shared/install-printf.c
+++ b/
src/shared/install-printf.c
@@
-19,7
+19,6
@@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include <assert.h>
#include <stdlib.h>
#include "specifier.h"
#include <stdlib.h>
#include "specifier.h"
@@
-27,21
+26,35
@@
#include "util.h"
#include "install-printf.h"
#include "util.h"
#include "install-printf.h"
-static
char *specifier_prefix_and_instance(char specifier, void *data, void *userdata
) {
+static
int specifier_prefix_and_instance(char specifier, void *data, void *userdata, char **ret
) {
InstallInfo *i = userdata;
InstallInfo *i = userdata;
+ char *n;
+
assert(i);
assert(i);
- return unit_name_to_prefix_and_instance(i->name);
+ n = unit_name_to_prefix_and_instance(i->name);
+ if (!n)
+ return -ENOMEM;
+
+ *ret = n;
+ return 0;
}
}
-static
char *specifier_prefix(char specifier, void *data, void *userdata
) {
+static
int specifier_prefix(char specifier, void *data, void *userdata, char **ret
) {
InstallInfo *i = userdata;
InstallInfo *i = userdata;
+ char *n;
+
assert(i);
assert(i);
- return unit_name_to_prefix(i->name);
+ n = unit_name_to_prefix(i->name);
+ if (!n)
+ return -ENOMEM;
+
+ *ret = n;
+ return 0;
}
}
-static
char *specifier_instance(char specifier, void *data, void *userdata
) {
+static
int specifier_instance(char specifier, void *data, void *userdata, char **ret
) {
InstallInfo *i = userdata;
char *instance;
int r;
InstallInfo *i = userdata;
char *instance;
int r;
@@
-50,17
+63,22
@@
static char *specifier_instance(char specifier, void *data, void *userdata) {
r = unit_name_to_instance(i->name, &instance);
if (r < 0)
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
) {
+static
int specifier_user_name(char specifier, void *data, void *userdata, char **ret
) {
InstallInfo *i = userdata;
const char *username;
InstallInfo *i = userdata;
const char *username;
-
char _cleanup_free_
*tmp = NULL;
+
_cleanup_free_ char
*tmp = NULL;
char *printed = NULL;
assert(i);
char *printed = NULL;
assert(i);
@@
-82,18
+100,20
@@
static char *specifier_user_name(char specifier, void *data, void *userdata) {
r = get_user_creds(&username, &uid, NULL, NULL, NULL);
if (r < 0)
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;
}}
break;
}}
- return printed;
+
+ *ret = printed;
+ return 0;
}
}
-
char *install_full_printf(InstallInfo *i, const char *forma
t) {
+
int install_full_printf(InstallInfo *i, const char *format, char **re
t) {
/* This is similar to unit_full_printf() but does not support
* anything path-related.
/* This is similar to unit_full_printf() but does not support
* anything path-related.
@@
-108,6
+128,7
@@
char *install_full_printf(InstallInfo *i, const char *format) {
* %m the machine ID of the running system
* %H the host name of the running system
* %b the boot ID of the running system
* %m the machine ID of the running system
* %H the host name of the running system
* %b the boot ID of the running system
+ * %v `uname -r` of the running system
*/
const Specifier table[] = {
*/
const Specifier table[] = {
@@
-122,11
+143,13
@@
char *install_full_printf(InstallInfo *i, const char *format) {
{ 'm', specifier_machine_id, NULL },
{ 'H', specifier_host_name, NULL },
{ 'b', specifier_boot_id, NULL },
{ 'm', specifier_machine_id, NULL },
{ 'H', specifier_host_name, NULL },
{ 'b', specifier_boot_id, NULL },
- { 0, NULL, NULL }
+ { 'v', specifier_kernel_release, NULL },
+ {}
};
assert(i);
assert(format);
};
assert(i);
assert(format);
+ assert(ret);
- return specifier_printf(format, table, i);
+ return specifier_printf(format, table, i
, ret
);
}
}