[Pcsclite-cvs-commit] PCSC/src testpcsc.c,1.11,1.12

[rousseau@haydn.debian.org]

Update of /cvsroot/pcsclite/PCSC/src
In directory haydn:/tmp/cvs-serv31298

Modified Files:
	testpcsc.c 
Log Message:
do not ask for reader number if only one reader is present


Index: testpcsc.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/testpcsc.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- testpcsc.c	19 Apr 2004 15:21:06 -0000	1.11
+++ testpcsc.c	19 Apr 2004 15:24:25 -0000	1.12
@@ -122,27 +122,28 @@
 		while (mszReaders[++i] != 0) ;
 	}
 
-	do
-	{
-		printf("Enter the reader number          : ");
-		scanf("%d", &iReader);
-		printf("\n");
-
-		if (iReader > p || iReader <= 0)
+	if (p > 1)
+		do
 		{
-			printf("Invalid Value - try again\n");
+			printf("Enter the reader number          : ");
+			scanf("%d", &iReader);
+			printf("\n");
+
+			if (iReader > p || iReader <= 0)
+				printf("Invalid Value - try again\n");
 		}
-	}
-	while (iReader > p || iReader <= 0);
+		while (iReader > p || iReader <= 0);
+	else
+		iReader = 1;
 
 	rgReaderStates[0].szReader = &mszReaders[iList[iReader]];
 	rgReaderStates[0].dwCurrentState = SCARD_STATE_EMPTY;
 
-	printf("Waiting for card insertion         \n");
+	printf("Waiting for card insertion       : ");
+	fflush(stdout);
 	rv = SCardGetStatusChange(hContext, INFINITE, rgReaderStates, 1);
 
-	printf("                                 : %s\n",
-		pcsc_stringify_error(rv));
+	printf("%s\n", pcsc_stringify_error(rv));
 
 	if (rv != SCARD_S_SUCCESS)
 	{