summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNIIBE Yutaka <gniibe@fsij.org>2022-03-15 07:17:31 +0100
committerNIIBE Yutaka <gniibe@fsij.org>2022-03-15 07:19:11 +0100
commitc6dd9ff9290427504faef120bd5c1ebb78990ca0 (patch)
tree46624a3c90e32a6fc4461744846131c6da6e22c9
parentFix previous commit. (diff)
downloadgnupg2-c6dd9ff9290427504faef120bd5c1ebb78990ca0.tar.xz
gnupg2-c6dd9ff9290427504faef120bd5c1ebb78990ca0.zip
scd: Fix DEVINFO with no --watch.
* scd/app.c (app_send_devinfo): Fix for outputing once. * scd/command.c (hlp_devinfo): Fix comment. -- Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
-rw-r--r--scd/app.c2
-rw-r--r--scd/command.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/scd/app.c b/scd/app.c
index 3961bdf6c..aeb773a67 100644
--- a/scd/app.c
+++ b/scd/app.c
@@ -447,7 +447,7 @@ app_send_devinfo (ctrl_t ctrl, int keep_looping)
}
send_status_direct (ctrl, "DEVINFO_END", "");
- if (no_device && !keep_looping)
+ if (keep_looping == 0)
break;
card_list_wait ();
diff --git a/scd/command.c b/scd/command.c
index 8bc8f7f4e..10f5a2fe1 100644
--- a/scd/command.c
+++ b/scd/command.c
@@ -2312,7 +2312,7 @@ static const char hlp_devinfo[] =
"\n"
"Return information about devices. If the option --watch is given,\n"
"it keeps reporting status change until it detects no device is\n"
- "available."
+ "available.\n"
"The information is returned as a status line using the format:\n"
"\n"
" DEVICE <card_type> <serialno> <app_type>\n"