shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-23 21:35:11 +03:00
Code

Merge pull request #34793 from yuwata/journalctl-copy-arguments

Browse Source 
journalctl: copy arguments
This commit is contained in:
Yu Watanabe 2024-10-17 01:52:03 +09:00 committed by GitHub
commit cadb074b9c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 63 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
src/journal/journalctl.c
View File

@ -50,11 +50,11 @@ sd_id128_t arg_boot_id = {};
int arg_boot_offset = 0; int arg_boot_offset = 0;
bool arg_dmesg = false; bool arg_dmesg = false;
bool arg_no_hostname = false; bool arg_no_hostname = false;
const char *arg_cursor = NULL; char *arg_cursor = NULL;
const char *arg_cursor_file = NULL; char *arg_cursor_file = NULL;
const char *arg_after_cursor = NULL; char *arg_after_cursor = NULL;
bool arg_show_cursor = false; bool arg_show_cursor = false;
const char *arg_directory = NULL; char *arg_directory = NULL;
char **arg_file = NULL; char **arg_file = NULL;
bool arg_file_stdin = false; bool arg_file_stdin = false;
int arg_priorities = 0; int arg_priorities = 0;
@ -75,7 +75,7 @@ char **arg_user_units = NULL;
bool arg_invocation = false; bool arg_invocation = false;
sd_id128_t arg_invocation_id = SD_ID128_NULL; sd_id128_t arg_invocation_id = SD_ID128_NULL;
int arg_invocation_offset = 0; int arg_invocation_offset = 0;
const char *arg_field = NULL; char *arg_field = NULL;
bool arg_catalog = false; bool arg_catalog = false;
bool arg_reverse = false; bool arg_reverse = false;
int arg_journal_type = 0; int arg_journal_type = 0;
@ -83,27 +83,35 @@ int arg_journal_additional_open_flags = 0;
int arg_namespace_flags = 0; int arg_namespace_flags = 0;
char *arg_root = NULL; char *arg_root = NULL;
char *arg_image = NULL; char *arg_image = NULL;
const char *arg_machine = NULL; char *arg_machine = NULL;
const char *arg_namespace = NULL; char *arg_namespace = NULL;
uint64_t arg_vacuum_size = 0; uint64_t arg_vacuum_size = 0;
uint64_t arg_vacuum_n_files = 0; uint64_t arg_vacuum_n_files = 0;
usec_t arg_vacuum_time = 0; usec_t arg_vacuum_time = 0;
Set *arg_output_fields = NULL; Set *arg_output_fields = NULL;
const char *arg_pattern = NULL; char *arg_pattern = NULL;
pcre2_code *arg_compiled_pattern = NULL; pcre2_code *arg_compiled_pattern = NULL;
PatternCompileCase arg_case = PATTERN_COMPILE_CASE_AUTO; PatternCompileCase arg_case = PATTERN_COMPILE_CASE_AUTO;
static ImagePolicy *arg_image_policy = NULL; static ImagePolicy *arg_image_policy = NULL;
STATIC_DESTRUCTOR_REGISTER(arg_cursor, freep);
STATIC_DESTRUCTOR_REGISTER(arg_cursor_file, freep);
STATIC_DESTRUCTOR_REGISTER(arg_after_cursor, freep);
STATIC_DESTRUCTOR_REGISTER(arg_directory, freep);
STATIC_DESTRUCTOR_REGISTER(arg_file, strv_freep); STATIC_DESTRUCTOR_REGISTER(arg_file, strv_freep);
STATIC_DESTRUCTOR_REGISTER(arg_facilities, set_freep); STATIC_DESTRUCTOR_REGISTER(arg_facilities, set_freep);
STATIC_DESTRUCTOR_REGISTER(arg_verify_key, freep); STATIC_DESTRUCTOR_REGISTER(arg_verify_key, erase_and_freep);
STATIC_DESTRUCTOR_REGISTER(arg_syslog_identifier, strv_freep); STATIC_DESTRUCTOR_REGISTER(arg_syslog_identifier, strv_freep);
STATIC_DESTRUCTOR_REGISTER(arg_exclude_identifier, strv_freep); STATIC_DESTRUCTOR_REGISTER(arg_exclude_identifier, strv_freep);
STATIC_DESTRUCTOR_REGISTER(arg_system_units, strv_freep); STATIC_DESTRUCTOR_REGISTER(arg_system_units, strv_freep);
STATIC_DESTRUCTOR_REGISTER(arg_user_units, strv_freep); STATIC_DESTRUCTOR_REGISTER(arg_user_units, strv_freep);
STATIC_DESTRUCTOR_REGISTER(arg_field, freep);
STATIC_DESTRUCTOR_REGISTER(arg_root, freep); STATIC_DESTRUCTOR_REGISTER(arg_root, freep);
STATIC_DESTRUCTOR_REGISTER(arg_image, freep); STATIC_DESTRUCTOR_REGISTER(arg_image, freep);
STATIC_DESTRUCTOR_REGISTER(arg_machine, freep);
STATIC_DESTRUCTOR_REGISTER(arg_namespace, freep);
STATIC_DESTRUCTOR_REGISTER(arg_output_fields, set_freep); STATIC_DESTRUCTOR_REGISTER(arg_output_fields, set_freep);
STATIC_DESTRUCTOR_REGISTER(arg_pattern, freep);
STATIC_DESTRUCTOR_REGISTER(arg_compiled_pattern, pattern_freep); STATIC_DESTRUCTOR_REGISTER(arg_compiled_pattern, pattern_freep);
STATIC_DESTRUCTOR_REGISTER(arg_image_policy, image_policy_freep); STATIC_DESTRUCTOR_REGISTER(arg_image_policy, image_policy_freep);
@ -567,24 +575,29 @@ static int parse_argv(int argc, char *argv[]) {
break; break;
case 'M': case 'M':
arg_machine = optarg; r = free_and_strdup_warn(&arg_machine, optarg);
if (r < 0)
return r;
break; break;
case ARG_NAMESPACE: case ARG_NAMESPACE:
if (streq(optarg, "*")) { if (streq(optarg, "*")) {
arg_namespace_flags = SD_JOURNAL_ALL_NAMESPACES; arg_namespace_flags = SD_JOURNAL_ALL_NAMESPACES;
arg_namespace = NULL; arg_namespace = mfree(arg_namespace);
} else if (startswith(optarg, "+")) { } else if (startswith(optarg, "+")) {
arg_namespace_flags = SD_JOURNAL_INCLUDE_DEFAULT_NAMESPACE; arg_namespace_flags = SD_JOURNAL_INCLUDE_DEFAULT_NAMESPACE;
arg_namespace = optarg + 1; r = free_and_strdup_warn(&arg_namespace, optarg + 1);
if (r < 0)
return r;
} else if (isempty(optarg)) { } else if (isempty(optarg)) {
arg_namespace_flags = 0; arg_namespace_flags = 0;
arg_namespace = NULL; arg_namespace = mfree(arg_namespace);
} else { } else {
arg_namespace_flags = 0; arg_namespace_flags = 0;
arg_namespace = optarg; r = free_and_strdup_warn(&arg_namespace, optarg);
if (r < 0)
return r;
} }
break; break;
case ARG_LIST_NAMESPACES: case ARG_LIST_NAMESPACES:
@ -592,7 +605,9 @@ static int parse_argv(int argc, char *argv[]) {
break; break;
case 'D': case 'D':
arg_directory = optarg; r = free_and_strdup_warn(&arg_directory, optarg);
if (r < 0)
return r;
break; break;
case 'i': case 'i':
@ -628,15 +643,21 @@ static int parse_argv(int argc, char *argv[]) {
break; break;
case 'c': case 'c':
arg_cursor = optarg; r = free_and_strdup_warn(&arg_cursor, optarg);
if (r < 0)
return r;
break; break;
case ARG_CURSOR_FILE: case ARG_CURSOR_FILE:
arg_cursor_file = optarg; r = free_and_strdup_warn(&arg_cursor_file, optarg);
if (r < 0)
return r;
break; break;
case ARG_AFTER_CURSOR: case ARG_AFTER_CURSOR:
arg_after_cursor = optarg; r = free_and_strdup_warn(&arg_after_cursor, optarg);
if (r < 0)
return r;
break; break;
case ARG_SHOW_CURSOR: case ARG_SHOW_CURSOR:
@ -689,9 +710,11 @@ static int parse_argv(int argc, char *argv[]) {
break; break;
case ARG_VERIFY_KEY: case ARG_VERIFY_KEY:
r = free_and_strdup(&arg_verify_key, optarg); erase_and_free(arg_verify_key);
if (r < 0) arg_verify_key = strdup(optarg);
return r; if (!arg_verify_key)
return log_oom();
/* Use memset not explicit_bzero() or similar so this doesn't look confusing /* Use memset not explicit_bzero() or similar so this doesn't look confusing
* in ps or htop output. */ * in ps or htop output. */
memset(optarg, 'x', strlen(optarg)); memset(optarg, 'x', strlen(optarg));
@ -791,7 +814,9 @@ static int parse_argv(int argc, char *argv[]) {
} }
case 'g': case 'g':
arg_pattern = optarg; r = free_and_strdup_warn(&arg_pattern, optarg);
if (r < 0)
return r;
break; break;
case ARG_CASE_SENSITIVE: case ARG_CASE_SENSITIVE:
@ -861,7 +886,9 @@ static int parse_argv(int argc, char *argv[]) {
case 'F': case 'F':
arg_action = ACTION_LIST_FIELDS; arg_action = ACTION_LIST_FIELDS;
arg_field = optarg; r = free_and_strdup_warn(&arg_field, optarg);
if (r < 0)
return r;
break; break;
case 'N': case 'N':
@ -1032,6 +1059,7 @@ static int parse_argv(int argc, char *argv[]) {
static int run(int argc, char *argv[]) { static int run(int argc, char *argv[]) {
_cleanup_(loop_device_unrefp) LoopDevice *loop_device = NULL; _cleanup_(loop_device_unrefp) LoopDevice *loop_device = NULL;
_cleanup_(umount_and_freep) char *mounted_dir = NULL; _cleanup_(umount_and_freep) char *mounted_dir = NULL;
_cleanup_strv_free_ char **args = NULL;
int r; int r;
setlocale(LC_ALL, ""); setlocale(LC_ALL, "");
@ -1041,7 +1069,9 @@ static int run(int argc, char *argv[]) {
if (r <= 0) if (r <= 0)
return r; return r;
char **args = strv_skip(argv, optind); r = strv_copy_unless_empty(strv_skip(argv, optind), &args);
if (r < 0)
return log_oom();
if (arg_image) { if (arg_image) {
assert(!arg_root); assert(!arg_root);

16
src/journal/journalctl.h
View File

@ -55,11 +55,11 @@ extern sd_id128_t arg_boot_id;
extern int arg_boot_offset; extern int arg_boot_offset;
extern bool arg_dmesg; extern bool arg_dmesg;
extern bool arg_no_hostname; extern bool arg_no_hostname;
extern const char *arg_cursor; extern char *arg_cursor;
extern const char *arg_cursor_file; extern char *arg_cursor_file;
extern const char *arg_after_cursor; extern char *arg_after_cursor;
extern bool arg_show_cursor; extern bool arg_show_cursor;
extern const char *arg_directory; extern char *arg_directory;
extern char **arg_file; extern char **arg_file;
extern bool arg_file_stdin; extern bool arg_file_stdin;
extern int arg_priorities; extern int arg_priorities;
@ -80,7 +80,7 @@ extern char **arg_user_units;
extern bool arg_invocation; extern bool arg_invocation;
extern sd_id128_t arg_invocation_id; extern sd_id128_t arg_invocation_id;
extern int arg_invocation_offset; extern int arg_invocation_offset;
extern const char *arg_field; extern char *arg_field;
extern bool arg_catalog; extern bool arg_catalog;
extern bool arg_reverse; extern bool arg_reverse;
extern int arg_journal_type; extern int arg_journal_type;
@ -88,13 +88,13 @@ extern int arg_journal_additional_open_flags;
extern int arg_namespace_flags; extern int arg_namespace_flags;
extern char *arg_root; extern char *arg_root;
extern char *arg_image; extern char *arg_image;
extern const char *arg_machine; extern char *arg_machine;
extern const char *arg_namespace; extern char *arg_namespace;
extern uint64_t arg_vacuum_size; extern uint64_t arg_vacuum_size;
extern uint64_t arg_vacuum_n_files; extern uint64_t arg_vacuum_n_files;
extern usec_t arg_vacuum_time; extern usec_t arg_vacuum_time;
extern Set *arg_output_fields; extern Set *arg_output_fields;
extern const char *arg_pattern; extern char *arg_pattern;
extern pcre2_code *arg_compiled_pattern; extern pcre2_code *arg_compiled_pattern;
extern PatternCompileCase arg_case; extern PatternCompileCase arg_case;