giomba
/
opensc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Missed these from r4818 

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@4820 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
martin 2010-10-20 12:33:07 +00:00
parent f7000a93c1
commit fa0e236881
4 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/tools/cardos-tool.c
View File

@ -1132,8 +1132,11 @@ int main(int argc, char *const argv[])
sc_strerror(r)); sc_strerror(r));
return 1; return 1;
} }
if (verbose > 0)
if (verbose > 1) {
ctx->debug = verbose; ctx->debug = verbose;
ctx->debug_file = stderr;
}
if (opt_driver != NULL) { if (opt_driver != NULL) {
err = sc_set_card_driver(ctx, opt_driver); err = sc_set_card_driver(ctx, opt_driver);

5
src/tools/cryptoflex-tool.c
View File

@ -1045,7 +1045,10 @@ int main(int argc, char * const argv[])
return 1; return 1;
} }
ctx->debug = verbose; if (verbose > 1) {
ctx->debug = verbose;
ctx->debug_file = stderr;
}
err = util_connect_card(ctx, &card, opt_reader, opt_wait, verbose); err = util_connect_card(ctx, &card, opt_reader, opt_wait, verbose);
printf("Using card driver: %s\n", card->driver->name); printf("Using card driver: %s\n", card->driver->name);

9
src/tools/opensc-explorer.c
View File

@ -1192,7 +1192,7 @@ static int do_debug(int argc, char **argv)
printf("Debug level set to %d\n", i); printf("Debug level set to %d\n", i);
ctx->debug = i; ctx->debug = i;
if (i) { if (i) {
ctx->debug_file = stdout; ctx->debug_file = stderr;
} else { } else {
ctx->debug_file = NULL; ctx->debug_file = NULL;
} }
@ -1604,8 +1604,11 @@ int main(int argc, char * const argv[])
fprintf(stderr, "Failed to establish context: %s\n", sc_strerror(r)); fprintf(stderr, "Failed to establish context: %s\n", sc_strerror(r));
return 1; return 1;
} }
if (verbose > 1)
ctx->debug = verbose-1; if (verbose > 1) {
ctx->debug = verbose;
ctx->debug_file = stderr;
}
if (opt_driver != NULL) { if (opt_driver != NULL) {
err = sc_set_card_driver(ctx, opt_driver); err = sc_set_card_driver(ctx, opt_driver);

7
src/tools/opensc-tool.c
View File

@ -726,7 +726,12 @@ int main(int argc, char * const argv[])
fprintf(stderr, "Failed to establish context: %s\n", sc_strerror(r)); fprintf(stderr, "Failed to establish context: %s\n", sc_strerror(r));
return 1; return 1;
} }
ctx->debug = verbose;
if (verbose > 1) {
ctx->debug = verbose;
ctx->debug_file = stderr;
}
if (do_get_conf_entry) { if (do_get_conf_entry) {
if ((err = opensc_get_conf_entry (opt_conf_entry))) if ((err = opensc_get_conf_entry (opt_conf_entry)))
goto end; goto end;