diff options
| author | Ondrej Oprala | 2014-04-30 14:42:51 +0200 |
|---|---|---|
| committer | Karel Zak | 2014-05-15 13:56:00 +0200 |
| commit | 4ea7848b507ceb39ca761d2f0380e96df9c2b1e0 (patch) | |
| tree | 10369bd22b62652135d6d51522e009c16d6b39f5 /login-utils/lslogins.c | |
| parent | lslogins: add support for multiple time formats (diff) | |
| download | kernel-qcow2-util-linux-4ea7848b507ceb39ca761d2f0380e96df9c2b1e0.tar.gz kernel-qcow2-util-linux-4ea7848b507ceb39ca761d2f0380e96df9c2b1e0.tar.xz kernel-qcow2-util-linux-4ea7848b507ceb39ca761d2f0380e96df9c2b1e0.zip | |
lslogins: add option --iso
Signed-off-by: Ondrej Oprala <ooprala@redhat.com>
Diffstat (limited to 'login-utils/lslogins.c')
| -rw-r--r-- | login-utils/lslogins.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/login-utils/lslogins.c b/login-utils/lslogins.c index 96185cb76..2c2521d2c 100644 --- a/login-utils/lslogins.c +++ b/login-utils/lslogins.c @@ -133,6 +133,7 @@ enum { TIME_SHORT_RELATIVE, TIME_SHORT, TIME_FULL, + TIME_ISO, }; /* @@ -281,6 +282,9 @@ static char *make_time(int mode, time_t time) case TIME_SHORT: strftime(buf, 32, "%a %b %d %Y", &tm); break; + case TIME_ISO: + strftime(buf, 32, "%Y-%m-%dT%H:%M:%S%z", &tm); + break; } return xstrdup(buf); } @@ -299,6 +303,7 @@ static void __attribute__((__noreturn__)) usage(FILE *out) fputs(_(" -f, --failed Display data about the last users' failed logins\n"), out); fputs(_(" -fulltimes Show dates in a long format\n"), out); fputs(_(" -g, --groups=<groups> Display users belonging to a group in GROUPS\n"), out); + fputs(_(" -i, --iso Display dates in the ISO-8601 format\n"), out); fputs(_(" -l, --logins=<logins> Display only users from LOGINS\n"), out); fputs(_(" --last Show info about the users' last login sessions\n"), out); fputs(_(" -m, --supp-groups Display supplementary groups as well\n"), out); @@ -492,7 +497,6 @@ static int parse_btmp(struct lslogins_control *ctl, char *path) static int get_sgroups(int *len, gid_t **list, struct passwd *pwd) { int n = 0; - gid_t *safelist; *len = 0; *list = NULL; @@ -517,13 +521,6 @@ static int get_sgroups(int *len, gid_t **list, struct passwd *pwd) (*list)[n] = (*list)[--(*len)]; *list = xrealloc(*list, *len * sizeof(gid_t)); -#if 0 - if (!safelist && *len) { - free(*list); - return -1; - } - *list = safelist; -#endif return 0; } @@ -1171,6 +1168,7 @@ int main(int argc, char *argv[]) { "fulltimes", no_argument, 0, OPT_FULLT }, { "groups", required_argument, 0, 'g' }, { "help", no_argument, 0, 'h' }, + { "iso", no_argument, 0, 'i' }, { "logins", required_argument, 0, 'l' }, { "supp-groups", no_argument, 0, 'm' }, { "newline", no_argument, 0, 'n' }, @@ -1208,7 +1206,7 @@ int main(int argc, char *argv[]) ctl->cmp_fn = cmp_uid; - while ((c = getopt_long(argc, argv, "acefg:hl:mno:rstuxzZ", + while ((c = getopt_long(argc, argv, "acefg:hil:mno:rstuxzZ", longopts, NULL)) != -1) { err_exclusive_options(c, longopts, excl, excl_st); @@ -1231,6 +1229,9 @@ int main(int argc, char *argv[]) break; case 'h': usage(stdout); + case 'i': + ctl->time_mode = TIME_ISO; + break; case 'l': logins = optarg; break; |