static char sessioncmd[] = "session %127s %ld %ld %ld %ld %ld %ld\n";
static char restorecmd[] = "restore replace=%c prelinks=%d where=%s\n";
static char restorecmd1[] = "restore replace=%c prelinks=%d where=\n";
-static char restorecmdR[] = "restore replace=%c prelinks=%d rwhere=%s\n";
+static char restorecmdR[] = "restore replace=%c prelinks=%d regexwhere=%s\n";
static char verifycmd[] = "verify level=%30s";
static char estimatecmd[] = "estimate listing=%d";
static char runbefore[] = "RunBeforeJob %s";
static char runafter[] = "RunAfterJob %s";
-static char runscript[] = "Run OnSuccess=%u OnFailure=%u AbortOnError=%u When=%u Command=%s";
+static char runscript[] = "Run OnSuccess=%d OnFailure=%d AbortOnError=%d When=%d Command=%s";
/* Responses sent to Director */
static char errmsg[] = "2999 Invalid command\n";
Dmsg0(100, "Done with term_find_files\n");
free_jcr(jcr); /* destroy JCR record */
Dmsg0(100, "Done with free_jcr\n");
+ Dsm_check(1);
return NULL;
}
bnet_fsend(dir, _("2901 Job %s not found.\n"), Job);
} else {
if (cjcr->store_bsock) {
- cjcr->store_bsock->timed_out = 1;
- cjcr->store_bsock->terminated = 1;
+ cjcr->store_bsock->m_timed_out = 1;
+ cjcr->store_bsock->m_terminated = 1;
pthread_kill(cjcr->my_thread_id, TIMEOUT_SIGNAL);
}
set_jcr_job_status(cjcr, JS_Canceled);
{
BSOCK *dir = jcr->dir_bsock;
POOLMEM *msg = get_memory(dir->msglen+1);
+ int on_success, on_failure, abort_on_error;
RUNSCRIPT *cmd = new_runscript() ;
Dmsg1(100, "runscript_cmd: '%s'\n", dir->msg);
- if (sscanf(dir->msg, runscript, &cmd->on_success,
- &cmd->on_failure,
- &cmd->abort_on_error,
+ /* Note, we cannot sscanf into bools */
+ if (sscanf(dir->msg, runscript, &on_success,
+ &on_failure,
+ &abort_on_error,
&cmd->when,
msg) != 5) {
pm_strcpy(jcr->errmsg, dir->msg);
free_memory(msg);
return 0;
}
+ cmd->on_success = on_success;
+ cmd->on_failure = on_failure;
+ cmd->abort_on_error = abort_on_error;
unbash_spaces(msg);
cmd->set_command(msg);
if (!bpipe) {
berrno be;
Jmsg(jcr, M_FATAL, 0, _("Cannot run program: %s. ERR=%s\n"),
- p, be.strerror());
+ p, be.bstrerror());
free_pool_memory(fn);
return;
}
if ((stat=close_bpipe(bpipe)) != 0) {
berrno be;
Jmsg(jcr, M_FATAL, 0, _("Error running program: %s. stat=%d: ERR=%s\n"),
- p, be.code(stat), be.strerror(stat));
+ p, be.code(stat), be.bstrerror(stat));
return;
}
break;
if ((ffd = fopen(p, "rb")) == NULL) {
berrno be;
Jmsg(jcr, M_FATAL, 0, _("Cannot open FileSet input file: %s. ERR=%s\n"),
- p, be.strerror());
+ p, be.bstrerror());
return;
}
while (fgets(buf, sizeof(buf), ffd)) {
{
int j;
const char *p;
+ char strip[100];
for (p=opts; *p; p++) {
switch (*p) {
}
fo->VerifyOpts[j] = 0;
break;
+ case 'P': /* strip path */
+ /* Get integer */
+ p++; /* skip P */
+ for (j=0; *p && *p != ':'; p++) {
+ strip[j] = *p;
+ if (j < (int)sizeof(strip) - 1) {
+ j++;
+ }
+ }
+ strip[j] = 0;
+ fo->strip_path = atoi(strip);
+ fo->flags |= FO_STRIPPATH;
+ Dmsg2(100, "strip=%s strip_path=%d\n", strip, fo->strip_path);
+ break;
case 'w':
fo->flags |= FO_IF_NEWER;
break;
if (!bs) {
berrno be;
Jmsg(jcr, M_FATAL, 0, _("Could not create bootstrap file %s: ERR=%s\n"),
- jcr->RestoreBootstrap, be.strerror());
+ jcr->RestoreBootstrap, be.bstrerror());
/*
* Suck up what he is sending to us so that he will then
* read our error message.
adj = btime_to_utime(bt_adj);
since_time += adj; /* adjust for clock difference */
if (adj != 0) {
- Jmsg(jcr, M_INFO, 0, _("DIR and FD clocks differ by %d seconds, FD automatically adjusting.\n"), adj);
+ int type;
+ if (adj > 600 || adj < -600) {
+ type = M_WARNING;
+ } else {
+ type = M_INFO;
+ }
+ Jmsg(jcr, type, 0, _("DIR and FD clocks differ by %d seconds, FD automatically adjusting.\n"), adj);
}
bnet_sig(dir, BNET_EOD);
}
} else {
berrno be;
- Jmsg(jcr, M_WARNING, 0, _("VSS was not initialized properly. VSS support is disabled. ERR=%s\n"), be.strerror());
+ Jmsg(jcr, M_WARNING, 0, _("VSS was not initialized properly. VSS support is disabled. ERR=%s\n"), be.bstrerror());
}
}
#endif
{
BSOCK *dir = jcr->dir_bsock;
BSOCK *sd = jcr->store_bsock;
- POOLMEM *where;
+ POOLMEM *args;
+ bool use_regexwhere=false;
int prefix_links;
char replace;
char ed1[50], ed2[50];
*/
Dmsg0(150, "restore command\n");
/* Pickup where string */
- where = get_memory(dir->msglen+1);
- *where = 0;
+ args = get_memory(dir->msglen+1);
+ *args = 0;
- if (sscanf(dir->msg, restorecmd, &replace, &prefix_links, where) != 3) {
- if (sscanf(dir->msg, restorecmdR, &replace, &prefix_links, where) != 3){
+ if (sscanf(dir->msg, restorecmd, &replace, &prefix_links, args) != 3) {
+ if (sscanf(dir->msg, restorecmdR, &replace, &prefix_links, args) != 3){
if (sscanf(dir->msg, restorecmd1, &replace, &prefix_links) != 2) {
pm_strcpy(jcr->errmsg, dir->msg);
Jmsg(jcr, M_FATAL, 0, _("Bad replace command. CMD=%s\n"), jcr->errmsg);
return 0;
}
- *where = 0;
+ *args = 0;
}
- jcr->where_use_regexp = true;
+ use_regexwhere = true;
}
/* Turn / into nothing */
- if (IsPathSeparator(where[0]) && where[1] == '\0') {
- where[0] = '\0';
+ if (IsPathSeparator(args[0]) && args[1] == '\0') {
+ args[0] = '\0';
}
- Dmsg2(150, "Got replace %c, where=%s\n", replace, where);
- unbash_spaces(where);
- jcr->where = bstrdup(where);
+ Dmsg2(150, "Got replace %c, where=%s\n", replace, args);
+ unbash_spaces(args);
- if (jcr->where_use_regexp) {
- jcr->where_bregexp = get_bregexps(jcr->where);
+ if (use_regexwhere) {
+ jcr->where_bregexp = get_bregexps(args);
if (!jcr->where_bregexp) {
- Jmsg(jcr, M_FATAL, 0, _("Bad where regexp. where=%s\n"), jcr->where);
- free_pool_memory(where);
- return 0;
+ Jmsg(jcr, M_FATAL, 0, _("Bad where regexp. where=%s\n"), args);
+ free_pool_memory(args);
+ return 0;
}
+ } else {
+ jcr->where = bstrdup(args);
}
- free_pool_memory(where);
+
+ free_pool_memory(args);
jcr->replace = replace;
jcr->prefix_links = prefix_links;
if (!bs) {
berrno be;
Jmsg(jcr, M_FATAL, 0, _("Could not open bootstrap file %s: ERR=%s\n"),
- jcr->RestoreBootstrap, be.strerror());
+ jcr->RestoreBootstrap, be.bstrerror());
set_jcr_job_status(jcr, JS_ErrorTerminated);
goto bail_out;
}
projects / bacula / bacula / blobdiff