1
0
mirror of https://github.com/systemd/systemd.git synced 2025-01-14 23:24:38 +03:00

cgls,loginctl,systemctl: fix -l

Fixup for 98a6e13 "journalctl,loginctl,systemctl,systemd-cgls: add -l
as alias for --full".
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2013-06-19 18:08:14 -04:00
parent fe004b7c3a
commit 422fa6500a
3 changed files with 8 additions and 8 deletions

View File

@ -77,7 +77,7 @@ static int parse_argv(int argc, char *argv[]) {
assert(argc >= 1);
assert(argv);
while ((c = getopt_long(argc, argv, "hkaM:", options, NULL)) >= 0) {
while ((c = getopt_long(argc, argv, "hkalM:", options, NULL)) >= 0) {
switch (c) {

View File

@ -1346,13 +1346,13 @@ static int parse_argv(int argc, char *argv[]) {
{ "version", no_argument, NULL, ARG_VERSION },
{ "property", required_argument, NULL, 'p' },
{ "all", no_argument, NULL, 'a' },
{ "full", no_argument, NULL, 'l' },
{ "no-pager", no_argument, NULL, ARG_NO_PAGER },
{ "kill-who", required_argument, NULL, ARG_KILL_WHO },
{ "signal", required_argument, NULL, 's' },
{ "host", required_argument, NULL, 'H' },
{ "privileged", no_argument, NULL, 'P' },
{ "no-ask-password", no_argument, NULL, ARG_NO_ASK_PASSWORD },
{ "full", no_argument, NULL, 'l' },
{ NULL, 0, NULL, 0 }
};
@ -1361,7 +1361,7 @@ static int parse_argv(int argc, char *argv[]) {
assert(argc >= 0);
assert(argv);
while ((c = getopt_long(argc, argv, "hp:as:H:P", options, NULL)) >= 0) {
while ((c = getopt_long(argc, argv, "hp:als:H:P", options, NULL)) >= 0) {
switch (c) {
@ -1395,6 +1395,10 @@ static int parse_argv(int argc, char *argv[]) {
arg_all = true;
break;
case 'l':
arg_full = true;
break;
case ARG_NO_PAGER:
arg_no_pager = true;
break;
@ -1424,10 +1428,6 @@ static int parse_argv(int argc, char *argv[]) {
parse_user_at_host(optarg, &arg_user, &arg_host);
break;
case 'l':
arg_full = true;
break;
case '?':
return -EINVAL;

View File

@ -4872,7 +4872,7 @@ static int systemctl_parse_argv(int argc, char *argv[]) {
assert(argc >= 0);
assert(argv);
while ((c = getopt_long(argc, argv, "ht:p:aqfs:H:Pn:o:i", options, NULL)) >= 0) {
while ((c = getopt_long(argc, argv, "ht:p:alqfs:H:Pn:o:i", options, NULL)) >= 0) {
switch (c) {