* 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
/* Forward referenced subroutines */
static void store_inc(LEX *lc, struct res_items *item, int index, int pass);
+static void store_applyto(LEX *lc, struct res_items *item, int index, int pass);
static void store_backup(LEX *lc, struct res_items *item, int index, int pass);
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);
+static void store_opts(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},
static struct res_items cat_items[] = {
{"name", store_name, ITEM(res_cat.hdr.name), 0, ITEM_REQUIRED, 0},
{"description", store_str, ITEM(res_cat.hdr.desc), 0, 0, 0},
- {"address", store_str, ITEM(res_cat.address), 0, 0, 0},
- {"dbport", store_pint, ITEM(res_cat.DBport), 0, 0, 0},
+ {"address", store_str, ITEM(res_cat.db_address), 0, 0, 0},
+ {"dbaddress", store_str, ITEM(res_cat.db_address), 0, 0, 0},
+ {"dbport", store_pint, ITEM(res_cat.db_port), 0, 0, 0},
/* keep this password as store_str for the moment */
{"password", store_str, ITEM(res_cat.db_password), 0, 0, 0},
{"user", store_str, ITEM(res_cat.db_user), 0, 0, 0},
{"dbname", store_str, ITEM(res_cat.db_name), 0, ITEM_REQUIRED, 0},
+ {"dbsocket", store_str, ITEM(res_cat.db_socket), 0, 0, 0},
{NULL, NULL, NULL, 0, 0, 0}
};
{"client", store_res, ITEM(res_job.client), R_CLIENT, 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},
+ {"prefixlinks", store_yesno, ITEM(res_job.PrefixLinks), 1, ITEM_DEFAULT, 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}
};
+/*
+ * FileOptions Resource
+ * name handler value code flags default_value
+ */
+static struct res_items fo_items[] = {
+ {"name", store_name, ITEM(res_fo.hdr.name), 0, ITEM_REQUIRED, 0},
+ {"description", store_str, ITEM(res_fo.hdr.desc), 0, 0, 0},
+ {"compression", store_opts, ITEM(res_fo.opts), 0, 0, 0},
+ {"signature", store_opts, ITEM(res_fo.opts), 0, 0, 0},
+ {"verify", store_opts, ITEM(res_fo.opts), 0, 0, 0},
+ {"replace", store_replace, ITEM(res_fo.replace), 0, 0, 0},
+ {"applyto", store_applyto, ITEM(res_fo.applyto), 0, 0, 0},
+ {NULL, NULL, NULL, 0, 0, 0}
+};
+
+
+
/* Message resource */
extern struct res_items msgs_items[];
{"storage", store_items, R_STORAGE, NULL},
{"catalog", cat_items, R_CATALOG, NULL},
{"schedule", sch_items, R_SCHEDULE, NULL},
+ {"fileoptions", fo_items, R_FILEOPTIONS, NULL},
{"fileset", fs_items, R_FILESET, NULL},
{"group", group_items, R_GROUP, NULL},
{"pool", pool_items, R_POOL, NULL},
{"messages", msgs_items, R_MSGS, NULL},
{"counter", counter_items, R_COUNTER, NULL},
+ {"fileoptions", fo_items, R_FILEOPTIONS, 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},
};
/* 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
-#define FS_KW_ONEFS 5
-#define FS_KW_RECURSE 6
-
-/* 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},
- {"onefs", FS_KW_ONEFS},
- {"recurse", FS_KW_RECURSE},
+ {"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 */
- {"yes", FS_KW_ONEFS, "0"},
- {"no", FS_KW_ONEFS, "f"},
- {"yes", FS_KW_RECURSE, "0"},
- {"no", FS_KW_RECURSE, "h"},
+ {"md5", INC_KW_SIGNATURE, "M"},
+ {"sha1", INC_KW_SIGNATURE, "S"},
+ {"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_CLIENT:
sendit(sock, "Client: name=%s address=%s FDport=%d\n",
res->res_client.hdr.name, res->res_client.address, res->res_client.FDport);
- sendit(sock, "JobRetention=%" lld " FileRetention=%" lld " AutoPrune=%d\n",
+ sendit(sock, " JobRetention=%" lld " FileRetention=%" lld " AutoPrune=%d\n",
res->res_client.JobRetention, res->res_client.FileRetention,
res->res_client.AutoPrune);
if (res->res_client.catalog) {
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, NPRT(res->res_cat.address),
- res->res_cat.DBport, res->res_cat.db_name, NPRT(res->res_cat.db_user));
+ res->res_cat.hdr.name, NPRT(res->res_cat.db_address),
+ res->res_cat.db_port, 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,
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, " --> ");
dump_resource(-R_STORAGE, (RES *)res->res_job.storage, sendit, sock);
case R_FILESET:
sendit(sock, "FileSet: name=%s\n", res->res_fs.hdr.name);
for (i=0; i<res->res_fs.num_includes; i++)
- sendit(sock, " Inc: %s\n", res->res_fs.include_array[i]);
+ sendit(sock, " Inc: %s\n", res->res_fs.include_array[i]->name);
for (i=0; i<res->res_fs.num_excludes; i++)
- sendit(sock, " Exc: %s\n", res->res_fs.exclude_array[i]);
+ sendit(sock, " Exc: %s\n", res->res_fs.exclude_array[i]->name);
break;
case R_SCHEDULE:
if (res->res_sch.run) {
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, " --> ");
if (res->res_msgs.operator_cmd)
sendit(sock, " opcmd=%s\n", res->res_msgs.operator_cmd);
break;
+ case R_FILEOPTIONS:
+ sendit(sock, "FileOptions: name=%s\n", res->res_msgs.hdr.name);
+ sendit(sock, " opts=%s replace=%c\n", res->res_fo.opts,
+ res->res_fo.replace);
+ for (int i=0; i < res->res_fo.num_applyto; i++) {
+ sendit(sock, " applyto=%s\n", res->res_fo.applyto[i]);
+ }
+ break;
default:
- sendit(sock, "Unknown resource type %d\n", type);
+ sendit(sock, "Unknown resource type %d in dump_resource.\n", type);
break;
}
if (recurse && res->res_dir.hdr.next) {
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_store.address) {
free(res->res_store.address);
- if (res->res_store.password)
+ }
+ if (res->res_store.password) {
free(res->res_store.password);
- if (res->res_store.media_type)
+ }
+ if (res->res_store.media_type) {
free(res->res_store.media_type);
- if (res->res_store.dev_name)
+ }
+ if (res->res_store.dev_name) {
free(res->res_store.dev_name);
+ }
break;
case R_CATALOG:
- if (res->res_cat.address)
- free(res->res_cat.address);
- if (res->res_cat.db_user)
+ if (res->res_cat.db_address) {
+ free(res->res_cat.db_address);
+ }
+ if (res->res_cat.db_socket) {
+ free(res->res_cat.db_socket);
+ }
+ if (res->res_cat.db_user) {
free(res->res_cat.db_user);
- if (res->res_cat.db_name)
+ }
+ if (res->res_cat.db_name) {
free(res->res_cat.db_name);
- if (res->res_cat.db_password)
+ }
+ if (res->res_cat.db_password) {
free(res->res_cat.db_password);
+ }
break;
case R_FILESET:
if ((num=res->res_fs.num_includes)) {
- while (--num >= 0)
+ while (--num >= 0) {
free(res->res_fs.include_array[num]);
+ }
free(res->res_fs.include_array);
}
if ((num=res->res_fs.num_excludes)) {
- while (--num >= 0)
+ while (--num >= 0) {
free(res->res_fs.exclude_array[num]);
+ }
free(res->res_fs.exclude_array);
}
break;
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);
}
free(res->res_msgs.operator_cmd);
free_msgs_res((MSGS *)res); /* free message resource */
res = NULL;
+ break;
+ case R_FILEOPTIONS:
+ if (res->res_fo.num_applyto) {
+ for (int i=0; i < res->res_fo.num_applyto; i++) {
+ free(res->res_fo.applyto[i]);
+ }
+ free((char *)res->res_fo.applyto);
+ }
+
break;
case R_GROUP:
break;
default:
- printf("Unknown resource type %d\n", type);
+ printf("Unknown resource type %d in free_resource.\n", type);
}
/* Common stuff again -- free the resource, recurse to next one */
if (res) {
case R_CATALOG:
case R_STORAGE:
case R_FILESET:
+ case R_FILEOPTIONS:
case R_GROUP:
case R_POOL:
case R_MSGS:
res->res_sch.run = res_all.res_sch.run;
break;
default:
- Emsg1(M_ERROR, 0, "Unknown resource type %d\n", type);
+ Emsg1(M_ERROR, 0, "Unknown resource type %d in save_resource.\n", type);
error = 1;
break;
}
case R_MSGS:
size = sizeof(MSGS);
break;
+ case R_COUNTER:
+ size = sizeof(COUNTER);
+ break;
+ case R_FILEOPTIONS:
+ size = sizeof(FILEOPTIONS);
+ break;
default:
- printf("Unknown resource type %d\n", type);
+ printf("Unknown resource type %d in save_resrouce.\n", type);
error = 1;
size = 1;
break;
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) {
+ *(int *)(item->value) = 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
/* 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;
+ ((JOB *)(item->value))->replace = ReplaceOptions[i].token;
i = 0;
break;
}
/*
- * 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, T_NAME); /* expect at least one option */
- 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(000, "Catopts=%s option=%s optlen=%d\n", opts, option,optlen);
}
- token = lex_get_token(lc, T_ALL); /* 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 */
+ }
}
int token, i;
int options = lc->options;
int keyword;
- char *fname;
char inc_opts[100];
int inc_opts_len;
lc->options |= LOPT_NO_IDENT; /* make spaces significant */
/* Get include options */
- strcpy(inc_opts, "0"); /* set no options */
+ inc_opts[0] = 0;
while ((token=lex_get_token(lc, T_ALL)) != T_BOB) {
- keyword = FS_KW_NONE;
+ 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 == FS_KW_NONE) {
+ 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_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);
case T_IDENTIFIER:
case T_UNQUOTED_STRING:
case T_QUOTED_STRING:
- fname = (char *) malloc(lc->str_len + inc_opts_len + 1);
- strcpy(fname, inc_opts);
- strcat(fname, lc->str);
+ INCEXE *incexe;
+ incexe = (INCEXE *)malloc(lc->str_len + sizeof(INCEXE));
+ memset(incexe, 0, sizeof(INCEXE));
+ bstrncpy(incexe->opts, inc_opts, sizeof(incexe->opts));
+ strcpy(incexe->name, lc->str);
if (res_all.res_fs.have_MD5) {
- MD5Update(&res_all.res_fs.md5c, (unsigned char *) fname, inc_opts_len + lc->str_len);
+ MD5Update(&res_all.res_fs.md5c, (unsigned char *)incexe,
+ sizeof(INCEXE) + lc->str_len);
}
if (item->code == 0) { /* include */
if (res_all.res_fs.num_includes == res_all.res_fs.include_size) {
res_all.res_fs.include_size += 10;
if (res_all.res_fs.include_array == NULL) {
- res_all.res_fs.include_array = (char **) malloc(sizeof(char *) * res_all.res_fs.include_size);
+ res_all.res_fs.include_array = (INCEXE **)malloc(sizeof(INCEXE *) * res_all.res_fs.include_size);
} else {
- res_all.res_fs.include_array = (char **) realloc(res_all.res_fs.include_array,
- sizeof(char *) * res_all.res_fs.include_size);
+ res_all.res_fs.include_array = (INCEXE **)realloc(res_all.res_fs.include_array,
+ sizeof(INCEXE *) * res_all.res_fs.include_size);
}
}
- res_all.res_fs.include_array[res_all.res_fs.num_includes++] =
- fname;
+ res_all.res_fs.include_array[res_all.res_fs.num_includes++] = incexe;
} else { /* exclude */
if (res_all.res_fs.num_excludes == res_all.res_fs.exclude_size) {
res_all.res_fs.exclude_size += 10;
if (res_all.res_fs.exclude_array == NULL) {
- res_all.res_fs.exclude_array = (char **) malloc(sizeof(char *) * res_all.res_fs.exclude_size);
+ res_all.res_fs.exclude_array = (INCEXE **)malloc(sizeof(INCEXE *) * res_all.res_fs.exclude_size);
} else {
- res_all.res_fs.exclude_array = (char **) realloc(res_all.res_fs.exclude_array,
- sizeof(char *) * res_all.res_fs.exclude_size);
+ res_all.res_fs.exclude_array = (INCEXE **)realloc(res_all.res_fs.exclude_array,
+ sizeof(INCEXE *) * res_all.res_fs.exclude_size);
}
}
- res_all.res_fs.exclude_array[res_all.res_fs.num_excludes++] =
- fname;
+ res_all.res_fs.exclude_array[res_all.res_fs.num_excludes++] = incexe;
}
break;
default:
lc->options = options;
set_bit(index, res_all.hdr.item_present);
}
+
+/* Store FileOptions ApplyTo info */
+static void store_applyto(LEX *lc, struct res_items *item, int index, int pass)
+{
+ int token;
+ char *applyto;
+
+ if (pass == 1) {
+ /* Pickup ApplyTo string
+ */
+ token = lex_get_token(lc, T_ALL);
+ switch (token) {
+ case T_IDENTIFIER:
+ case T_UNQUOTED_STRING:
+ case T_QUOTED_STRING:
+ applyto = (char *)malloc(lc->str_len + 1);
+ strcpy(applyto, lc->str);
+ res_all.res_fo.num_applyto++;
+ if (res_all.res_fo.applyto == NULL) {
+ res_all.res_fo.applyto = (char **)malloc(sizeof(char *) * res_all.res_fo.num_applyto);
+ } else {
+ res_all.res_fo.applyto = (char **)realloc(res_all.res_fo.applyto,
+ sizeof(char *) * res_all.res_fo.num_applyto);
+ }
+ res_all.res_fo.applyto[res_all.res_fo.num_applyto-1] = applyto;
+ break;
+ default:
+ scan_err1(lc, "Expected a filename, got: %s", lc->str);
+ }
+ } else { /* pass 2 */
+ lex_get_token(lc, T_ALL);
+ }
+ scan_to_eol(lc);
+ set_bit(index, res_all.hdr.item_present);
+}
+
+static void store_opts(LEX *lc, struct res_items *item, int index, int pass)
+{
+ int token, i;
+ int keyword;
+ char inc_opts[100];
+
+ inc_opts[0] = 0;
+ keyword = INC_KW_NONE;
+ for (i=0; FS_option_kw[i].name; i++) {
+ if (strcasecmp(item->name, 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);
+ }
+ Dmsg2(000, "keyword=%d %s\n", keyword, FS_option_kw[keyword].name);
+ scan_include_options(lc, keyword, inc_opts, sizeof(inc_opts));
+
+ bstrncat((char *)item->value, inc_opts, MAX_FO_OPTS);
+
+ scan_to_eol(lc);
+ set_bit(index, res_all.hdr.item_present);
+}
projects / bacula / bacula / blobdiff