security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +02:00
Code Activity

* gpgsm.c (main): Use the log file only in server mode.

Browse source 
* import.c (print_imported_summary): New.
(check_and_store): Update the counters, take new argument.
(import_one): Factored out core of gpgsm_import.
(gpgsm_import): Print counters.
(gpgsm_import_files): New.
* gpgsm.c (main): Use the new function for import.
This commit is contained in:
Werner Koch 2002-08-20 13:09:53 +00:00
parent 12fb1e6d55
commit e18e3875b7
6 changed files with 156 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

11
sm/gpgsm.c
View file

@ -229,7 +229,6 @@ static ARGPARSE_OPTS opts[] = {
{ aLearnCard, "learn-card", 256 ,N_("register a smartcard")},
{ aServer, "server", 256, N_("run in server mode")},
{ oLogFile, "log-file" ,2, N_("use a log file for the server")},
{ 301, NULL, 0, N_("@\nOptions:\n ") },
@ -1000,7 +999,7 @@ main ( int argc, char **argv)
if (may_coredump && !opt.quiet)
log_info (_("WARNING: program may create a core file!\n"));
if (logfile)
if (logfile && cmd == aServer)
{
log_set_file (logfile);
log_set_prefix (NULL, 1|2|4);
@ -1227,13 +1226,7 @@ main ( int argc, char **argv)
break;
case aImport:
if (!argc)
gpgsm_import (&ctrl, 0);
else
{
for (; argc; argc--, argv++)
gpgsm_import (&ctrl, open_read (*argv));
}
gpgsm_import_files (&ctrl, argc, argv, open_read);
break;
case aExport: