X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fdird%2Fua_restore.c;h=37a88125742e2432273b701b0ae67101ae7abcfb;hb=636fd4fd4cac25733522509a4041b85594fa5af9;hp=2b1cf9cd0a909950d4a31ef9fc1b5792577c66bf;hpb=308ccd5dbf04c397a750e3e0272ac9a846082f0b;p=bacula%2Fbacula diff --git a/bacula/src/dird/ua_restore.c b/bacula/src/dird/ua_restore.c index 2b1cf9cd0a..37a8812574 100644 --- a/bacula/src/dird/ua_restore.c +++ b/bacula/src/dird/ua_restore.c @@ -1,112 +1,71 @@ /* * * 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 + Copyright (C) 2002-2005 Kern Sibbald 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. + modify it under the terms of the GNU General Public License + version 2 as amended with additional clauses defined in the + file LICENSE in the main source directory. 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. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + the file LICENSE for additional details. */ + #include "bacula.h" #include "dird.h" /* Imported functions */ -extern int run_cmd(UAContext *ua, const char *cmd); 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_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; - - -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 +extern char *uar_jobid_fileindex, *uar_dif, *uar_sel_all_temp; +extern char *uar_count_files, *uar_jobids_fileindex; +extern char *uar_jobid_fileindex_from_dir; + /* 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 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_date(UAContext *ua, char *date, int date_len); static int count_handler(void *ctx, int num_fields, char **row); @@ -117,9 +76,10 @@ static int count_handler(void *ctx, int num_fields, char **row); */ int restore_cmd(UAContext *ua, const char *cmd) { - RESTORE_CTX rx; /* restore context */ + RESTORE_CTX rx; /* restore context */ JOB *job; int i; + POOLMEM *fname; memset(&rx, 0, sizeof(rx)); rx.path = get_pool_memory(PM_FNAME); @@ -141,49 +101,59 @@ int restore_cmd(UAContext *ua, const char *cmd) 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")); + "No Restore Job Resource found in bacula-dir.conf.\n" + "You must create at least one before running this command.\n")); goto bail_out; } - /* + /* * Request user to select JobIds or files by various different methods * last 20 jobs, where File saved, most recent backup, ... * In the end, a list of files are pumped into * 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 */ if (!build_directory_tree(ua, &rx)) { bsendmsg(ua, _("Restore not done.\n")); - goto bail_out; + 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 */ + uint32_t selected_files; + 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; + goto bail_out; } - if (!write_bsr_file(ua, rx.bsr)) { - goto bail_out; + if (!(selected_files = write_bsr_file(ua, rx))) { + bsendmsg(ua, _("No files selected to be restored.\n")); + goto bail_out; + } + /* If no count of files, use bsr generated value (often wrong) */ + if (rx.selected_files == 0) { + rx.selected_files = selected_files; + } + if (rx.selected_files==1) { + bsendmsg(ua, _("\n1 file selected to be restored.\n\n")); + } + else { + bsendmsg(ua, _("\n%u files selected to be restored.\n\n"), rx.selected_files); } - 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")); goto bail_out; @@ -205,21 +175,24 @@ int restore_cmd(UAContext *ua, const char *cmd) } /* Build run command */ + fname = get_pool_memory(PM_MESSAGE); + make_unique_restore_filename(ua, &fname); if (rx.where) { - Mmsg(&ua->cmd, - "run job=\"%s\" client=\"%s\" storage=\"%s\" bootstrap=\"%s/restore.bsr\"" - " where=\"%s\" files=%d", + Mmsg(ua->cmd, + "run job=\"%s\" client=\"%s\" storage=\"%s\" bootstrap=\"%s\"" + " where=\"%s\" files=%d catalog=\"%s\"", job->hdr.name, rx.ClientName, rx.store?rx.store->hdr.name:"", - working_directory, rx.where, rx.selected_files); + fname, rx.where, rx.selected_files, ua->catalog->hdr.name); } else { - Mmsg(&ua->cmd, - "run job=\"%s\" client=\"%s\" storage=\"%s\" bootstrap=\"%s/restore.bsr\"" - " files=%d", + Mmsg(ua->cmd, + "run job=\"%s\" client=\"%s\" storage=\"%s\" bootstrap=\"%s\"" + " files=%d catalog=\"%s\"", job->hdr.name, rx.ClientName, rx.store?rx.store->hdr.name:"", - working_directory, rx.selected_files); + fname, rx.selected_files, ua->catalog->hdr.name); } - if (find_arg(ua, _("yes")) > 0) { - pm_strcat(&ua->cmd, " yes"); /* pass it on to the run command */ + free_pool_memory(fname); + if (find_arg(ua, N_("yes")) > 0) { + pm_strcat(ua->cmd, " yes"); /* pass it on to the run command */ } Dmsg1(400, "Submitting: %s\n", ua->cmd); parse_ua_args(ua); @@ -233,7 +206,7 @@ bail_out: } -static void free_rx(RESTORE_CTX *rx) +static void free_rx(RESTORE_CTX *rx) { free_bsr(rx->bsr); rx->bsr = NULL; @@ -262,14 +235,14 @@ static int get_client_name(UAContext *ua, RESTORE_CTX *rx) 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, N_("client")); if (i >= 0) { - bstrncpy(rx->ClientName, ua->argv[i], sizeof(rx->ClientName)); - return 1; + 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)); } @@ -277,9 +250,13 @@ static int get_client_name(UAContext *ua, RESTORE_CTX *rx) } /* - * The first step in the restore process is for the user to + * 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) { @@ -290,32 +267,40 @@ static int user_select_jobids_or_files(UAContext *ua, RESTORE_CTX *rx) JOB_DBR jr; 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", + 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"), + _("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"), + _("Cancel"), NULL }; const char *kw[] = { + /* These keywords are handled in a for loop */ "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 */ + "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 */ NULL }; @@ -323,87 +308,88 @@ static int user_select_jobids_or_files(UAContext *ua, RESTORE_CTX *rx) for (i=1; iargc; 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; + 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) { + 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) { + return 0; + } + bstrncpy(date, ua->argv[i], sizeof(date)); + have_date = true; + break; + case 3: /* file */ + case 4: /* dir */ + 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_or_dir(ua, rx, date, j==4); + 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 5: /* select */ + if (!have_date) { + bstrutime(date, sizeof(date), time(NULL)); + } + if (!select_backups_before_date(ua, rx, date)) { + return 0; + } + done = true; + break; + case 6: /* 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; + 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; - /* + 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 */ + 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" @@ -419,116 +405,176 @@ static int user_select_jobids_or_files(UAContext *ua, RESTORE_CTX *rx) 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: "))) { - 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 */ + 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_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(fname, ua->cmd, len); + Mmsg(rx->query, uar_file, 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 */ + 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, or < to enter a filename\n" - "containg a list of file names, and terminate\n" + 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 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, or < to enter a filename\n" - "containg a list of file names, and terminate\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); + } + /* 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 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; + 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); + } + /* 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: /* Find JobIds for current backup */ + bstrutime(date, sizeof(date), time(NULL)); + if (!select_backups_before_date(ua, rx, date)) { + return 0; + } + done = false; + break; + + case 9: /* Find JobIds for give 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) { + bsendmsg(ua, _("You have already seleted 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 */ + } + bstrutime(date, sizeof(date), time(NULL)); + if (!get_client_name(ua, rx)) { + return 0; + } + bsendmsg(ua, _("Enter full directory names or start the name\n" + "with a < to indicate it is a filename containg 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] != '<' && ua->cmd[len-1] != '/') { + strcat(ua->cmd, "/"); + } + insert_one_file_or_dir(ua, rx, date, true); + } + /* 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 11: /* Cancel or quit */ + return 0; } } @@ -536,8 +582,12 @@ static int user_select_jobids_or_files(UAContext *ua, RESTORE_CTX *rx) 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); + if (strchr(rx->JobIds,',')) { + bsendmsg(ua, _("You have selected the following JobIds: %s\n"), rx->JobIds); + } + else { + bsendmsg(ua, _("You have selected the following JobId: %s\n"), rx->JobIds); + } memset(&jr, 0, sizeof(JOB_DBR)); @@ -546,31 +596,32 @@ static int user_select_jobids_or_files(UAContext *ua, RESTORE_CTX *rx) int stat = get_next_jobid_from_list(&p, &JobId); if (stat < 0) { bsendmsg(ua, _("Invalid JobId in list.\n")); - return 0; + return 0; } if (stat == 0) { - break; + break; } if (jr.JobId == JobId) { - continue; /* duplicate of last JobId */ + continue; /* duplicate of last JobId */ } 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; + char ed1[50]; + bsendmsg(ua, _("Unable to get Job record for JobId=%s: ERR=%s\n"), + edit_int64(JobId, ed1), db_strerror(ua->db)); + return 0; } if (!acl_access_ok(ua, Job_ACL, jr.Name)) { - bsendmsg(ua, _("No authorization. Job \"%s\" not selected.\n"), - jr.Name); - continue; + bsendmsg(ua, _("No authorization. Job \"%s\" not selected.\n"), + jr.Name); + continue; } rx->TotalFiles += jr.JobFiles; } return 1; } -/* +/* * Get date from user */ static int get_date(UAContext *ua, char *date, int date_len) @@ -579,45 +630,56 @@ static int get_date(UAContext *ua, char *date, int date_len) "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")); - } + } bstrncpy(date, ua->cmd, date_len); return 1; } /* - * Insert a single file, or read a list of files from a file + * 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]; char *p = ua->cmd; int line = 0; - + switch (*p) { case '<': p++; if ((ffd = fopen(p, "r")) == NULL) { + berrno be; bsendmsg(ua, _("Cannot open file %s: ERR=%s\n"), - p, strerror(errno)); - break; + p, be.strerror()); + 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)) { + bsendmsg(ua, _("Error occurred on line %d of %s\n"), line, p); + } + } else { + if (!insert_file_into_findex_list(ua, rx, file, date)) { + bsendmsg(ua, _("Error occurred on line %d of %s\n"), line, p); + } + } } fclose(ffd); 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; } } @@ -627,39 +689,85 @@ static void insert_one_file(UAContext *ua, RESTORE_CTX *rx, char *date) * 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) { + char ed1[50]; + strip_trailing_junk(file); split_path_and_filename(rx, file); - Mmsg(&rx->query, uar_jobid_fileindex, date, rx->path, rx->fname, rx->ClientName); + if (*rx->JobIds == 0) { + 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->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)); + bsendmsg(ua, _("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; + return true; } - rx->selected_files++; /* * Find the MediaTypes for this JobId and add to the name_list */ - Mmsg(&rx->query, uar_mediatype, rx->JobId); + Mmsg(rx->query, uar_mediatype, edit_int64(rx->JobId, ed1)); 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 false; } - return 1; + 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) +{ + char ed1[50]; + + strip_trailing_junk(dir); + if (*rx->JobIds == 0) { + bsendmsg(ua, _("No JobId specified cannot continue.\n")); + return false; + } else { + Mmsg(rx->query, uar_jobid_fileindex_from_dir, rx->JobIds, + dir, 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)); + } + if (!rx->found) { + bsendmsg(ua, _("No database record found for: %s\n"), dir); + return true; + } + /* + * Find the MediaTypes for this JobId and add to the name_list + */ + Mmsg(rx->query, uar_mediatype, edit_int64(rx->JobId, ed1)); + if (!db_sql_query(ua->db, rx->query, unique_name_list_handler, (void *)&rx->name_list)) { + bsendmsg(ua, "%s", db_strerror(ua->db)); + return false; + } + return true; +} + + static void split_path_and_filename(RESTORE_CTX *rx, char *name) { char *p, *f; - /* Find path without the filename. + /* Find path without the filename. * I.e. everything after the last / is a "filename". * OK, maybe it is a directory name, but we treat it like * a filename. If we don't find a / then the whole name @@ -667,40 +775,38 @@ static void split_path_and_filename(RESTORE_CTX *rx, char *name) */ for (p=f=name; *p; p++) { if (*p == '/') { - f = p; /* set pos of last slash */ + 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 */ + f++; /* yes, point to filename */ + } else { /* no, whole thing must be path name */ f = p; } /* If filename doesn't exist (i.e. root directory), we - * simply create a blank name consisting of a single + * simply create a blank name consisting of a single * space. This makes handling zero length filenames * easier. */ 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 */ + memcpy(rx->fname, f, rx->fnl); /* copy filename */ rx->fname[rx->fnl] = 0; } else { - rx->fname[0] = ' '; /* blank filename */ - rx->fname[1] = 0; - rx->fnl = 1; + rx->fname[0] = 0; + rx->fnl = 0; } - rx->pnl = f - name; + 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; } else { - rx->path[0] = ' '; - rx->path[1] = 0; - rx->pnl = 1; + rx->path[0] = 0; + rx->pnl = 0; } Dmsg2(100, "sllit path=%s file=%s\n", rx->path, rx->fname); @@ -712,9 +818,10 @@ 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)); - /* + /* * Build the directory tree containing JobIds user selected */ tree.root = new_tree(rx->TotalFiles); @@ -730,70 +837,106 @@ static bool build_directory_tree(UAContext *ua, RESTORE_CTX *rx) 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); + Mmsg(rx->query, uar_count_files, edit_int64(JobId, ed1)); if (!db_sql_query(ua->db, rx->query, count_handler, (void *)rx)) { bsendmsg(ua, "%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 */ } } for (p=rx->JobIds; get_next_jobid_from_list(&p, &JobId) > 0; ) { + char ed1[50]; - if (JobId == last_JobId) { - continue; /* eliminate duplicate JobIds */ + if (JobId == last_JobId) { + continue; /* eliminate duplicate JobIds */ } last_JobId = JobId; - bsendmsg(ua, _("Building directory tree for JobId %u ...\n"), JobId); + bsendmsg(ua, _("\nBuilding directory tree for JobId %s ... "), + edit_int64(JobId, ed1)); 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)); } /* * Find the MediaTypes for this JobId and add to the name_list */ - Mmsg(&rx->query, uar_mediatype, JobId); + Mmsg(rx->query, uar_mediatype, edit_int64(JobId, ed1)); if (!db_sql_query(ua->db, rx->query, unique_name_list_handler, (void *)&rx->name_list)) { bsendmsg(ua, "%s", db_strerror(ua->db)); } } - 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":""); + if (tree.FileCount == 0) { + bsendmsg(ua, _("\nThere were no files inserted into the tree, so file selection\n" + "is not possible.Most likely your retention policy pruned the files\n")); + if (!get_yesno(ua, _("\nDo you want to restore all the files? (yes|no): "))) { + OK = false; + } else { + 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); + } + OK = true; + } + } else { + char ec1[50]; + if (items==1) { + if (tree.all) { + bsendmsg(ua, _("\n1 Job, %s files inserted into the tree and marked for extraction.\n"), + edit_uint64_with_commas(tree.FileCount, ec1)); + } + else { + bsendmsg(ua, _("\n1 Job, %s files inserted into the tree.\n"), + edit_uint64_with_commas(tree.FileCount, ec1)); + } + } + else { + if (tree.all) { + bsendmsg(ua, _("\n%d Jobs, %s files inserted into the tree and marked for extraction.\n"), + items, edit_uint64_with_commas(tree.FileCount, ec1)); + } + else { + bsendmsg(ua, _("\n%d Jobs, %s files inserted into the tree.\n"), + items, edit_uint64_with_commas(tree.FileCount, ec1)); + } + } - /* Check MediaType and select storage that corresponds */ - get_storage_from_mediatype(ua, &rx->name_list, rx); + /* Check MediaType and select storage that corresponds */ + get_storage_from_mediatype(ua, &rx->name_list, rx); - 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, N_("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) { - 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) { + 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 */ + } + } + } } } - free_tree(tree.root); /* free the directory tree */ + free_tree(tree.root); /* free the directory tree */ return OK; } @@ -802,13 +945,13 @@ static bool build_directory_tree(UAContext *ua, RESTORE_CTX *rx) * 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; @@ -832,27 +975,28 @@ static int select_backups_before_date(UAContext *ua, RESTORE_CTX *rx, char *date bstrncpy(rx->ClientName, cr.Name, sizeof(rx->ClientName)); /* - * Get FileSet + * Get FileSet */ memset(&fsr, 0, sizeof(fsr)); - i = find_arg_with_value(ua, "FileSet"); + i = find_arg_with_value(ua, "FileSet"); 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; + bsendmsg(ua, _("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)); } - if (do_prompt(ua, _("FileSet"), _("Select FileSet resource"), - fileset_name, sizeof(fileset_name)) < 0) { - goto bail_out; + if (do_prompt(ua, _("FileSet"), _("Select FileSet resource"), + fileset_name, sizeof(fileset_name)) < 0) { + goto bail_out; } bstrncpy(fsr.FileSet, fileset_name, sizeof(fsr.FileSet)); @@ -870,15 +1014,17 @@ static int select_backups_before_date(UAContext *ua, RESTORE_CTX *rx, char *date memset(&pr, 0, sizeof(pr)); bstrncpy(pr.Name, rx->pool->hdr.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); } } /* 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)); goto bail_out; @@ -902,8 +1048,8 @@ static int select_backups_before_date(UAContext *ua, RESTORE_CTX *rx, char *date } /* 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); + Mmsg(rx->query, uar_dif, edit_uint64(rx->JobTDate, ed1), date, + 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)); } @@ -918,8 +1064,8 @@ static int select_backups_before_date(UAContext *ua, RESTORE_CTX *rx, char *date } /* 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); + Mmsg(rx->query, uar_inc, edit_uint64(rx->JobTDate, ed1), date, + 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)); } @@ -934,59 +1080,64 @@ static int select_backups_before_date(UAContext *ua, RESTORE_CTX *rx, char *date if (rx->JobIds[0] != 0) { /* 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); + ok = true; } else { - bsendmsg(ua, _("No jobs found.\n")); + bsendmsg(ua, _("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 ok; } /* Return next JobId from comma separated list */ -static int get_next_jobid_from_list(char **p, uint32_t *JobId) +int get_next_jobid_from_list(char **p, JobId_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; + if (*q == 0) { + break; + } else if (*q == ',') { + q++; + break; } jobid[i] = *q++; jobid[i+1] = 0; } - if (jobid[0] == 0 || !is_a_number(jobid)) { + if (jobid[0] == 0) { return 0; + } else if (!is_a_number(jobid)) { + return -1; /* error */ } *p = q; - *JobId = strtoul(jobid, NULL, 10); + *JobId = str_to_int64(jobid); return 1; } static int 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])); + 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; } @@ -997,14 +1148,14 @@ static int jobid_handler(void *ctx, int num_fields, char **row) { RESTORE_CTX *rx = (RESTORE_CTX *)ctx; - if (strcmp(rx->last_jobid, row[0]) == 0) { - return 0; /* duplicate id */ + if (strcmp(rx->last_jobid, row[0]) == 0) { + return 0; /* duplicate id */ } bstrncpy(rx->last_jobid, row[0], sizeof(rx->last_jobid)); if (rx->JobIds[0] != 0) { - pm_strcat(&rx->JobIds, ","); + pm_strcat(rx->JobIds, ","); } - pm_strcat(&rx->JobIds, row[0]); + pm_strcat(rx->JobIds, row[0]); return 0; } @@ -1016,7 +1167,7 @@ static int last_full_handler(void *ctx, int num_fields, char **row) { RESTORE_CTX *rx = (RESTORE_CTX *)ctx; - rx->JobTDate = str_to_int64(row[1]); + rx->JobTDate = str_to_int64(row[1]); return 0; } @@ -1042,21 +1193,21 @@ 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) { + 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); + 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); + name->max_ids = (name->max_ids * 3) / 2; + name->name = (char **)brealloc(name->name, sizeof(char *) * name->max_ids); } } for (int i=0; inum_ids; i++) { if (strcmp(name->name[i], row[0]) == 0) { - return 0; /* already in list, return */ + return 0; /* already in list, return */ } } /* Add new name to list */ @@ -1069,7 +1220,7 @@ static int unique_name_list_handler(void *ctx, int num_fields, char **row) * 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]); } @@ -1080,7 +1231,7 @@ static void print_name_list(UAContext *ua, NAME_LIST *name_list) * Free names in the list */ static void free_name_list(NAME_LIST *name_list) -{ +{ for (int i=0; i < name_list->num_ids; i++) { free(name_list->name[i]); } @@ -1113,15 +1264,15 @@ static void get_storage_from_mediatype(UAContext *ua, NAME_LIST *name_list, REST return; } /* - * We have a single MediaType, look it up in our Storage resource + * We have a single MediaType, look it up in our Storage resource */ 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 (acl_access_ok(ua, Storage_ACL, store->hdr.name)) { + rx->store = store; + } + break; } } UnlockRes(); @@ -1129,17 +1280,17 @@ static void get_storage_from_mediatype(UAContext *ua, NAME_LIST *name_list, REST if (rx->store) { /* Check if an explicit storage resource is given */ store = NULL; - int i = find_arg_with_value(ua, "storage"); + 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->hdr.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; + store->hdr.name); + rx->store = store; } return; } @@ -1151,6 +1302,6 @@ static void get_storage_from_mediatype(UAContext *ua, NAME_LIST *name_list, REST 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]); + name_list->name[0]); } }