FreeCalypso > hg > fc-pcsc-tools

changeset 28:78f93e3c9ebf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fc-simtool & fc-uicc-tool: show card reader name and ATR only in interactive mode
author Mychaela Falconia <falcon@freecalypso.org>
date Fri, 12 Feb 2021 16:14:53 +0000
parents be946be3f9a7
children d368051576d0
files simtool/main.c uicc/main.c
diffstat 2 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/simtool/main.c	Fri Feb 12 16:03:26 2021 +0000
+++ b/simtool/main.c	Fri Feb 12 16:14:53 2021 +0000
@@ -13,9 +13,9 @@
 
 	setup_pcsc_context();
 	get_reader_name();
-	printf("Card reader name: %s\n", reader_name_buf);
+	if (argc < 2)
+		printf("Card reader name: %s\n", reader_name_buf);
 	connect_to_card();
-	retrieve_atr();
 	if (argc >= 2) {
 		rc = dispatch_ready_argv(argc - 1, argv + 1);
 		if (rc)
@@ -23,6 +23,7 @@
 		else
 			good_exit();
 	}
+	retrieve_atr();
 	for (;;) {
 		if (isatty(0)) {
 			fputs("simtool> ", stdout);
--- a/uicc/main.c	Fri Feb 12 16:03:26 2021 +0000
+++ b/uicc/main.c	Fri Feb 12 16:14:53 2021 +0000
@@ -13,9 +13,9 @@
 
 	setup_pcsc_context();
 	get_reader_name();
-	printf("Card reader name: %s\n", reader_name_buf);
+	if (argc < 2)
+		printf("Card reader name: %s\n", reader_name_buf);
 	connect_to_card();
-	retrieve_atr();
 	if (argc >= 2) {
 		rc = dispatch_ready_argv(argc - 1, argv + 1);
 		if (rc)
@@ -23,6 +23,7 @@
 		else
 			good_exit();
 	}
+	retrieve_atr();
 	for (;;) {
 		if (isatty(0)) {
 			fputs("uicc> ", stdout);