* Version $Id$
*/
/*
- 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
static void store_restore(LEX *lc, struct res_items *item, int index, int pass);
static void store_jobtype(LEX *lc, struct res_items *item, int index, int pass);
static void store_level(LEX *lc, struct res_items *item, int index, int pass);
+static void store_replace(LEX *lc, struct res_items *item, int index, int pass);
/* We build the current resource here as we are
{"name", store_name, ITEM(res_dir.hdr.name), 0, ITEM_REQUIRED, 0},
{"description", store_str, ITEM(res_dir.hdr.desc), 0, 0, 0},
{"messages", store_res, ITEM(res_dir.messages), R_MSGS, 0, 0},
- {"dirport", store_pint, ITEM(res_dir.DIRport), 0, ITEM_REQUIRED, 0},
- {"queryfile", store_dir, ITEM(res_dir.query_file), 0, 0, 0},
+ {"dirport", store_pint, ITEM(res_dir.DIRport), 0, ITEM_DEFAULT, 9101},
+ {"diraddress", store_str, ITEM(res_dir.DIRaddr), 0, 0, 0},
+ {"queryfile", store_dir, ITEM(res_dir.query_file), 0, ITEM_REQUIRED, 0},
{"workingdirectory", store_dir, ITEM(res_dir.working_directory), 0, ITEM_REQUIRED, 0},
{"piddirectory", store_dir, ITEM(res_dir.pid_directory), 0, ITEM_REQUIRED, 0},
{"subsysdirectory", store_dir, ITEM(res_dir.subsys_directory), 0, ITEM_REQUIRED, 0},
{"name", store_name, ITEM(res_client.hdr.name), 0, ITEM_REQUIRED, 0},
{"description", store_str, ITEM(res_client.hdr.desc), 0, 0, 0},
{"address", store_str, ITEM(res_client.address), 0, ITEM_REQUIRED, 0},
- {"fdport", store_pint, ITEM(res_client.FDport), 0, ITEM_REQUIRED, 0},
+ {"fdport", store_pint, ITEM(res_client.FDport), 0, ITEM_DEFAULT, 9102},
{"password", store_password, ITEM(res_client.password), 0, ITEM_REQUIRED, 0},
{"catalog", store_res, ITEM(res_client.catalog), R_CATALOG, 0, 0},
{"fileretention", store_time, ITEM(res_client.FileRetention), 0, ITEM_DEFAULT, 60*60*24*60},
static struct res_items store_items[] = {
{"name", store_name, ITEM(res_store.hdr.name), 0, ITEM_REQUIRED, 0},
{"description", store_str, ITEM(res_store.hdr.desc), 0, 0, 0},
- {"sdport", store_pint, ITEM(res_store.SDport), 0, ITEM_REQUIRED, 0},
+ {"sdport", store_pint, ITEM(res_store.SDport), 0, ITEM_DEFAULT, 9103},
{"sddport", store_pint, ITEM(res_store.SDDport), 0, 0, 0}, /* deprecated */
{"address", store_str, ITEM(res_store.address), 0, ITEM_REQUIRED, 0},
{"password", store_password, ITEM(res_store.password), 0, ITEM_REQUIRED, 0},
{"device", store_strname, ITEM(res_store.dev_name), 0, ITEM_REQUIRED, 0},
{"mediatype", store_strname, ITEM(res_store.media_type), 0, ITEM_REQUIRED, 0},
+ {"autochanger", store_yesno, ITEM(res_store.autochanger), 1, ITEM_DEFAULT, 0},
{NULL, NULL, NULL, 0, 0, 0}
};
{"storage", store_res, ITEM(res_job.storage), R_STORAGE, 0, 0},
{"pool", store_res, ITEM(res_job.pool), R_POOL, 0, 0},
{"client", store_res, ITEM(res_job.client), R_CLIENT, 0, 0},
- {"fileset", store_res, ITEM(res_job.fs), R_FILESET, 0, 0},
+ {"fileset", store_res, ITEM(res_job.fileset), R_FILESET, 0, 0},
+ {"where", store_dir, ITEM(res_job.RestoreWhere), 0, 0, 0},
+ {"replace", store_replace, ITEM(res_job.replace), REPLACE_ALWAYS, ITEM_DEFAULT, 0},
+ {"bootstrap",store_dir, ITEM(res_job.RestoreBootstrap), 0, 0, 0},
{"maxruntime", store_time, ITEM(res_job.MaxRunTime), 0, 0, 0},
{"maxstartdelay", store_time,ITEM(res_job.MaxStartDelay), 0, 0, 0},
{"prunejobs", store_yesno, ITEM(res_job.PruneJobs), 1, ITEM_DEFAULT, 0},
{"prunefiles", store_yesno, ITEM(res_job.PruneFiles), 1, ITEM_DEFAULT, 0},
{"prunevolumes", store_yesno, ITEM(res_job.PruneVolumes), 1, ITEM_DEFAULT, 0},
+ {"runbeforejob", store_str, ITEM(res_job.RunBeforeJob), 0, 0, 0},
+ {"runafterjob", store_str, ITEM(res_job.RunAfterJob), 0, 0, 0},
+ {"spoolattributes", store_yesno, ITEM(res_job.SpoolAttributes), 1, ITEM_DEFAULT, 0},
+ {"writebootstrap", store_dir, ITEM(res_job.WriteBootstrap), 0, 0, 0},
{NULL, NULL, NULL, 0, 0, 0}
};
* name handler value code flags default_value
*/
static struct res_items pool_items[] = {
- {"name", store_name, ITEM(res_pool.hdr.name), 0, ITEM_REQUIRED, 0},
- {"description", store_str, ITEM(res_pool.hdr.desc), 0, 0, 0},
- {"pooltype", store_strname, ITEM(res_pool.pool_type), 0, ITEM_REQUIRED, 0},
- {"labelformat", store_strname, ITEM(res_pool.label_format), 0, 0, 0},
+ {"name", store_name, ITEM(res_pool.hdr.name), 0, ITEM_REQUIRED, 0},
+ {"description", store_str, ITEM(res_pool.hdr.desc), 0, 0, 0},
+ {"pooltype", store_strname, ITEM(res_pool.pool_type), 0, ITEM_REQUIRED, 0},
+ {"labelformat", store_strname, ITEM(res_pool.label_format), 0, 0, 0},
{"usecatalog", store_yesno, ITEM(res_pool.use_catalog), 1, ITEM_DEFAULT, 1},
- {"usevolumeonce", store_yesno, ITEM(res_pool.use_volume_once), 1, 0, 0},
- {"maximumvolumes", store_pint, ITEM(res_pool.max_volumes), 0, 0, 0},
- {"acceptanyvolume", store_yesno, ITEM(res_pool.accept_any_volume), 1, 0, 0},
+ {"usevolumeonce", store_yesno, ITEM(res_pool.use_volume_once), 1, 0, 0},
+ {"maximumvolumes", store_pint, ITEM(res_pool.max_volumes), 0, 0, 0},
+ {"maximumvolumejobs", store_pint, ITEM(res_pool.MaxVolJobs), 0, 0, 0},
+ {"maximumvolumefiles", store_pint, ITEM(res_pool.MaxVolFiles), 0, 0, 0},
+ {"maximumvolumebytes", store_size, ITEM(res_pool.MaxVolBytes), 0, 0, 0},
+ {"acceptanyvolume", store_yesno, ITEM(res_pool.accept_any_volume), 1, ITEM_DEFAULT, 1},
{"catalogfiles", store_yesno, ITEM(res_pool.catalog_files), 1, ITEM_DEFAULT, 1},
- {"volumeretention", store_time, ITEM(res_pool.VolRetention), 0, ITEM_DEFAULT, 60*60*24*365},
+ {"volumeretention", store_time, ITEM(res_pool.VolRetention), 0, ITEM_DEFAULT, 60*60*24*365},
+ {"volumeuseduration", store_time, ITEM(res_pool.VolUseDuration),0, 0, 0},
{"autoprune", store_yesno, ITEM(res_pool.AutoPrune), 1, ITEM_DEFAULT, 1},
{"recycle", store_yesno, ITEM(res_pool.Recycle), 1, ITEM_DEFAULT, 1},
{NULL, NULL, NULL, 0, 0, 0}
};
+/*
+ * Counter Resource
+ * name handler value code flags default_value
+ */
+static struct res_items counter_items[] = {
+ {"name", store_name, ITEM(res_counter.hdr.name), 0, ITEM_REQUIRED, 0},
+ {"description", store_str, ITEM(res_counter.hdr.desc), 0, 0, 0},
+ {"minimum", store_int, ITEM(res_counter.MinValue), 0, ITEM_DEFAULT, 0},
+ {"maximum", store_pint, ITEM(res_counter.MaxValue), 0, ITEM_DEFAULT, INT32_MAX},
+ {"global", store_yesno, ITEM(res_counter.Global), 0, ITEM_DEFAULT, 0},
+ {"wrapcounter", store_strname, ITEM(res_counter.WrapCounter), 0, 0, 0},
+ {NULL, NULL, NULL, 0, 0, 0}
+};
+
+
/* Message resource */
extern struct res_items msgs_items[];
{"group", group_items, R_GROUP, NULL},
{"pool", pool_items, R_POOL, NULL},
{"messages", msgs_items, R_MSGS, NULL},
+ {"counter", counter_items, R_COUNTER, NULL},
{NULL, NULL, 0, NULL}
};
{"Full", L_FULL, JT_BACKUP},
{"Incremental", L_INCREMENTAL, JT_BACKUP},
{"Differential", L_DIFFERENTIAL, JT_BACKUP},
- {"Level", L_LEVEL, JT_BACKUP},
{"Since", L_SINCE, JT_BACKUP},
{"Catalog", L_VERIFY_CATALOG, JT_VERIFY},
{"Initcatalog", L_VERIFY_INIT, JT_VERIFY},
- {"Volume", L_VERIFY_VOLUME, JT_VERIFY},
+ {"VolumeToCatalog", L_VERIFY_VOLUME_TO_CATALOG, JT_VERIFY},
{"Data", L_VERIFY_DATA, JT_VERIFY},
{NULL, 0}
};
{"jobid", 'J'}, /* JobId to restore */
{"where", 'W'}, /* root of restore */
{"replace", 'R'}, /* replacement options */
+ {"bootstrap", 'B'}, /* bootstrap file */
{NULL, 0}
};
/* Options permitted in Restore replace= */
-static struct s_kw ReplaceOptions[] = {
- {"always", 'A'}, /* always */
- {"ifnewer", 'W'},
- {"never", 'N'},
+struct s_kw ReplaceOptions[] = {
+ {"always", REPLACE_ALWAYS},
+ {"ifnewer", REPLACE_IFNEWER},
+ {"ifolder", REPLACE_IFOLDER},
+ {"never", REPLACE_NEVER},
{NULL, 0}
};
/* Define FileSet KeyWord values */
-#define FS_KW_NONE 0
-#define FS_KW_COMPRESSION 1
-#define FS_KW_SIGNATURE 2
-#define FS_KW_ENCRYPTION 3
-#define FS_KW_VERIFY 4
-
-/* FileSet keywords */
+#define INC_KW_NONE 0
+#define INC_KW_COMPRESSION 1
+#define INC_KW_SIGNATURE 2
+#define INC_KW_ENCRYPTION 3
+#define INC_KW_VERIFY 4
+#define INC_KW_ONEFS 5
+#define INC_KW_RECURSE 6
+#define INC_KW_SPARSE 7
+#define INC_KW_REPLACE 8 /* restore options */
+#define INC_KW_READFIFO 9 /* Causes fifo data to be read */
+
+/* Include keywords */
static struct s_kw FS_option_kw[] = {
- {"compression", FS_KW_COMPRESSION},
- {"signature", FS_KW_SIGNATURE},
- {"encryption", FS_KW_ENCRYPTION},
- {"verify", FS_KW_VERIFY},
+ {"compression", INC_KW_COMPRESSION},
+ {"signature", INC_KW_SIGNATURE},
+ {"encryption", INC_KW_ENCRYPTION},
+ {"verify", INC_KW_VERIFY},
+ {"onefs", INC_KW_ONEFS},
+ {"recurse", INC_KW_RECURSE},
+ {"sparse", INC_KW_SPARSE},
+ {"replace", INC_KW_REPLACE},
+ {"readfifo", INC_KW_READFIFO},
{NULL, 0}
};
/* Options permitted for each keyword and resulting value */
static struct s_fs_opt FS_options[] = {
- {"md5", FS_KW_SIGNATURE, "M"},
- {"gzip", FS_KW_COMPRESSION, "Z6"},
- {"gzip1", FS_KW_COMPRESSION, "Z1"},
- {"gzip2", FS_KW_COMPRESSION, "Z2"},
- {"gzip3", FS_KW_COMPRESSION, "Z3"},
- {"gzip4", FS_KW_COMPRESSION, "Z4"},
- {"gzip5", FS_KW_COMPRESSION, "Z5"},
- {"gzip6", FS_KW_COMPRESSION, "Z6"},
- {"gzip7", FS_KW_COMPRESSION, "Z7"},
- {"gzip8", FS_KW_COMPRESSION, "Z8"},
- {"gzip9", FS_KW_COMPRESSION, "Z9"},
- {"blowfish", FS_KW_ENCRYPTION, "B"}, /* ***FIXME*** not implemented */
- {"3des", FS_KW_ENCRYPTION, "3"}, /* ***FIXME*** not implemented */
+ {"md5", INC_KW_SIGNATURE, "M"},
+ {"gzip", INC_KW_COMPRESSION, "Z6"},
+ {"gzip1", INC_KW_COMPRESSION, "Z1"},
+ {"gzip2", INC_KW_COMPRESSION, "Z2"},
+ {"gzip3", INC_KW_COMPRESSION, "Z3"},
+ {"gzip4", INC_KW_COMPRESSION, "Z4"},
+ {"gzip5", INC_KW_COMPRESSION, "Z5"},
+ {"gzip6", INC_KW_COMPRESSION, "Z6"},
+ {"gzip7", INC_KW_COMPRESSION, "Z7"},
+ {"gzip8", INC_KW_COMPRESSION, "Z8"},
+ {"gzip9", INC_KW_COMPRESSION, "Z9"},
+ {"blowfish", INC_KW_ENCRYPTION, "B"}, /* ***FIXME*** not implemented */
+ {"3des", INC_KW_ENCRYPTION, "3"}, /* ***FIXME*** not implemented */
+ {"yes", INC_KW_ONEFS, "0"},
+ {"no", INC_KW_ONEFS, "f"},
+ {"yes", INC_KW_RECURSE, "0"},
+ {"no", INC_KW_RECURSE, "h"},
+ {"yes", INC_KW_SPARSE, "s"},
+ {"no", INC_KW_SPARSE, "0"},
+ {"always", INC_KW_REPLACE, "a"},
+ {"ifnewer", INC_KW_REPLACE, "w"},
+ {"never", INC_KW_REPLACE, "n"},
+ {"yes", INC_KW_READFIFO, "r"},
+ {"no", INC_KW_READFIFO, "0"},
{NULL, 0, 0}
};
case R_CATALOG:
sendit(sock, "Catalog: name=%s address=%s DBport=%d db_name=%s\n\
db_user=%s\n",
- res->res_cat.hdr.name, res->res_cat.address, res->res_cat.DBport,
- res->res_cat.db_name, res->res_cat.db_user);
+ res->res_cat.hdr.name, NPRT(res->res_cat.address),
+ res->res_cat.DBport, res->res_cat.db_name, NPRT(res->res_cat.db_user));
break;
case R_JOB:
sendit(sock, "Job: name=%s JobType=%d level=%s\n", res->res_job.hdr.name,
sendit(sock, " --> ");
dump_resource(-R_CLIENT, (RES *)res->res_job.client, sendit, sock);
}
- if (res->res_job.fs) {
+ if (res->res_job.fileset) {
sendit(sock, " --> ");
- dump_resource(-R_FILESET, (RES *)res->res_job.fs, sendit, sock);
+ dump_resource(-R_FILESET, (RES *)res->res_job.fileset, sendit, sock);
}
if (res->res_job.schedule) {
sendit(sock, " --> ");
dump_resource(-R_SCHEDULE, (RES *)res->res_job.schedule, sendit, sock);
}
if (res->res_job.RestoreWhere) {
- sendit(sock, " --> Where=%s\n", res->res_job.RestoreWhere);
+ sendit(sock, " --> Where=%s\n", NPRT(res->res_job.RestoreWhere));
+ }
+ if (res->res_job.RestoreBootstrap) {
+ sendit(sock, " --> Bootstrap=%s\n", NPRT(res->res_job.RestoreBootstrap));
+ }
+ if (res->res_job.RunBeforeJob) {
+ sendit(sock, " --> RunBefore=%s\n", NPRT(res->res_job.RunBeforeJob));
+ }
+ if (res->res_job.RunAfterJob) {
+ sendit(sock, " --> RunAfter=%s\n", NPRT(res->res_job.RunAfterJob));
+ }
+ if (res->res_job.WriteBootstrap) {
+ sendit(sock, " --> WriteBootstrap=%s\n", NPRT(res->res_job.WriteBootstrap));
}
if (res->res_job.storage) {
sendit(sock, " --> ");
strcpy(buf, " hour=");
for (i=0; i<24; i++) {
if (bit_is_set(i, run->hour)) {
- sprintf(num, "%d ", i+1);
+ sprintf(num, "%d ", i);
strcat(buf, num);
}
}
}
strcat(buf, "\n");
sendit(sock, buf);
+ strcpy(buf, " wpos=");
+ for (i=0; i<5; i++) {
+ if (bit_is_set(i, run->wpos)) {
+ sprintf(num, "%d ", i+1);
+ strcat(buf, num);
+ }
+ }
+ strcat(buf, "\n");
+ sendit(sock, buf);
sendit(sock, " mins=%d\n", run->minute);
if (run->pool) {
sendit(sock, " --> ");
res->res_pool.max_volumes, res->res_pool.AutoPrune,
res->res_pool.VolRetention);
sendit(sock, " recycle=%d LabelFormat=%s\n", res->res_pool.Recycle,
- res->res_pool.label_format?res->res_pool.label_format:"*None*");
+ NPRT(res->res_pool.label_format));
break;
case R_MSGS:
sendit(sock, "Messages: name=%s\n", res->res_msgs.hdr.name);
switch (type) {
case R_DIRECTOR:
- if (res->res_dir.working_directory)
+ if (res->res_dir.working_directory) {
free(res->res_dir.working_directory);
- if (res->res_dir.pid_directory)
+ }
+ if (res->res_dir.pid_directory) {
free(res->res_dir.pid_directory);
- if (res->res_dir.subsys_directory)
+ }
+ if (res->res_dir.subsys_directory) {
free(res->res_dir.subsys_directory);
- if (res->res_dir.password)
+ }
+ if (res->res_dir.password) {
free(res->res_dir.password);
- if (res->res_dir.query_file)
+ }
+ if (res->res_dir.query_file) {
free(res->res_dir.query_file);
+ }
+ if (res->res_dir.DIRaddr) {
+ free(res->res_dir.DIRaddr);
+ }
break;
case R_CLIENT:
- if (res->res_client.address)
+ if (res->res_client.address) {
free(res->res_client.address);
- if (res->res_client.password)
+ }
+ if (res->res_client.password) {
free(res->res_client.password);
+ }
break;
case R_STORAGE:
if (res->res_store.address)
if (res->res_job.RestoreWhere) {
free(res->res_job.RestoreWhere);
}
+ if (res->res_job.RestoreBootstrap) {
+ free(res->res_job.RestoreBootstrap);
+ }
+ if (res->res_job.WriteBootstrap) {
+ free(res->res_job.WriteBootstrap);
+ }
+ if (res->res_job.RunBeforeJob) {
+ free(res->res_job.RunBeforeJob);
+ }
+ if (res->res_job.RunAfterJob) {
+ free(res->res_job.RunAfterJob);
+ }
break;
case R_MSGS:
if (res->res_msgs.mail_cmd)
for (i=0; items[i].name; i++) {
if (items[i].flags & ITEM_REQUIRED) {
if (!bit_is_set(i, res_all.res_dir.hdr.item_present)) {
- Emsg2(M_ABORT, 0, "%s item is required in %s resource, but not found.\n",
+ Emsg2(M_ERROR_TERM, 0, "%s item is required in %s resource, but not found.\n",
items[i].name, resources[rindex]);
}
}
/* If this triggers, take a look at lib/parse_conf.h */
if (i >= MAX_RES_ITEMS) {
- Emsg1(M_ABORT, 0, "Too many items in %s resource\n", resources[rindex]);
+ Emsg1(M_ERROR_TERM, 0, "Too many items in %s resource\n", resources[rindex]);
}
}
/* Resources containing another resource */
case R_DIRECTOR:
if ((res = (URES *)GetResWithName(R_DIRECTOR, res_all.res_dir.hdr.name)) == NULL) {
- Emsg1(M_ABORT, 0, "Cannot find Director resource %s\n", res_all.res_dir.hdr.name);
+ Emsg1(M_ERROR_TERM, 0, "Cannot find Director resource %s\n", res_all.res_dir.hdr.name);
}
res->res_dir.messages = res_all.res_dir.messages;
break;
case R_JOB:
if ((res = (URES *)GetResWithName(R_JOB, res_all.res_dir.hdr.name)) == NULL) {
- Emsg1(M_ABORT, 0, "Cannot find Job resource %s\n", res_all.res_dir.hdr.name);
+ Emsg1(M_ERROR_TERM, 0, "Cannot find Job resource %s\n", res_all.res_dir.hdr.name);
}
res->res_job.messages = res_all.res_job.messages;
res->res_job.schedule = res_all.res_job.schedule;
res->res_job.client = res_all.res_job.client;
- res->res_job.fs = res_all.res_job.fs;
+ res->res_job.fileset = res_all.res_job.fileset;
res->res_job.storage = res_all.res_job.storage;
res->res_job.pool = res_all.res_job.pool;
if (res->res_job.JobType == 0) {
- Emsg1(M_ABORT, 0, "Job Type not defined for Job resource %s\n", res_all.res_dir.hdr.name);
+ Emsg1(M_ERROR_TERM, 0, "Job Type not defined for Job resource %s\n", res_all.res_dir.hdr.name);
}
if (res->res_job.level != 0) {
int i;
}
}
if (i != 0) {
- Emsg1(M_ABORT, 0, "Inappropriate level specified in Job resource %s\n",
+ Emsg1(M_ERROR_TERM, 0, "Inappropriate level specified in Job resource %s\n",
res_all.res_dir.hdr.name);
}
}
break;
case R_CLIENT:
if ((res = (URES *)GetResWithName(R_CLIENT, res_all.res_client.hdr.name)) == NULL) {
- Emsg1(M_ABORT, 0, "Cannot find Client resource %s\n", res_all.res_client.hdr.name);
+ Emsg1(M_ERROR_TERM, 0, "Cannot find Client resource %s\n", res_all.res_client.hdr.name);
}
res->res_client.catalog = res_all.res_client.catalog;
break;
* into the Schedule resource.
*/
if ((res = (URES *)GetResWithName(R_SCHEDULE, res_all.res_client.hdr.name)) == NULL) {
- Emsg1(M_ABORT, 0, "Cannot find Schedule resource %s\n", res_all.res_client.hdr.name);
+ Emsg1(M_ERROR_TERM, 0, "Cannot find Schedule resource %s\n", res_all.res_client.hdr.name);
}
res->res_sch.run = res_all.res_sch.run;
break;
default:
printf("Unknown resource type %d\n", type);
error = 1;
+ size = 1;
break;
}
/* Common */
if (!error) {
res = (URES *)malloc(size);
memcpy(res, &res_all, size);
- res->res_dir.hdr.next = resources[rindex].res_head;
- resources[rindex].res_head = (RES *)res;
- Dmsg2(90, "dir_conf: inserting %s res: %s\n", res_to_str(type),
- res->res_dir.hdr.name);
+ if (!resources[rindex].res_head) {
+ resources[rindex].res_head = (RES *)res; /* store first entry */
+ } else {
+ RES *next;
+ /* Add new res to end of chain */
+ for (next=resources[rindex].res_head; next->next; next=next->next)
+ { }
+ next->next = (RES *)res;
+ Dmsg2(90, "Inserting %s res: %s\n", res_to_str(type),
+ res->res_dir.hdr.name);
+ }
}
-
}
/*
{
int token, i;
- token = lex_get_token(lc);
- if (token != T_IDENTIFIER && token != T_STRING && token != T_QUOTED_STRING) {
- scan_err1(lc, "expected an identifier or string, got: %s", lc->str);
- } else {
- /* Store the type both pass 1 and pass 2 */
- for (i=0; jobtypes[i].type_name; i++) {
- if (strcasecmp(lc->str, jobtypes[i].type_name) == 0) {
- ((JOB *)(item->value))->JobType = jobtypes[i].job_type;
- i = 0;
- break;
- }
- }
- if (i != 0) {
- scan_err1(lc, "Expected a Job Type keyword, got: %s", lc->str);
+ token = lex_get_token(lc, T_NAME);
+ /* Store the type both pass 1 and pass 2 */
+ for (i=0; jobtypes[i].type_name; i++) {
+ if (strcasecmp(lc->str, jobtypes[i].type_name) == 0) {
+ ((JOB *)(item->value))->JobType = jobtypes[i].job_type;
+ i = 0;
+ break;
}
}
+ if (i != 0) {
+ scan_err1(lc, "Expected a Job Type keyword, got: %s", lc->str);
+ }
scan_to_eol(lc);
set_bit(index, res_all.hdr.item_present);
}
{
int token, i;
- token = lex_get_token(lc);
- if (token != T_IDENTIFIER && token != T_STRING && token != T_QUOTED_STRING) {
- scan_err1(lc, "expected an identifier or string, got: %s", lc->str);
- } else {
- /* Store the level pass 2 so that type is defined */
- for (i=0; joblevels[i].level_name; i++) {
- if (strcasecmp(lc->str, joblevels[i].level_name) == 0) {
- ((JOB *)(item->value))->level = joblevels[i].level;
- i = 0;
- break;
- }
- }
- if (i != 0) {
- scan_err1(lc, "Expected a Job Level keyword, got: %s", lc->str);
+ token = lex_get_token(lc, T_NAME);
+ /* Store the level pass 2 so that type is defined */
+ for (i=0; joblevels[i].level_name; i++) {
+ if (strcasecmp(lc->str, joblevels[i].level_name) == 0) {
+ ((JOB *)(item->value))->level = joblevels[i].level;
+ i = 0;
+ break;
}
}
+ if (i != 0) {
+ scan_err1(lc, "Expected a Job Level keyword, got: %s", lc->str);
+ }
scan_to_eol(lc);
set_bit(index, res_all.hdr.item_present);
}
-
+static void store_replace(LEX *lc, struct res_items *item, int index, int pass)
+{
+ int token, i;
+ token = lex_get_token(lc, T_NAME);
+ /* Scan Replacement options */
+ for (i=0; ReplaceOptions[i].name; i++) {
+ if (strcasecmp(lc->str, ReplaceOptions[i].name) == 0) {
+ ((JOB *)(item->value))->replace = ReplaceOptions[i].token;
+ i = 0;
+ break;
+ }
+ }
+ if (i != 0) {
+ scan_err1(lc, "Expected a Restore replacement option, got: %s", lc->str);
+ }
+ scan_to_eol(lc);
+ set_bit(index, res_all.hdr.item_present);
+}
/*
* Store backup/verify info for Job record
((JOB *)(item->value))->JobType = item->code;
- while ((token = lex_get_token(lc)) != T_EOL) {
+ while ((token = lex_get_token(lc, T_ALL)) != T_EOL) {
int found;
- if (token != T_IDENTIFIER && token != T_STRING && token != T_QUOTED_STRING) {
+ Dmsg1(150, "store_backup got token=%s\n", lex_tok_to_str(token));
+
+ if (token != T_IDENTIFIER && token != T_UNQUOTED_STRING && token != T_QUOTED_STRING) {
scan_err1(lc, "Expected a backup/verify keyword, got: %s", lc->str);
- } else {
- Dmsg1(190, "Got keyword: %s\n", lc->str);
- found = FALSE;
- for (i=0; BakVerFields[i].name; i++) {
- if (strcasecmp(lc->str, BakVerFields[i].name) == 0) {
- found = TRUE;
- if (lex_get_token(lc) != T_EQUALS) {
- scan_err1(lc, "Expected an equals, got: %s", lc->str);
- }
- token = lex_get_token(lc);
- if (token != T_IDENTIFIER && token != T_STRING && token != T_QUOTED_STRING) {
- scan_err1(lc, "Expected a keyword name, got: %s", lc->str);
- }
- Dmsg1(190, "Got value: %s\n", lc->str);
- switch (BakVerFields[i].token) {
- case 'C':
- /* Find Client Resource */
- if (pass == 2) {
- res = GetResWithName(R_CLIENT, lc->str);
- if (res == NULL) {
- scan_err1(lc, "Could not find specified Client Resource: %s",
- lc->str);
- }
- res_all.res_job.client = (CLIENT *)res;
- }
- break;
- case 'F':
- /* Find FileSet Resource */
- if (pass == 2) {
- res = GetResWithName(R_FILESET, lc->str);
- if (res == NULL) {
- scan_err1(lc, "Could not find specified FileSet Resource: %s\n",
- lc->str);
- }
- res_all.res_job.fs = (FILESET *)res;
+ }
+ Dmsg1(190, "Got keyword: %s\n", lc->str);
+ found = FALSE;
+ for (i=0; BakVerFields[i].name; i++) {
+ if (strcasecmp(lc->str, BakVerFields[i].name) == 0) {
+ found = TRUE;
+ if (lex_get_token(lc, T_ALL) != T_EQUALS) {
+ scan_err1(lc, "Expected an equals, got: %s", lc->str);
+ }
+ token = lex_get_token(lc, T_NAME);
+ Dmsg1(190, "Got value: %s\n", lc->str);
+ switch (BakVerFields[i].token) {
+ case 'C':
+ /* Find Client Resource */
+ if (pass == 2) {
+ res = GetResWithName(R_CLIENT, lc->str);
+ if (res == NULL) {
+ scan_err1(lc, "Could not find specified Client Resource: %s",
+ lc->str);
}
- break;
- case 'L':
- /* Get level */
- for (i=0; joblevels[i].level_name; i++) {
- if (joblevels[i].job_type == item->code &&
- strcasecmp(lc->str, joblevels[i].level_name) == 0) {
- ((JOB *)(item->value))->level = joblevels[i].level;
- i = 0;
- break;
- }
+ res_all.res_job.client = (CLIENT *)res;
+ }
+ break;
+ case 'F':
+ /* Find FileSet Resource */
+ if (pass == 2) {
+ res = GetResWithName(R_FILESET, lc->str);
+ if (res == NULL) {
+ scan_err1(lc, "Could not find specified FileSet Resource: %s\n",
+ lc->str);
}
- if (i != 0) {
- scan_err1(lc, "Expected a Job Level keyword, got: %s", lc->str);
+ res_all.res_job.fileset = (FILESET *)res;
+ }
+ break;
+ case 'L':
+ /* Get level */
+ for (i=0; joblevels[i].level_name; i++) {
+ if (joblevels[i].job_type == item->code &&
+ strcasecmp(lc->str, joblevels[i].level_name) == 0) {
+ ((JOB *)(item->value))->level = joblevels[i].level;
+ i = 0;
+ break;
}
- break;
- } /* end switch */
- break;
- } /* end if strcmp() */
- } /* end for */
- if (!found) {
- scan_err1(lc, "%s not a valid Backup/verify keyword", lc->str);
- }
+ }
+ if (i != 0) {
+ scan_err1(lc, "Expected a Job Level keyword, got: %s", lc->str);
+ }
+ break;
+ } /* end switch */
+ break;
+ } /* end if strcmp() */
+ } /* end for */
+ if (!found) {
+ scan_err1(lc, "%s not a valid Backup/verify keyword", lc->str);
}
} /* end while */
lc->options = options; /* reset original options */
/*
* Store restore info for Job record
*
- * Restore = JobId=<job-id> Where=<root-directory> Replace=<options>
+ * Restore = JobId=<job-id> Where=<root-directory> Replace=<options> Bootstrap=<file>
*
*/
static void store_restore(LEX *lc, struct res_items *item, int index, int pass)
Dmsg0(190, "Enter store_restore()\n");
((JOB *)(item->value))->JobType = item->code;
- while ((token = lex_get_token(lc)) != T_EOL) {
+ while ((token = lex_get_token(lc, T_ALL)) != T_EOL) {
int found;
- if (token != T_IDENTIFIER && token != T_STRING && token != T_QUOTED_STRING) {
- scan_err1(lc, "Expected a Restore keyword, got: %s", lc->str);
- } else {
- found = FALSE;
- for (i=0; RestoreFields[i].name; i++) {
- Dmsg1(190, "Restore kw=%s\n", lc->str);
- if (strcasecmp(lc->str, RestoreFields[i].name) == 0) {
- found = TRUE;
- if (lex_get_token(lc) != T_EQUALS) {
- scan_err1(lc, "Expected an equals, got: %s", lc->str);
- }
- token = lex_get_token(lc);
- Dmsg1(190, "Restore value=%s\n", lc->str);
- switch (RestoreFields[i].token) {
- case 'C':
- /* Find Client Resource */
- if (pass == 2) {
- res = GetResWithName(R_CLIENT, lc->str);
- if (res == NULL) {
- scan_err1(lc, "Could not find specified Client Resource: %s",
- lc->str);
- }
- res_all.res_job.client = (CLIENT *)res;
- }
- break;
- case 'F':
- /* Find FileSet Resource */
- if (pass == 2) {
- res = GetResWithName(R_FILESET, lc->str);
- if (res == NULL) {
- scan_err1(lc, "Could not find specified FileSet Resource: %s\n",
- lc->str);
- }
- res_all.res_job.fs = (FILESET *)res;
- }
- break;
- case 'J':
- /* JobId */
- if (token != T_NUMBER) {
- scan_err1(lc, "expected an integer number, got: %s", lc->str);
- }
- errno = 0;
- res_all.res_job.RestoreJobId = strtol(lc->str, NULL, 0);
- Dmsg1(190, "RestorJobId=%d\n", res_all.res_job.RestoreJobId);
- if (errno != 0) {
- scan_err1(lc, "expected an integer number, got: %s", lc->str);
- }
- break;
- case 'W':
- /* Where */
- if (token != T_IDENTIFIER && token != T_STRING && token != T_QUOTED_STRING) {
- scan_err1(lc, "Expected a Restore root directory, got: %s", lc->str);
- }
- if (pass == 1) {
- res_all.res_job.RestoreWhere = bstrdup(lc->str);
- }
- break;
- case 'R':
- /* Replacement options */
- if (token != T_IDENTIFIER && token != T_STRING && token != T_QUOTED_STRING) {
- scan_err1(lc, "Expected a keyword name, got: %s", lc->str);
+ if (token != T_IDENTIFIER && token != T_UNQUOTED_STRING && token != T_QUOTED_STRING) {
+ scan_err1(lc, "expected a name, got: %s", lc->str);
+ }
+ found = FALSE;
+ for (i=0; RestoreFields[i].name; i++) {
+ Dmsg1(190, "Restore kw=%s\n", lc->str);
+ if (strcasecmp(lc->str, RestoreFields[i].name) == 0) {
+ found = TRUE;
+ if (lex_get_token(lc, T_ALL) != T_EQUALS) {
+ scan_err1(lc, "Expected an equals, got: %s", lc->str);
+ }
+ token = lex_get_token(lc, T_ALL);
+ Dmsg1(190, "Restore value=%s\n", lc->str);
+ switch (RestoreFields[i].token) {
+ case 'B':
+ /* Bootstrap */
+ if (token != T_IDENTIFIER && token != T_UNQUOTED_STRING && token != T_QUOTED_STRING) {
+ scan_err1(lc, "Expected a Restore bootstrap file, got: %s", lc->str);
+ }
+ if (pass == 1) {
+ res_all.res_job.RestoreBootstrap = bstrdup(lc->str);
+ }
+ break;
+ case 'C':
+ /* Find Client Resource */
+ if (pass == 2) {
+ res = GetResWithName(R_CLIENT, lc->str);
+ if (res == NULL) {
+ scan_err1(lc, "Could not find specified Client Resource: %s",
+ lc->str);
}
- /* Fix to scan Replacement options */
- for (i=0; ReplaceOptions[i].name; i++) {
- if (strcasecmp(lc->str, ReplaceOptions[i].name) == 0) {
- ((JOB *)(item->value))->RestoreOptions = ReplaceOptions[i].token;
- i = 0;
- break;
- }
+ res_all.res_job.client = (CLIENT *)res;
+ }
+ break;
+ case 'F':
+ /* Find FileSet Resource */
+ if (pass == 2) {
+ res = GetResWithName(R_FILESET, lc->str);
+ if (res == NULL) {
+ scan_err1(lc, "Could not find specified FileSet Resource: %s\n",
+ lc->str);
}
- if (i != 0) {
- scan_err1(lc, "Expected a Restore replacement option, got: %s", lc->str);
+ res_all.res_job.fileset = (FILESET *)res;
+ }
+ break;
+ case 'J':
+ /* JobId */
+ if (token != T_NUMBER) {
+ scan_err1(lc, "expected an integer number, got: %s", lc->str);
+ }
+ errno = 0;
+ res_all.res_job.RestoreJobId = strtol(lc->str, NULL, 0);
+ Dmsg1(190, "RestorJobId=%d\n", res_all.res_job.RestoreJobId);
+ if (errno != 0) {
+ scan_err1(lc, "expected an integer number, got: %s", lc->str);
+ }
+ break;
+ case 'W':
+ /* Where */
+ if (token != T_IDENTIFIER && token != T_UNQUOTED_STRING && token != T_QUOTED_STRING) {
+ scan_err1(lc, "Expected a Restore root directory, got: %s", lc->str);
+ }
+ if (pass == 1) {
+ res_all.res_job.RestoreWhere = bstrdup(lc->str);
+ }
+ break;
+ case 'R':
+ /* Replacement options */
+ if (token != T_IDENTIFIER && token != T_UNQUOTED_STRING && token != T_QUOTED_STRING) {
+ scan_err1(lc, "Expected a keyword name, got: %s", lc->str);
+ }
+ /* Fix to scan Replacement options */
+ for (i=0; ReplaceOptions[i].name; i++) {
+ if (strcasecmp(lc->str, ReplaceOptions[i].name) == 0) {
+ ((JOB *)(item->value))->replace = ReplaceOptions[i].token;
+ i = 0;
+ break;
}
- break;
- } /* end switch */
- break;
- } /* end if strcmp() */
- } /* end for */
- if (!found) {
- scan_err1(lc, "%s not a valid Restore keyword", lc->str);
- }
+ }
+ if (i != 0) {
+ scan_err1(lc, "Expected a Restore replacement option, got: %s", lc->str);
+ }
+ break;
+ } /* end switch */
+ break;
+ } /* end if strcmp() */
+ } /* end for */
+ if (!found) {
+ scan_err1(lc, "%s not a valid Restore keyword", lc->str);
}
} /* end while */
lc->options = options; /* reset original options */
/*
- * Scan for FileSet options (keyword=option) is converted into one or
+ * Scan for Include options (keyword=option) is converted into one or
* two characters. Verifyopts=xxxx is Vxxxx:
*/
-static char *scan_fs_options(LEX *lc, int keyword)
+static void scan_include_options(LEX *lc, int keyword, char *opts, int optlen)
{
int token, i;
- static char opts[100];
char option[3];
option[0] = 0; /* default option = none */
- opts[0] = option[2] = 0; /* terminate options */
- for (;;) {
- token = lex_get_token(lc); /* expect at least one option */
- if (token != T_IDENTIFIER && token != T_STRING && token != T_QUOTED_STRING) {
- scan_err1(lc, "expected a FileSet option, got: %s", lc->str);
- }
- if (keyword == FS_KW_VERIFY) { /* special case */
- /* ***FIXME**** ensure these are in permitted set */
- strcpy(option, "V"); /* indicate Verify */
- strcat(option, lc->str);
- strcat(option, ":"); /* terminate it */
- } else {
- for (i=0; FS_options[i].name; i++) {
- if (strcasecmp(lc->str, FS_options[i].name) == 0 && FS_options[i].keyword == keyword) {
- option[0] = FS_options[i].option[0];
- option[1] = FS_options[i].option[1];
- i = 0;
- break;
- }
- }
- if (i != 0) {
- scan_err1(lc, "Expected a FileSet option keyword, got: %s", lc->str);
+ option[2] = 0; /* terminate options */
+ token = lex_get_token(lc, T_NAME); /* expect at least one option */
+ if (keyword == INC_KW_VERIFY) { /* special case */
+ /* ***FIXME**** ensure these are in permitted set */
+ bstrncat(opts, "V", optlen); /* indicate Verify */
+ bstrncat(opts, lc->str, optlen);
+ bstrncat(opts, ":", optlen); /* terminate it */
+ } else {
+ for (i=0; FS_options[i].name; i++) {
+ if (strcasecmp(lc->str, FS_options[i].name) == 0 && FS_options[i].keyword == keyword) {
+ /* NOTE! maximum 2 letters here or increase option[3] */
+ option[0] = FS_options[i].option[0];
+ option[1] = FS_options[i].option[1];
+ i = 0;
+ break;
}
}
- strcat(opts, option);
-
- /* check if more options are specified */
- if (lc->ch != ',') {
- break; /* no, get out */
+ if (i != 0) {
+ scan_err1(lc, "Expected a FileSet option keyword, got:%s:", lc->str);
+ } else { /* add option */
+ bstrncat(opts, option, optlen);
+ Dmsg3(200, "Catopts=%s option=%s optlen=%d\n", opts, option,optlen);
}
- token = lex_get_token(lc); /* yes, eat comma */
}
- return opts;
+ /* If option terminated by comma, eat it */
+ if (lc->ch == ',') {
+ token = lex_get_token(lc, T_ALL); /* yes, eat comma */
+ }
}
lc->options |= LOPT_NO_IDENT; /* make spaces significant */
/* Get include options */
- strcpy(inc_opts, "0"); /* set no options */
- while ((token=lex_get_token(lc)) != T_BOB) {
- if (token != T_STRING) {
- scan_err1(lc, "expected a FileSet option keyword, got: %s", lc->str);
- } else {
- keyword = FS_KW_NONE;
- for (i=0; FS_option_kw[i].name; i++) {
- if (strcasecmp(lc->str, FS_option_kw[i].name) == 0) {
- keyword = FS_option_kw[i].token;
- break;
- }
- }
- if (keyword == FS_KW_NONE) {
- scan_err1(lc, "Expected a FileSet keyword, got: %s", lc->str);
+ inc_opts[0] = 0;
+ while ((token=lex_get_token(lc, T_ALL)) != T_BOB) {
+ keyword = INC_KW_NONE;
+ for (i=0; FS_option_kw[i].name; i++) {
+ if (strcasecmp(lc->str, FS_option_kw[i].name) == 0) {
+ keyword = FS_option_kw[i].token;
+ break;
}
}
+ if (keyword == INC_KW_NONE) {
+ scan_err1(lc, "Expected a FileSet keyword, got: %s", lc->str);
+ }
/* Option keyword should be following by = <option> */
- if ((token=lex_get_token(lc)) != T_EQUALS) {
+ if ((token=lex_get_token(lc, T_ALL)) != T_EQUALS) {
scan_err1(lc, "expected an = following keyword, got: %s", lc->str);
}
- strcat(inc_opts, scan_fs_options(lc, keyword));
+ scan_include_options(lc, keyword, inc_opts, sizeof(inc_opts));
if (token == T_BOB) {
break;
}
}
- strcat(inc_opts, " "); /* add field separator */
+ if (!inc_opts[0]) {
+ strcat(inc_opts, "0 "); /* set no options */
+ } else {
+ strcat(inc_opts, " "); /* add field separator */
+ }
inc_opts_len = strlen(inc_opts);
-
if (pass == 1) {
if (!res_all.res_fs.have_MD5) {
MD5Init(&res_all.res_fs.md5c);
* a "0 " (zero) indicates no options,
* and fname is the file/directory name given
*/
- while ((token = lex_get_token(lc)) != T_EOB) {
+ while ((token = lex_get_token(lc, T_ALL)) != T_EOB) {
switch (token) {
case T_COMMA:
case T_EOL:
continue;
case T_IDENTIFIER:
- case T_STRING:
+ case T_UNQUOTED_STRING:
case T_QUOTED_STRING:
fname = (char *) malloc(lc->str_len + inc_opts_len + 1);
strcpy(fname, inc_opts);
}
}
} else { /* pass 2 */
- while (lex_get_token(lc) != T_EOB)
+ while (lex_get_token(lc, T_ALL) != T_EOB)
{}
}
scan_to_eol(lc);
projects / bacula / bacula / blobdiff