*/
/*
- Copyright (C) 2000-2005 Kern Sibbald
+ Copyright (C) 2000-2006 Kern Sibbald
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
extern int r_last;
extern RES_TABLE resources[];
extern RES **res_head;
-extern int console_msg_pending;
-extern FILE *con_fd;
-extern brwlock_t con_lock;
/* Imported functions */
int autodisplay_cmd(UAContext *ua, const char *cmd)
{
static const char *kw[] = {
- N_("on"),
- N_("off"),
+ NT_("on"),
+ NT_("off"),
NULL};
switch (find_arg_keyword(ua, kw)) {
case 0:
- ua->auto_display_messages = 1;
+ ua->auto_display_messages = true;
break;
case 1:
- ua->auto_display_messages = 0;
+ ua->auto_display_messages = false;
break;
default:
bsendmsg(ua, _("ON or OFF keyword missing.\n"));
}
/*
- * Turn batch processing on/off
+ * Turn GUI mode on/off
*/
int gui_cmd(UAContext *ua, const char *cmd)
{
static const char *kw[] = {
- N_("on"),
- N_("off"),
+ NT_("on"),
+ NT_("off"),
NULL};
switch (find_arg_keyword(ua, kw)) {
case 0:
- ua->batch = true;
- ua->jcr->gui = true;
+ ua->jcr->gui = ua->gui = true;
break;
case 1:
- ua->batch = false;
- ua->jcr->gui = false;
+ ua->jcr->gui = ua->gui = false;
break;
default:
bsendmsg(ua, _("ON or OFF keyword missing.\n"));
struct showstruct {const char *res_name; int type;};
static struct showstruct reses[] = {
- {N_("directors"), R_DIRECTOR},
- {N_("clients"), R_CLIENT},
- {N_("counters"), R_COUNTER},
- {N_("devices"), R_DEVICE},
- {N_("jobs"), R_JOB},
- {N_("storages"), R_STORAGE},
- {N_("catalogs"), R_CATALOG},
- {N_("schedules"), R_SCHEDULE},
- {N_("filesets"), R_FILESET},
- {N_("pools"), R_POOL},
- {N_("messages"), R_MSGS},
- {N_("all"), -1},
- {N_("help"), -2},
+ {NT_("directors"), R_DIRECTOR},
+ {NT_("clients"), R_CLIENT},
+ {NT_("counters"), R_COUNTER},
+ {NT_("devices"), R_DEVICE},
+ {NT_("jobs"), R_JOB},
+ {NT_("storages"), R_STORAGE},
+ {NT_("catalogs"), R_CATALOG},
+ {NT_("schedules"), R_SCHEDULE},
+ {NT_("filesets"), R_FILESET},
+ {NT_("pools"), R_POOL},
+ {NT_("messages"), R_MSGS},
+ {NT_("all"), -1},
+ {NT_("help"), -2},
{NULL, 0}
};
*
* list jobs - lists all jobs run
* list jobid=nnn - list job data for jobid
- * list job=name - list job data for job
+ * list ujobid=uname - list job data for unique jobid
+ * list job=name - list all jobs with "name"
+ * list jobname=name - same as above
* list jobmedia jobid=<nn>
* list jobmedia job=name
* list files jobid=<nn> - list files saved for job nn
/* Scan arguments looking for things to do */
for (i=1; i<ua->argc; i++) {
/* List JOBS */
- if (strcasecmp(ua->argk[i], N_("jobs")) == 0) {
+ if (strcasecmp(ua->argk[i], NT_("jobs")) == 0) {
/* Apply any limit */
- j = find_arg_with_value(ua, N_("limit"));
+ j = find_arg_with_value(ua, NT_("limit"));
if (j >= 0) {
jr.limit = atoi(ua->argv[j]);
}
db_list_job_records(ua->jcr, ua->db, &jr, prtit, ua, llist);
/* List JOBTOTALS */
- } else if (strcasecmp(ua->argk[i], N_("jobtotals")) == 0) {
+ } else if (strcasecmp(ua->argk[i], NT_("jobtotals")) == 0) {
db_list_job_totals(ua->jcr, ua->db, &jr, prtit, ua);
- /* List JOBID */
- } else if (strcasecmp(ua->argk[i], N_("jobid")) == 0) {
+ /* List JOBID=nn */
+ } else if (strcasecmp(ua->argk[i], NT_("jobid")) == 0) {
if (ua->argv[i]) {
jobid = str_to_int64(ua->argv[i]);
if (jobid > 0) {
}
}
- /* List JOB */
- } else if (strcasecmp(ua->argk[i], N_("job")) == 0 && ua->argv[i]) {
+ /* List JOB=xxx */
+ } else if ((strcasecmp(ua->argk[i], NT_("job")) == 0 ||
+ strcasecmp(ua->argk[i], NT_("jobname")) == 0) && ua->argv[i]) {
+ bstrncpy(jr.Name, ua->argv[i], MAX_NAME_LENGTH);
+ jr.JobId = 0;
+ db_list_job_records(ua->jcr, ua->db, &jr, prtit, ua, llist);
+
+ /* List UJOBID=xxx */
+ } else if (strcasecmp(ua->argk[i], NT_("ujobid")) == 0 && ua->argv[i]) {
bstrncpy(jr.Job, ua->argv[i], MAX_NAME_LENGTH);
jr.JobId = 0;
db_list_job_records(ua->jcr, ua->db, &jr, prtit, ua, llist);
/* List FILES */
- } else if (strcasecmp(ua->argk[i], N_("files")) == 0) {
+ } else if (strcasecmp(ua->argk[i], NT_("files")) == 0) {
for (j=i+1; j<ua->argc; j++) {
- if (strcasecmp(ua->argk[j], N_("job")) == 0 && ua->argv[j]) {
+ if (strcasecmp(ua->argk[j], NT_("ujobid")) == 0 && ua->argv[j]) {
bstrncpy(jr.Job, ua->argv[j], MAX_NAME_LENGTH);
jr.JobId = 0;
db_get_job_record(ua->jcr, ua->db, &jr);
jobid = jr.JobId;
- } else if (strcasecmp(ua->argk[j], N_("jobid")) == 0 && ua->argv[j]) {
+ } else if (strcasecmp(ua->argk[j], NT_("jobid")) == 0 && ua->argv[j]) {
jobid = str_to_int64(ua->argv[j]);
} else {
continue;
}
/* List JOBMEDIA */
- } else if (strcasecmp(ua->argk[i], N_("jobmedia")) == 0) {
+ } else if (strcasecmp(ua->argk[i], NT_("jobmedia")) == 0) {
int done = FALSE;
for (j=i+1; j<ua->argc; j++) {
- if (strcasecmp(ua->argk[j], N_("job")) == 0 && ua->argv[j]) {
+ if (strcasecmp(ua->argk[j], NT_("ujobid")) == 0 && ua->argv[j]) {
bstrncpy(jr.Job, ua->argv[j], MAX_NAME_LENGTH);
jr.JobId = 0;
db_get_job_record(ua->jcr, ua->db, &jr);
jobid = jr.JobId;
- } else if (strcasecmp(ua->argk[j], N_("jobid")) == 0 && ua->argv[j]) {
+ } else if (strcasecmp(ua->argk[j], NT_("jobid")) == 0 && ua->argv[j]) {
jobid = str_to_int64(ua->argv[j]);
} else {
continue;
}
/* List POOLS */
- } else if (strcasecmp(ua->argk[i], N_("pool")) == 0 ||
- strcasecmp(ua->argk[i], N_("pools")) == 0) {
+ } else if (strcasecmp(ua->argk[i], NT_("pool")) == 0 ||
+ strcasecmp(ua->argk[i], NT_("pools")) == 0) {
POOL_DBR pr;
memset(&pr, 0, sizeof(pr));
if (ua->argv[i]) {
}
db_list_pool_records(ua->jcr, ua->db, &pr, prtit, ua, llist);
- } else if (strcasecmp(ua->argk[i], N_("clients")) == 0) {
+ } else if (strcasecmp(ua->argk[i], NT_("clients")) == 0) {
db_list_client_records(ua->jcr, ua->db, prtit, ua, llist);
/* List MEDIA or VOLUMES */
- } else if (strcasecmp(ua->argk[i], N_("media")) == 0 ||
- strcasecmp(ua->argk[i], N_("volume")) == 0 ||
- strcasecmp(ua->argk[i], N_("volumes")) == 0) {
+ } else if (strcasecmp(ua->argk[i], NT_("media")) == 0 ||
+ strcasecmp(ua->argk[i], NT_("volume")) == 0 ||
+ strcasecmp(ua->argk[i], NT_("volumes")) == 0) {
bool done = false;
for (j=i+1; j<ua->argc; j++) {
- if (strcasecmp(ua->argk[j], N_("job")) == 0 && ua->argv[j]) {
+ if (strcasecmp(ua->argk[j], NT_("ujobid")) == 0 && ua->argv[j]) {
bstrncpy(jr.Job, ua->argv[j], MAX_NAME_LENGTH);
jr.JobId = 0;
db_get_job_record(ua->jcr, ua->db, &jr);
jobid = jr.JobId;
- } else if (strcasecmp(ua->argk[j], N_("jobid")) == 0 && ua->argv[j]) {
+ } else if (strcasecmp(ua->argk[j], NT_("jobid")) == 0 && ua->argv[j]) {
jobid = str_to_int64(ua->argv[j]);
} else {
continue;
}
/* Is a specific pool wanted? */
for (i=1; i<ua->argc; i++) {
- if (strcasecmp(ua->argk[i], N_("pool")) == 0) {
+ if (strcasecmp(ua->argk[i], NT_("pool")) == 0) {
if (!get_pool_dbr(ua, &pr)) {
bsendmsg(ua, _("No Pool specified.\n"));
return 1;
return 1;
}
/* List next volume */
- } else if (strcasecmp(ua->argk[i], N_("nextvol")) == 0 ||
- strcasecmp(ua->argk[i], N_("nextvolume")) == 0) {
- n = 1;
- j = find_arg_with_value(ua, N_("days"));
+ } else if (strcasecmp(ua->argk[i], NT_("nextvol")) == 0 ||
+ strcasecmp(ua->argk[i], NT_("nextvolume")) == 0) {
+ n = 1;
+ j = find_arg_with_value(ua, NT_("days"));
if (j >= 0) {
n = atoi(ua->argv[j]);
- if ((n < 0) || (n > 50)) {
- bsendmsg(ua, _("Ignoring illegal value for days.\n"));
- n = 1;
- }
+ if ((n < 0) || (n > 50)) {
+ bsendmsg(ua, _("Ignoring illegal value for days.\n"));
+ n = 1;
+ }
}
list_nextvol(ua, n);
- } else if (strcasecmp(ua->argk[i], N_("limit")) == 0
- || strcasecmp(ua->argk[i], N_("days")) == 0) {
+ } else if (strcasecmp(ua->argk[i], NT_("limit")) == 0
+ || strcasecmp(ua->argk[i], NT_("days")) == 0) {
/* Ignore it */
} else {
bsendmsg(ua, _("Unknown list keyword: %s\n"), NPRT(ua->argk[i]));
if (!complete_jcr_for_job(jcr, job, pool)) {
return false;
}
- mr.PoolId = jcr->PoolId;
- if (run->storage) {
- jcr->store = run->storage;
- }
memset(&pr, 0, sizeof(pr));
- pr.PoolId = jcr->PoolId;
+ pr.PoolId = jcr->jr.PoolId;
if (! db_get_pool_record(ua->jcr, ua->db, &pr)) {
- strcpy(pr.Name, "*UnknownPool*");
+ bstrncpy(pr.Name, "*UnknownPool*", sizeof(pr.Name));
}
- if (!find_next_volume_for_append(jcr, &mr, 0)) {
- bsendmsg(ua, _("Could not find next Volume for Job %s (%s, %s).\n"),
- job->hdr.name, pr.Name, level_to_str(run->level));
+ mr.PoolId = jcr->jr.PoolId;
+ if (run->storage) {
+ jcr->wstore = run->storage;
+ } else {
+ jcr->wstore = (STORE *)job->storage->first();
+ }
+ mr.StorageId = jcr->wstore->StorageId;
+ if (!find_next_volume_for_append(jcr, &mr, 1, false/*no create*/)) {
+ bsendmsg(ua, _("Could not find next Volume for Job %s (%s, %s).\n"),
+ job->hdr.name, pr.Name, level_to_str(run->level));
} else {
bsendmsg(ua,
- _("The next Volume to be used by Job \"%s\" (%s, %s) will be %s\n"),
+ _("The next Volume to be used by Job \"%s\" (%s, %s) will be %s\n"),
job->hdr.name, pr.Name, level_to_str(run->level), mr.VolumeName);
found = true;
}
}
if (!found) {
bsendmsg(ua, _("Could not find next Volume for Job %s.\n"),
- job->hdr.name);
+ job->hdr.name);
return false;
}
return true;
}
for ( ; run; run=run->next) {
/*
- * Find runs in next 24 hours
+ * Find runs in next 24 hours. Day 0 is today, so if
+ * ndays=1, look at today and tomorrow.
*/
for (day = 0; day <= ndays; day++) {
- future = now + (day * 60 * 60 * 24);
+ future = now + (day * 60 * 60 * 24);
- /* Break down the time into components */
- localtime_r(&future, &tm);
- mday = tm.tm_mday - 1;
- wday = tm.tm_wday;
- month = tm.tm_mon;
- wom = mday / 7;
- woy = tm_woy(future);
+ /* Break down the time into components */
+ (void)localtime_r(&future, &tm);
+ mday = tm.tm_mday - 1;
+ wday = tm.tm_wday;
+ month = tm.tm_mon;
+ wom = mday / 7;
+ woy = tm_woy(future);
- is_scheduled = bit_is_set(mday, run->mday) && bit_is_set(wday, run->wday) &&
+ is_scheduled = bit_is_set(mday, run->mday) && bit_is_set(wday, run->wday) &&
bit_is_set(month, run->month) && bit_is_set(wom, run->wom) &&
bit_is_set(woy, run->woy);
#ifdef xxx
- Dmsg2(000, "day=%d is_scheduled=%d\n", day, is_scheduled);
- Dmsg1(000, "bit_set_mday=%d\n", bit_is_set(mday, run->mday));
- Dmsg1(000, "bit_set_wday=%d\n", bit_is_set(wday, run->wday));
- Dmsg1(000, "bit_set_month=%d\n", bit_is_set(month, run->month));
- Dmsg1(000, "bit_set_wom=%d\n", bit_is_set(wom, run->wom));
- Dmsg1(000, "bit_set_woy=%d\n", bit_is_set(woy, run->woy));
+ Dmsg2(000, "day=%d is_scheduled=%d\n", day, is_scheduled);
+ Dmsg1(000, "bit_set_mday=%d\n", bit_is_set(mday, run->mday));
+ Dmsg1(000, "bit_set_wday=%d\n", bit_is_set(wday, run->wday));
+ Dmsg1(000, "bit_set_month=%d\n", bit_is_set(month, run->month));
+ Dmsg1(000, "bit_set_wom=%d\n", bit_is_set(wom, run->wom));
+ Dmsg1(000, "bit_set_woy=%d\n", bit_is_set(woy, run->woy));
#endif
- if (is_scheduled) { /* Jobs scheduled on that day */
+ if (is_scheduled) { /* Jobs scheduled on that day */
#ifdef xxx
- char buf[300], num[10];
- bsnprintf(buf, sizeof(buf), "tm.hour=%d hour=", tm.tm_hour);
- for (i=0; i<24; i++) {
- if (bit_is_set(i, run->hour)) {
- bsnprintf(num, sizeof(num), "%d ", i);
- bstrncat(buf, num, sizeof(buf));
- }
- }
- bstrncat(buf, "\n", sizeof(buf));
- Dmsg1(000, "%s", buf);
+ char buf[300], num[10];
+ bsnprintf(buf, sizeof(buf), "tm.hour=%d hour=", tm.tm_hour);
+ for (i=0; i<24; i++) {
+ if (bit_is_set(i, run->hour)) {
+ bsnprintf(num, sizeof(num), "%d ", i);
+ bstrncat(buf, num, sizeof(buf));
+ }
+ }
+ bstrncat(buf, "\n", sizeof(buf));
+ Dmsg1(000, "%s", buf);
#endif
- /* find time (time_t) job is to be run */
- localtime_r(&future, &runtm);
- for (i= 0; i < 24; i++) {
- if (bit_is_set(i, run->hour)) {
- runtm.tm_hour = i;
- runtm.tm_min = run->minute;
- runtm.tm_sec = 0;
- runtime = mktime(&runtm);
- Dmsg2(200, "now=%d runtime=%d\n", now, runtime);
- if ((runtime > now) && (runtime < endtime)) {
- Dmsg2(200, "Found it level=%d %c\n", run->level, run->level);
- return run; /* found it, return run resource */
- }
- }
- }
- }
+ /* find time (time_t) job is to be run */
+ (void)localtime_r(&future, &runtm);
+ for (i= 0; i < 24; i++) {
+ if (bit_is_set(i, run->hour)) {
+ runtm.tm_hour = i;
+ runtm.tm_min = run->minute;
+ runtm.tm_sec = 0;
+ runtime = mktime(&runtm);
+ Dmsg2(200, "now=%d runtime=%d\n", now, runtime);
+ if ((runtime > now) && (runtime < endtime)) {
+ Dmsg2(200, "Found it level=%d %c\n", run->level, run->level);
+ return run; /* found it, return run resource */
+ }
+ }
+ }
+ }
}
} /* end for loop over runs */
/* Nothing found */
Jmsg(jcr, M_INFO, 0, _("Pool %s created in database.\n"), pr.Name);
}
}
- jcr->PoolId = pr.PoolId;
jcr->jr.PoolId = pr.PoolId;
return 1;
}
{
char msg[2000];
int mlen;
- int do_truncate = FALSE;
+ bool do_truncate = false;
Pw(con_lock);
pthread_cleanup_push(con_lock_release, (void *)NULL);
strcpy(ua->UA_sock->msg, msg);
ua->UA_sock->msglen = mlen;
bnet_send(ua->UA_sock);
- do_truncate = TRUE;
+ do_truncate = true;
}
if (do_truncate) {
- ftruncate(fileno(con_fd), 0L);
+ (void)ftruncate(fileno(con_fd), 0L);
}
console_msg_pending = FALSE;
ua->user_notified_msg_pending = FALSE;
projects / bacula / bacula / blobdiff