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
}
/* Send restore command */
- char replace, *where, *cmd;
+ char replace, *where, *cmd=NULL;
char empty = '\0';
if (jcr->replace != 0) {
} else {
replace = REPLACE_ALWAYS; /* always replace */
}
- if (jcr->where) {
+
+ where = ∅ /* default */
+
+ if (jcr->RegexWhere) {
+ where = jcr->RegexWhere; /* override */
+ cmd = restorecmdR;
+ } else if (jcr->job->RegexWhere) {
+ where = jcr->job->RegexWhere; /* no override take from job */
+ cmd = restorecmdR;
+
+ } else if (jcr->where) {
where = jcr->where; /* override */
+ cmd = restorecmd;
} else if (jcr->job->RestoreWhere) {
where = jcr->job->RestoreWhere; /* no override take from job */
- } else {
- where = ∅ /* None */
- }
+ cmd = restorecmd;
+ }
jcr->prefix_links = jcr->job->PrefixLinks;
- if (jcr->where_use_regexp) {
- cmd = restorecmdR;
- } else {
- cmd = restorecmd;
- }
-
bash_spaces(where);
bnet_fsend(fd, cmd, replace, jcr->prefix_links, where);
unbash_spaces(where);
" Build OS: %s %s %s\n"
" JobId: %d\n"
" Job: %s\n"
-" Client: %s\n"
+" Restore Client: %s\n"
" Start time: %s\n"
" End time: %s\n"
" Files Expected: %s\n"
HOST_OS, DISTNAME, DISTVER,
jcr->jr.JobId,
jcr->jr.Job,
- jcr->client->hdr.name,
+ jcr->client->name(),
sdt,
edt,
edit_uint64_with_commas((uint64_t)jcr->ExpectedFiles, ec1),