|
 |
17b0f1 |
From 9f2aa24a4cad32e10cba693be95f3ff9c46ee73e Mon Sep 17 00:00:00 2001
|
|
|
17b0f1 |
From: Yu Watanabe <watanabe.yu+github@gmail.com>
|
|
|
17b0f1 |
Date: Sun, 27 Aug 2017 16:34:53 +0900
|
|
|
17b0f1 |
Subject: [PATCH] journal-remote: show error message if output file name does
|
|
|
17b0f1 |
not end with .journal
|
|
|
17b0f1 |
|
|
|
17b0f1 |
`journalctl -o export | systemd-journal-remote -o /tmp/dir -`
|
|
|
17b0f1 |
gives the following error messages.
|
|
|
17b0f1 |
```
|
|
|
17b0f1 |
Failed to open output journal /tmp/dir: Invalid argument
|
|
|
17b0f1 |
Failed to get writer for source stdin: Invalid argument
|
|
|
17b0f1 |
Failed to create source for fd:0 (stdin): Invalid argument
|
|
|
17b0f1 |
```
|
|
|
17b0f1 |
And these are hard to understand what is the problem.
|
|
|
17b0f1 |
This commit makes journal-remote check whether the output file name
|
|
|
17b0f1 |
ends with .journal suffix or not, and if not, output error message.
|
|
|
17b0f1 |
|
|
|
17b0f1 |
(cherry picked from commit 6b1b9f75c85d26ddbda62e7b7afa6944044f4f95)
|
|
|
17b0f1 |
|
|
|
17b0f1 |
Resolves: bz#1267552
|
|
|
17b0f1 |
---
|
|
|
17b0f1 |
src/journal-remote/journal-remote.c | 13 +++++++++----
|
|
|
17b0f1 |
1 file changed, 9 insertions(+), 4 deletions(-)
|
|
|
17b0f1 |
|
|
|
17b0f1 |
diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c
|
|
|
17b0f1 |
index e65daf6a0b..431e28329b 100644
|
|
|
17b0f1 |
--- a/src/journal-remote/journal-remote.c
|
|
|
17b0f1 |
+++ b/src/journal-remote/journal-remote.c
|
|
|
17b0f1 |
@@ -1479,10 +1479,15 @@ static int parse_argv(int argc, char *argv[]) {
|
|
|
17b0f1 |
arg_split_mode = JOURNAL_WRITE_SPLIT_NONE;
|
|
|
17b0f1 |
}
|
|
|
17b0f1 |
|
|
|
17b0f1 |
- if (arg_split_mode == JOURNAL_WRITE_SPLIT_NONE
|
|
|
17b0f1 |
- && arg_output && is_dir(arg_output, true) > 0) {
|
|
|
17b0f1 |
- log_error("For SplitMode=none, output must be a file.");
|
|
|
17b0f1 |
- return -EINVAL;
|
|
|
17b0f1 |
+ if (arg_split_mode == JOURNAL_WRITE_SPLIT_NONE && arg_output) {
|
|
|
17b0f1 |
+ if (is_dir(arg_output, true) > 0) {
|
|
|
17b0f1 |
+ log_error("For SplitMode=none, output must be a file.");
|
|
|
17b0f1 |
+ return -EINVAL;
|
|
|
17b0f1 |
+ }
|
|
|
17b0f1 |
+ if (!endswith(arg_output, ".journal")) {
|
|
|
17b0f1 |
+ log_error("For SplitMode=none, output file name must end with .journal.");
|
|
|
17b0f1 |
+ return -EINVAL;
|
|
|
17b0f1 |
+ }
|
|
|
17b0f1 |
}
|
|
|
17b0f1 |
|
|
|
17b0f1 |
if (arg_split_mode == JOURNAL_WRITE_SPLIT_HOST
|