git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@299
91ce42f0-d328-0410-95d8-
f526ca767f89
jcr->last_fname = get_pool_memory(PM_FNAME);
jcr->last_fname[0] = 0;
jcr->client_name = get_memory(strlen(my_name) + 1);
jcr->last_fname = get_pool_memory(PM_FNAME);
jcr->last_fname[0] = 0;
jcr->client_name = get_memory(strlen(my_name) + 1);
- strcpy(jcr->client_name, my_name);
+ pm_strcpy(&jcr->client_name, my_name);
dir->jcr = (void *)jcr;
/**********FIXME******* add command handler error code */
dir->jcr = (void *)jcr;
/**********FIXME******* add command handler error code */
jcr->RestoreBootstrap, strerror(errno));
free_pool_memory(jcr->RestoreBootstrap);
jcr->RestoreBootstrap = NULL;
jcr->RestoreBootstrap, strerror(errno));
free_pool_memory(jcr->RestoreBootstrap);
jcr->RestoreBootstrap = NULL;
+ set_jcr_job_status(jcr, JS_ErrorTerminated);
Dmsg1(110, "bfiled>dird: %s", dir->msg);
jcr->JobType = JT_RESTORE;
Dmsg1(110, "bfiled>dird: %s", dir->msg);
jcr->JobType = JT_RESTORE;
- set_jcr_job_status(jcr, JS_Blocked);
+ set_jcr_job_status(jcr, JS_Blocked);
if (!open_sd_read_session(jcr)) {
if (!open_sd_read_session(jcr)) {
+ set_jcr_job_status(jcr, JS_ErrorTerminated);
+ goto bail_out;
+ set_jcr_job_status(jcr, JS_Running);
+
/*
* Do restore of files and data
*/
do_restore(jcr);
/*
* Do restore of files and data
*/
do_restore(jcr);
+ set_jcr_job_status(jcr, JS_Terminated);
+ if (jcr->JobStatus != JS_Terminated) {
+ bnet_suppress_error_messages(sd, 1);
+ }
+
/*
* Send Close session command to Storage daemon
*/
bnet_fsend(sd, read_close, jcr->Ticket);
Dmsg1(130, "bfiled>stored: %s", sd->msg);
/*
* Send Close session command to Storage daemon
*/
bnet_fsend(sd, read_close, jcr->Ticket);
Dmsg1(130, "bfiled>stored: %s", sd->msg);
- /* ****FIXME**** check response */
bnet_recv(sd); /* get OK */
/* Inform Storage daemon that we are done */
bnet_sig(sd, BNET_TERMINATE);
bnet_recv(sd); /* get OK */
/* Inform Storage daemon that we are done */
bnet_sig(sd, BNET_TERMINATE);
- bnet_fsend(dir, EndRestore, jcr->JobStatus, jcr->num_files_examined, jcr->JobBytes);
+bail_out:
+ /* Send termination status back to Dir */
+ bnet_fsend(dir, EndRestore, jcr->JobStatus, jcr->num_files_examined,
+ jcr->JobBytes);
/* Inform Director that we are done */
bnet_sig(dir, BNET_TERMINATE);
Dmsg0(130, "Done in job.c\n");
/* Inform Director that we are done */
bnet_sig(dir, BNET_TERMINATE);
Dmsg0(130, "Done in job.c\n");
+ return !job_cancelled(jcr);
}
static int open_sd_read_session(JCR *jcr)
}
static int open_sd_read_session(JCR *jcr)
set_jcr_job_status(jcr, JS_Running);
if (!bnet_set_buffer_size(sd, MAX_NETWORK_BUFFER_SIZE, BNET_SETBUF_READ)) {
set_jcr_job_status(jcr, JS_Running);
if (!bnet_set_buffer_size(sd, MAX_NETWORK_BUFFER_SIZE, BNET_SETBUF_READ)) {
+ set_jcr_job_status(jcr, JS_ErrorTerminated);
return;
}
jcr->buf_size = sd->msglen;
return;
}
jcr->buf_size = sd->msglen;
*/
if (extract) {
if (ofd < 0) {
*/
if (extract) {
if (ofd < 0) {
- Emsg0(M_ERROR, 0, _("Logic error output file should be open\n"));
+ Jmsg0(jcr, M_ERROR, 0, _("Logic error output file should be open\n"));
}
set_attributes(jcr, fname, ofile, lname, type, stream,
&statp, attribsEx, &ofd);
}
set_attributes(jcr, fname, ofile, lname, type, stream,
&statp, attribsEx, &ofd);
} else if (extract) {
Dmsg1(30, "Found wierd stream %d\n", stream);
if (ofd < 0) {
} else if (extract) {
Dmsg1(30, "Found wierd stream %d\n", stream);
if (ofd < 0) {
- Emsg0(M_ERROR, 0, _("Logic error output file should be open\n"));
+ Jmsg0(jcr, M_ERROR, 0, _("Logic error output file should be open\n"));
}
set_attributes(jcr, fname, ofile, lname, type, stream,
&statp, attribsEx, &ofd);
}
set_attributes(jcr, fname, ofile, lname, type, stream,
&statp, attribsEx, &ofd);
p = encode_time(statp->st_ctime, p);
*p++ = ' ';
*p++ = ' ';
p = encode_time(statp->st_ctime, p);
*p++ = ' ';
*p++ = ' ';
- for (f=fname; *f && (p-buf) < (int)sizeof(buf); )
+ for (f=fname; *f && (p-buf) < (int)sizeof(buf)-10; ) {
if (type == FT_LNK) {
*p++ = ' ';
*p++ = '-';
*p++ = '>';
*p++ = ' ';
/* Copy link name */
if (type == FT_LNK) {
*p++ = ' ';
*p++ = '-';
*p++ = '>';
*p++ = ' ';
/* Copy link name */
- for (f=lname; *f && (p-buf) < (int)sizeof(buf); )
+ for (f=lname; *f && (p-buf) < (int)sizeof(buf)-10; ) {
jcr->buf_size = MAX_NETWORK_BUFFER_SIZE;
if ((jcr->big_buf = (char *) malloc(jcr->buf_size)) == NULL) {
jcr->buf_size = MAX_NETWORK_BUFFER_SIZE;
if ((jcr->big_buf = (char *) malloc(jcr->buf_size)) == NULL) {
- Emsg1(M_ABORT, 0, _("Cannot malloc %d network read buffer\n"), MAX_NETWORK_BUFFER_SIZE);
+ Jmsg1(jcr, M_ABORT, 0, _("Cannot malloc %d network read buffer\n"), MAX_NETWORK_BUFFER_SIZE);
}
set_find_options((FF_PKT *)jcr->ff, jcr->incremental, jcr->mtime);
Dmsg0(10, "Start find files\n");
}
set_find_options((FF_PKT *)jcr->ff, jcr->incremental, jcr->mtime);
Dmsg0(10, "Start find files\n");
Pmsg2(0, "None of above!!! stream=%d data=%s\n", stream,sd->msg);
}
}
Pmsg2(0, "None of above!!! stream=%d data=%s\n", stream,sd->msg);
}
}
+ set_jcr_job_status(jcr, JS_Terminated);
+ goto ok_out;
+ set_jcr_job_status(jcr, JS_ErrorTerminated);
+ok_out:
if (jcr->compress_buf) {
free(jcr->compress_buf);
jcr->compress_buf = NULL;
if (jcr->compress_buf) {
free(jcr->compress_buf);
jcr->compress_buf = NULL;
p = encode_time(statp->st_ctime, p);
*p++ = ' ';
*p++ = ' ';
p = encode_time(statp->st_ctime, p);
*p++ = ' ';
*p++ = ' ';
- for (f=fname; *f && (p-buf) < (int)sizeof(buf); )
+ for (f=fname; *f && (p-buf) < (int)sizeof(buf)-10; )
*p++ = *f++;
if (type == FT_LNK) {
*p++ = ' ';
*p++ = *f++;
if (type == FT_LNK) {
*p++ = ' ';
*p++ = '>';
*p++ = ' ';
/* Copy link name */
*p++ = '>';
*p++ = ' ';
/* Copy link name */
- for (f=lname; *f && (p-buf) < (int)sizeof(buf); )
+ for (f=lname; *f && (p-buf) < (int)sizeof(buf)-10; )
*p++ = *f++;
}
*p++ = '\n';
*p++ = *f++;
}
*p++ = '\n';
- inc =(struct s_included_file *) bmalloc(sizeof(struct s_included_file) + len + 1);
- inc->next = ff->included_files_list;
+ inc =(struct s_included_file *)bmalloc(sizeof(struct s_included_file) + len + 1);
inc->options = 0;
inc->VerifyOpts[0] = 'V';
inc->VerifyOpts[1] = ':';
inc->options = 0;
inc->VerifyOpts[0] = 'V';
inc->VerifyOpts[1] = ':';
- ff->included_files_list = inc;
+ inc->next = NULL;
+ /* Chain this one on the end of the list */
+ if (!ff->included_files_list) {
+ /* First one, so set head */
+ ff->included_files_list = inc;
+ } else {
+ struct s_included_file *next;
+ /* Walk to end of list */
+ for (next=ff->included_files_list; next->next; next=next->next)
+ { }
+ next->next = inc;
+ }
Dmsg1(50, "add_fname_to_include fname=%s\n", inc->fname);
}
Dmsg1(50, "add_fname_to_include fname=%s\n", inc->fname);
}
- Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker
+ Copyright (C) 2000-2003 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
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
if (msgs != daemon_msgs) {
/* read what mail prog returned -- should be nothing */
while (fgets(line, len, bpipe->rfd)) {
if (msgs != daemon_msgs) {
/* read what mail prog returned -- should be nothing */
while (fgets(line, len, bpipe->rfd)) {
-// Dmsg1(000, "Mail prog got: %s", line);
Jmsg1(jcr, M_INFO, 0, _("Mail prog: %s"), line);
}
}
Jmsg1(jcr, M_INFO, 0, _("Mail prog: %s"), line);
}
}
d_msg(char *file, int line, int level, char *fmt,...)
{
char buf[5000];
d_msg(char *file, int line, int level, char *fmt,...)
{
char buf[5000];
va_list arg_ptr;
int details = TRUE;
va_list arg_ptr;
int details = TRUE;
if (level <= debug_level) {
#ifdef FULL_LOCATION
if (details) {
if (level <= debug_level) {
#ifdef FULL_LOCATION
if (details) {
- i= sprintf(buf, "%s: %s:%d ", my_name, file, line);
+ len= sprintf(buf, "%s: %s:%d ", my_name, file, line);
#endif
va_start(arg_ptr, fmt);
#endif
va_start(arg_ptr, fmt);
- bvsnprintf(buf+i, sizeof(buf)-i, (char *)fmt, arg_ptr);
+ bvsnprintf(buf+len, sizeof(buf)-len, (char *)fmt, arg_ptr);
va_end(arg_ptr);
fputs(buf, stdout);
va_end(arg_ptr);
fputs(buf, stdout);
t_msg(char *file, int line, int level, char *fmt,...)
{
char buf[5000];
t_msg(char *file, int line, int level, char *fmt,...)
{
char buf[5000];
va_list arg_ptr;
int details = TRUE;
va_list arg_ptr;
int details = TRUE;
#ifdef FULL_LOCATION
if (details) {
#ifdef FULL_LOCATION
if (details) {
- sprintf(buf, "%s: %s:%d ", my_name, file, line);
- i = strlen(buf);
+ len = sprintf(buf, "%s: %s:%d ", my_name, file, line);
#endif
va_start(arg_ptr, fmt);
#endif
va_start(arg_ptr, fmt);
- bvsnprintf(buf+i, sizeof(buf)-i, (char *)fmt, arg_ptr);
+ bvsnprintf(buf+len, sizeof(buf)-len, (char *)fmt, arg_ptr);
va_end(arg_ptr);
fputs(buf, trace_fd);
va_end(arg_ptr);
fputs(buf, trace_fd);
{
char buf[5000];
va_list arg_ptr;
{
char buf[5000];
va_list arg_ptr;
/*
* Check if we have a message destination defined.
/*
* Check if we have a message destination defined.
}
switch (type) {
case M_ABORT:
}
switch (type) {
case M_ABORT:
- sprintf(buf, "%s: ABORTING due to ERROR in %s:%d\n",
+ len = sprintf(buf, "%s: ABORTING due to ERROR in %s:%d\n",
my_name, file, line);
break;
case M_ERROR_TERM:
my_name, file, line);
break;
case M_ERROR_TERM:
- sprintf(buf, "%s: ERROR TERMINATION at %s:%d\n",
+ len = sprintf(buf, "%s: ERROR TERMINATION at %s:%d\n",
my_name, file, line);
break;
case M_FATAL:
if (level == -1) /* skip details */
my_name, file, line);
break;
case M_FATAL:
if (level == -1) /* skip details */
- sprintf(buf, "%s: Fatal Error because: ", my_name);
+ len = sprintf(buf, "%s: Fatal Error because: ", my_name);
- sprintf(buf, "%s: Fatal Error at %s:%d because:\n", my_name, file, line);
+ len = sprintf(buf, "%s: Fatal Error at %s:%d because:\n", my_name, file, line);
break;
case M_ERROR:
if (level == -1) /* skip details */
break;
case M_ERROR:
if (level == -1) /* skip details */
- sprintf(buf, "%s: Error: ", my_name);
+ len = sprintf(buf, "%s: Error: ", my_name);
- sprintf(buf, "%s: Error in %s:%d ", my_name, file, line);
+ len = sprintf(buf, "%s: Error in %s:%d ", my_name, file, line);
- sprintf(buf, "%s: Warning: ", my_name);
+ len = sprintf(buf, "%s: Warning: ", my_name);
- sprintf(buf, "%s: ", my_name);
+ len = sprintf(buf, "%s: ", my_name);
- bvsnprintf(buf+i, sizeof(buf)-i, (char *)fmt, arg_ptr);
+ bvsnprintf(buf+len, sizeof(buf)-len, (char *)fmt, arg_ptr);
va_end(arg_ptr);
dispatch_message(NULL, type, level, buf);
va_end(arg_ptr);
dispatch_message(NULL, type, level, buf);
Jmsg(void *vjcr, int type, int level, char *fmt,...)
{
char rbuf[5000];
Jmsg(void *vjcr, int type, int level, char *fmt,...)
{
char rbuf[5000];
JCR *jcr = (JCR *)vjcr;
MSGS *msgs;
char *job;
JCR *jcr = (JCR *)vjcr;
MSGS *msgs;
char *job;
job = jcr->Job;
}
if (!msgs) {
job = jcr->Job;
}
if (!msgs) {
+ msgs = daemon_msgs; /* if no jcr, we use daemon handler */
+ job = ""; /* Set null job name if none */
- buf = rbuf; /* we are the Director */
/*
* Check if we have a message destination defined.
* We always report M_ABORT and M_ERROR_TERM
*/
/*
* Check if we have a message destination defined.
* We always report M_ABORT and M_ERROR_TERM
*/
-/*
- * Tmsg5(000, "jcr=%x msgs=%x type=%d send_msg=%x *msg=%x\n",
- * jcr, msgs, type, msgs->send_msg, (int)msgs->send_msg[0]);
- */
/* There is an apparent compiler bug with the following if
* statement, so the set_jcr... is simply a noop to reload
* registers.
/* There is an apparent compiler bug with the following if
* statement, so the set_jcr... is simply a noop to reload
* registers.
}
switch (type) {
case M_ABORT:
}
switch (type) {
case M_ABORT:
- sprintf(buf, "%s ABORTING due to ERROR\n", my_name);
+ len = sprintf(rbuf, "%s ABORTING due to ERROR\n", my_name);
break;
case M_ERROR_TERM:
break;
case M_ERROR_TERM:
- sprintf(buf, "%s ERROR TERMINATION\n", my_name);
+ len = sprintf(rbuf, "%s ERROR TERMINATION\n", my_name);
- sprintf(buf, "%s: %s Fatal error: ", my_name, job);
+ len = sprintf(rbuf, "%s: %s Fatal error: ", my_name, job);
- jcr->JobStatus = JS_FatalError;
+ set_jcr_job_status(jcr, JS_FatalError);
- sprintf(buf, "%s: %s Error: ", my_name, job);
+ len = sprintf(rbuf, "%s: %s Error: ", my_name, job);
if (jcr) {
jcr->Errors++;
}
break;
case M_WARNING:
if (jcr) {
jcr->Errors++;
}
break;
case M_WARNING:
- sprintf(buf, "%s: %s Warning: ", my_name, job);
+ len = sprintf(rbuf, "%s: %s Warning: ", my_name, job);
- sprintf(buf, "%s: ", my_name);
+ len = sprintf(rbuf, "%s: ", my_name);
- len = bvsnprintf(buf+i, sizeof(rbuf)-i, fmt, arg_ptr);
+ bvsnprintf(rbuf+len, sizeof(rbuf)-len, fmt, arg_ptr);
va_end(arg_ptr);
dispatch_message(jcr, type, level, rbuf);
va_end(arg_ptr);
dispatch_message(jcr, type, level, rbuf);
- Dmsg3(500, "i=%d sizeof(rbuf)-i=%d len=%d\n", i, sizeof(rbuf)-i, len);
-
if (type == M_ABORT){
char *p = 0;
p[0] = 0; /* generate segmentation violation */
if (type == M_ABORT){
char *p = 0;
p[0] = 0; /* generate segmentation violation */
va_list arg_ptr;
int i, len, maxlen;
va_list arg_ptr;
int i, len, maxlen;
- sprintf(*pool_buf, "%s:%d ", file, line);
- i = strlen(*pool_buf);
+ i = sprintf(*pool_buf, "%s:%d ", file, line);
again:
maxlen = sizeof_pool_memory(*pool_buf) - i - 1;
again:
maxlen = sizeof_pool_memory(*pool_buf) - i - 1;
- Jmsg(jcr, type, level, pool_buf);
+ Jmsg(jcr, type, level, "%s", pool_buf);