Cleanups, fixes and PC/SC support

1 files changed, 6 insertions, 2 deletions

diff --git a/scd/sc-copykeys.c b/scd/sc-copykeys.c
index 9caf39a8a..b56b88590 100644
--- a/scd/sc-copykeys.c
+++ b/scd/sc-copykeys.c
@@ -44,6 +44,7 @@
 enum cmd_and_opt_values 
 { oVerbose	  = 'v',
   oReaderPort     = 500,
+  octapiDriver,
   oDebug,
   oDebugAll,
 
@@ -55,7 +56,8 @@ static ARGPARSE_OPTS opts[] = {
   { 301, NULL, 0, "@Options:\n " },
 
   { oVerbose, "verbose",   0, "verbose" },
-  { oReaderPort, "reader-port", 1, "|N|connect to reader at port N"},
+  { oReaderPort, "reader-port", 2, "|N|connect to reader at port N"},
+  { octapiDriver, "ctapi-driver", 2, "NAME|use NAME as ctAPI driver"},
   { oDebug,	"debug"     ,4|16, "set debugging flags"},
   { oDebugAll, "debug-all" ,0, "enable full debugging"},
   {0}
@@ -115,7 +117,7 @@ main (int argc, char **argv )
 {
   ARGPARSE_ARGS pargs;
   int slot, rc;
-  int reader_port = 32768; /* First USB reader. */
+  const char *reader_port = NULL;
   struct app_ctx_s appbuf;
 
   memset (&appbuf, 0, sizeof appbuf);
@@ -146,6 +148,8 @@ main (int argc, char **argv )
         case oVerbose: opt.verbose++; break;
         case oDebug: opt.debug |= pargs.r.ret_ulong; break;
         case oDebugAll: opt.debug = ~0; break;
+        case oReaderPort: reader_port = pargs.r.ret_str; break;
+        case octapiDriver: opt.ctapi_driver = pargs.r.ret_str; break;
         default : pargs.err = 2; break;
 	}
     }