+/*
+ Bacula® - The Network Backup Solution
+
+ Copyright (C) 2002-2009 Free Software Foundation Europe e.V.
+
+ The main author of Bacula is Kern Sibbald, with contributions from
+ many others, a complete list can be found in the file AUTHORS.
+ This program is Free Software; you can redistribute it and/or
+ modify it under the terms of version two of the GNU General Public
+ License as published by the Free Software Foundation and included
+ in the file LICENSE.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301, USA.
+
+ Bacula® is a registered trademark of Kern Sibbald.
+ The licensor of Bacula is the Free Software Foundation Europe
+ (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
+ Switzerland, email:ftf@fsfeurope.org.
+*/
/*
*
* Bacula Director -- User Agent Database restore Command
- * Creates a bootstrap file for restoring files and
- * starts the restore job.
+ * Creates a bootstrap file for restoring files and
+ * starts the restore job.
*
- * Tree handling routines split into ua_tree.c July MMIII.
- * BSR (bootstrap record) handling routines split into
- * bsr.c July MMIII
+ * Tree handling routines split into ua_tree.c July MMIII.
+ * BSR (bootstrap record) handling routines split into
+ * bsr.c July MMIII
*
* Kern Sibbald, July MMII
*
* Version $Id$
*/
-/*
- Copyright (C) 2002-2004 Kern Sibbald and John Walker
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public
- License along with this program; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA.
-
- */
#include "bacula.h"
#include "dird.h"
-
/* Imported functions */
extern void print_bsr(UAContext *ua, RBSR *bsr);
-/* Imported variables */
-extern char *uar_list_jobs, *uar_file, *uar_sel_files;
-extern char *uar_del_temp, *uar_del_temp1, *uar_create_temp;
-extern char *uar_create_temp1, *uar_last_full, *uar_full;
-extern char *uar_inc, *uar_list_temp, *uar_sel_jobid_temp;
-extern char *uar_sel_all_temp1, *uar_sel_fileset, *uar_mediatype;
-extern char *uar_jobid_fileindex, *uar_dif, *uar_sel_all_temp;
-extern char *uar_count_files, *uar_jobids_fileindex;
-
-
-struct NAME_LIST {
- char **name; /* list of names */
- int num_ids; /* ids stored */
- int max_ids; /* size of array */
- int num_del; /* number deleted */
- int tot_ids; /* total to process */
-};
-
-
-/* Main structure for obtaining JobIds or Files to be restored */
-struct RESTORE_CTX {
- utime_t JobTDate;
- uint32_t TotalFiles;
- uint32_t JobId;
- char ClientName[MAX_NAME_LENGTH];
- char last_jobid[10];
- POOLMEM *JobIds; /* User entered string of JobIds */
- STORE *store;
- JOB *restore_job;
- POOL *pool;
- int restore_jobs;
- uint32_t selected_files;
- char *where;
- RBSR *bsr;
- POOLMEM *fname; /* filename only */
- POOLMEM *path; /* path only */
- POOLMEM *query;
- int fnl; /* filename length */
- int pnl; /* path length */
- bool found;
- bool all; /* mark all as default */
- NAME_LIST name_list;
-};
-
-
-#define MAX_ID_LIST_LEN 1000000
/* Forward referenced functions */
static int last_full_handler(void *ctx, int num_fields, char **row);
static int jobid_handler(void *ctx, int num_fields, char **row);
-static int get_next_jobid_from_list(char **p, uint32_t *JobId);
static int user_select_jobids_or_files(UAContext *ua, RESTORE_CTX *rx);
static int fileset_handler(void *ctx, int num_fields, char **row);
-static void print_name_list(UAContext *ua, NAME_LIST *name_list);
-static int unique_name_list_handler(void *ctx, int num_fields, char **row);
static void free_name_list(NAME_LIST *name_list);
-static void get_storage_from_mediatype(UAContext *ua, NAME_LIST *name_list, RESTORE_CTX *rx);
-static int select_backups_before_date(UAContext *ua, RESTORE_CTX *rx, char *date);
+static bool select_backups_before_date(UAContext *ua, RESTORE_CTX *rx, char *date);
static bool build_directory_tree(UAContext *ua, RESTORE_CTX *rx);
static void free_rx(RESTORE_CTX *rx);
-static void split_path_and_filename(RESTORE_CTX *rx, char *fname);
+static void split_path_and_filename(UAContext *ua, RESTORE_CTX *rx, char *fname);
static int jobid_fileindex_handler(void *ctx, int num_fields, char **row);
-static int insert_file_into_findex_list(UAContext *ua, RESTORE_CTX *rx, char *file,
- char *date);
-static void insert_one_file(UAContext *ua, RESTORE_CTX *rx, char *date);
+static bool insert_file_into_findex_list(UAContext *ua, RESTORE_CTX *rx, char *file,
+ char *date);
+static bool insert_dir_into_findex_list(UAContext *ua, RESTORE_CTX *rx, char *dir,
+ char *date);
+static void insert_one_file_or_dir(UAContext *ua, RESTORE_CTX *rx, char *date, bool dir);
static int get_client_name(UAContext *ua, RESTORE_CTX *rx);
+static int get_restore_client_name(UAContext *ua, RESTORE_CTX &rx);
static int get_date(UAContext *ua, char *date, int date_len);
-static int count_handler(void *ctx, int num_fields, char **row);
+static int restore_count_handler(void *ctx, int num_fields, char **row);
+static bool insert_table_into_findex_list(UAContext *ua, RESTORE_CTX *rx, char *table);
+static void get_and_display_basejobs(UAContext *ua, RESTORE_CTX *rx);
/*
* Restore files
*/
int restore_cmd(UAContext *ua, const char *cmd)
{
- RESTORE_CTX rx; /* restore context */
+ RESTORE_CTX rx; /* restore context */
JOB *job;
int i;
+ JCR *jcr = ua->jcr;
+ char *escaped_bsr_name = NULL;
+ char *escaped_where_name = NULL;
+ char *strip_prefix, *add_prefix, *add_suffix, *regexp;
+ strip_prefix = add_prefix = add_suffix = regexp = NULL;
memset(&rx, 0, sizeof(rx));
rx.path = get_pool_memory(PM_FNAME);
rx.fname = get_pool_memory(PM_FNAME);
rx.JobIds = get_pool_memory(PM_FNAME);
+ rx.BaseJobIds = get_pool_memory(PM_FNAME);
rx.query = get_pool_memory(PM_FNAME);
rx.bsr = new_bsr();
rx.where = ua->argv[i];
}
- if (!open_db(ua)) {
+ i = find_arg_with_value(ua, "strip_prefix");
+ if (i >= 0) {
+ strip_prefix = ua->argv[i];
+ }
+
+ i = find_arg_with_value(ua, "add_prefix");
+ if (i >= 0) {
+ add_prefix = ua->argv[i];
+ }
+
+ i = find_arg_with_value(ua, "add_suffix");
+ if (i >= 0) {
+ add_suffix = ua->argv[i];
+ }
+
+ i = find_arg_with_value(ua, "regexwhere");
+ if (i >= 0) {
+ rx.RegexWhere = ua->argv[i];
+ }
+
+ if (strip_prefix || add_suffix || add_prefix) {
+ int len = bregexp_get_build_where_size(strip_prefix, add_prefix, add_suffix);
+ regexp = (char *)bmalloc(len * sizeof(char));
+
+ bregexp_build_where(regexp, len, strip_prefix, add_prefix, add_suffix);
+ rx.RegexWhere = regexp;
+ }
+
+ /* TODO: add acl for regexwhere ? */
+
+ if (rx.RegexWhere) {
+ if (!acl_access_ok(ua, Where_ACL, rx.RegexWhere)) {
+ ua->error_msg(_("\"RegexWhere\" specification not authorized.\n"));
+ goto bail_out;
+ }
+ }
+
+ if (rx.where) {
+ if (!acl_access_ok(ua, Where_ACL, rx.where)) {
+ ua->error_msg(_("\"where\" specification not authorized.\n"));
+ goto bail_out;
+ }
+ }
+
+ if (!open_client_db(ua)) {
goto bail_out;
}
LockRes();
foreach_res(job, R_JOB) {
if (job->JobType == JT_RESTORE) {
- if (!rx.restore_job) {
- rx.restore_job = job;
- }
- rx.restore_jobs++;
+ if (!rx.restore_job) {
+ rx.restore_job = job;
+ }
+ rx.restore_jobs++;
}
}
UnlockRes();
if (!rx.restore_jobs) {
- bsendmsg(ua, _(
- "No Restore Job Resource found. You must create at least\n"
- "one before running this command.\n"));
+ ua->error_msg(_(
+ "No Restore Job Resource found in bacula-dir.conf.\n"
+ "You must create at least one before running this command.\n"));
goto bail_out;
}
* add_findex()
*/
switch (user_select_jobids_or_files(ua, &rx)) {
- case 0:
+ case 0: /* error */
goto bail_out;
- case 1: /* select by jobid */
+ case 1: /* selected by jobid */
+ get_and_display_basejobs(ua, &rx);
if (!build_directory_tree(ua, &rx)) {
- bsendmsg(ua, _("Restore not done.\n"));
- goto bail_out;
+ ua->send_msg(_("Restore not done.\n"));
+ goto bail_out;
}
break;
- case 2: /* select by filename, no tree needed */
+ case 2: /* selected by filename, no tree needed */
break;
}
if (rx.bsr->JobId) {
- if (!complete_bsr(ua, rx.bsr)) { /* find Vol, SessId, SessTime from JobIds */
- bsendmsg(ua, _("Unable to construct a valid BSR. Cannot continue.\n"));
- goto bail_out;
+ char ed1[50];
+ if (!complete_bsr(ua, rx.bsr)) { /* find Vol, SessId, SessTime from JobIds */
+ ua->error_msg(_("Unable to construct a valid BSR. Cannot continue.\n"));
+ goto bail_out;
+ }
+ if (!(rx.selected_files = write_bsr_file(ua, rx))) {
+ ua->warning_msg(_("No files selected to be restored.\n"));
+ goto bail_out;
}
- if (!write_bsr_file(ua, rx.bsr)) {
- goto bail_out;
+ display_bsr_info(ua, rx); /* display vols needed, etc */
+
+ if (rx.selected_files==1) {
+ ua->info_msg(_("\n1 file selected to be restored.\n\n"));
+ } else {
+ ua->info_msg(_("\n%s files selected to be restored.\n\n"),
+ edit_uint64_with_commas(rx.selected_files, ed1));
}
- bsendmsg(ua, _("\n%u file%s selected to be restored.\n\n"), rx.selected_files,
- rx.selected_files==1?"":"s");
} else {
- bsendmsg(ua, _("No files selected to be restored.\n"));
+ ua->warning_msg(_("No files selected to be restored.\n"));
goto bail_out;
}
get_client_name(ua, &rx);
if (!rx.ClientName) {
- bsendmsg(ua, _("No Restore Job resource found!\n"));
+ ua->error_msg(_("No Client resource found!\n"));
goto bail_out;
}
+ get_restore_client_name(ua, rx);
+
+ escaped_bsr_name = escape_filename(jcr->RestoreBootstrap);
/* Build run command */
- if (rx.where) {
+ if (rx.RegexWhere) {
+ escaped_where_name = escape_filename(rx.RegexWhere);
+ Mmsg(ua->cmd,
+ "run job=\"%s\" client=\"%s\" restoreclient=\"%s\" storage=\"%s\""
+ " bootstrap=\"%s\" regexwhere=\"%s\" files=%u catalog=\"%s\"",
+ job->name(), rx.ClientName, rx.RestoreClientName,
+ rx.store?rx.store->name():"",
+ escaped_bsr_name ? escaped_bsr_name : jcr->RestoreBootstrap,
+ escaped_where_name ? escaped_where_name : rx.RegexWhere,
+ rx.selected_files, ua->catalog->name());
+
+ } else if (rx.where) {
+ escaped_where_name = escape_filename(rx.where);
Mmsg(ua->cmd,
- "run job=\"%s\" client=\"%s\" storage=\"%s\" bootstrap=\"%s/restore.bsr\""
- " where=\"%s\" files=%d catalog=\"%s\"",
- job->hdr.name, rx.ClientName, rx.store?rx.store->hdr.name:"",
- working_directory, rx.where, rx.selected_files, ua->catalog->hdr.name);
+ "run job=\"%s\" client=\"%s\" restoreclient=\"%s\" storage=\"%s\""
+ " bootstrap=\"%s\" where=\"%s\" files=%u catalog=\"%s\"",
+ job->name(), rx.ClientName, rx.RestoreClientName,
+ rx.store?rx.store->name():"",
+ escaped_bsr_name ? escaped_bsr_name : jcr->RestoreBootstrap,
+ escaped_where_name ? escaped_where_name : rx.where,
+ rx.selected_files, ua->catalog->name());
+
} else {
Mmsg(ua->cmd,
- "run job=\"%s\" client=\"%s\" storage=\"%s\" bootstrap=\"%s/restore.bsr\""
- " files=%d catalog=\"%s\"",
- job->hdr.name, rx.ClientName, rx.store?rx.store->hdr.name:"",
- working_directory, rx.selected_files, ua->catalog->hdr.name);
+ "run job=\"%s\" client=\"%s\" restoreclient=\"%s\" storage=\"%s\""
+ " bootstrap=\"%s\" files=%u catalog=\"%s\"",
+ job->name(), rx.ClientName, rx.RestoreClientName,
+ rx.store?rx.store->name():"",
+ escaped_bsr_name ? escaped_bsr_name : jcr->RestoreBootstrap,
+ rx.selected_files, ua->catalog->name());
+ }
+
+ if (escaped_bsr_name != NULL) {
+ bfree(escaped_bsr_name);
}
- if (find_arg(ua, _("yes")) > 0) {
+
+ if (escaped_where_name != NULL) {
+ bfree(escaped_where_name);
+ }
+
+ if (regexp) {
+ bfree(regexp);
+ }
+
+ if (find_arg(ua, NT_("yes")) > 0) {
pm_strcat(ua->cmd, " yes"); /* pass it on to the run command */
}
- Dmsg1(400, "Submitting: %s\n", ua->cmd);
+ Dmsg1(200, "Submitting: %s\n", ua->cmd);
parse_ua_args(ua);
run_cmd(ua, ua->cmd);
free_rx(&rx);
return 1;
bail_out:
+ if (escaped_bsr_name != NULL) {
+ bfree(escaped_bsr_name);
+ }
+
+ if (escaped_where_name != NULL) {
+ bfree(escaped_where_name);
+ }
+
+ if (regexp) {
+ bfree(regexp);
+ }
+
free_rx(&rx);
return 0;
}
+/*
+ * Fill the rx->BaseJobIds and display the list
+ */
+static void get_and_display_basejobs(UAContext *ua, RESTORE_CTX *rx)
+{
+ db_list_ctx jobids;
+
+ if (!db_get_used_base_jobids(ua->jcr, ua->db, rx->JobIds, &jobids)) {
+ ua->warning_msg("%s", db_strerror(ua->db));
+ }
+
+ if (jobids.count) {
+ POOL_MEM q;
+ Mmsg(q, uar_print_jobs, jobids.list);
+ ua->send_msg(_("The restore will use the following job(s) as Base\n"));
+ db_list_sql_query(ua->jcr, ua->db, q.c_str(), prtit, ua, 1, HORZ_LIST);
+ }
+ pm_strcpy(rx->BaseJobIds, jobids.list);
+}
+
static void free_rx(RESTORE_CTX *rx)
{
free_bsr(rx->bsr);
rx->bsr = NULL;
- if (rx->JobIds) {
- free_pool_memory(rx->JobIds);
- rx->JobIds = NULL;
- }
- if (rx->fname) {
- free_pool_memory(rx->fname);
- rx->fname = NULL;
- }
- if (rx->path) {
- free_pool_memory(rx->path);
- rx->path = NULL;
- }
- if (rx->query) {
- free_pool_memory(rx->query);
- rx->query = NULL;
- }
+ free_and_null_pool_memory(rx->JobIds);
+ free_and_null_pool_memory(rx->BaseJobIds);
+ free_and_null_pool_memory(rx->fname);
+ free_and_null_pool_memory(rx->path);
+ free_and_null_pool_memory(rx->query);
free_name_list(&rx->name_list);
}
+static bool has_value(UAContext *ua, int i)
+{
+ if (!ua->argv[i]) {
+ ua->error_msg(_("Missing value for keyword: %s\n"), ua->argk[i]);
+ return false;
+ }
+ return true;
+}
+
+/*
+ * This gets the client name from which the backup was made
+ */
static int get_client_name(UAContext *ua, RESTORE_CTX *rx)
{
/* If no client name specified yet, get it now */
if (!rx->ClientName[0]) {
CLIENT_DBR cr;
/* try command line argument */
- int i = find_arg_with_value(ua, _("client"));
+ int i = find_arg_with_value(ua, NT_("client"));
+ if (i < 0) {
+ i = find_arg_with_value(ua, NT_("backupclient"));
+ }
if (i >= 0) {
- bstrncpy(rx->ClientName, ua->argv[i], sizeof(rx->ClientName));
- return 1;
+ if (!has_value(ua, i)) {
+ return 0;
+ }
+ bstrncpy(rx->ClientName, ua->argv[i], sizeof(rx->ClientName));
+ return 1;
}
memset(&cr, 0, sizeof(cr));
if (!get_client_dbr(ua, &cr)) {
- return 0;
+ return 0;
}
bstrncpy(rx->ClientName, cr.Name, sizeof(rx->ClientName));
}
return 1;
}
+/*
+ * This is where we pick up a client name to restore to.
+ */
+static int get_restore_client_name(UAContext *ua, RESTORE_CTX &rx)
+{
+ /* Start with same name as backup client */
+ bstrncpy(rx.RestoreClientName, rx.ClientName, sizeof(rx.RestoreClientName));
+
+ /* try command line argument */
+ int i = find_arg_with_value(ua, NT_("restoreclient"));
+ if (i >= 0) {
+ if (!has_value(ua, i)) {
+ return 0;
+ }
+ bstrncpy(rx.RestoreClientName, ua->argv[i], sizeof(rx.RestoreClientName));
+ return 1;
+ }
+ return 1;
+}
+
+
+
/*
* The first step in the restore process is for the user to
* select a list of JobIds from which he will subsequently
* select which files are to be restored.
+ *
+ * Returns: 2 if filename list made
+ * 1 if jobid list made
+ * 0 on error
*/
static int user_select_jobids_or_files(UAContext *ua, RESTORE_CTX *rx)
{
char *p;
char date[MAX_TIME_LENGTH];
bool have_date = false;
+ /* Include current second if using current time */
+ utime_t now = time(NULL) + 1;
JobId_t JobId;
- JOB_DBR jr;
+ JOB_DBR jr = { (JobId_t)-1 };
bool done = false;
int i, j;
const char *list[] = {
- "List last 20 Jobs run",
- "List Jobs where a given File is saved",
- "Enter list of comma separated JobIds to select",
- "Enter SQL list command",
- "Select the most recent backup for a client",
- "Select backup for a client before a specified time",
- "Enter a list of files to restore",
- "Enter a list of files to restore before a specified time",
- "Cancel",
+ _("List last 20 Jobs run"),
+ _("List Jobs where a given File is saved"),
+ _("Enter list of comma separated JobIds to select"),
+ _("Enter SQL list command"),
+ _("Select the most recent backup for a client"),
+ _("Select backup for a client before a specified time"),
+ _("Enter a list of files to restore"),
+ _("Enter a list of files to restore before a specified time"),
+ _("Find the JobIds of the most recent backup for a client"),
+ _("Find the JobIds for a backup for a client before a specified time"),
+ _("Enter a list of directories to restore for found JobIds"),
+ _("Select full restore to a specified Job date"),
+ _("Cancel"),
NULL };
const char *kw[] = {
- "jobid", /* 0 */
- "current", /* 1 */
- "before", /* 2 */
- "file", /* 3 */
- "select", /* 4 */
- "pool", /* 5 */
- "all", /* 6 */
- "client", /* 7 */
- "storage", /* 8 */
- "fileset", /* 9 */
- "where", /* 10 */
- "yes", /* 11 */
- "done", /* 12 */
+ /* These keywords are handled in a for loop */
+ "jobid", /* 0 */
+ "current", /* 1 */
+ "before", /* 2 */
+ "file", /* 3 */
+ "directory", /* 4 */
+ "select", /* 5 */
+ "pool", /* 6 */
+ "all", /* 7 */
+
+ /* The keyword below are handled by individual arg lookups */
+ "client", /* 8 */
+ "storage", /* 9 */
+ "fileset", /* 10 */
+ "where", /* 11 */
+ "yes", /* 12 */
+ "bootstrap", /* 13 */
+ "done", /* 14 */
+ "strip_prefix", /* 15 */
+ "add_prefix", /* 16 */
+ "add_suffix", /* 17 */
+ "regexwhere", /* 18 */
+ "restoreclient", /* 19 */
+ "copies", /* 20 */
NULL
};
- *rx->JobIds = 0;
+ rx->JobIds[0] = 0;
for (i=1; i<ua->argc; i++) { /* loop through arguments */
bool found_kw = false;
- for (j=0; kw[j]; j++) { /* loop through keywords */
- if (strcasecmp(kw[j], ua->argk[i]) == 0) {
- found_kw = true;
- break;
- }
+ for (j=0; kw[j]; j++) { /* loop through keywords */
+ if (strcasecmp(kw[j], ua->argk[i]) == 0) {
+ found_kw = true;
+ break;
+ }
}
if (!found_kw) {
- bsendmsg(ua, _("Unknown keyword: %s\n"), ua->argk[i]);
- return 0;
+ ua->error_msg(_("Unknown keyword: %s\n"), ua->argk[i]);
+ return 0;
}
/* Found keyword in kw[] list, process it */
switch (j) {
- case 0: /* jobid */
- if (*rx->JobIds != 0) {
- pm_strcat(rx->JobIds, ",");
- }
- pm_strcat(rx->JobIds, ua->argv[i]);
- done = true;
- break;
- case 1: /* current */
- bstrutime(date, sizeof(date), time(NULL));
- have_date = true;
- break;
- case 2: /* before */
- if (str_to_utime(ua->argv[i]) == 0) {
- bsendmsg(ua, _("Improper date format: %s\n"), ua->argv[i]);
- return 0;
- }
- bstrncpy(date, ua->argv[i], sizeof(date));
- have_date = true;
- break;
- case 3: /* file */
- if (!have_date) {
- bstrutime(date, sizeof(date), time(NULL));
- }
- if (!get_client_name(ua, rx)) {
- return 0;
- }
- pm_strcpy(ua->cmd, ua->argv[i]);
- insert_one_file(ua, rx, date);
- if (rx->name_list.num_ids) {
- /* Check MediaType and select storage that corresponds */
- get_storage_from_mediatype(ua, &rx->name_list, rx);
- done = true;
- }
- break;
- case 4: /* select */
- if (!have_date) {
- bstrutime(date, sizeof(date), time(NULL));
- }
- if (!select_backups_before_date(ua, rx, date)) {
- return 0;
- }
- done = true;
- break;
- case 5: /* pool specified */
- rx->pool = (POOL *)GetResWithName(R_POOL, ua->argv[i]);
- if (!rx->pool) {
- bsendmsg(ua, _("Error: Pool resource \"%s\" does not exist.\n"), ua->argv[i]);
- return 0;
- }
- if (!acl_access_ok(ua, Pool_ACL, ua->argv[i])) {
- rx->pool = NULL;
- bsendmsg(ua, _("Error: Pool resource \"%s\" access not allowed.\n"), ua->argv[i]);
- return 0;
- }
- break;
- case 6: /* all specified */
- rx->all = true;
- break;
+ case 0: /* jobid */
+ if (!has_value(ua, i)) {
+ return 0;
+ }
+ if (*rx->JobIds != 0) {
+ pm_strcat(rx->JobIds, ",");
+ }
+ pm_strcat(rx->JobIds, ua->argv[i]);
+ done = true;
+ break;
+ case 1: /* current */
+ /*
+ * Note, we add one second here just to include any job
+ * that may have finished within the current second,
+ * which happens a lot in scripting small jobs.
+ */
+ bstrutime(date, sizeof(date), now);
+ have_date = true;
+ break;
+ case 2: /* before */
+ if (have_date || !has_value(ua, i)) {
+ return 0;
+ }
+ if (str_to_utime(ua->argv[i]) == 0) {
+ ua->error_msg(_("Improper date format: %s\n"), ua->argv[i]);
+ return 0;
+ }
+ bstrncpy(date, ua->argv[i], sizeof(date));
+ have_date = true;
+ break;
+ case 3: /* file */
+ case 4: /* dir */
+ if (!has_value(ua, i)) {
+ return 0;
+ }
+ if (!have_date) {
+ bstrutime(date, sizeof(date), now);
+ }
+ if (!get_client_name(ua, rx)) {
+ return 0;
+ }
+ pm_strcpy(ua->cmd, ua->argv[i]);
+ insert_one_file_or_dir(ua, rx, date, j==4);
+ return 2;
+ case 5: /* select */
+ if (!have_date) {
+ bstrutime(date, sizeof(date), now);
+ }
+ if (!select_backups_before_date(ua, rx, date)) {
+ return 0;
+ }
+ done = true;
+ break;
+ case 6: /* pool specified */
+ if (!has_value(ua, i)) {
+ return 0;
+ }
+ rx->pool = (POOL *)GetResWithName(R_POOL, ua->argv[i]);
+ if (!rx->pool) {
+ ua->error_msg(_("Error: Pool resource \"%s\" does not exist.\n"), ua->argv[i]);
+ return 0;
+ }
+ if (!acl_access_ok(ua, Pool_ACL, ua->argv[i])) {
+ rx->pool = NULL;
+ ua->error_msg(_("Error: Pool resource \"%s\" access not allowed.\n"), ua->argv[i]);
+ return 0;
+ }
+ break;
+ case 7: /* all specified */
+ rx->all = true;
+ break;
/*
* All keywords 7 or greater are ignored or handled by a select prompt
*/
default:
- break;
+ break;
}
}
- if (rx->name_list.num_ids) {
- return 2; /* filename list made */
- }
if (!done) {
- bsendmsg(ua, _("\nFirst you select one or more JobIds that contain files\n"
- "to be restored. You will be presented several methods\n"
- "of specifying the JobIds. Then you will be allowed to\n"
- "select which files from those JobIds are to be restored.\n\n"));
+ ua->send_msg(_("\nFirst you select one or more JobIds that contain files\n"
+ "to be restored. You will be presented several methods\n"
+ "of specifying the JobIds. Then you will be allowed to\n"
+ "select which files from those JobIds are to be restored.\n\n"));
}
/* If choice not already made above, prompt */
char *fname;
int len;
bool gui_save;
+ db_list_ctx jobids;
start_prompt(ua, _("To select the JobIds, you have the following choices:\n"));
for (int i=0; list[i]; i++) {
- add_prompt(ua, list[i]);
+ add_prompt(ua, list[i]);
}
done = true;
switch (do_prompt(ua, "", _("Select item: "), NULL, 0)) {
- case -1: /* error */
- return 0;
- case 0: /* list last 20 Jobs run */
- gui_save = ua->jcr->gui;
- ua->jcr->gui = true;
- db_list_sql_query(ua->jcr, ua->db, uar_list_jobs, prtit, ua, 1, HORZ_LIST);
- ua->jcr->gui = gui_save;
- done = false;
- break;
- case 1: /* list where a file is saved */
- if (!get_cmd(ua, _("Enter Filename (no path):"))) {
- return 0;
- }
- len = strlen(ua->cmd);
- fname = (char *)malloc(len * 2 + 1);
- db_escape_string(fname, ua->cmd, len);
- Mmsg(rx->query, uar_file, fname);
- free(fname);
- gui_save = ua->jcr->gui;
- ua->jcr->gui = true;
- db_list_sql_query(ua->jcr, ua->db, rx->query, prtit, ua, 1, HORZ_LIST);
- ua->jcr->gui = gui_save;
- done = false;
- break;
- case 2: /* enter a list of JobIds */
- if (!get_cmd(ua, _("Enter JobId(s), comma separated, to restore: "))) {
- return 0;
- }
- pm_strcpy(rx->JobIds, ua->cmd);
- break;
- case 3: /* Enter an SQL list command */
- if (!get_cmd(ua, _("Enter SQL list command: "))) {
- return 0;
- }
- gui_save = ua->jcr->gui;
- ua->jcr->gui = true;
- db_list_sql_query(ua->jcr, ua->db, ua->cmd, prtit, ua, 1, HORZ_LIST);
- ua->jcr->gui = gui_save;
- done = false;
- break;
- case 4: /* Select the most recent backups */
- bstrutime(date, sizeof(date), time(NULL));
- if (!select_backups_before_date(ua, rx, date)) {
- return 0;
- }
- break;
- case 5: /* select backup at specified time */
- if (!get_date(ua, date, sizeof(date))) {
- return 0;
- }
- if (!select_backups_before_date(ua, rx, date)) {
- return 0;
- }
- break;
- case 6: /* Enter files */
- bstrutime(date, sizeof(date), time(NULL));
- if (!get_client_name(ua, rx)) {
- return 0;
- }
- bsendmsg(ua, _("Enter file names with paths, or < to enter a filename\n"
- "containg a list of file names with paths, and terminate\n"
- "them with a blank line.\n"));
- for ( ;; ) {
- if (!get_cmd(ua, _("Enter full filename: "))) {
- return 0;
- }
- len = strlen(ua->cmd);
- if (len == 0) {
- break;
- }
- insert_one_file(ua, rx, date);
- }
- /* Check MediaType and select storage that corresponds */
- if (rx->name_list.num_ids) {
- get_storage_from_mediatype(ua, &rx->name_list, rx);
- }
- return 2;
- case 7: /* enter files backed up before specified time */
- if (!get_date(ua, date, sizeof(date))) {
- return 0;
- }
- if (!get_client_name(ua, rx)) {
- return 0;
- }
- bsendmsg(ua, _("Enter file names with paths, or < to enter a filename\n"
- "containg a list of file names with paths, and terminate\n"
- "them with a blank line.\n"));
- for ( ;; ) {
- if (!get_cmd(ua, _("Enter full filename: "))) {
- return 0;
- }
- len = strlen(ua->cmd);
- if (len == 0) {
- break;
- }
- insert_one_file(ua, rx, date);
- }
- /* Check MediaType and select storage that corresponds */
- if (rx->name_list.num_ids) {
- get_storage_from_mediatype(ua, &rx->name_list, rx);
- }
- return 2;
-
-
- case 8: /* Cancel or quit */
- return 0;
+ case -1: /* error or cancel */
+ return 0;
+ case 0: /* list last 20 Jobs run */
+ if (!acl_access_ok(ua, Command_ACL, NT_("sqlquery"), 8)) {
+ ua->error_msg(_("SQL query not authorized.\n"));
+ return 0;
+ }
+ gui_save = ua->jcr->gui;
+ ua->jcr->gui = true;
+ db_list_sql_query(ua->jcr, ua->db, uar_list_jobs, prtit, ua, 1, HORZ_LIST);
+ ua->jcr->gui = gui_save;
+ done = false;
+ break;
+ case 1: /* list where a file is saved */
+ if (!get_client_name(ua, rx)) {
+ return 0;
+ }
+ if (!get_cmd(ua, _("Enter Filename (no path):"))) {
+ return 0;
+ }
+ len = strlen(ua->cmd);
+ fname = (char *)malloc(len * 2 + 1);
+ db_escape_string(ua->jcr, ua->db, fname, ua->cmd, len);
+ Mmsg(rx->query, uar_file[db_type], rx->ClientName, fname);
+ free(fname);
+ gui_save = ua->jcr->gui;
+ ua->jcr->gui = true;
+ db_list_sql_query(ua->jcr, ua->db, rx->query, prtit, ua, 1, HORZ_LIST);
+ ua->jcr->gui = gui_save;
+ done = false;
+ break;
+ case 2: /* enter a list of JobIds */
+ if (!get_cmd(ua, _("Enter JobId(s), comma separated, to restore: "))) {
+ return 0;
+ }
+ pm_strcpy(rx->JobIds, ua->cmd);
+ break;
+ case 3: /* Enter an SQL list command */
+ if (!acl_access_ok(ua, Command_ACL, NT_("sqlquery"), 8)) {
+ ua->error_msg(_("SQL query not authorized.\n"));
+ return 0;
+ }
+ if (!get_cmd(ua, _("Enter SQL list command: "))) {
+ return 0;
+ }
+ gui_save = ua->jcr->gui;
+ ua->jcr->gui = true;
+ db_list_sql_query(ua->jcr, ua->db, ua->cmd, prtit, ua, 1, HORZ_LIST);
+ ua->jcr->gui = gui_save;
+ done = false;
+ break;
+ case 4: /* Select the most recent backups */
+ if (!have_date) {
+ bstrutime(date, sizeof(date), now);
+ }
+ if (!select_backups_before_date(ua, rx, date)) {
+ return 0;
+ }
+ break;
+ case 5: /* select backup at specified time */
+ if (!have_date) {
+ if (!get_date(ua, date, sizeof(date))) {
+ return 0;
+ }
+ }
+ if (!select_backups_before_date(ua, rx, date)) {
+ return 0;
+ }
+ break;
+ case 6: /* Enter files */
+ if (!have_date) {
+ bstrutime(date, sizeof(date), now);
+ }
+ if (!get_client_name(ua, rx)) {
+ return 0;
+ }
+ ua->send_msg(_("Enter file names with paths, or < to enter a filename\n"
+ "containing a list of file names with paths, and terminate\n"
+ "them with a blank line.\n"));
+ for ( ;; ) {
+ if (!get_cmd(ua, _("Enter full filename: "))) {
+ return 0;
+ }
+ len = strlen(ua->cmd);
+ if (len == 0) {
+ break;
+ }
+ insert_one_file_or_dir(ua, rx, date, false);
+ }
+ return 2;
+ case 7: /* enter files backed up before specified time */
+ if (!have_date) {
+ if (!get_date(ua, date, sizeof(date))) {
+ return 0;
+ }
+ }
+ if (!get_client_name(ua, rx)) {
+ return 0;
+ }
+ ua->send_msg(_("Enter file names with paths, or < to enter a filename\n"
+ "containing a list of file names with paths, and terminate\n"
+ "them with a blank line.\n"));
+ for ( ;; ) {
+ if (!get_cmd(ua, _("Enter full filename: "))) {
+ return 0;
+ }
+ len = strlen(ua->cmd);
+ if (len == 0) {
+ break;
+ }
+ insert_one_file_or_dir(ua, rx, date, false);
+ }
+ return 2;
+
+ case 8: /* Find JobIds for current backup */
+ if (!have_date) {
+ bstrutime(date, sizeof(date), now);
+ }
+ if (!select_backups_before_date(ua, rx, date)) {
+ return 0;
+ }
+ done = false;
+ break;
+
+ case 9: /* Find JobIds for give date */
+ if (!have_date) {
+ if (!get_date(ua, date, sizeof(date))) {
+ return 0;
+ }
+ }
+ if (!select_backups_before_date(ua, rx, date)) {
+ return 0;
+ }
+ done = false;
+ break;
+
+ case 10: /* Enter directories */
+ if (*rx->JobIds != 0) {
+ ua->send_msg(_("You have already selected the following JobIds: %s\n"),
+ rx->JobIds);
+ } else if (get_cmd(ua, _("Enter JobId(s), comma separated, to restore: "))) {
+ if (*rx->JobIds != 0 && *ua->cmd) {
+ pm_strcat(rx->JobIds, ",");
+ }
+ pm_strcat(rx->JobIds, ua->cmd);
+ }
+ if (*rx->JobIds == 0 || *rx->JobIds == '.') {
+ return 0; /* nothing entered, return */
+ }
+ if (!have_date) {
+ bstrutime(date, sizeof(date), now);
+ }
+ if (!get_client_name(ua, rx)) {
+ return 0;
+ }
+ ua->send_msg(_("Enter full directory names or start the name\n"
+ "with a < to indicate it is a filename containing a list\n"
+ "of directories and terminate them with a blank line.\n"));
+ for ( ;; ) {
+ if (!get_cmd(ua, _("Enter directory name: "))) {
+ return 0;
+ }
+ len = strlen(ua->cmd);
+ if (len == 0) {
+ break;
+ }
+ /* Add trailing slash to end of directory names */
+ if (ua->cmd[0] != '<' && !IsPathSeparator(ua->cmd[len-1])) {
+ strcat(ua->cmd, "/");
+ }
+ insert_one_file_or_dir(ua, rx, date, true);
+ }
+ return 2;
+
+ case 11: /* Choose a jobid and select jobs */
+ if (!get_cmd(ua, _("Enter JobId to get the state to restore: ")) ||
+ !is_an_integer(ua->cmd))
+ {
+ return 0;
+ }
+
+ memset(&jr, 0, sizeof(JOB_DBR));
+ jr.JobId = str_to_int64(ua->cmd);
+ if (!db_get_job_record(ua->jcr, ua->db, &jr)) {
+ ua->error_msg(_("Unable to get Job record for JobId=%s: ERR=%s\n"),
+ ua->cmd, db_strerror(ua->db));
+ return 0;
+ }
+ ua->send_msg(_("Selecting jobs to build the Full state at %s\n"),
+ jr.cStartTime);
+ jr.JobLevel = L_INCREMENTAL; /* Take Full+Diff+Incr */
+ if (!db_accurate_get_jobids(ua->jcr, ua->db, &jr, &jobids)) {
+ return 0;
+ }
+ pm_strcpy(rx->JobIds, jobids.list);
+ Dmsg1(30, "Item 12: jobids = %s\n", rx->JobIds);
+ break;
+ case 12: /* Cancel or quit */
+ return 0;
}
}
- if (*rx->JobIds == 0) {
- bsendmsg(ua, _("No Jobs selected.\n"));
- return 0;
- }
- bsendmsg(ua, _("You have selected the following JobId%s: %s\n"),
- strchr(rx->JobIds,',')?"s":"",rx->JobIds);
-
memset(&jr, 0, sizeof(JOB_DBR));
-
+ POOLMEM *JobIds = get_pool_memory(PM_FNAME);
+ *JobIds = 0;
rx->TotalFiles = 0;
+ /*
+ * Find total number of files to be restored, and filter the JobId
+ * list to contain only ones permitted by the ACL conditions.
+ */
for (p=rx->JobIds; ; ) {
+ char ed1[50];
int stat = get_next_jobid_from_list(&p, &JobId);
if (stat < 0) {
- bsendmsg(ua, _("Invalid JobId in list.\n"));
- return 0;
+ ua->error_msg(_("Invalid JobId in list.\n"));
+ free_pool_memory(JobIds);
+ return 0;
}
if (stat == 0) {
- break;
+ break;
}
if (jr.JobId == JobId) {
- continue; /* duplicate of last JobId */
+ continue; /* duplicate of last JobId */
}
+ memset(&jr, 0, sizeof(JOB_DBR));
jr.JobId = JobId;
if (!db_get_job_record(ua->jcr, ua->db, &jr)) {
- bsendmsg(ua, _("Unable to get Job record for JobId=%u: ERR=%s\n"),
- JobId, db_strerror(ua->db));
- return 0;
+ ua->error_msg(_("Unable to get Job record for JobId=%s: ERR=%s\n"),
+ edit_int64(JobId, ed1), db_strerror(ua->db));
+ free_pool_memory(JobIds);
+ return 0;
}
if (!acl_access_ok(ua, Job_ACL, jr.Name)) {
- bsendmsg(ua, _("No authorization. Job \"%s\" not selected.\n"),
- jr.Name);
- continue;
+ ua->error_msg(_("Access to JobId=%s (Job \"%s\") not authorized. Not selected.\n"),
+ edit_int64(JobId, ed1), jr.Name);
+ continue;
+ }
+ if (*JobIds != 0) {
+ pm_strcat(JobIds, ",");
}
+ pm_strcat(JobIds, edit_int64(JobId, ed1));
rx->TotalFiles += jr.JobFiles;
}
+ free_pool_memory(rx->JobIds);
+ rx->JobIds = JobIds; /* Set ACL filtered list */
+ if (*rx->JobIds == 0) {
+ ua->warning_msg(_("No Jobs selected.\n"));
+ return 0;
+ }
+
+ if (strchr(rx->JobIds,',')) {
+ ua->info_msg(_("You have selected the following JobIds: %s\n"), rx->JobIds);
+ } else {
+ ua->info_msg(_("You have selected the following JobId: %s\n"), rx->JobIds);
+ }
return 1;
}
*/
static int get_date(UAContext *ua, char *date, int date_len)
{
- bsendmsg(ua, _("The restored files will the most current backup\n"
- "BEFORE the date you specify below.\n\n"));
+ ua->send_msg(_("The restored files will the most current backup\n"
+ "BEFORE the date you specify below.\n\n"));
for ( ;; ) {
if (!get_cmd(ua, _("Enter date as YYYY-MM-DD HH:MM:SS :"))) {
- return 0;
+ return 0;
}
if (str_to_utime(ua->cmd) != 0) {
- break;
+ break;
}
- bsendmsg(ua, _("Improper date format.\n"));
+ ua->error_msg(_("Improper date format.\n"));
}
bstrncpy(date, ua->cmd, date_len);
return 1;
/*
* Insert a single file, or read a list of files from a file
*/
-static void insert_one_file(UAContext *ua, RESTORE_CTX *rx, char *date)
+static void insert_one_file_or_dir(UAContext *ua, RESTORE_CTX *rx, char *date, bool dir)
{
FILE *ffd;
char file[5000];
switch (*p) {
case '<':
p++;
- if ((ffd = fopen(p, "r")) == NULL) {
- bsendmsg(ua, _("Cannot open file %s: ERR=%s\n"),
- p, strerror(errno));
- break;
+ if ((ffd = fopen(p, "rb")) == NULL) {
+ berrno be;
+ ua->error_msg(_("Cannot open file %s: ERR=%s\n"),
+ p, be.bstrerror());
+ break;
}
while (fgets(file, sizeof(file), ffd)) {
- line++;
- if (!insert_file_into_findex_list(ua, rx, file, date)) {
- bsendmsg(ua, _("Error occurred on line %d of %s\n"), line, p);
- }
+ line++;
+ if (dir) {
+ if (!insert_dir_into_findex_list(ua, rx, file, date)) {
+ ua->error_msg(_("Error occurred on line %d of file \"%s\"\n"), line, p);
+ }
+ } else {
+ if (!insert_file_into_findex_list(ua, rx, file, date)) {
+ ua->error_msg(_("Error occurred on line %d of file \"%s\"\n"), line, p);
+ }
+ }
}
fclose(ffd);
break;
+ case '?':
+ p++;
+ insert_table_into_findex_list(ua, rx, p);
+ break;
default:
- insert_file_into_findex_list(ua, rx, ua->cmd, date);
+ if (dir) {
+ insert_dir_into_findex_list(ua, rx, ua->cmd, date);
+ } else {
+ insert_file_into_findex_list(ua, rx, ua->cmd, date);
+ }
break;
}
}
* lookup the most recent backup in the catalog to get the JobId
* and FileIndex, then insert them into the findex list.
*/
-static int insert_file_into_findex_list(UAContext *ua, RESTORE_CTX *rx, char *file,
- char *date)
+static bool insert_file_into_findex_list(UAContext *ua, RESTORE_CTX *rx, char *file,
+ char *date)
{
- strip_trailing_junk(file);
- split_path_and_filename(rx, file);
+ strip_trailing_newline(file);
+ split_path_and_filename(ua, rx, file);
if (*rx->JobIds == 0) {
- Mmsg(rx->query, uar_jobid_fileindex, date, rx->path, rx->fname, rx->ClientName);
+ Mmsg(rx->query, uar_jobid_fileindex, date, rx->path, rx->fname,
+ rx->ClientName);
} else {
Mmsg(rx->query, uar_jobids_fileindex, rx->JobIds, date,
- rx->path, rx->fname, rx->ClientName);
+ rx->path, rx->fname, rx->ClientName);
}
rx->found = false;
/* Find and insert jobid and File Index */
if (!db_sql_query(ua->db, rx->query, jobid_fileindex_handler, (void *)rx)) {
- bsendmsg(ua, _("Query failed: %s. ERR=%s\n"),
- rx->query, db_strerror(ua->db));
+ ua->error_msg(_("Query failed: %s. ERR=%s\n"),
+ rx->query, db_strerror(ua->db));
}
if (!rx->found) {
- bsendmsg(ua, _("No database record found for: %s\n"), file);
- return 0;
+ ua->error_msg(_("No database record found for: %s\n"), file);
+// ua->error_msg("Query=%s\n", rx->query);
+ return true;
}
- rx->selected_files++;
- /*
- * Find the MediaTypes for this JobId and add to the name_list
- */
- Mmsg(rx->query, uar_mediatype, rx->JobId);
- if (!db_sql_query(ua->db, rx->query, unique_name_list_handler, (void *)&rx->name_list)) {
- bsendmsg(ua, "%s", db_strerror(ua->db));
- return 0;
+ return true;
+}
+
+/*
+ * For a given path lookup the most recent backup in the catalog
+ * to get the JobId and FileIndexes of all files in that directory.
+ */
+static bool insert_dir_into_findex_list(UAContext *ua, RESTORE_CTX *rx, char *dir,
+ char *date)
+{
+ strip_trailing_junk(dir);
+ if (*rx->JobIds == 0) {
+ ua->error_msg(_("No JobId specified cannot continue.\n"));
+ return false;
+ } else {
+ Mmsg(rx->query, uar_jobid_fileindex_from_dir[db_type], rx->JobIds, dir, rx->ClientName);
}
- return 1;
+ rx->found = false;
+ /* Find and insert jobid and File Index */
+ if (!db_sql_query(ua->db, rx->query, jobid_fileindex_handler, (void *)rx)) {
+ ua->error_msg(_("Query failed: %s. ERR=%s\n"),
+ rx->query, db_strerror(ua->db));
+ }
+ if (!rx->found) {
+ ua->error_msg(_("No database record found for: %s\n"), dir);
+ return true;
+ }
+ return true;
+}
+
+/*
+ * Get the JobId and FileIndexes of all files in the specified table
+ */
+static bool insert_table_into_findex_list(UAContext *ua, RESTORE_CTX *rx, char *table)
+{
+ strip_trailing_junk(table);
+ Mmsg(rx->query, uar_jobid_fileindex_from_table, table);
+
+ rx->found = false;
+ /* Find and insert jobid and File Index */
+ if (!db_sql_query(ua->db, rx->query, jobid_fileindex_handler, (void *)rx)) {
+ ua->error_msg(_("Query failed: %s. ERR=%s\n"),
+ rx->query, db_strerror(ua->db));
+ }
+ if (!rx->found) {
+ ua->error_msg(_("No table found: %s\n"), table);
+ return true;
+ }
+ return true;
}
-static void split_path_and_filename(RESTORE_CTX *rx, char *name)
+static void split_path_and_filename(UAContext *ua, RESTORE_CTX *rx, char *name)
{
char *p, *f;
* must be a path name (e.g. c:).
*/
for (p=f=name; *p; p++) {
- if (*p == '/') {
- f = p; /* set pos of last slash */
+ if (IsPathSeparator(*p)) {
+ f = p; /* set pos of last slash */
}
}
- if (*f == '/') { /* did we find a slash? */
- f++; /* yes, point to filename */
- } else { /* no, whole thing must be path name */
+ if (IsPathSeparator(*f)) { /* did we find a slash? */
+ f++; /* yes, point to filename */
+ } else { /* no, whole thing must be path name */
f = p;
}
*/
rx->fnl = p - f;
if (rx->fnl > 0) {
- rx->fname = check_pool_memory_size(rx->fname, rx->fnl+1);
- memcpy(rx->fname, f, rx->fnl); /* copy filename */
- rx->fname[rx->fnl] = 0;
+ rx->fname = check_pool_memory_size(rx->fname, 2*(rx->fnl)+1);
+ db_escape_string(ua->jcr, ua->db, rx->fname, f, rx->fnl);
} else {
rx->fname[0] = 0;
rx->fnl = 0;
rx->pnl = f - name;
if (rx->pnl > 0) {
- rx->path = check_pool_memory_size(rx->path, rx->pnl+1);
- memcpy(rx->path, name, rx->pnl);
- rx->path[rx->pnl] = 0;
+ rx->path = check_pool_memory_size(rx->path, 2*(rx->pnl)+1);
+ db_escape_string(ua->jcr, ua->db, rx->path, name, rx->pnl);
} else {
rx->path[0] = 0;
rx->pnl = 0;
}
- Dmsg2(100, "sllit path=%s file=%s\n", rx->path, rx->fname);
+ Dmsg2(100, "split path=%s file=%s\n", rx->path, rx->fname);
+}
+
+static bool ask_for_fileregex(UAContext *ua, RESTORE_CTX *rx)
+{
+ if (find_arg(ua, NT_("all")) >= 0) { /* if user enters all on command line */
+ return true; /* select everything */
+ }
+ ua->send_msg(_("\n\nFor one or more of the JobIds selected, no files were found,\n"
+ "so file selection is not possible.\n"
+ "Most likely your retention policy pruned the files.\n"));
+ if (get_yesno(ua, _("\nDo you want to restore all the files? (yes|no): "))) {
+ if (ua->pint32_val == 1)
+ return true;
+ while (get_cmd(ua, _("\nRegexp matching files to restore? (empty to abort): "))) {
+ if (ua->cmd[0] == '\0') {
+ break;
+ } else {
+ regex_t *fileregex_re = NULL;
+ int rc;
+ char errmsg[500] = "";
+
+ fileregex_re = (regex_t *)bmalloc(sizeof(regex_t));
+ rc = regcomp(fileregex_re, ua->cmd, REG_EXTENDED|REG_NOSUB);
+ if (rc != 0) {
+ regerror(rc, fileregex_re, errmsg, sizeof(errmsg));
+ }
+ regfree(fileregex_re);
+ free(fileregex_re);
+ if (*errmsg) {
+ ua->send_msg(_("Regex compile error: %s\n"), errmsg);
+ } else {
+ rx->bsr->fileregex = bstrdup(ua->cmd);
+ return true;
+ }
+ }
+ }
+ }
+ return false;
}
static bool build_directory_tree(UAContext *ua, RESTORE_CTX *rx)
JobId_t JobId, last_JobId;
char *p;
bool OK = true;
+ char ed1[50];
memset(&tree, 0, sizeof(TREE_CTX));
/*
* For display purposes, the same JobId, with different volumes may
* appear more than once, however, we only insert it once.
*/
- int items = 0;
p = rx->JobIds;
tree.FileEstimate = 0;
if (get_next_jobid_from_list(&p, &JobId) > 0) {
/* Use first JobId as estimate of the number of files to restore */
- Mmsg(rx->query, uar_count_files, JobId);
- if (!db_sql_query(ua->db, rx->query, count_handler, (void *)rx)) {
- bsendmsg(ua, "%s\n", db_strerror(ua->db));
+ Mmsg(rx->query, uar_count_files, edit_int64(JobId, ed1));
+ if (!db_sql_query(ua->db, rx->query, restore_count_handler, (void *)rx)) {
+ ua->error_msg("%s\n", db_strerror(ua->db));
}
if (rx->found) {
- /* Add about 25% more than this job for over estimate */
- tree.FileEstimate = rx->JobId + (rx->JobId >> 2);
- tree.DeltaCount = rx->JobId/50; /* print 50 ticks */
+ /* Add about 25% more than this job for over estimate */
+ tree.FileEstimate = rx->JobId + (rx->JobId >> 2);
+ tree.DeltaCount = rx->JobId/50; /* print 50 ticks */
}
}
+
+ ua->info_msg(_("\nBuilding directory tree for JobId(s) %s ... "),
+ rx->JobIds);
+
+#define new_get_file_list
+#ifdef new_get_file_list
+ if (!db_get_file_list(ua->jcr, ua->db, rx->JobIds, insert_tree_handler, (void *)&tree)) {
+ ua->error_msg("%s", db_strerror(ua->db));
+ }
+ if (*rx->BaseJobIds) {
+ pm_strcat(rx->JobIds, ",");
+ pm_strcat(rx->JobIds, rx->BaseJobIds);
+ }
+#else
for (p=rx->JobIds; get_next_jobid_from_list(&p, &JobId) > 0; ) {
+ char ed1[50];
if (JobId == last_JobId) {
- continue; /* eliminate duplicate JobIds */
+ continue; /* eliminate duplicate JobIds */
}
last_JobId = JobId;
- bsendmsg(ua, _("\nBuilding directory tree for JobId %u ... "), JobId);
- items++;
/*
* Find files for this JobId and insert them in the tree
*/
- Mmsg(rx->query, uar_sel_files, JobId);
+ Mmsg(rx->query, uar_sel_files, edit_int64(JobId, ed1));
if (!db_sql_query(ua->db, rx->query, insert_tree_handler, (void *)&tree)) {
- bsendmsg(ua, "%s", db_strerror(ua->db));
+ ua->error_msg("%s", db_strerror(ua->db));
}
- /*
- * Find the MediaTypes for this JobId and add to the name_list
- */
- Mmsg(rx->query, uar_mediatype, JobId);
- if (!db_sql_query(ua->db, rx->query, unique_name_list_handler, (void *)&rx->name_list)) {
- bsendmsg(ua, "%s", db_strerror(ua->db));
+ }
+#endif
+ /*
+ * Look at the first JobId on the list (presumably the oldest) and
+ * if it is marked purged, don't do the manual selection because
+ * the Job was pruned, so the tree is incomplete.
+ */
+ if (tree.FileCount != 0) {
+ /* Find out if any Job is purged */
+ Mmsg(rx->query, "SELECT SUM(PurgedFiles) FROM Job WHERE JobId IN (%s)", rx->JobIds);
+ if (!db_sql_query(ua->db, rx->query, restore_count_handler, (void *)rx)) {
+ ua->error_msg("%s\n", db_strerror(ua->db));
+ }
+ /* rx->JobId is the PurgedFiles flag */
+ if (rx->found && rx->JobId > 0) {
+ tree.FileCount = 0; /* set count to zero, no tree selection */
}
}
- char ec1[50];
- bsendmsg(ua, "\n%d Job%s, %s files inserted into the tree%s.\n",
- items, items==1?"":"s", edit_uint64_with_commas(tree.FileCount, ec1),
- tree.all?" and marked for extraction":"");
-
- /* Check MediaType and select storage that corresponds */
- get_storage_from_mediatype(ua, &rx->name_list, rx);
+ if (tree.FileCount == 0) {
+ OK = ask_for_fileregex(ua, rx);
+ if (OK) {
+ last_JobId = 0;
+ for (p=rx->JobIds; get_next_jobid_from_list(&p, &JobId) > 0; ) {
+ if (JobId == last_JobId) {
+ continue; /* eliminate duplicate JobIds */
+ }
+ add_findex_all(rx->bsr, JobId);
+ }
+ }
+ } else {
+ char ec1[50];
+ if (tree.all) {
+ ua->info_msg(_("\n%s files inserted into the tree and marked for extraction.\n"),
+ edit_uint64_with_commas(tree.FileCount, ec1));
+ } else {
+ ua->info_msg(_("\n%s files inserted into the tree.\n"),
+ edit_uint64_with_commas(tree.FileCount, ec1));
+ }
- if (find_arg(ua, _("done")) < 0) {
- /* Let the user interact in selecting which files to restore */
- OK = user_select_files_from_tree(&tree);
- }
+ if (find_arg(ua, NT_("done")) < 0) {
+ /* Let the user interact in selecting which files to restore */
+ OK = user_select_files_from_tree(&tree);
+ }
- /*
- * Walk down through the tree finding all files marked to be
- * extracted making a bootstrap file.
- */
- if (OK) {
- for (TREE_NODE *node=first_tree_node(tree.root); node; node=next_tree_node(node)) {
- Dmsg2(400, "FI=%d node=0x%x\n", node->FileIndex, node);
- if (node->extract || node->extract_dir) {
- Dmsg2(400, "type=%d FI=%d\n", node->type, node->FileIndex);
- add_findex(rx->bsr, node->JobId, node->FileIndex);
- if (node->extract && node->type != TN_NEWDIR) {
- rx->selected_files++; /* count only saved files */
- }
- }
+ /*
+ * Walk down through the tree finding all files marked to be
+ * extracted making a bootstrap file.
+ */
+ if (OK) {
+ for (TREE_NODE *node=first_tree_node(tree.root); node; node=next_tree_node(node)) {
+ Dmsg2(400, "FI=%d node=0x%x\n", node->FileIndex, node);
+ if (node->extract || node->extract_dir) {
+ Dmsg3(400, "JobId=%lld type=%d FI=%d\n", (uint64_t)node->JobId, node->type, node->FileIndex);
+ add_findex(rx->bsr, node->JobId, node->FileIndex);
+ if (node->extract && node->type != TN_NEWDIR) {
+ rx->selected_files++; /* count only saved files */
+ }
+ }
+ }
}
}
- free_tree(tree.root); /* free the directory tree */
+ free_tree(tree.root); /* free the directory tree */
return OK;
}
* This routine is used to get the current backup or a backup
* before the specified date.
*/
-static int select_backups_before_date(UAContext *ua, RESTORE_CTX *rx, char *date)
+static bool select_backups_before_date(UAContext *ua, RESTORE_CTX *rx, char *date)
{
- int stat = 0;
+ bool ok = false;
FILESET_DBR fsr;
CLIENT_DBR cr;
char fileset_name[MAX_NAME_LENGTH];
- char ed1[50];
+ char ed1[50], ed2[50];
char pool_select[MAX_NAME_LENGTH];
int i;
-
/* Create temp tables */
db_sql_query(ua->db, uar_del_temp, NULL, NULL);
db_sql_query(ua->db, uar_del_temp1, NULL, NULL);
- if (!db_sql_query(ua->db, uar_create_temp, NULL, NULL)) {
- bsendmsg(ua, "%s\n", db_strerror(ua->db));
+ if (!db_sql_query(ua->db, uar_create_temp[db_type], NULL, NULL)) {
+ ua->error_msg("%s\n", db_strerror(ua->db));
}
- if (!db_sql_query(ua->db, uar_create_temp1, NULL, NULL)) {
- bsendmsg(ua, "%s\n", db_strerror(ua->db));
+ if (!db_sql_query(ua->db, uar_create_temp1[db_type], NULL, NULL)) {
+ ua->error_msg("%s\n", db_strerror(ua->db));
}
/*
* Select Client from the Catalog
if (i >= 0) {
bstrncpy(fsr.FileSet, ua->argv[i], sizeof(fsr.FileSet));
if (!db_get_fileset_record(ua->jcr, ua->db, &fsr)) {
- bsendmsg(ua, _("Error getting FileSet \"%s\": ERR=%s\n"), fsr.FileSet,
- db_strerror(ua->db));
- i = -1;
+ ua->error_msg(_("Error getting FileSet \"%s\": ERR=%s\n"), fsr.FileSet,
+ db_strerror(ua->db));
+ i = -1;
}
}
- if (i < 0) { /* fileset not found */
- Mmsg(rx->query, uar_sel_fileset, cr.ClientId, cr.ClientId);
+ if (i < 0) { /* fileset not found */
+ edit_int64(cr.ClientId, ed1);
+ Mmsg(rx->query, uar_sel_fileset, ed1, ed1);
start_prompt(ua, _("The defined FileSet resources are:\n"));
if (!db_sql_query(ua->db, rx->query, fileset_handler, (void *)ua)) {
- bsendmsg(ua, "%s\n", db_strerror(ua->db));
+ ua->error_msg("%s\n", db_strerror(ua->db));
}
if (do_prompt(ua, _("FileSet"), _("Select FileSet resource"),
- fileset_name, sizeof(fileset_name)) < 0) {
- goto bail_out;
+ fileset_name, sizeof(fileset_name)) < 0) {
+ ua->error_msg(_("No FileSet found for client \"%s\".\n"), cr.Name);
+ goto bail_out;
}
bstrncpy(fsr.FileSet, fileset_name, sizeof(fsr.FileSet));
if (!db_get_fileset_record(ua->jcr, ua->db, &fsr)) {
- bsendmsg(ua, _("Error getting FileSet record: %s\n"), db_strerror(ua->db));
- bsendmsg(ua, _("This probably means you modified the FileSet.\n"
- "Continuing anyway.\n"));
+ ua->warning_msg(_("Error getting FileSet record: %s\n"), db_strerror(ua->db));
+ ua->send_msg(_("This probably means you modified the FileSet.\n"
+ "Continuing anyway.\n"));
}
}
if (rx->pool) {
POOL_DBR pr;
memset(&pr, 0, sizeof(pr));
- bstrncpy(pr.Name, rx->pool->hdr.name, sizeof(pr.Name));
+ bstrncpy(pr.Name, rx->pool->name(), sizeof(pr.Name));
if (db_get_pool_record(ua->jcr, ua->db, &pr)) {
- bsnprintf(pool_select, sizeof(pool_select), "AND Media.PoolId=%u ", pr.PoolId);
+ bsnprintf(pool_select, sizeof(pool_select), "AND Media.PoolId=%s ",
+ edit_int64(pr.PoolId, ed1));
} else {
- bsendmsg(ua, _("Pool \"%s\" not found, using any pool.\n"), pr.Name);
+ ua->warning_msg(_("Pool \"%s\" not found, using any pool.\n"), pr.Name);
}
}
/* Find JobId of last Full backup for this client, fileset */
- Mmsg(rx->query, uar_last_full, cr.ClientId, cr.ClientId, date, fsr.FileSet,
- pool_select);
+ edit_int64(cr.ClientId, ed1);
+ Mmsg(rx->query, uar_last_full, ed1, ed1, date, fsr.FileSet,
+ pool_select);
if (!db_sql_query(ua->db, rx->query, NULL, NULL)) {
- bsendmsg(ua, "%s\n", db_strerror(ua->db));
+ ua->error_msg("%s\n", db_strerror(ua->db));
goto bail_out;
}
/* Find all Volumes used by that JobId */
if (!db_sql_query(ua->db, uar_full, NULL, NULL)) {
- bsendmsg(ua, "%s\n", db_strerror(ua->db));
+ ua->error_msg("%s\n", db_strerror(ua->db));
goto bail_out;
}
+
/* Note, this is needed because I don't seem to get the callback
* from the call just above.
*/
rx->JobTDate = 0;
if (!db_sql_query(ua->db, uar_sel_all_temp1, last_full_handler, (void *)rx)) {
- bsendmsg(ua, "%s\n", db_strerror(ua->db));
+ ua->warning_msg("%s\n", db_strerror(ua->db));
}
if (rx->JobTDate == 0) {
- bsendmsg(ua, _("No Full backup before %s found.\n"), date);
+ ua->error_msg(_("No Full backup before %s found.\n"), date);
goto bail_out;
}
/* Now find most recent Differental Job after Full save, if any */
Mmsg(rx->query, uar_dif, edit_uint64(rx->JobTDate, ed1), date,
- cr.ClientId, fsr.FileSet, pool_select);
+ edit_int64(cr.ClientId, ed2), fsr.FileSet, pool_select);
if (!db_sql_query(ua->db, rx->query, NULL, NULL)) {
- bsendmsg(ua, "%s\n", db_strerror(ua->db));
+ ua->warning_msg("%s\n", db_strerror(ua->db));
}
- /* Now update JobTDate to lock onto Differental, if any */
+ /* Now update JobTDate to look into Differental, if any */
rx->JobTDate = 0;
if (!db_sql_query(ua->db, uar_sel_all_temp, last_full_handler, (void *)rx)) {
- bsendmsg(ua, "%s\n", db_strerror(ua->db));
+ ua->warning_msg("%s\n", db_strerror(ua->db));
}
if (rx->JobTDate == 0) {
- bsendmsg(ua, _("No Full backup before %s found.\n"), date);
+ ua->error_msg(_("No Full backup before %s found.\n"), date);
goto bail_out;
}
/* Now find all Incremental Jobs after Full/dif save */
Mmsg(rx->query, uar_inc, edit_uint64(rx->JobTDate, ed1), date,
- cr.ClientId, fsr.FileSet, pool_select);
+ edit_int64(cr.ClientId, ed2), fsr.FileSet, pool_select);
if (!db_sql_query(ua->db, rx->query, NULL, NULL)) {
- bsendmsg(ua, "%s\n", db_strerror(ua->db));
+ ua->warning_msg("%s\n", db_strerror(ua->db));
}
/* Get the JobIds from that list */
- rx->JobIds[0] = 0;
- rx->last_jobid[0] = 0;
+ rx->last_jobid[0] = rx->JobIds[0] = 0;
+
if (!db_sql_query(ua->db, uar_sel_jobid_temp, jobid_handler, (void *)rx)) {
- bsendmsg(ua, "%s\n", db_strerror(ua->db));
+ ua->warning_msg("%s\n", db_strerror(ua->db));
}
if (rx->JobIds[0] != 0) {
+ if (find_arg(ua, NT_("copies")) > 0) {
+ /* Display a list of all copies */
+ db_list_copies_records(ua->jcr, ua->db, 0, rx->JobIds,
+ prtit, ua, HORZ_LIST);
+ }
/* Display a list of Jobs selected for this restore */
- db_list_sql_query(ua->jcr, ua->db, uar_list_temp, prtit, ua, 1, HORZ_LIST);
+ db_list_sql_query(ua->jcr, ua->db, uar_list_temp, prtit, ua, 1,HORZ_LIST);
+ ok = true;
+
} else {
- bsendmsg(ua, _("No jobs found.\n"));
+ ua->warning_msg(_("No jobs found.\n"));
}
- stat = 1;
-
bail_out:
db_sql_query(ua->db, uar_del_temp, NULL, NULL);
db_sql_query(ua->db, uar_del_temp1, NULL, NULL);
- return stat;
-}
-
-
-/* Return next JobId from comma separated list */
-static int get_next_jobid_from_list(char **p, uint32_t *JobId)
-{
- char jobid[30];
- char *q = *p;
-
- jobid[0] = 0;
- for (int i=0; i<(int)sizeof(jobid); i++) {
- if (*q == ',' || *q == 0) {
- q++;
- break;
- }
- jobid[i] = *q++;
- jobid[i+1] = 0;
- }
- if (jobid[0] == 0 || !is_a_number(jobid)) {
- return 0;
- }
- *p = q;
- *JobId = strtoul(jobid, NULL, 10);
- return 1;
+ return ok;
}
-static int count_handler(void *ctx, int num_fields, char **row)
+static int restore_count_handler(void *ctx, int num_fields, char **row)
{
RESTORE_CTX *rx = (RESTORE_CTX *)ctx;
- rx->JobId = atoi(row[0]);
+ rx->JobId = str_to_int64(row[0]);
rx->found = true;
return 0;
}
/*
* Callback handler to get JobId and FileIndex for files
+ * can insert more than one depending on the caller.
*/
static int jobid_fileindex_handler(void *ctx, int num_fields, char **row)
{
RESTORE_CTX *rx = (RESTORE_CTX *)ctx;
- rx->JobId = atoi(row[0]);
- add_findex(rx->bsr, rx->JobId, atoi(row[1]));
+
+ Dmsg2(200, "JobId=%s FileIndex=%s\n", row[0], row[1]);
+ rx->JobId = str_to_int64(row[0]);
+ add_findex(rx->bsr, rx->JobId, str_to_int64(row[1]));
rx->found = true;
+ rx->selected_files++;
return 0;
}
RESTORE_CTX *rx = (RESTORE_CTX *)ctx;
if (strcmp(rx->last_jobid, row[0]) == 0) {
- return 0; /* duplicate id */
+ return 0; /* duplicate id */
}
bstrncpy(rx->last_jobid, row[0], sizeof(rx->last_jobid));
if (rx->JobIds[0] != 0) {
return 0;
}
-/*
- * Called here with each name to be added to the list. The name is
- * added to the list if it is not already in the list.
- *
- * Used to make unique list of FileSets and MediaTypes
- */
-static int unique_name_list_handler(void *ctx, int num_fields, char **row)
-{
- NAME_LIST *name = (NAME_LIST *)ctx;
-
- if (name->num_ids == MAX_ID_LIST_LEN) {
- return 1;
- }
- if (name->num_ids == name->max_ids) {
- if (name->max_ids == 0) {
- name->max_ids = 1000;
- name->name = (char **)bmalloc(sizeof(char *) * name->max_ids);
- } else {
- name->max_ids = (name->max_ids * 3) / 2;
- name->name = (char **)brealloc(name->name, sizeof(char *) * name->max_ids);
- }
- }
- for (int i=0; i<name->num_ids; i++) {
- if (strcmp(name->name[i], row[0]) == 0) {
- return 0; /* already in list, return */
- }
- }
- /* Add new name to list */
- name->name[name->num_ids++] = bstrdup(row[0]);
- return 0;
-}
-
-
-/*
- * Print names in the list
- */
-static void print_name_list(UAContext *ua, NAME_LIST *name_list)
-{
- for (int i=0; i < name_list->num_ids; i++) {
- bsendmsg(ua, "%s\n", name_list->name[i]);
- }
-}
-
-
/*
* Free names in the list
*/
for (int i=0; i < name_list->num_ids; i++) {
free(name_list->name[i]);
}
- if (name_list->name) {
- free(name_list->name);
- name_list->name = NULL;
- }
+ bfree_and_null(name_list->name);
name_list->max_ids = 0;
name_list->num_ids = 0;
}
-static void get_storage_from_mediatype(UAContext *ua, NAME_LIST *name_list, RESTORE_CTX *rx)
+void find_storage_resource(UAContext *ua, RESTORE_CTX &rx, char *Storage, char *MediaType)
{
STORE *store;
- if (name_list->num_ids > 1) {
- bsendmsg(ua, _("Warning, the JobIds that you selected refer to more than one MediaType.\n"
- "Restore is not possible. The MediaTypes used are:\n"));
- print_name_list(ua, name_list);
- rx->store = select_storage_resource(ua);
- return;
- }
-
- if (name_list->num_ids == 0) {
- bsendmsg(ua, _("No MediaType found for your JobIds.\n"));
- rx->store = select_storage_resource(ua);
- return;
- }
- if (rx->store) {
+ if (rx.store) {
+ Dmsg1(200, "Already have store=%s\n", rx.store->name());
return;
}
/*
- * We have a single MediaType, look it up in our Storage resource
+ * Try looking up Storage by name
*/
LockRes();
foreach_res(store, R_STORAGE) {
- if (strcmp(name_list->name[0], store->media_type) == 0) {
- if (acl_access_ok(ua, Storage_ACL, store->hdr.name)) {
- rx->store = store;
- }
- break;
+ if (strcmp(Storage, store->name()) == 0) {
+ if (acl_access_ok(ua, Storage_ACL, store->name())) {
+ rx.store = store;
+ }
+ break;
}
}
UnlockRes();
- if (rx->store) {
+ if (rx.store) {
/* Check if an explicit storage resource is given */
store = NULL;
int i = find_arg_with_value(ua, "storage");
if (i > 0) {
- store = (STORE *)GetResWithName(R_STORAGE, ua->argv[i]);
- if (store && !acl_access_ok(ua, Storage_ACL, store->hdr.name)) {
- store = NULL;
- }
+ store = (STORE *)GetResWithName(R_STORAGE, ua->argv[i]);
+ if (store && !acl_access_ok(ua, Storage_ACL, store->name())) {
+ store = NULL;
+ }
}
- if (store && (store != rx->store)) {
- bsendmsg(ua, _("Warning default storage overridden by %s on command line.\n"),
- store->hdr.name);
- rx->store = store;
+ if (store && (store != rx.store)) {
+ ua->info_msg(_("Warning default storage overridden by \"%s\" on command line.\n"),
+ store->name());
+ rx.store = store;
+ Dmsg1(200, "Set store=%s\n", rx.store->name());
}
return;
}
- /* Take command line arg, or ask user if none */
- rx->store = get_storage_resource(ua, false /* don't use default */);
+ /* If no storage resource, try to find one from MediaType */
+ if (!rx.store) {
+ LockRes();
+ foreach_res(store, R_STORAGE) {
+ if (strcmp(MediaType, store->media_type) == 0) {
+ if (acl_access_ok(ua, Storage_ACL, store->name())) {
+ rx.store = store;
+ Dmsg1(200, "Set store=%s\n", rx.store->name());
+ ua->warning_msg(_("Storage \"%s\" not found, using Storage \"%s\" from MediaType \"%s\".\n"),
+ Storage, store->name(), MediaType);
+ }
+ UnlockRes();
+ return;
+ }
+ }
+ UnlockRes();
+ ua->warning_msg(_("\nUnable to find Storage resource for\n"
+ "MediaType \"%s\", needed by the Jobs you selected.\n"), MediaType);
+ }
- if (!rx->store) {
- bsendmsg(ua, _("\nWarning. Unable to find Storage resource for\n"
- "MediaType \"%s\", needed by the Jobs you selected.\n"
- "You will be allowed to select a Storage device later.\n"),
- name_list->name[0]);
+ /* Take command line arg, or ask user if none */
+ rx.store = get_storage_resource(ua, false /* don't use default */);
+ if (rx.store) {
+ Dmsg1(200, "Set store=%s\n", rx.store->name());
}
+
}
projects / bacula / bacula / blobdiff