extern int do_restore(JCR *jcr);
extern int do_verify(JCR *jcr);
extern void backup_cleanup(void);
-extern void start_UA_server(int port);
/* Queue of jobs to be run */
static workq_t job_wq; /* our job work queue */
{
int stat, errstat;
- init_msg(jcr, jcr->msgs);
+ init_msg(jcr, jcr->messages);
create_unique_job_name(jcr, jcr->job->hdr.name);
jcr->jr.SchedTime = jcr->sched_time;
jcr->jr.StartTime = jcr->start_time;
* Open database
*/
Dmsg0(50, "Open database\n");
- jcr->db=db_init_database(jcr->catalog->db_name, jcr->catalog->db_user,
+ jcr->db=db_init_database(jcr, jcr->catalog->db_name, jcr->catalog->db_user,
jcr->catalog->db_password);
if (!db_open_database(jcr->db)) {
Jmsg(jcr, M_FATAL, 0, "%s", db_strerror(jcr->db));
case JT_ADMIN:
/* No actual job */
do_autoprune(jcr);
+ jcr->JobStatus = JS_Terminated;
break;
default:
- Dmsg1(0, "Unimplemented job type: %d\n", jcr->JobType);
+ Pmsg1(0, "Unimplemented job type: %d\n", jcr->JobType);
break;
}
}
return 0;
}
jcr->jr.ClientId = cr.ClientId;
- Dmsg2(9, "Created Client %s record %d\n", jcr->client->hdr.name,
+ Dmsg2(100, "Created Client %s record %d\n", jcr->client->hdr.name,
jcr->jr.ClientId);
return 1;
}
strcpy(jcr->client_name, jcr->client->hdr.name);
jcr->pool = job->pool;
jcr->catalog = job->client->catalog;
- jcr->fileset = job->fs;
- jcr->msgs = job->messages;
+ jcr->fileset = job->fileset;
+ jcr->messages = job->messages;
if (jcr->RestoreBootstrap) {
free(jcr->RestoreBootstrap);
}
*/
static char *edit_run_codes(JCR *jcr, char *omsg, char *imsg)
{
- char *p, *o;
+ char *p;
const char *str;
char add[20];
+ *omsg = 0;
Dmsg1(200, "edit_run_codes: %s\n", imsg);
- add[2] = 0;
- o = omsg;
for (p=imsg; *p; p++) {
if (*p == '%') {
switch (*++p) {
case '%':
- add[0] = '%';
- add[1] = 0;
- str = add;
+ str = "%";
break;
case 'c':
str = jcr->client_name;
default:
add[0] = '%';
add[1] = *p;
+ add[2] = 0;
str = add;
break;
}
str = add;
}
Dmsg1(200, "add_str %s\n", str);
- add_str_to_pool_mem(&omsg, &o, (char *)str);
- *o = 0;
+ pm_strcat(&omsg, (char *)str);
Dmsg1(200, "omsg=%s\n", omsg);
}
- *o = 0;
return omsg;
}