/*
*
* Bacula Director -- User Agent Database restore Command
- * Creates a bootstrap file for restoring files
+ * 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
*
* Kern Sibbald, July MMII
*
*/
/*
- Copyright (C) 2002-2003 Kern Sibbald and John Walker
+ 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
#include "bacula.h"
#include "dird.h"
-#include <fnmatch.h>
-#include "findlib/find.h"
-
/* Imported functions */
-extern int runcmd(UAContext *ua, char *cmd);
+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_sel_all_temp1, *uar_sel_fileset, *uar_mediatype;
-
-
-/* Context for insert_tree_handler() */
-struct TREE_CTX {
- TREE_ROOT *root; /* root */
- TREE_NODE *node; /* current node */
- TREE_NODE *avail_node; /* unused node last insert */
- int cnt; /* count for user feedback */
- UAContext *ua;
-};
+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;
-/* Main structure for obtaining JobIds */
-struct JOBIDS {
- utime_t JobTDate;
- uint32_t TotalFiles;
- char ClientName[MAX_NAME_LENGTH];
- char JobIds[200]; /* User entered string of JobIds */
- STORE *store;
-};
-
-
-/* FileIndex entry in restore bootstrap record */
-struct RBSR_FINDEX {
- RBSR_FINDEX *next;
- int32_t findex;
- int32_t findex2;
-};
-
-/*
- * Restore bootstrap record -- not the real one, but useful here
- * The restore bsr is a chain of BSR records (linked by next).
- * Each BSR represents a single JobId, and within it, it
- * contains a linked list of file indexes for that JobId.
- * The complete_bsr() routine, will then add all the volumes
- * on which the Job is stored to the BSR.
- */
-struct RBSR {
- RBSR *next; /* next JobId */
- uint32_t JobId; /* JobId this bsr */
- uint32_t VolSessionId;
- uint32_t VolSessionTime;
- int VolCount; /* Volume parameter count */
- VOL_PARAMS *VolParams; /* Volume, start/end file/blocks */
- RBSR_FINDEX *fi; /* File indexes this JobId */
-};
struct NAME_LIST {
char **name; /* list of names */
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 RBSR *new_bsr();
-static void free_bsr(RBSR *bsr);
-static void write_bsr(UAContext *ua, RBSR *bsr, FILE *fd);
-static int write_bsr_file(UAContext *ua, RBSR *bsr);
-static void print_bsr(UAContext *ua, RBSR *bsr);
-static int complete_bsr(UAContext *ua, RBSR *bsr);
-static int insert_tree_handler(void *ctx, int num_fields, char **row);
-static void add_findex(RBSR *bsr, uint32_t JobId, int32_t findex);
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 next_jobid_from_list(char **p, uint32_t *JobId);
-static int user_select_jobids(UAContext *ua, JOBIDS *ji);
-static void user_select_files(TREE_CTX *tree);
+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, JOBIDS *ji);
-static RBSR *sort_bsr(RBSR *bsr);
-
+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 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 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);
/*
* Restore files
*
*/
-int restorecmd(UAContext *ua, char *cmd)
+int restore_cmd(UAContext *ua, const char *cmd)
{
- POOLMEM *query;
- TREE_CTX tree;
- JobId_t JobId, last_JobId;
- char *p;
- RBSR *bsr;
- char *nofname = "";
- JOBIDS ji;
- JOB *job = NULL;
- JOB *restore_job = NULL;
- int restore_jobs = 0;
- NAME_LIST name_list;
- uint32_t selected_files = 0;
- char *where = NULL;
+ RESTORE_CTX rx; /* restore context */
+ JOB *job;
int i;
+ 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.query = get_pool_memory(PM_FNAME);
+ rx.bsr = new_bsr();
+
i = find_arg_with_value(ua, "where");
if (i >= 0) {
- where = ua->argv[i];
+ rx.where = ua->argv[i];
}
if (!open_db(ua)) {
- return 0;
+ goto bail_out;
}
- memset(&tree, 0, sizeof(TREE_CTX));
- memset(&name_list, 0, sizeof(name_list));
- memset(&ji, 0, sizeof(ji));
-
/* Ensure there is at least one Restore Job */
LockRes();
- while ( (job = (JOB *)GetNextRes(R_JOB, (RES *)job)) ) {
+ foreach_res(job, R_JOB) {
if (job->JobType == JT_RESTORE) {
- if (!restore_job) {
- restore_job = job;
+ if (!rx.restore_job) {
+ rx.restore_job = job;
}
- restore_jobs++;
+ rx.restore_jobs++;
}
}
UnlockRes();
- if (!restore_jobs) {
+ if (!rx.restore_jobs) {
bsendmsg(ua, _(
"No Restore Job Resource found. You must create at least\n"
"one before running this command.\n"));
- return 0;
+ goto bail_out;
}
/*
- * Request user to select JobIds by various different methods
+ * 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()
*/
- if (!user_select_jobids(ua, &ji)) {
- return 0;
- }
-
- /*
- * Build the directory tree containing JobIds user selected
- */
- tree.root = new_tree(ji.TotalFiles);
- tree.root->fname = nofname;
- tree.ua = ua;
- query = get_pool_memory(PM_MESSAGE);
- last_JobId = 0;
- /*
- * For display purposes, the same JobId, with different volumes may
- * appear more than once, however, we only insert it once.
- */
- int items = 0;
- for (p=ji.JobIds; next_jobid_from_list(&p, &JobId) > 0; ) {
-
- if (JobId == last_JobId) {
- continue; /* eliminate duplicate JobIds */
- }
- last_JobId = JobId;
- bsendmsg(ua, _("Building directory tree for JobId %u ...\n"), JobId);
- items++;
- /*
- * Find files for this JobId and insert them in the tree
- */
- Mmsg(&query, uar_sel_files, JobId);
- if (!db_sql_query(ua->db, query, insert_tree_handler, (void *)&tree)) {
- bsendmsg(ua, "%s", db_strerror(ua->db));
- }
- /*
- * Find the FileSets for this JobId and add to the name_list
- */
- Mmsg(&query, uar_mediatype, JobId);
- if (!db_sql_query(ua->db, query, unique_name_list_handler, (void *)&name_list)) {
- bsendmsg(ua, "%s", db_strerror(ua->db));
- }
-
- }
- bsendmsg(ua, "%d items inserted into the tree and marked for extraction.\n", items);
- free_pool_memory(query);
-
- /* Check MediaType and select storage that corresponds */
- get_storage_from_mediatype(ua, &name_list, &ji);
- free_name_list(&name_list);
-
- /* Let the user select which files to restore */
- user_select_files(&tree);
-
- /*
- * Walk down through the tree finding all files marked to be
- * extracted making a bootstrap file.
- */
- bsr = new_bsr();
- 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) {
- Dmsg2(400, "type=%d FI=%d\n", node->type, node->FileIndex);
- add_findex(bsr, node->JobId, node->FileIndex);
- selected_files++;
+ switch (user_select_jobids_or_files(ua, &rx)) {
+ case 0:
+ goto bail_out;
+ case 1: /* select by jobid */
+ if (!build_directory_tree(ua, &rx)) {
+ bsendmsg(ua, _("Restore not done.\n"));
+ goto bail_out;
}
+ break;
+ case 2: /* select by filename, no tree needed */
+ break;
}
- free_tree(tree.root); /* free the directory tree */
-
- if (bsr->JobId) {
- if (!complete_bsr(ua, bsr)) { /* find Vol, SessId, SessTime from JobIds */
+ 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"));
- free_bsr(bsr);
- return 0;
+ goto bail_out;
+ }
+ if (!write_bsr_file(ua, rx.bsr)) {
+ goto bail_out;
}
-// print_bsr(ua, bsr);
- write_bsr_file(ua, bsr);
- bsendmsg(ua, _("\n%u files selected to restore.\n\n"), 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 restore.\n"));
+ bsendmsg(ua, _("No files selected to be restored.\n"));
+ goto bail_out;
}
- free_bsr(bsr);
- if (restore_jobs == 1) {
- job = restore_job;
+ if (rx.restore_jobs == 1) {
+ job = rx.restore_job;
} else {
job = select_restore_job_resource(ua);
}
if (!job) {
- bsendmsg(ua, _("No Restore Job resource found!\n"));
- return 0;
+ goto bail_out;
}
- /* If no client name specified yet, get it now */
- if (!ji.ClientName[0]) {
- CLIENT_DBR cr;
- memset(&cr, 0, sizeof(cr));
- if (!get_client_dbr(ua, &cr)) {
- return 0;
- }
- bstrncpy(ji.ClientName, cr.Name, sizeof(ji.ClientName));
+ get_client_name(ua, &rx);
+ if (!rx.ClientName) {
+ bsendmsg(ua, _("No Restore Job resource found!\n"));
+ goto bail_out;
}
/* Build run command */
- if (where) {
- Mmsg(&ua->cmd,
+ if (rx.where) {
+ Mmsg(ua->cmd,
"run job=\"%s\" client=\"%s\" storage=\"%s\" bootstrap=\"%s/restore.bsr\""
- " where=\"%s\"",
- job->hdr.name, ji.ClientName, ji.store?ji.store->hdr.name:"",
- working_directory, where);
+ " where=\"%s\" files=%d",
+ job->hdr.name, rx.ClientName, rx.store?rx.store->hdr.name:"",
+ working_directory, rx.where, rx.selected_files);
} else {
- Mmsg(&ua->cmd,
- "run job=\"%s\" client=\"%s\" storage=\"%s\" bootstrap=\"%s/restore.bsr\"",
- job->hdr.name, ji.ClientName, ji.store?ji.store->hdr.name:"",
- working_directory);
+ Mmsg(ua->cmd,
+ "run job=\"%s\" client=\"%s\" storage=\"%s\" bootstrap=\"%s/restore.bsr\""
+ " files=%d",
+ job->hdr.name, rx.ClientName, rx.store?rx.store->hdr.name:"",
+ working_directory, rx.selected_files);
+ }
+ if (find_arg(ua, _("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);
- runcmd(ua, ua->cmd);
+ run_cmd(ua, ua->cmd);
+ free_rx(&rx);
+ return 1;
+
+bail_out:
+ free_rx(&rx);
+ return 0;
+
+}
- bsendmsg(ua, _("Restore command done.\n"));
+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_name_list(&rx->name_list);
+}
+
+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"));
+ if (i >= 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;
+ }
+ bstrncpy(rx->ClientName, cr.Name, sizeof(rx->ClientName));
+ }
return 1;
}
* select a list of JobIds from which he will subsequently
* select which files are to be restored.
*/
-static int user_select_jobids(UAContext *ua, JOBIDS *ji)
+static int user_select_jobids_or_files(UAContext *ua, RESTORE_CTX *rx)
{
- char fileset_name[MAX_NAME_LENGTH];
- char *p, ed1[50];
- FILESET_DBR fsr;
- CLIENT_DBR cr;
+ char *p;
+ char date[MAX_TIME_LENGTH];
+ bool have_date = false;
JobId_t JobId;
JOB_DBR jr;
- POOLMEM *query;
- int done = 0;
- char *list[] = {
+ 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 JobIds to select",
+ "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",
NULL };
- bsendmsg(ua, _("\nFirst you select one or more JobIds that contain files\n"
+ 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 */
+ NULL
+ };
+
+ *rx->JobIds = 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;
+ }
+ }
+ if (!found_kw) {
+ bsendmsg(ua, _("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;
+ /*
+ * All keywords 7 or greater are ignored or handled by a select prompt
+ */
+ default:
+ 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"));
+ }
+ /* If choice not already made above, prompt */
for ( ; !done; ) {
+ char *fname;
+ int len;
+ bool gui_save;
+
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]);
}
- done = 1;
+ done = true;
switch (do_prompt(ua, "", _("Select item: "), NULL, 0)) {
case -1: /* error */
return 0;
case 0: /* list last 20 Jobs run */
- db_list_sql_query(ua->jcr, ua->db, uar_list_jobs, prtit, ua, 1, 0);
- done = 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 */
- char *fname;
- int len;
- if (!get_cmd(ua, _("Enter Filename: "))) {
+ 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);
- query = get_pool_memory(PM_MESSAGE);
- Mmsg(&query, uar_file, fname);
+ Mmsg(rx->query, uar_file, fname);
free(fname);
- db_list_sql_query(ua->jcr, ua->db, query, prtit, ua, 1, 0);
- free_pool_memory(query);
- done = 0;
+ 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;
}
- bstrncpy(ji->JobIds, ua->cmd, sizeof(ji->JobIds));
+ pm_strcpy(rx->JobIds, ua->cmd);
break;
case 3: /* Enter an SQL list command */
if (!get_cmd(ua, _("Enter SQL list command: "))) {
return 0;
}
- db_list_sql_query(ua->jcr, ua->db, ua->cmd, prtit, ua, 1, 0);
- done = 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 */
- query = get_pool_memory(PM_MESSAGE);
- 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_temp1, NULL, NULL)) {
- bsendmsg(ua, "%s\n", db_strerror(ua->db));
+ bstrutime(date, sizeof(date), time(NULL));
+ if (!select_backups_before_date(ua, rx, date)) {
+ return 0;
}
- /*
- * Select Client from the Catalog
- */
- memset(&cr, 0, sizeof(cr));
- if (!get_client_dbr(ua, &cr)) {
- free_pool_memory(query);
- db_sql_query(ua->db, uar_del_temp, NULL, NULL);
- db_sql_query(ua->db, uar_del_temp1, NULL, NULL);
+ break;
+ case 5: /* select backup at specified time */
+ if (!get_date(ua, date, sizeof(date))) {
return 0;
}
- bstrncpy(ji->ClientName, cr.Name, sizeof(ji->ClientName));
-
- /*
- * Select FileSet
- */
- Mmsg(&query, uar_sel_fileset, cr.ClientId, cr.ClientId);
- start_prompt(ua, _("The defined FileSet resources are:\n"));
- if (!db_sql_query(ua->db, query, fileset_handler, (void *)ua)) {
- bsendmsg(ua, "%s\n", db_strerror(ua->db));
+ if (!select_backups_before_date(ua, rx, date)) {
+ return 0;
}
- if (do_prompt(ua, _("FileSet"), _("Select FileSet resource"),
- fileset_name, sizeof(fileset_name)) < 0) {
- free_pool_memory(query);
- db_sql_query(ua->db, uar_del_temp, NULL, NULL);
- db_sql_query(ua->db, uar_del_temp1, NULL, NULL);
+ break;
+ case 6: /* Enter files */
+ bstrutime(date, sizeof(date), time(NULL));
+ if (!get_client_name(ua, rx)) {
return 0;
}
- fsr.FileSetId = atoi(fileset_name); /* Id is first part of name */
- 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"));
+ 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);
}
-
- /* Find JobId of last Full backup for this client, fileset */
- Mmsg(&query, uar_last_full, cr.ClientId, cr.ClientId, fsr.FileSetId);
- if (!db_sql_query(ua->db, query, NULL, NULL)) {
- bsendmsg(ua, "%s\n", db_strerror(ua->db));
+ /* Check MediaType and select storage that corresponds */
+ if (rx->name_list.num_ids) {
+ get_storage_from_mediatype(ua, &rx->name_list, rx);
}
- /* 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));
+ return 2;
+ case 7: /* enter files backed up before specified time */
+ if (!get_date(ua, date, sizeof(date))) {
+ return 0;
}
- /* Note, this is needed as I don't seem to get the callback
- * from the call just above.
- */
- if (!db_sql_query(ua->db, uar_sel_all_temp1, last_full_handler, (void *)ji)) {
- bsendmsg(ua, "%s\n", db_strerror(ua->db));
+ if (!get_client_name(ua, rx)) {
+ return 0;
}
- /* Now find all Incremental Jobs */
- Mmsg(&query, uar_inc, edit_uint64(ji->JobTDate, ed1), cr.ClientId, fsr.FileSetId);
- if (!db_sql_query(ua->db, query, NULL, NULL)) {
- bsendmsg(ua, "%s\n", db_strerror(ua->db));
+ 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);
}
- free_pool_memory(query);
- db_list_sql_query(ua->jcr, ua->db, uar_list_temp, prtit, ua, 1, 0);
-
- if (!db_sql_query(ua->db, uar_sel_jobid_temp, jobid_handler, (void *)ji)) {
- bsendmsg(ua, "%s\n", db_strerror(ua->db));
+ /* Check MediaType and select storage that corresponds */
+ if (rx->name_list.num_ids) {
+ get_storage_from_mediatype(ua, &rx->name_list, rx);
}
- db_sql_query(ua->db, uar_del_temp, NULL, NULL);
- db_sql_query(ua->db, uar_del_temp1, NULL, NULL);
- break;
- case 5:
+ return 2;
+
+
+ case 8: /* Cancel or quit */
return 0;
}
}
- if (*ji->JobIds == 0) {
+ if (*rx->JobIds == 0) {
bsendmsg(ua, _("No Jobs selected.\n"));
return 0;
}
- bsendmsg(ua, _("You have selected the following JobId: %s\n"), ji->JobIds);
+ bsendmsg(ua, _("You have selected the following JobId%s: %s\n"),
+ strchr(rx->JobIds,',')?"s":"",rx->JobIds);
memset(&jr, 0, sizeof(JOB_DBR));
- ji->TotalFiles = 0;
- for (p=ji->JobIds; ; ) {
- int stat = next_jobid_from_list(&p, &JobId);
+ rx->TotalFiles = 0;
+ for (p=rx->JobIds; ; ) {
+ int stat = get_next_jobid_from_list(&p, &JobId);
if (stat < 0) {
bsendmsg(ua, _("Invalid JobId in list.\n"));
return 0;
if (stat == 0) {
break;
}
+ if (jr.JobId == 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. ERR=%s\n"), db_strerror(ua->db));
+ bsendmsg(ua, _("Unable to get Job record for JobId=%u: ERR=%s\n"),
+ JobId, db_strerror(ua->db));
return 0;
}
- ji->TotalFiles += jr.JobFiles;
- }
- return 1;
-}
-
-static int next_jobid_from_list(char **p, uint32_t *JobId)
-{
- char jobid[30];
- int i;
- char *q = *p;
-
- jobid[0] = 0;
- for (i=0; i<(int)sizeof(jobid); i++) {
- if (*q == ',' || *q == 0) {
- q++;
- break;
+ if (!acl_access_ok(ua, Job_ACL, jr.Name)) {
+ bsendmsg(ua, _("No authorization. Job \"%s\" not selected.\n"),
+ jr.Name);
+ continue;
}
- jobid[i] = *q++;
- jobid[i+1] = 0;
+ rx->TotalFiles += jr.JobFiles;
}
- if (jobid[0] == 0 || !is_a_number(jobid)) {
- return 0;
- }
- *p = q;
- *JobId = strtoul(jobid, NULL, 10);
return 1;
}
-/*
- * Callback handler make list of JobIds
+/*
+ * Get date from user
*/
-static int jobid_handler(void *ctx, int num_fields, char **row)
+static int get_date(UAContext *ua, char *date, int date_len)
{
- JOBIDS *ji = (JOBIDS *)ctx;
-
- if (strlen(ji->JobIds)+strlen(row[0])+2 < sizeof(ji->JobIds)) {
- if (ji->JobIds[0] != 0) {
- strcat(ji->JobIds, ",");
+ bsendmsg(ua, _("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;
}
- strcat(ji->JobIds, row[0]);
- }
-
- return 0;
-}
-
-
-/*
- * Callback handler to pickup last Full backup JobId and ClientId
- */
-static int last_full_handler(void *ctx, int num_fields, char **row)
-{
- JOBIDS *ji = (JOBIDS *)ctx;
-
- ji->JobTDate = strtoll(row[1], NULL, 10);
-
- return 0;
-}
-
-/*
- * Callback handler build fileset prompt list
- */
-static int fileset_handler(void *ctx, int num_fields, char **row)
-{
- char prompt[MAX_NAME_LENGTH+200];
-
- snprintf(prompt, sizeof(prompt), "%s %s %s", row[0], row[1], row[2]);
- add_prompt((UAContext *)ctx, prompt);
- return 0;
+ if (str_to_utime(ua->cmd) != 0) {
+ break;
+ }
+ bsendmsg(ua, _("Improper date format.\n"));
+ }
+ bstrncpy(date, ua->cmd, date_len);
+ return 1;
}
-/* Forward referenced commands */
-
-static int markcmd(UAContext *ua, TREE_CTX *tree);
-static int countcmd(UAContext *ua, TREE_CTX *tree);
-static int findcmd(UAContext *ua, TREE_CTX *tree);
-static int lscmd(UAContext *ua, TREE_CTX *tree);
-static int dircmd(UAContext *ua, TREE_CTX *tree);
-static int helpcmd(UAContext *ua, TREE_CTX *tree);
-static int cdcmd(UAContext *ua, TREE_CTX *tree);
-static int pwdcmd(UAContext *ua, TREE_CTX *tree);
-static int unmarkcmd(UAContext *ua, TREE_CTX *tree);
-static int quitcmd(UAContext *ua, TREE_CTX *tree);
-
-
-struct cmdstruct { char *key; int (*func)(UAContext *ua, TREE_CTX *tree); char *help; };
-static struct cmdstruct commands[] = {
- { N_("mark"), markcmd, _("mark file for restoration")},
- { N_("unmark"), unmarkcmd, _("unmark file for restoration")},
- { N_("cd"), cdcmd, _("change current directory")},
- { N_("pwd"), pwdcmd, _("print current working directory")},
- { N_("ls"), lscmd, _("list current directory")},
- { N_("dir"), dircmd, _("list current directory")},
- { N_("count"), countcmd, _("count marked files")},
- { N_("find"), findcmd, _("find files")},
- { N_("done"), quitcmd, _("leave file selection mode")},
- { N_("exit"), quitcmd, _("exit = done")},
- { N_("help"), helpcmd, _("print help")},
- { N_("?"), helpcmd, _("print help")},
- };
-#define comsize (sizeof(commands)/sizeof(struct cmdstruct))
-
-
/*
- * Enter a prompt mode where the user can select/deselect
- * files to be restored. This is sort of like a mini-shell
- * that allows "cd", "pwd", "add", "rm", ...
+ * Insert a single file, or read a list of files from a file
*/
-static void user_select_files(TREE_CTX *tree)
+static void insert_one_file(UAContext *ua, RESTORE_CTX *rx, char *date)
{
- char cwd[2000];
-
- bsendmsg(tree->ua, _(
- "\nYou are now entering file selection mode where you add and\n"
- "remove files to be restored. All files are initially added.\n"
- "Enter \"done\" to leave this mode.\n\n"));
- /*
- * Enter interactive command handler allowing selection
- * of individual files.
- */
- tree->node = (TREE_NODE *)tree->root;
- tree_getpath(tree->node, cwd, sizeof(cwd));
- bsendmsg(tree->ua, _("cwd is: %s\n"), cwd);
- for ( ;; ) {
- int found, len, stat, i;
- if (!get_cmd(tree->ua, "$ ")) {
+ FILE *ffd;
+ char file[5000];
+ char *p = ua->cmd;
+ int line = 0;
+
+ switch (*p) {
+ case '<':
+ p++;
+ if ((ffd = fopen(p, "r")) == NULL) {
+ bsendmsg(ua, _("Cannot open file %s: ERR=%s\n"),
+ p, strerror(errno));
break;
}
- parse_ua_args(tree->ua);
- if (tree->ua->argc == 0) {
- return;
- }
-
- len = strlen(tree->ua->argk[0]);
- found = 0;
- stat = 0;
- for (i=0; i<(int)comsize; i++) /* search for command */
- if (strncasecmp(tree->ua->argk[0], _(commands[i].key), len) == 0) {
- stat = (*commands[i].func)(tree->ua, tree); /* go execute command */
- found = 1;
- 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);
}
- if (!found) {
- bsendmsg(tree->ua, _("Illegal command. Enter \"done\" to exit.\n"));
- continue;
- }
- if (!stat) {
- break;
}
+ fclose(ffd);
+ break;
+ default:
+ insert_file_into_findex_list(ua, rx, ua->cmd, date);
+ break;
}
}
/*
- * Create new FileIndex entry for BSR
+ * For a given file (path+filename), split into path and file, then
+ * lookup the most recent backup in the catalog to get the JobId
+ * and FileIndex, then insert them into the findex list.
*/
-static RBSR_FINDEX *new_findex()
-{
- RBSR_FINDEX *fi = (RBSR_FINDEX *)bmalloc(sizeof(RBSR_FINDEX));
- memset(fi, 0, sizeof(RBSR_FINDEX));
- return fi;
-}
-
-/* Free all BSR FileIndex entries */
-static void free_findex(RBSR_FINDEX *fi)
+static int insert_file_into_findex_list(UAContext *ua, RESTORE_CTX *rx, char *file,
+ char *date)
{
- if (fi) {
- free_findex(fi->next);
- free(fi);
+ strip_trailing_junk(file);
+ split_path_and_filename(rx, file);
+ Mmsg(rx->query, uar_jobid_fileindex, 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));
+ }
+ if (!rx->found) {
+ bsendmsg(ua, _("No database record found for: %s\n"), file);
+ return 0;
}
-}
-
-static void write_findex(UAContext *ua, RBSR_FINDEX *fi, FILE *fd)
-{
- if (fi) {
- if (fi->findex == fi->findex2) {
- fprintf(fd, "FileIndex=%d\n", fi->findex);
- } else {
- fprintf(fd, "FileIndex=%d-%d\n", fi->findex, fi->findex2);
- }
- write_findex(ua, fi->next, fd);
+ 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 1;
}
-
-static void print_findex(UAContext *ua, RBSR_FINDEX *fi)
+static void split_path_and_filename(RESTORE_CTX *rx, char *name)
{
- if (fi) {
- if (fi->findex == fi->findex2) {
- bsendmsg(ua, "FileIndex=%d\n", fi->findex);
- } else {
- bsendmsg(ua, "FileIndex=%d-%d\n", fi->findex, fi->findex2);
+ char *p, *f;
+
+ /* 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
+ * must be a path name (e.g. c:).
+ */
+ for (p=f=name; *p; p++) {
+ if (*p == '/') {
+ f = p; /* set pos of last slash */
}
- print_findex(ua, fi->next);
}
-}
+ if (*f == '/') { /* did we find a slash? */
+ f++; /* yes, point to filename */
+ } else { /* no, whole thing must be path name */
+ f = p;
+ }
-/* Create a new bootstrap record */
-static RBSR *new_bsr()
-{
- RBSR *bsr = (RBSR *)bmalloc(sizeof(RBSR));
- memset(bsr, 0, sizeof(RBSR));
- return bsr;
-}
+ /* If filename doesn't exist (i.e. root directory), we
+ * 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 */
+ rx->fname[rx->fnl] = 0;
+ } else {
+ rx->fname[0] = ' '; /* blank filename */
+ rx->fname[1] = 0;
+ rx->fnl = 1;
+ }
-/* Free the entire BSR */
-static void free_bsr(RBSR *bsr)
-{
- if (bsr) {
- free_findex(bsr->fi);
- free_bsr(bsr->next);
- if (bsr->VolParams) {
- free(bsr->VolParams);
- }
- free(bsr);
+ 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;
}
+
+ Dmsg2(100, "sllit path=%s file=%s\n", rx->path, rx->fname);
}
-/*
- * Complete the BSR by filling in the VolumeName and
- * VolSessionId and VolSessionTime using the JobId
- */
-static int complete_bsr(UAContext *ua, RBSR *bsr)
+static bool build_directory_tree(UAContext *ua, RESTORE_CTX *rx)
{
- JOB_DBR jr;
+ TREE_CTX tree;
+ JobId_t JobId, last_JobId;
+ char *p;
+ bool OK = true;
- if (bsr) {
- memset(&jr, 0, sizeof(jr));
- jr.JobId = bsr->JobId;
- if (!db_get_job_record(ua->jcr, ua->db, &jr)) {
- bsendmsg(ua, _("Unable to get Job record. ERR=%s\n"), db_strerror(ua->db));
- return 0;
+ memset(&tree, 0, sizeof(TREE_CTX));
+ /*
+ * Build the directory tree containing JobIds user selected
+ */
+ tree.root = new_tree(rx->TotalFiles);
+ tree.ua = ua;
+ tree.all = rx->all;
+ last_JobId = 0;
+ /*
+ * 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));
}
- bsr->VolSessionId = jr.VolSessionId;
- bsr->VolSessionTime = jr.VolSessionTime;
- if ((bsr->VolCount=db_get_job_volume_parameters(ua->jcr, ua->db, bsr->JobId,
- &(bsr->VolParams))) == 0) {
- bsendmsg(ua, _("Unable to get Job Volume Parameters. ERR=%s\n"), db_strerror(ua->db));
- if (bsr->VolParams) {
- free(bsr->VolParams);
- bsr->VolParams = NULL;
- }
- return 0;
+ 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 */
}
- return complete_bsr(ua, bsr->next);
}
- return 1;
-}
+ for (p=rx->JobIds; get_next_jobid_from_list(&p, &JobId) > 0; ) {
-/*
- * Write the bootstrap record to file
- */
-static int write_bsr_file(UAContext *ua, RBSR *bsr)
-{
- FILE *fd;
- POOLMEM *fname = get_pool_memory(PM_MESSAGE);
- int stat;
-
- Mmsg(&fname, "%s/restore.bsr", working_directory);
- fd = fopen(fname, "w+");
- if (!fd) {
- bsendmsg(ua, _("Unable to create bootstrap file %s. ERR=%s\n"),
- fname, strerror(errno));
- free_pool_memory(fname);
- return 0;
- }
- /* Sort the bsr chain */
- bsr = sort_bsr(bsr);
- /* Write them to file */
- write_bsr(ua, bsr, fd);
- stat = !ferror(fd);
- fclose(fd);
- bsendmsg(ua, _("Bootstrap records written to %s\n"), fname);
-
- /* Tell the user what he will need to mount */
- bsendmsg(ua, _("\nThe restore job will require the following Volumes:\n"));
- /* Create Unique list of Volumes using prompt list */
- start_prompt(ua, "");
- for (RBSR *nbsr=bsr; nbsr; nbsr=nbsr->next) {
- for (int i=0; i < nbsr->VolCount; i++) {
- add_prompt(ua, nbsr->VolParams[i].VolumeName);
+ if (JobId == last_JobId) {
+ 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);
+ 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);
+ if (!db_sql_query(ua->db, rx->query, unique_name_list_handler, (void *)&rx->name_list)) {
+ bsendmsg(ua, "%s", db_strerror(ua->db));
}
}
- for (int i=0; i < ua->num_prompts; i++) {
- bsendmsg(ua, " %s\n", ua->prompt[i]);
- free(ua->prompt[i]);
- }
- ua->num_prompts = 0;
- bsendmsg(ua, "\n");
- free_pool_memory(fname);
- return stat;
-}
+ 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":"");
-/*
- * First sort the bsr chain, then sort the VolParams
- */
-static RBSR *sort_bsr(RBSR *bsr)
-{
- if (!bsr) {
- return bsr;
- }
- /* ****FIXME**** sort the bsr chain */
- for (RBSR *nbsr=bsr; nbsr; nbsr=nbsr->next) {
- }
- return bsr;
-}
+ /* Check MediaType and select storage that corresponds */
+ get_storage_from_mediatype(ua, &rx->name_list, rx);
-static void write_bsr(UAContext *ua, RBSR *bsr, FILE *fd)
-{
- if (bsr) {
- for (int i=0; i < bsr->VolCount; i++) {
- fprintf(fd, "Volume=\"%s\"\n", bsr->VolParams[i].VolumeName);
- fprintf(fd, "VolSessionId=%u\n", bsr->VolSessionId);
- fprintf(fd, "VolSessionTime=%u\n", bsr->VolSessionTime);
- fprintf(fd, "VolFile=%u-%u\n", bsr->VolParams[i].StartFile,
- bsr->VolParams[i].EndFile);
- fprintf(fd, "VolBlock=%u-%u\n", bsr->VolParams[i].StartBlock,
- bsr->VolParams[i].EndBlock);
- write_findex(ua, bsr->fi, fd);
- }
- write_bsr(ua, bsr->next, fd);
+ if (find_arg(ua, _("done")) < 0) {
+ /* Let the user interact in selecting which files to restore */
+ OK = user_select_files_from_tree(&tree);
}
-}
-static void print_bsr(UAContext *ua, RBSR *bsr)
-{
- if (bsr) {
- for (int i=0; i < bsr->VolCount; i++) {
- bsendmsg(ua, "Volume=\"%s\"\n", bsr->VolParams[i].VolumeName);
- bsendmsg(ua, "VolSessionId=%u\n", bsr->VolSessionId);
- bsendmsg(ua, "VolSessionTime=%u\n", bsr->VolSessionTime);
- bsendmsg(ua, "VolFile=%u-%u\n", bsr->VolParams[i].StartFile,
- bsr->VolParams[i].EndFile);
- bsendmsg(ua, "VolBlock=%u-%u\n", bsr->VolParams[i].StartBlock,
- bsr->VolParams[i].EndBlock);
- print_findex(ua, bsr->fi);
+ /*
+ * 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 */
+ }
+ }
}
- print_bsr(ua, bsr->next);
}
+
+ free_tree(tree.root); /* free the directory tree */
+ return OK;
}
/*
- * Add a FileIndex to the list of BootStrap records.
- * Here we are only dealing with JobId's and the FileIndexes
- * associated with those JobIds.
+ * This routine is used to get the current backup or a backup
+ * before the specified date.
*/
-static void add_findex(RBSR *bsr, uint32_t JobId, int32_t findex)
+static int select_backups_before_date(UAContext *ua, RESTORE_CTX *rx, char *date)
{
- RBSR *nbsr;
- RBSR_FINDEX *fi, *lfi;
-
- if (findex == 0) {
- return; /* probably a dummy directory */
- }
-
- if (!bsr->fi) { /* if no FI add one */
- /* This is the first FileIndex item in the chain */
- bsr->fi = new_findex();
- bsr->JobId = JobId;
- bsr->fi->findex = findex;
- bsr->fi->findex2 = findex;
- return;
- }
- /* Walk down list of bsrs until we find the JobId */
- if (bsr->JobId != JobId) {
- for (nbsr=bsr->next; nbsr; nbsr=nbsr->next) {
- if (nbsr->JobId == JobId) {
- bsr = nbsr;
- break;
- }
- }
+ int stat = 0;
+ FILESET_DBR fsr;
+ CLIENT_DBR cr;
+ char fileset_name[MAX_NAME_LENGTH];
+ char ed1[50];
+ char pool_select[MAX_NAME_LENGTH];
+ int i;
- if (!nbsr) { /* Must add new JobId */
- /* Add new JobId at end of chain */
- for (nbsr=bsr; nbsr->next; nbsr=nbsr->next)
- { }
- nbsr->next = new_bsr();
- nbsr->next->JobId = JobId;
- nbsr->next->fi = new_findex();
- nbsr->next->fi->findex = findex;
- nbsr->next->fi->findex2 = findex;
- return;
- }
+
+ /* 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_temp1, NULL, NULL)) {
+ bsendmsg(ua, "%s\n", db_strerror(ua->db));
+ }
+ /*
+ * Select Client from the Catalog
+ */
+ memset(&cr, 0, sizeof(cr));
+ if (!get_client_dbr(ua, &cr)) {
+ goto bail_out;
}
+ bstrncpy(rx->ClientName, cr.Name, sizeof(rx->ClientName));
- /*
- * At this point, bsr points to bsr containing JobId,
- * and we are sure that there is at least one fi record.
+ /*
+ * Get FileSet
*/
- lfi = fi = bsr->fi;
- /* Check if this findex is smaller than first item */
- if (findex < fi->findex) {
- if ((findex+1) == fi->findex) {
- fi->findex = findex; /* extend down */
- return;
+ memset(&fsr, 0, sizeof(fsr));
+ 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;
}
- fi = new_findex(); /* yes, insert before first item */
- fi->findex = findex;
- fi->findex2 = findex;
- fi->next = lfi;
- bsr->fi = fi;
- return;
}
- /* Walk down fi chain and find where to insert insert new FileIndex */
- for ( ; fi; fi=fi->next) {
- if (findex == (fi->findex2 + 1)) { /* extend up */
- RBSR_FINDEX *nfi;
- fi->findex2 = findex;
- if (fi->next && ((findex+1) == fi->next->findex)) {
- nfi = fi->next;
- fi->findex2 = nfi->findex2;
- fi->next = nfi->next;
- free(nfi);
- }
- return;
+ if (i < 0) { /* fileset not found */
+ Mmsg(rx->query, uar_sel_fileset, cr.ClientId, cr.ClientId);
+ 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 (findex < fi->findex) { /* add before */
- if ((findex+1) == fi->findex) {
- fi->findex = findex;
- return;
- }
- break;
+ if (do_prompt(ua, _("FileSet"), _("Select FileSet resource"),
+ fileset_name, sizeof(fileset_name)) < 0) {
+ goto bail_out;
}
- lfi = fi;
- }
- /* Add to last place found */
- fi = new_findex();
- fi->findex = findex;
- fi->findex2 = findex;
- fi->next = lfi->next;
- lfi->next = fi;
- return;
-}
-/*
- * This callback routine is responsible for inserting the
- * items it gets into the directory tree. For each JobId selected
- * this routine is called once for each file. We do not allow
- * duplicate filenames, but instead keep the info from the most
- * recent file entered (i.e. the JobIds are assumed to be sorted)
- */
-static int insert_tree_handler(void *ctx, int num_fields, char **row)
-{
- TREE_CTX *tree = (TREE_CTX *)ctx;
- char fname[2000];
- TREE_NODE *node, *new_node;
- int type;
-
- strip_trailing_junk(row[1]);
- if (*row[1] == 0) {
- if (*row[0] != '/') { /* Must be Win32 directory */
- type = TN_DIR_NLS;
- } else {
- type = TN_DIR;
+ 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"));
}
- } else {
- type = TN_FILE;
- }
- sprintf(fname, "%s%s", row[0], row[1]);
- if (tree->avail_node) {
- node = tree->avail_node;
- } else {
- node = new_tree_node(tree->root, type);
- tree->avail_node = node;
- }
- Dmsg3(200, "FI=%d type=%d fname=%s\n", node->FileIndex, type, fname);
- new_node = insert_tree_node(fname, node, tree->root, NULL);
- /* Note, if node already exists, save new one for next time */
- if (new_node != node) {
- tree->avail_node = node;
- } else {
- tree->avail_node = NULL;
}
- new_node->FileIndex = atoi(row[2]);
- new_node->JobId = atoi(row[3]);
- new_node->type = type;
- new_node->extract = 1; /* extract all by default */
- tree->cnt++;
- return 0;
-}
-
-/*
- * Set extract to value passed. We recursively walk
- * down the tree setting all children if the
- * node is a directory.
- */
-static void set_extract(UAContext *ua, TREE_NODE *node, TREE_CTX *tree, int value)
-{
- TREE_NODE *n;
- FILE_DBR fdbr;
- struct stat statp;
-
- node->extract = value;
- /* For a non-file (i.e. directory), we see all the children */
- if (node->type != TN_FILE) {
- for (n=node->child; n; n=n->sibling) {
- set_extract(ua, n, tree, value);
- }
- } else if (value) {
- char cwd[2000];
- /* Ordinary file, we get the full path, look up the
- * attributes, decode them, and if we are hard linked to
- * a file that was saved, we must load that file too.
- */
- tree_getpath(node, cwd, sizeof(cwd));
- fdbr.FileId = 0;
- fdbr.JobId = node->JobId;
- if (db_get_file_attributes_record(ua->jcr, ua->db, cwd, &fdbr)) {
- uint32_t LinkFI;
- decode_stat(fdbr.LStat, &statp, &LinkFI); /* decode stat pkt */
- /*
- * If we point to a hard linked file, traverse the tree to
- * find that file, and mark it for restoration as well. It
- * must have the Link we just obtained and the same JobId.
- */
- if (LinkFI) {
- for (n=first_tree_node(tree->root); n; n=next_tree_node(n)) {
- if (n->FileIndex == LinkFI && n->JobId == node->JobId) {
- n->extract = 1;
- break;
- }
- }
- }
+ /* If Pool specified, add PoolId specification */
+ pool_select[0] = 0;
+ if (rx->pool) {
+ POOL_DBR pr;
+ 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);
+ } else {
+ bsendmsg(ua, _("Pool \"%s\" not found, using any pool.\n"), pr.Name);
}
}
-}
-static int markcmd(UAContext *ua, TREE_CTX *tree)
-{
- TREE_NODE *node;
+ /* 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);
+ if (!db_sql_query(ua->db, rx->query, NULL, NULL)) {
+ bsendmsg(ua, "%s\n", db_strerror(ua->db));
+ goto bail_out;
+ }
- if (ua->argc < 2)
- return 1;
- if (!tree->node->child) {
- return 1;
+ /* 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));
+ goto bail_out;
}
- for (node = tree->node->child; node; node=node->sibling) {
- if (fnmatch(ua->argk[1], node->fname, 0) == 0) {
- set_extract(ua, node, tree, 1);
- }
+ /* 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));
+ }
+ if (rx->JobTDate == 0) {
+ bsendmsg(ua, _("No Full backup before %s found.\n"), date);
+ goto bail_out;
}
- return 1;
-}
-static int countcmd(UAContext *ua, TREE_CTX *tree)
-{
- int total, extract;
-
- total = extract = 0;
- for (TREE_NODE *node=first_tree_node(tree->root); node; node=next_tree_node(node)) {
- if (node->type != TN_NEWDIR) {
- total++;
- if (node->extract) {
- extract++;
- }
- }
+ /* 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);
+ if (!db_sql_query(ua->db, rx->query, NULL, NULL)) {
+ bsendmsg(ua, "%s\n", db_strerror(ua->db));
+ }
+ /* Now update JobTDate to lock onto 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));
+ }
+ if (rx->JobTDate == 0) {
+ bsendmsg(ua, _("No Full backup before %s found.\n"), date);
+ goto bail_out;
}
- bsendmsg(ua, "%d total files. %d marked for restoration.\n", total, extract);
- return 1;
-}
-static int findcmd(UAContext *ua, TREE_CTX *tree)
-{
- char cwd[2000];
+ /* 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);
+ if (!db_sql_query(ua->db, rx->query, NULL, NULL)) {
+ bsendmsg(ua, "%s\n", db_strerror(ua->db));
+ }
- if (ua->argc == 1) {
- bsendmsg(ua, _("No file specification given.\n"));
- return 0;
+ /* Get the JobIds from that list */
+ rx->JobIds[0] = 0;
+ rx->last_jobid[0] = 0;
+ if (!db_sql_query(ua->db, uar_sel_jobid_temp, jobid_handler, (void *)rx)) {
+ bsendmsg(ua, "%s\n", db_strerror(ua->db));
}
-
- for (int i=1; i < ua->argc; i++) {
- for (TREE_NODE *node=first_tree_node(tree->root); node; node=next_tree_node(node)) {
- if (fnmatch(ua->argk[i], node->fname, 0) == 0) {
- tree_getpath(node, cwd, sizeof(cwd));
- bsendmsg(ua, "%s%s\n", node->extract?"*":"", cwd);
- }
- }
+
+ 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);
+ } else {
+ bsendmsg(ua, _("No jobs found.\n"));
}
- return 1;
-}
+ 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;
+}
-static int lscmd(UAContext *ua, TREE_CTX *tree)
+/* Return next JobId from comma separated list */
+static int get_next_jobid_from_list(char **p, uint32_t *JobId)
{
- TREE_NODE *node;
+ char jobid[30];
+ char *q = *p;
- if (!tree->node->child) {
- return 1;
- }
- for (node = tree->node->child; node; node=node->sibling) {
- if (ua->argc == 1 || fnmatch(ua->argk[1], node->fname, 0) == 0) {
- bsendmsg(ua, "%s%s%s\n", node->extract?"*":"", node->fname,
- (node->type==TN_DIR||node->type==TN_NEWDIR)?"/":"");
+ 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;
}
-extern char *getuser(uid_t uid);
-extern char *getgroup(gid_t gid);
+static int count_handler(void *ctx, int num_fields, char **row)
+{
+ RESTORE_CTX *rx = (RESTORE_CTX *)ctx;
+ rx->JobId = atoi(row[0]);
+ rx->found = true;
+ return 0;
+}
/*
- * This is actually the long form used for "dir"
+ * Callback handler to get JobId and FileIndex for files
*/
-static void ls_output(char *buf, char *fname, int extract, struct stat *statp)
+static int jobid_fileindex_handler(void *ctx, int num_fields, char **row)
{
- char *p, *f;
- char ec1[30];
- int n;
-
- p = encode_mode(statp->st_mode, buf);
- n = sprintf(p, " %2d ", (uint32_t)statp->st_nlink);
- p += n;
- n = sprintf(p, "%-8.8s %-8.8s", getuser(statp->st_uid), getgroup(statp->st_gid));
- p += n;
- n = sprintf(p, "%8.8s ", edit_uint64(statp->st_size, ec1));
- p += n;
- p = encode_time(statp->st_ctime, p);
- *p++ = ' ';
- if (extract) {
- *p++ = '*';
- } else {
- *p++ = ' ';
- }
- for (f=fname; *f; )
- *p++ = *f++;
- *p = 0;
+ RESTORE_CTX *rx = (RESTORE_CTX *)ctx;
+ rx->JobId = atoi(row[0]);
+ add_findex(rx->bsr, rx->JobId, atoi(row[1]));
+ rx->found = true;
+ return 0;
}
-
/*
- * Like ls command, but give more detail on each file
+ * Callback handler make list of JobIds
*/
-static int dircmd(UAContext *ua, TREE_CTX *tree)
+static int jobid_handler(void *ctx, int num_fields, char **row)
{
- TREE_NODE *node;
- FILE_DBR fdbr;
- struct stat statp;
- char buf[1000];
- char cwd[1100];
+ RESTORE_CTX *rx = (RESTORE_CTX *)ctx;
- if (!tree->node->child) {
- return 1;
+ if (strcmp(rx->last_jobid, row[0]) == 0) {
+ return 0; /* duplicate id */
}
- for (node = tree->node->child; node; node=node->sibling) {
- if (ua->argc == 1 || fnmatch(ua->argk[1], node->fname, 0) == 0) {
- tree_getpath(node, cwd, sizeof(cwd));
- fdbr.FileId = 0;
- fdbr.JobId = node->JobId;
- if (db_get_file_attributes_record(ua->jcr, ua->db, cwd, &fdbr)) {
- uint32_t LinkFI;
- decode_stat(fdbr.LStat, &statp, &LinkFI); /* decode stat pkt */
- ls_output(buf, cwd, node->extract, &statp);
- bsendmsg(ua, "%s\n", buf);
- } else {
- /* Something went wrong getting attributes -- print name */
- bsendmsg(ua, "%s%s%s\n", node->extract?"*":"", node->fname,
- (node->type==TN_DIR||node->type==TN_NEWDIR)?"/":"");
- }
- }
+ bstrncpy(rx->last_jobid, row[0], sizeof(rx->last_jobid));
+ if (rx->JobIds[0] != 0) {
+ pm_strcat(rx->JobIds, ",");
}
- return 1;
+ pm_strcat(rx->JobIds, row[0]);
+ return 0;
}
-static int helpcmd(UAContext *ua, TREE_CTX *tree)
+/*
+ * Callback handler to pickup last Full backup JobTDate
+ */
+static int last_full_handler(void *ctx, int num_fields, char **row)
{
- unsigned int i;
+ RESTORE_CTX *rx = (RESTORE_CTX *)ctx;
-/* usage(); */
- bsendmsg(ua, _(" Command Description\n ======= ===========\n"));
- for (i=0; i<comsize; i++) {
- bsendmsg(ua, _(" %-10s %s\n"), _(commands[i].key), _(commands[i].help));
- }
- bsendmsg(ua, "\n");
- return 1;
+ rx->JobTDate = str_to_int64(row[1]);
+ return 0;
}
/*
- * Change directories. Note, if the user specifies x: and it fails,
- * we assume it is a Win32 absolute cd rather than relative and
- * try a second time with /x: ... Win32 kludge.
+ * Callback handler build FileSet name prompt list
*/
-static int cdcmd(UAContext *ua, TREE_CTX *tree)
+static int fileset_handler(void *ctx, int num_fields, char **row)
{
- TREE_NODE *node;
- char cwd[2000];
-
- if (ua->argc != 2) {
- return 1;
- }
- node = tree_cwd(ua->argk[1], tree->root, tree->node);
- if (!node) {
- /* Try once more if Win32 drive -- make absolute */
- if (ua->argk[1][1] == ':') { /* win32 drive */
- strcpy(cwd, "/");
- strcat(cwd, ua->argk[1]);
- node = tree_cwd(cwd, tree->root, tree->node);
- }
- if (!node) {
- bsendmsg(ua, _("Invalid path given.\n"));
- } else {
- tree->node = node;
- }
- } else {
- tree->node = node;
+ /* row[0] = FileSet (name) */
+ if (row[0]) {
+ add_prompt((UAContext *)ctx, row[0]);
}
- tree_getpath(tree->node, cwd, sizeof(cwd));
- bsendmsg(ua, _("cwd is: %s\n"), cwd);
- return 1;
-}
-
-static int pwdcmd(UAContext *ua, TREE_CTX *tree)
-{
- char cwd[2000];
- tree_getpath(tree->node, cwd, sizeof(cwd));
- bsendmsg(ua, _("cwd is: %s\n"), cwd);
- return 1;
-}
-
-
-static int unmarkcmd(UAContext *ua, TREE_CTX *tree)
-{
- TREE_NODE *node;
-
- if (ua->argc < 2)
- return 1;
- if (!tree->node->child) {
- return 1;
- }
- for (node = tree->node->child; node; node=node->sibling) {
- if (fnmatch(ua->argk[1], node->fname, 0) == 0) {
- set_extract(ua, node, tree, 0);
- }
- }
- return 1;
-}
-
-static int quitcmd(UAContext *ua, TREE_CTX *tree)
-{
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)
{
*/
static void print_name_list(UAContext *ua, NAME_LIST *name_list)
{
- int i;
-
- for (i=0; i < name_list->num_ids; i++) {
+ for (int i=0; i < name_list->num_ids; i++) {
bsendmsg(ua, "%s\n", name_list->name[i]);
}
}
*/
static void free_name_list(NAME_LIST *name_list)
{
- int i;
-
- for (i=0; i < name_list->num_ids; i++) {
+ 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;
}
name_list->max_ids = 0;
name_list->num_ids = 0;
}
-static void get_storage_from_mediatype(UAContext *ua, NAME_LIST *name_list, JOBIDS *ji)
+static void get_storage_from_mediatype(UAContext *ua, NAME_LIST *name_list, RESTORE_CTX *rx)
{
- char name[MAX_NAME_LENGTH];
- STORE *store = NULL;
+ 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);
- ji->store = select_storage_resource(ua);
+ rx->store = select_storage_resource(ua);
return;
}
if (name_list->num_ids == 0) {
bsendmsg(ua, _("No MediaType found for your JobIds.\n"));
- ji->store = select_storage_resource(ua);
+ rx->store = select_storage_resource(ua);
return;
}
-
- start_prompt(ua, _("The defined Storage resources are:\n"));
+ if (rx->store) {
+ return;
+ }
+ /*
+ * We have a single MediaType, look it up in our Storage resource
+ */
LockRes();
- while ((store = (STORE *)GetNextRes(R_STORAGE, (RES *)store))) {
- if (strcmp(store->media_type, name_list->name[0]) == 0) {
- add_prompt(ua, store->hdr.name);
+ 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;
}
}
UnlockRes();
- do_prompt(ua, _("Storage"), _("Select Storage resource"), name, sizeof(name));
- ji->store = (STORE *)GetResWithName(R_STORAGE, name);
- if (!ji->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;
+ }
+ }
+ if (store && (store != rx->store)) {
+ bsendmsg(ua, _("Warning default storage overridden by %s on command line.\n"),
+ store->hdr.name);
+ rx->store = store;
+ }
+ return;
+ }
+
+ /* Take command line arg, or ask user if none */
+ rx->store = get_storage_resource(ua, false /* don't use default */);
+
+ if (!rx->store) {
bsendmsg(ua, _("\nWarning. Unable to find Storage resource for\n"
- "MediaType %s, needed by the Jobs you selected.\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]);
}
projects / bacula / bacula / blobdiff