X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fdird%2Fua_restore.c;h=500c0c1aa7fe8ae28095840145a72ee52eb7938b;hb=6e637fce30a1fdbc2da43552f513f529db4d4e87;hp=0aed6da0dcd520646a074aebfd6e96c757651b62;hpb=5fbd8982ddd21941c4be36222f71747d1b36488d;p=bacula%2Fbacula diff --git a/bacula/src/dird/ua_restore.c b/bacula/src/dird/ua_restore.c index 0aed6da0dc..500c0c1aa7 100644 --- a/bacula/src/dird/ua_restore.c +++ b/bacula/src/dird/ua_restore.c @@ -1,14 +1,14 @@ /* Bacula® - The Network Backup Solution - Copyright (C) 2002-2007 Free Software Foundation Europe e.V. + Copyright (C) 2002-2008 Free Software Foundation Europe e.V. The main author of Bacula is Kern Sibbald, with contributions from many others, a complete list can be found in the file AUTHORS. This program is Free Software; you can redistribute it and/or modify it under the terms of version two of the GNU General Public - License as published by the Free Software Foundation plus additions - that are listed in the file LICENSE. + License as published by the Free Software Foundation and included + in the file LICENSE. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -58,7 +58,7 @@ static void free_name_list(NAME_LIST *name_list); static bool select_backups_before_date(UAContext *ua, RESTORE_CTX *rx, char *date); static bool build_directory_tree(UAContext *ua, RESTORE_CTX *rx); static void free_rx(RESTORE_CTX *rx); -static void split_path_and_filename(RESTORE_CTX *rx, char *fname); +static void split_path_and_filename(UAContext *ua, RESTORE_CTX *rx, char *fname); static int jobid_fileindex_handler(void *ctx, int num_fields, char **row); static bool insert_file_into_findex_list(UAContext *ua, RESTORE_CTX *rx, char *file, char *date); @@ -120,7 +120,7 @@ int restore_cmd(UAContext *ua, const char *cmd) if (strip_prefix || add_suffix || add_prefix) { int len = bregexp_get_build_where_size(strip_prefix, add_prefix, add_suffix); - regexp = (char *) bmalloc (len * sizeof(char)); + regexp = (char *)bmalloc(len * sizeof(char)); bregexp_build_where(regexp, len, strip_prefix, add_prefix, add_suffix); rx.RegexWhere = regexp; @@ -233,7 +233,7 @@ int restore_cmd(UAContext *ua, const char *cmd) escaped_where_name = escape_filename(rx.RegexWhere); Mmsg(ua->cmd, "run job=\"%s\" client=\"%s\" restoreclient=\"%s\" storage=\"%s\"" - " bootstrap=\"%s\" regexwhere=\"%s\" files=%d catalog=\"%s\"", + " bootstrap=\"%s\" regexwhere=\"%s\" files=%u catalog=\"%s\"", job->name(), rx.ClientName, rx.RestoreClientName, rx.store?rx.store->name():"", escaped_bsr_name ? escaped_bsr_name : jcr->RestoreBootstrap, @@ -244,7 +244,7 @@ int restore_cmd(UAContext *ua, const char *cmd) escaped_where_name = escape_filename(rx.where); Mmsg(ua->cmd, "run job=\"%s\" client=\"%s\" restoreclient=\"%s\" storage=\"%s\"" - " bootstrap=\"%s\" where=\"%s\" files=%d catalog=\"%s\"", + " bootstrap=\"%s\" where=\"%s\" files=%u catalog=\"%s\"", job->name(), rx.ClientName, rx.RestoreClientName, rx.store?rx.store->name():"", escaped_bsr_name ? escaped_bsr_name : jcr->RestoreBootstrap, @@ -254,7 +254,7 @@ int restore_cmd(UAContext *ua, const char *cmd) } else { Mmsg(ua->cmd, "run job=\"%s\" client=\"%s\" restoreclient=\"%s\" storage=\"%s\"" - " bootstrap=\"%s\" files=%d catalog=\"%s\"", + " bootstrap=\"%s\" files=%u catalog=\"%s\"", job->name(), rx.ClientName, rx.RestoreClientName, rx.store?rx.store->name():"", escaped_bsr_name ? escaped_bsr_name : jcr->RestoreBootstrap, @@ -441,6 +441,7 @@ static int user_select_jobids_or_files(UAContext *ua, RESTORE_CTX *rx) "add_prefix", /* 16 */ "add_suffix", /* 17 */ "regexwhere", /* 18 */ + "restoreclient", /* 19 */ NULL }; @@ -580,8 +581,8 @@ static int user_select_jobids_or_files(UAContext *ua, RESTORE_CTX *rx) } 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); + db_escape_string(ua->jcr, ua->db, fname, ua->cmd, len); + Mmsg(rx->query, uar_file[db_type], rx->ClientName, fname); free(fname); gui_save = ua->jcr->gui; ua->jcr->gui = true; @@ -867,7 +868,7 @@ static bool insert_file_into_findex_list(UAContext *ua, RESTORE_CTX *rx, char *f char *date) { strip_trailing_newline(file); - split_path_and_filename(rx, file); + split_path_and_filename(ua, rx, file); if (*rx->JobIds == 0) { Mmsg(rx->query, uar_jobid_fileindex, date, rx->path, rx->fname, rx->ClientName); @@ -895,14 +896,13 @@ static bool insert_file_into_findex_list(UAContext *ua, RESTORE_CTX *rx, char *f */ static bool insert_dir_into_findex_list(UAContext *ua, RESTORE_CTX *rx, char *dir, char *date) -{ +{ strip_trailing_junk(dir); if (*rx->JobIds == 0) { ua->error_msg(_("No JobId specified cannot continue.\n")); return false; } else { - Mmsg(rx->query, uar_jobid_fileindex_from_dir, rx->JobIds, - dir, rx->ClientName); + Mmsg(rx->query, uar_jobid_fileindex_from_dir[db_type], rx->JobIds, dir, rx->ClientName); } rx->found = false; /* Find and insert jobid and File Index */ @@ -938,7 +938,7 @@ static bool insert_table_into_findex_list(UAContext *ua, RESTORE_CTX *rx, char * return true; } -static void split_path_and_filename(RESTORE_CTX *rx, char *name) +static void split_path_and_filename(UAContext *ua, RESTORE_CTX *rx, char *name) { char *p, *f; @@ -966,9 +966,8 @@ static void split_path_and_filename(RESTORE_CTX *rx, char *name) */ rx->fnl = p - f; if (rx->fnl > 0) { - rx->fname = check_pool_memory_size(rx->fname, rx->fnl+1); - memcpy(rx->fname, f, rx->fnl); /* copy filename */ - rx->fname[rx->fnl] = 0; + rx->fname = check_pool_memory_size(rx->fname, 2*(rx->fnl)+1); + db_escape_string(ua->jcr, ua->db, rx->fname, f, rx->fnl); } else { rx->fname[0] = 0; rx->fnl = 0; @@ -976,9 +975,8 @@ static void split_path_and_filename(RESTORE_CTX *rx, char *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; + rx->path = check_pool_memory_size(rx->path, 2*(rx->pnl)+1); + db_escape_string(ua->jcr, ua->db, rx->path, name, rx->pnl); } else { rx->path[0] = 0; rx->pnl = 0; @@ -1007,7 +1005,6 @@ static bool build_directory_tree(UAContext *ua, RESTORE_CTX *rx) * 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) { @@ -1022,23 +1019,12 @@ static bool build_directory_tree(UAContext *ua, RESTORE_CTX *rx) 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 */ - } - last_JobId = JobId; - ua->info_msg(_("\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, edit_int64(JobId, ed1)); - if (!db_sql_query(ua->db, rx->query, insert_tree_handler, (void *)&tree)) { - ua->error_msg("%s", db_strerror(ua->db)); - } + ua->info_msg(_("\nBuilding directory tree for JobId(s) %s ... "), + rx->JobIds); + + if (!db_get_file_list(ua->jcr, ua->db, rx->JobIds, insert_tree_handler, (void *)&tree)) { + ua->error_msg("%s", db_strerror(ua->db)); } if (tree.FileCount == 0) { ua->send_msg(_("\nThere were no files inserted into the tree, so file selection\n" @@ -1057,25 +1043,12 @@ static bool build_directory_tree(UAContext *ua, RESTORE_CTX *rx) } } else { char ec1[50]; - if (items==1) { - if (tree.all) { - ua->info_msg(_("\n1 Job, %s files inserted into the tree and marked for extraction.\n"), - edit_uint64_with_commas(tree.FileCount, ec1)); - } - else { - ua->info_msg(_("\n1 Job, %s files inserted into the tree.\n"), - edit_uint64_with_commas(tree.FileCount, ec1)); - } - } - else { - if (tree.all) { - ua->info_msg(_("\n%d Jobs, %s files inserted into the tree and marked for extraction.\n"), - items, edit_uint64_with_commas(tree.FileCount, ec1)); - } - else { - ua->info_msg(_("\n%d Jobs, %s files inserted into the tree.\n"), - items, edit_uint64_with_commas(tree.FileCount, ec1)); - } + if (tree.all) { + ua->info_msg(_("\n%s files inserted into the tree and marked for extraction.\n"), + edit_uint64_with_commas(tree.FileCount, ec1)); + } else { + ua->info_msg(_("\n%s files inserted into the tree.\n"), + edit_uint64_with_commas(tree.FileCount, ec1)); } if (find_arg(ua, NT_("done")) < 0) { @@ -1123,10 +1096,10 @@ static bool select_backups_before_date(UAContext *ua, RESTORE_CTX *rx, char *dat /* 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)) { + if (!db_sql_query(ua->db, uar_create_temp[db_type], NULL, NULL)) { ua->error_msg("%s\n", db_strerror(ua->db)); } - if (!db_sql_query(ua->db, uar_create_temp1, NULL, NULL)) { + if (!db_sql_query(ua->db, uar_create_temp1[db_type], NULL, NULL)) { ua->error_msg("%s\n", db_strerror(ua->db)); } /* @@ -1268,11 +1241,12 @@ bail_out: */ int get_next_jobid_from_list(char **p, JobId_t *JobId) { - char jobid[30]; + const int maxlen = 30; + char jobid[maxlen+1]; char *q = *p; jobid[0] = 0; - for (int i=0; i<(int)sizeof(jobid); i++) { + for (int i=0; iJobId = str_to_int64(row[0]); add_findex(rx->bsr, rx->JobId, str_to_int64(row[1])); rx->found = true; @@ -1435,6 +1411,8 @@ void find_storage_resource(UAContext *ua, RESTORE_CTX &rx, char *Storage, char * /* Take command line arg, or ask user if none */ rx.store = get_storage_resource(ua, false /* don't use default */); - Dmsg1(200, "Set store=%s\n", rx.store->name()); + if (rx.store) { + Dmsg1(200, "Set store=%s\n", rx.store->name()); + } }