diff options
Diffstat (limited to 'src/gdbmtool.c')
| -rw-r--r-- | src/gdbmtool.c | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/src/gdbmtool.c b/src/gdbmtool.c index 33bdf93..9c6eebe 100644 --- a/src/gdbmtool.c +++ b/src/gdbmtool.c @@ -543,42 +543,47 @@ reorganize_handler (struct handler_param *param GDBM_ARG_UNUSED) static void err_printer (void *data GDBM_ARG_UNUSED, char const *fmt, ...) { va_list ap; va_start (ap, fmt); vfprintf (stderr, fmt, ap); va_end (ap); fprintf (stderr, "\n"); } -/* recover verbose backup max-failed-keys=N max-failed-buckets=N max-failures=N */ +/* recover sumamry verbose backup max-failed-keys=N max-failed-buckets=N max-failures=N */ void recover_handler (struct handler_param *param) { gdbm_recovery rcvr; int flags = 0; int rc; int i; char *p; + int summary = 0; - for (i = 1; i < param->argc; i++) + for (i = 0; i < param->argc; i++) { char *arg = PARAM_STRING (param, i); if (strcmp (arg, "verbose") == 0) { rcvr.errfun = err_printer; flags |= GDBM_RCVR_ERRFUN; } + else if (strcmp (arg, "summary") == 0) + { + summary = 1; + } else if (strcmp (arg, "backup") == 0) { rcvr.errfun = err_printer; flags |= GDBM_RCVR_BACKUP; } else if (strncmp (arg, "max-failures=", 13) == 0) { rcvr.max_failures = strtoul (arg + 13, &p, 10); if (*p) { printf (_("not a number (stopped near %s)\n"), p); return; @@ -608,24 +613,37 @@ recover_handler (struct handler_param *param) else { terror (_("unrecognized argument: %s"), arg); return; } } rc = gdbm_recover (gdbm_file, &rcvr, flags); if (rc == 0) { fprintf (param->fp, _("Recovery succeeded.\n")); + if (summary) + { + fprintf (param->fp, + _("Keys recovered: %lu, failed: %lu, duplicate: %lu\n"), + (unsigned long) rcvr.recovered_keys, + (unsigned long) rcvr.failed_keys, + (unsigned long) rcvr.duplicate_keys); + fprintf (param->fp, + _("Buckets recovered: %lu, failed: %lu\n"), + (unsigned long) rcvr.recovered_buckets, + (unsigned long) rcvr.failed_buckets); + } + if (rcvr.backup_name) { fprintf (param->fp, _("Original database preserved in file %s"), rcvr.backup_name); free (rcvr.backup_name); } fputc ('\n', param->fp); } else { fprintf (stderr, _("Recovery failed: %s"), gdbm_strerror (gdbm_errno)); @@ -916,25 +934,25 @@ quit_handler (struct handler_param *param GDBM_ARG_UNUSED) exit (EXIT_OK); } /* export FILE [truncate] - export to a flat file format */ void export_handler (struct handler_param *param) { int format = GDBM_DUMP_FMT_ASCII; int flags = GDBM_WRCREAT; int i; int filemode; - for (i = 1; i < param->argc; i++) + for (i = 0; i < param->argc; i++) { if (strcmp (PARAM_STRING (param, i), "truncate") == 0) flags = GDBM_NEWDB; else if (strcmp (PARAM_STRING (param, i), "binary") == 0) format = GDBM_DUMP_FMT_BINARY; else if (strcmp (PARAM_STRING (param, i), "ascii") == 0) format = GDBM_DUMP_FMT_ASCII; else { terror (_("unrecognized argument: %s"), PARAM_STRING (param, i)); return; } @@ -950,25 +968,25 @@ export_handler (struct handler_param *param) } /* import FILE [replace] [nometa] - import from a flat file */ void import_handler (struct handler_param *param) { int flag = GDBM_INSERT; unsigned long err_line; int meta_mask = 0; int i; int rc; - for (i = 1; i < param->argc; i++) + for (i = 0; i < param->argc; i++) { if (strcmp (PARAM_STRING (param, i), "replace") == 0) flag = GDBM_REPLACE; else if (strcmp (PARAM_STRING (param, i), "nometa") == 0) meta_mask = GDBM_META_MASK_MODE | GDBM_META_MASK_OWNER; else { terror (_("unrecognized argument: %s"), PARAM_STRING (param, i)); return; } } @@ -1211,24 +1229,25 @@ struct command command_tab[] = { FALSE, REPEAT_NEVER, N_("firstkey") }, { S(reorganize), T_CMD, checkdb, reorganize_handler, NULL, { { NULL } }, FALSE, REPEAT_NEVER, N_("reorganize") }, { S(recover), T_CMD, checkdb, recover_handler, NULL, { { "[verbose]", GDBM_ARG_STRING }, + { "[summary]", GDBM_ARG_STRING }, { "[backup]", GDBM_ARG_STRING }, { "[max-failed-keys=N]", GDBM_ARG_STRING }, { "[max-failed-buckets=N]", GDBM_ARG_STRING }, { "[max-failures=N]", GDBM_ARG_STRING }, { NULL } }, FALSE, REPEAT_NEVER, N_("recover the database") }, { S(avail), T_CMD, avail_begin, avail_handler, NULL, { { NULL } }, FALSE, |