chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pager: introduce "jump to end" option
[elogind.git]
/
src
/
timedate
/
timedatectl.c
diff --git
a/src/timedate/timedatectl.c
b/src/timedate/timedatectl.c
index d379bccd7f4707194a161ae8ede9eff585b3e09b..ef2ea0830006bfd1cfee75fb4745a008ebe5a5f5 100644
(file)
--- a/
src/timedate/timedatectl.c
+++ b/
src/timedate/timedatectl.c
@@
-51,7
+51,7
@@
static void pager_open_if_enabled(void) {
if (arg_no_pager)
return;
if (arg_no_pager)
return;
- pager_open();
+ pager_open(
false
);
}
static void polkit_agent_open_if_enabled(void) {
}
static void polkit_agent_open_if_enabled(void) {
@@
-173,10
+173,10
@@
static void print_status_info(StatusInfo *i) {
zero(tm);
assert_se(strftime(b, sizeof(b), "%a %Y-%m-%d %H:%M:%S %Z", localtime_r(&tc, &tm)) > 0);
char_array_0(b);
zero(tm);
assert_se(strftime(b, sizeof(b), "%a %Y-%m-%d %H:%M:%S %Z", localtime_r(&tc, &tm)) > 0);
char_array_0(b);
- printf(" Last DST change: DST
became %s
\n"
+ printf(" Last DST change: DST
%s at
\n"
" %s\n"
" %s\n",
" %s\n"
" %s\n",
- is_dstc ? "
active" : "inactive
", a, b);
+ is_dstc ? "
began" : "ended
", a, b);
t = tn - 1;
zero(tm);
t = tn - 1;
zero(tm);
@@
-186,10
+186,10
@@
static void print_status_info(StatusInfo *i) {
zero(tm);
assert_se(strftime(b, sizeof(b), "%a %Y-%m-%d %H:%M:%S %Z", localtime_r(&tn, &tm)) > 0);
char_array_0(b);
zero(tm);
assert_se(strftime(b, sizeof(b), "%a %Y-%m-%d %H:%M:%S %Z", localtime_r(&tn, &tm)) > 0);
char_array_0(b);
- printf(" Next DST change: DST
will become %s, the clock will jump %s
\n"
+ printf(" Next DST change: DST
%s (the clock jumps %s) at
\n"
" %s\n"
" %s\n",
" %s\n"
" %s\n",
- is_dstn ? "
active" : "inactive
", jump_str(dn, s, sizeof(s)), a, b);
+ is_dstn ? "
begins" : "ends
", jump_str(dn, s, sizeof(s)), a, b);
free(zc);
free(zn);
free(zc);
free(zn);
@@
-425,7
+425,6
@@
static int list_timezones(DBusConnection *bus, char **args, unsigned n) {
_cleanup_fclose_ FILE *f = NULL;
_cleanup_strv_free_ char **zones = NULL;
size_t n_zones = 0;
_cleanup_fclose_ FILE *f = NULL;
_cleanup_strv_free_ char **zones = NULL;
size_t n_zones = 0;
- char **i;
assert(args);
assert(n == 1);
assert(args);
assert(n == 1);
@@
-487,8
+486,7
@@
static int list_timezones(DBusConnection *bus, char **args, unsigned n) {
pager_open_if_enabled();
strv_sort(zones);
pager_open_if_enabled();
strv_sort(zones);
- STRV_FOREACH(i, zones)
- puts(*i);
+ strv_print(zones);
return 0;
}
return 0;
}
@@
-551,7
+549,6
@@
static int parse_argv(int argc, char *argv[]) {
case ARG_VERSION:
puts(PACKAGE_STRING);
case ARG_VERSION:
puts(PACKAGE_STRING);
- puts(DISTRIBUTION);
puts(SYSTEMD_FEATURES);
return 0;
puts(SYSTEMD_FEATURES);
return 0;