summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-06-19 17:29:39 +0200
committerLennart Poettering <lennart@poettering.net>2014-06-19 17:29:39 +0200
commitc3f841063db371b9824b9f91df96a66dfbd24f83 (patch)
tree60cb24e4bbca01829a6044431c529af65f2dda64
parent1a524ed4adbc0170087b1f2ff0e6182c7c79ad6d (diff)
coredumpctl: fix columns sizing for timestamp
-rw-r--r--src/journal/coredumpctl.c6
-rw-r--r--src/shared/time-util.h1
2 files changed, 4 insertions, 3 deletions
diff --git a/src/journal/coredumpctl.c b/src/journal/coredumpctl.c
index 7314683309..325f62f3e7 100644
--- a/src/journal/coredumpctl.c
+++ b/src/journal/coredumpctl.c
@@ -383,15 +383,15 @@ static int print_list(FILE* file, sd_journal *j, int had_legend) {
if (!had_legend && !arg_no_legend)
fprintf(file, "%-*s %*s %*s %*s %*s %s\n",
- FORMAT_TIMESTAMP_MAX-1, "TIME",
+ FORMAT_TIMESTAMP_WIDTH, "TIME",
6, "PID",
5, "UID",
5, "GID",
3, "SIG",
"EXE");
- fprintf(file, "%*s %*s %*s %*s %*s %s\n",
- FORMAT_TIMESTAMP_MAX-1, buf,
+ fprintf(file, "%-*s %*s %*s %*s %*s %s\n",
+ FORMAT_TIMESTAMP_WIDTH, buf,
6, strna(pid),
5, strna(uid),
5, strna(gid),
diff --git a/src/shared/time-util.h b/src/shared/time-util.h
index f68c095605..34ba6c11be 100644
--- a/src/shared/time-util.h
+++ b/src/shared/time-util.h
@@ -58,6 +58,7 @@ typedef struct dual_timestamp {
#define NSEC_PER_YEAR ((usec_t) (31557600ULL*NSEC_PER_SEC))
#define FORMAT_TIMESTAMP_MAX ((4*4+1)+11+9+4+1) /* weekdays can be unicode */
+#define FORMAT_TIMESTAMP_WIDTH 28 /* when outputting, assume this width */
#define FORMAT_TIMESTAMP_RELATIVE_MAX 256
#define FORMAT_TIMESPAN_MAX 64