diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-04-06 20:11:41 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-04-07 15:42:25 +0200 |
| commit | 527b7a421ff3927d4f3f170b1b143452e88ae1dc (patch) | |
| tree | cfb13e123c6dfd547fb005db63a480ca709b46da /src/tmpfiles | |
| parent | 64f75d7a2898e0c0d2b66f93ddd34ffd345bb3c5 (diff) | |
util: rework cunescape(), improve error handling
Change cunescape() to return a normal error code, so that we can
distuingish OOM errors from parse errors.
This also adds a flags parameter to control whether "relaxed" or normal
parsing shall be done. If set no parse failures are generated, and the
only reason why cunescape() can fail is OOM.
Diffstat (limited to 'src/tmpfiles')
| -rw-r--r-- | src/tmpfiles/tmpfiles.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c index 20972f6310..8c89fb33b8 100644 --- a/src/tmpfiles/tmpfiles.c +++ b/src/tmpfiles/tmpfiles.c @@ -913,13 +913,13 @@ static int write_one_file(Item *i, const char *path) { } if (i->argument) { - _cleanup_free_ char *unescaped; + _cleanup_free_ char *unescaped = NULL; log_debug("%s to \"%s\".", i->type == CREATE_FILE ? "Appending" : "Writing", path); - unescaped = cunescape(i->argument); - if (!unescaped) - return log_oom(); + r = cunescape(i->argument, 0, &unescaped); + if (r < 0) + return log_error_errno(r, "Failed to unescape parameter to write: %s", i->argument); r = loop_write(fd, unescaped, strlen(unescaped), false); if (r < 0) |