* 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
/* Imported subroutines */
extern void store_run(LEX *lc, struct res_items *item, int index, int pass);
+extern void store_finc(LEX *lc, struct res_items *item, int index, int pass);
+extern void store_inc(LEX *lc, struct res_items *item, int index, int pass);
/* Forward referenced subroutines */
-static void store_inc(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);
{"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},
+ {"piddirectory",store_dir, ITEM(res_dir.pid_directory), 0, ITEM_REQUIRED, 0},
+ {"subsysdirectory", store_dir, ITEM(res_dir.subsys_directory), 0, 0, 0},
+ {"requiressl", store_yesno, ITEM(res_dir.require_ssl), 1, ITEM_DEFAULT, 0},
+ {"enablessl", store_yesno, ITEM(res_dir.enable_ssl), 1, ITEM_DEFAULT, 0},
{"maximumconcurrentjobs", store_pint, ITEM(res_dir.MaxConcurrentJobs), 0, ITEM_DEFAULT, 1},
{"password", store_password, ITEM(res_dir.password), 0, ITEM_REQUIRED, 0},
{"fdconnecttimeout", store_time,ITEM(res_dir.FDConnectTimeout), 0, ITEM_DEFAULT, 60 * 30},
{NULL, NULL, NULL, 0, 0, 0}
};
+/*
+ * Console Resource
+ *
+ * name handler value code flags default_value
+ */
+static struct res_items con_items[] = {
+ {"name", store_name, ITEM(res_con.hdr.name), 0, ITEM_REQUIRED, 0},
+ {"description", store_str, ITEM(res_con.hdr.desc), 0, 0, 0},
+ {"enablessl", store_yesno, ITEM(res_con.enable_ssl), 1, ITEM_DEFAULT, 0},
+ {"password", store_password, ITEM(res_con.password), 0, ITEM_REQUIRED, 0},
+ {NULL, NULL, NULL, 0, 0, 0}
+};
+
+
/*
* Client or File daemon resource
*
{"fileretention", store_time, ITEM(res_client.FileRetention), 0, ITEM_DEFAULT, 60*60*24*60},
{"jobretention", store_time, ITEM(res_client.JobRetention), 0, ITEM_DEFAULT, 60*60*24*180},
{"autoprune", store_yesno, ITEM(res_client.AutoPrune), 1, ITEM_DEFAULT, 1},
+ {"enablessl", store_yesno, ITEM(res_client.enable_ssl), 1, ITEM_DEFAULT, 0},
+ {"maximumconcurrentjobs", store_pint, ITEM(res_client.MaxConcurrentJobs), 0, ITEM_DEFAULT, 1},
{NULL, NULL, NULL, 0, 0, 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},
+ {"enablessl", store_yesno, ITEM(res_store.enable_ssl), 1, ITEM_DEFAULT, 0},
+ {"maximumconcurrentjobs", store_pint, ITEM(res_store.MaxConcurrentJobs), 0, ITEM_DEFAULT, 1},
{NULL, NULL, NULL, 0, 0, 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},
+ {"replace", store_replace, ITEM(res_job.replace), 0, ITEM_DEFAULT, REPLACE_ALWAYS},
{"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},
{"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},
+ {"maximumconcurrentjobs", store_pint, ITEM(res_job.MaxConcurrentJobs), 0, ITEM_DEFAULT, 1},
+ {"rescheduleonerror", store_yesno, ITEM(res_job.RescheduleOnError), 1, ITEM_DEFAULT, 0},
+ {"rescheduleinterval", store_time, ITEM(res_job.RescheduleInterval), 0, ITEM_DEFAULT, 60 * 30},
+ {"rescheduletimes", store_pint, ITEM(res_job.RescheduleTimes), 0, 0, 0},
{NULL, NULL, NULL, 0, 0, 0}
};
{"name", store_name, ITEM(res_fs.hdr.name), 0, ITEM_REQUIRED, 0},
{"description", store_str, ITEM(res_fs.hdr.desc), 0, 0, 0},
{"include", store_inc, NULL, 0, 0, 0},
+ {"finclude", store_finc, NULL, 0, ITEM_NO_EQUALS, 0},
{"exclude", store_inc, NULL, 1, 0, 0},
+ {"fexclude", store_finc, NULL, 1, ITEM_NO_EQUALS, 0},
{NULL, NULL, NULL, 0, 0, 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},
+ {"cleaningprefix", store_strname, ITEM(res_pool.cleaning_prefix), 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},
+ {"recycleoldestvolume", store_yesno, ITEM(res_pool.recycle_oldest_volume), 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},
{"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},
+ {"wrapcounter", store_res, ITEM(res_counter.WrapCounter), R_COUNTER, 0, 0},
+ {"catalog", store_res, ITEM(res_counter.Catalog), R_CATALOG, 0, 0},
{NULL, NULL, NULL, 0, 0, 0}
};
*/
struct s_res resources[] = {
{"director", dir_items, R_DIRECTOR, NULL},
+ {"console", con_items, R_CONSOLE, NULL},
{"client", cli_items, R_CLIENT, NULL},
{"job", job_items, R_JOB, NULL},
{"storage", store_items, R_STORAGE, NULL},
*/
struct s_jl joblevels[] = {
{"Full", L_FULL, JT_BACKUP},
+ {"Base", L_BASE, 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},
{NULL, 0}
};
-
-
-/* Define FileSet KeyWord values */
-
-#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 */
-
-/* Include keywords */
-static struct s_kw FS_option_kw[] = {
- {"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},
- {NULL, 0}
-};
-
-/* Options for FileSet keywords */
-
-struct s_fs_opt {
- char *name;
- int keyword;
- char *option;
-};
-
-/* Options permitted for each keyword and resulting value */
-static struct s_fs_opt FS_options[] = {
- {"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"},
- {NULL, 0, 0}
-};
-
char *level_to_str(int level)
{
int i;
return str;
}
-
-
/* Dump contents of resource */
void dump_resource(int type, RES *reshdr, void sendit(void *sock, char *fmt, ...), void *sock)
{
- int i;
URES *res = (URES *)reshdr;
int recurse = 1;
+ char ed1[30], ed2[30];
if (res == NULL) {
sendit(sock, "No %s resource defined\n", res_to_str(type));
recurse = 0;
}
switch (type) {
- case R_DIRECTOR:
- char ed1[30], ed2[30];
- sendit(sock, "Director: name=%s maxjobs=%d FDtimeout=%s SDtimeout=%s\n",
- reshdr->name, res->res_dir.MaxConcurrentJobs,
- edit_uint64(res->res_dir.FDConnectTimeout, ed1),
- edit_uint64(res->res_dir.SDConnectTimeout, ed2));
- if (res->res_dir.query_file) {
- sendit(sock, " query_file=%s\n", res->res_dir.query_file);
- }
- if (res->res_dir.messages) {
- sendit(sock, " --> ");
- dump_resource(-R_MSGS, (RES *)res->res_dir.messages, sendit, sock);
- }
+ case R_DIRECTOR:
+ sendit(sock, "Director: name=%s MaxJobs=%d FDtimeout=%s SDtimeout=%s\n",
+ reshdr->name, res->res_dir.MaxConcurrentJobs,
+ edit_uint64(res->res_dir.FDConnectTimeout, ed1),
+ edit_uint64(res->res_dir.SDConnectTimeout, ed2));
+ if (res->res_dir.query_file) {
+ sendit(sock, " query_file=%s\n", res->res_dir.query_file);
+ }
+ if (res->res_dir.messages) {
+ sendit(sock, " --> ");
+ dump_resource(-R_MSGS, (RES *)res->res_dir.messages, sendit, sock);
+ }
+ break;
+ case R_CONSOLE:
+ sendit(sock, "Console: name=%s SSL=%d\n",
+ res->res_con.hdr.name, res->res_con.enable_ssl);
+ break;
+ case R_COUNTER:
+ sendit(sock, "Counter: name=%s min=%d max=%d\n",
+ res->res_counter.hdr.name, res->res_counter.MinValue,
+ res->res_counter.MaxValue);
+ if (res->res_counter.Catalog) {
+ sendit(sock, " --> ");
+ dump_resource(-R_CATALOG, (RES *)res->res_counter.Catalog, sendit, sock);
+ }
+ if (res->res_counter.WrapCounter) {
+ sendit(sock, " --> ");
+ dump_resource(-R_COUNTER, (RES *)res->res_counter.WrapCounter, sendit, sock);
+ }
+
+
+
break;
- 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",
- res->res_client.JobRetention, res->res_client.FileRetention,
- res->res_client.AutoPrune);
- if (res->res_client.catalog) {
- sendit(sock, " --> ");
- dump_resource(-R_CATALOG, (RES *)res->res_client.catalog, sendit, sock);
+ case R_CLIENT:
+ sendit(sock, "Client: name=%s address=%s FDport=%d MaxJobs=%u\n",
+ res->res_client.hdr.name, res->res_client.address, res->res_client.FDport,
+ res->res_client.MaxConcurrentJobs);
+ 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) {
+ sendit(sock, " --> ");
+ dump_resource(-R_CATALOG, (RES *)res->res_client.catalog, sendit, sock);
+ }
+ break;
+ case R_STORAGE:
+ sendit(sock, "Storage: name=%s address=%s SDport=%d MaxJobs=%u\n\
+ DeviceName=%s MediaType=%s\n",
+ res->res_store.hdr.name, res->res_store.address, res->res_store.SDport,
+ res->res_store.MaxConcurrentJobs,
+ res->res_store.dev_name, res->res_store.media_type);
+ break;
+ 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.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 MaxJobs=%u\n",
+ res->res_job.hdr.name, res->res_job.JobType,
+ level_to_str(res->res_job.level), res->res_job.MaxConcurrentJobs);
+ sendit(sock, " Resched=%d Times=%d Interval=%s\n",
+ res->res_job.RescheduleOnError, res->res_job.RescheduleTimes,
+ edit_uint64_with_commas(res->res_job.RescheduleInterval, ed1));
+ if (res->res_job.client) {
+ sendit(sock, " --> ");
+ dump_resource(-R_CLIENT, (RES *)res->res_job.client, sendit, sock);
+ }
+ if (res->res_job.fileset) {
+ 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", 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, " --> ");
+ dump_resource(-R_STORAGE, (RES *)res->res_job.storage, sendit, sock);
+ }
+ if (res->res_job.pool) {
+ sendit(sock, " --> ");
+ dump_resource(-R_POOL, (RES *)res->res_job.pool, sendit, sock);
+ } else {
+ sendit(sock, "!!! No Pool resource\n");
+ }
+ if (res->res_job.messages) {
+ sendit(sock, " --> ");
+ dump_resource(-R_MSGS, (RES *)res->res_job.messages, sendit, sock);
+ }
+ break;
+ case R_FILESET:
+ sendit(sock, "FileSet: name=%s\n", res->res_fs.hdr.name);
+ for (int i=0; i<res->res_fs.num_includes; i++) {
+ INCEXE *incexe = res->res_fs.include_items[i];
+ for (int j=0; j<incexe->num_names; j++) {
+ sendit(sock, " Inc: %s\n", incexe->name_list[j]);
}
- break;
- case R_STORAGE:
- sendit(sock, "Storage: name=%s address=%s SDport=%d\n\
- DeviceName=%s MediaType=%s\n",
- res->res_store.hdr.name, res->res_store.address, res->res_store.SDport,
- res->res_store.dev_name, res->res_store.media_type);
- break;
- 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));
- break;
- case R_JOB:
- sendit(sock, "Job: name=%s JobType=%d level=%s\n", res->res_job.hdr.name,
- res->res_job.JobType, level_to_str(res->res_job.level));
- if (res->res_job.client) {
- sendit(sock, " --> ");
- dump_resource(-R_CLIENT, (RES *)res->res_job.client, sendit, sock);
+ }
+ for (int i=0; i<res->res_fs.num_excludes; i++) {
+ INCEXE *incexe = res->res_fs.exclude_items[i];
+ for (int j=0; j<incexe->num_names; j++) {
+ sendit(sock, " Exc: %s\n", incexe->name_list[j]);
}
- if (res->res_job.fileset) {
- sendit(sock, " --> ");
- dump_resource(-R_FILESET, (RES *)res->res_job.fileset, sendit, sock);
+ }
+ break;
+ case R_SCHEDULE:
+ if (res->res_sch.run) {
+ int i;
+ RUN *run = res->res_sch.run;
+ char buf[1000], num[10];
+ sendit(sock, "Schedule: name=%s\n", res->res_sch.hdr.name);
+ if (!run) {
+ break;
}
- if (res->res_job.schedule) {
- sendit(sock, " --> ");
- dump_resource(-R_SCHEDULE, (RES *)res->res_job.schedule, sendit, sock);
+next_run:
+ sendit(sock, " --> Run Level=%s\n", level_to_str(run->level));
+ strcpy(buf, " hour=");
+ for (i=0; i<24; i++) {
+ if (bit_is_set(i, run->hour)) {
+ sprintf(num, "%d ", i);
+ strcat(buf, num);
+ }
}
- if (res->res_job.RestoreWhere) {
- sendit(sock, " --> Where=%s\n", NPRT(res->res_job.RestoreWhere));
+ strcat(buf, "\n");
+ sendit(sock, buf);
+ strcpy(buf, " mday=");
+ for (i=0; i<31; i++) {
+ if (bit_is_set(i, run->mday)) {
+ sprintf(num, "%d ", i+1);
+ strcat(buf, num);
+ }
}
- if (res->res_job.RestoreBootstrap) {
- sendit(sock, " --> Bootstrap=%s\n", NPRT(res->res_job.RestoreBootstrap));
+ strcat(buf, "\n");
+ sendit(sock, buf);
+ strcpy(buf, " month=");
+ for (i=0; i<12; i++) {
+ if (bit_is_set(i, run->month)) {
+ sprintf(num, "%d ", i+1);
+ strcat(buf, num);
+ }
}
- if (res->res_job.RunBeforeJob) {
- sendit(sock, " --> RunBefore=%s\n", NPRT(res->res_job.RunBeforeJob));
+ strcat(buf, "\n");
+ sendit(sock, buf);
+ strcpy(buf, " wday=");
+ for (i=0; i<7; i++) {
+ if (bit_is_set(i, run->wday)) {
+ sprintf(num, "%d ", i+1);
+ strcat(buf, num);
+ }
}
- if (res->res_job.RunAfterJob) {
- sendit(sock, " --> RunAfter=%s\n", NPRT(res->res_job.RunAfterJob));
+ 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);
+ }
}
- if (res->res_job.WriteBootstrap) {
- sendit(sock, " --> WriteBootstrap=%s\n", NPRT(res->res_job.WriteBootstrap));
+ strcat(buf, "\n");
+ sendit(sock, buf);
+ sendit(sock, " mins=%d\n", run->minute);
+ if (run->pool) {
+ sendit(sock, " --> ");
+ dump_resource(-R_POOL, (RES *)run->pool, sendit, sock);
}
- if (res->res_job.storage) {
- sendit(sock, " --> ");
- dump_resource(-R_STORAGE, (RES *)res->res_job.storage, sendit, sock);
+ if (run->storage) {
+ sendit(sock, " --> ");
+ dump_resource(-R_STORAGE, (RES *)run->storage, sendit, sock);
}
- if (res->res_job.pool) {
- sendit(sock, " --> ");
- dump_resource(-R_POOL, (RES *)res->res_job.pool, sendit, sock);
- } else {
- sendit(sock, "!!! No Pool resource\n");
+ if (run->msgs) {
+ sendit(sock, " --> ");
+ dump_resource(-R_MSGS, (RES *)run->msgs, sendit, sock);
}
- if (res->res_job.messages) {
- sendit(sock, " --> ");
- dump_resource(-R_MSGS, (RES *)res->res_job.messages, sendit, sock);
+ /* If another Run record is chained in, go print it */
+ if (run->next) {
+ run = run->next;
+ goto next_run;
}
- break;
- 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]);
- for (i=0; i<res->res_fs.num_excludes; i++)
- sendit(sock, " Exc: %s\n", res->res_fs.exclude_array[i]);
- break;
- case R_SCHEDULE:
- if (res->res_sch.run) {
- int i;
- RUN *run = res->res_sch.run;
- char buf[1000], num[10];
- sendit(sock, "Schedule: name=%s\n", res->res_sch.hdr.name);
- if (!run) {
- break;
- }
-next_run:
- sendit(sock, " --> Run Level=%s\n", level_to_str(run->level));
- strcpy(buf, " hour=");
- for (i=0; i<24; i++) {
- if (bit_is_set(i, run->hour)) {
- sprintf(num, "%d ", i+1);
- strcat(buf, num);
- }
- }
- strcat(buf, "\n");
- sendit(sock, buf);
- strcpy(buf, " mday=");
- for (i=0; i<31; i++) {
- if (bit_is_set(i, run->mday)) {
- sprintf(num, "%d ", i+1);
- strcat(buf, num);
- }
- }
- strcat(buf, "\n");
- sendit(sock, buf);
- strcpy(buf, " month=");
- for (i=0; i<12; i++) {
- if (bit_is_set(i, run->month)) {
- sprintf(num, "%d ", i+1);
- strcat(buf, num);
- }
- }
- strcat(buf, "\n");
- sendit(sock, buf);
- strcpy(buf, " wday=");
- for (i=0; i<7; i++) {
- if (bit_is_set(i, run->wday)) {
- 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, " --> ");
- dump_resource(-R_POOL, (RES *)run->pool, sendit, sock);
- }
- if (run->storage) {
- sendit(sock, " --> ");
- dump_resource(-R_STORAGE, (RES *)run->storage, sendit, sock);
- }
- if (run->msgs) {
- sendit(sock, " --> ");
- dump_resource(-R_MSGS, (RES *)run->msgs, sendit, sock);
- }
- /* If another Run record is chained in, go print it */
- if (run->next) {
- run = run->next;
- goto next_run;
- }
- } else {
- sendit(sock, "Schedule: name=%s\n", res->res_sch.hdr.name);
- }
- break;
- case R_GROUP:
- sendit(sock, "Group: name=%s\n", res->res_group.hdr.name);
- break;
- case R_POOL:
- sendit(sock, "Pool: name=%s PoolType=%s\n", res->res_pool.hdr.name,
- res->res_pool.pool_type);
- sendit(sock, " use_cat=%d use_once=%d acpt_any=%d cat_files=%d\n",
- res->res_pool.use_catalog, res->res_pool.use_volume_once,
- res->res_pool.accept_any_volume, res->res_pool.catalog_files);
- sendit(sock, " max_vols=%d auto_prune=%d VolRetention=%" lld "\n",
- res->res_pool.max_volumes, res->res_pool.AutoPrune,
- res->res_pool.VolRetention);
- sendit(sock, " recycle=%d LabelFormat=%s\n", res->res_pool.Recycle,
- NPRT(res->res_pool.label_format));
- break;
- case R_MSGS:
- sendit(sock, "Messages: name=%s\n", res->res_msgs.hdr.name);
- if (res->res_msgs.mail_cmd)
- sendit(sock, " mailcmd=%s\n", res->res_msgs.mail_cmd);
- if (res->res_msgs.operator_cmd)
- sendit(sock, " opcmd=%s\n", res->res_msgs.operator_cmd);
- break;
- default:
- sendit(sock, "Unknown resource type %d\n", type);
- break;
+ } else {
+ sendit(sock, "Schedule: name=%s\n", res->res_sch.hdr.name);
+ }
+ break;
+ case R_GROUP:
+ sendit(sock, "Group: name=%s\n", res->res_group.hdr.name);
+ break;
+ case R_POOL:
+ sendit(sock, "Pool: name=%s PoolType=%s\n", res->res_pool.hdr.name,
+ res->res_pool.pool_type);
+ sendit(sock, " use_cat=%d use_once=%d acpt_any=%d cat_files=%d\n",
+ res->res_pool.use_catalog, res->res_pool.use_volume_once,
+ res->res_pool.accept_any_volume, res->res_pool.catalog_files);
+ sendit(sock, " max_vols=%d auto_prune=%d VolRetention=%" lld "\n",
+ res->res_pool.max_volumes, res->res_pool.AutoPrune,
+ res->res_pool.VolRetention);
+ sendit(sock, " recycle=%d LabelFormat=%s\n", res->res_pool.Recycle,
+ NPRT(res->res_pool.label_format));
+ sendit(sock, " CleaningPrefix=%s\n",
+ NPRT(res->res_pool.cleaning_prefix));
+ sendit(sock, " recyleOldest=%d MaxVolJobs=%d MaxVolFiles=%d\n",
+ res->res_pool.recycle_oldest_volume,
+ res->res_pool.MaxVolJobs, res->res_pool.MaxVolFiles);
+ break;
+ case R_MSGS:
+ sendit(sock, "Messages: name=%s\n", res->res_msgs.hdr.name);
+ if (res->res_msgs.mail_cmd)
+ sendit(sock, " mailcmd=%s\n", res->res_msgs.mail_cmd);
+ if (res->res_msgs.operator_cmd)
+ sendit(sock, " opcmd=%s\n", res->res_msgs.operator_cmd);
+ break;
+ default:
+ sendit(sock, "Unknown resource type %d in dump_resource.\n", type);
+ break;
}
if (recurse && res->res_dir.hdr.next) {
dump_resource(type, res->res_dir.hdr.next, sendit, sock);
}
}
+/*
+ * Free all the members of an INCEXE structure
+ */
+static void free_incexe(INCEXE *incexe)
+{
+ for (int i=0; i<incexe->num_names; i++) {
+ free(incexe->name_list[i]);
+ }
+ if (incexe->name_list) {
+ free(incexe->name_list);
+ }
+ for (int i=0; i<incexe->num_opts; i++) {
+ FOPTS *fopt = incexe->opts_list[i];
+ if (fopt->match) {
+ free(fopt->match);
+ }
+ for (int j=0; j<fopt->num_base; j++) {
+ free(fopt->base_list[j]);
+ }
+ if (fopt->base_list) {
+ free(fopt->base_list);
+ }
+ free(fopt);
+ }
+ if (incexe->opts_list) {
+ free(incexe->opts_list);
+ }
+ free(incexe);
+}
+
/*
* Free memory of resource.
* NB, we don't need to worry about freeing any references
}
switch (type) {
- case R_DIRECTOR:
- if (res->res_dir.working_directory) {
- free(res->res_dir.working_directory);
- }
- if (res->res_dir.pid_directory) {
- free(res->res_dir.pid_directory);
- }
- if (res->res_dir.subsys_directory) {
- free(res->res_dir.subsys_directory);
- }
- if (res->res_dir.password) {
- free(res->res_dir.password);
- }
- 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) {
- free(res->res_client.address);
- }
- if (res->res_client.password) {
- free(res->res_client.password);
- }
- break;
- case R_STORAGE:
- if (res->res_store.address)
- free(res->res_store.address);
- if (res->res_store.password)
- free(res->res_store.password);
- if (res->res_store.media_type)
- free(res->res_store.media_type);
- 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)
- free(res->res_cat.db_user);
- if (res->res_cat.db_name)
- free(res->res_cat.db_name);
- 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)
- free(res->res_fs.include_array[num]);
- free(res->res_fs.include_array);
- }
- if ((num=res->res_fs.num_excludes)) {
- while (--num >= 0)
- free(res->res_fs.exclude_array[num]);
- free(res->res_fs.exclude_array);
- }
- break;
- case R_POOL:
- if (res->res_pool.pool_type) {
- free(res->res_pool.pool_type);
- }
- if (res->res_pool.label_format) {
- free(res->res_pool.label_format);
- }
- break;
- case R_SCHEDULE:
- if (res->res_sch.run) {
- RUN *nrun, *next;
- nrun = res->res_sch.run;
- while (nrun) {
- next = nrun->next;
- free(nrun);
- nrun = next;
- }
- }
- break;
- case R_JOB:
- 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);
+ case R_DIRECTOR:
+ if (res->res_dir.working_directory) {
+ free(res->res_dir.working_directory);
+ }
+ if (res->res_dir.pid_directory) {
+ free(res->res_dir.pid_directory);
+ }
+ if (res->res_dir.subsys_directory) {
+ free(res->res_dir.subsys_directory);
+ }
+ if (res->res_dir.password) {
+ free(res->res_dir.password);
+ }
+ 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_COUNTER:
+ break;
+ case R_CONSOLE:
+ if (res->res_con.password) {
+ free(res->res_con.password);
+ }
+ break;
+ case R_CLIENT:
+ if (res->res_client.address) {
+ free(res->res_client.address);
+ }
+ if (res->res_client.password) {
+ free(res->res_client.password);
+ }
+ break;
+ case R_STORAGE:
+ if (res->res_store.address) {
+ free(res->res_store.address);
+ }
+ if (res->res_store.password) {
+ free(res->res_store.password);
+ }
+ if (res->res_store.media_type) {
+ free(res->res_store.media_type);
+ }
+ if (res->res_store.dev_name) {
+ free(res->res_store.dev_name);
+ }
+ break;
+ case R_CATALOG:
+ 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) {
+ free(res->res_cat.db_name);
+ }
+ 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) {
+ free_incexe(res->res_fs.include_items[num]);
}
- if (res->res_job.RunBeforeJob) {
- free(res->res_job.RunBeforeJob);
+ free(res->res_fs.include_items);
+ }
+ res->res_fs.num_includes = 0;
+ if ((num=res->res_fs.num_excludes)) {
+ while (--num >= 0) {
+ free_incexe(res->res_fs.exclude_items[num]);
}
- if (res->res_job.RunAfterJob) {
- free(res->res_job.RunAfterJob);
+ free(res->res_fs.exclude_items);
+ }
+ res->res_fs.num_excludes = 0;
+ break;
+ case R_POOL:
+ if (res->res_pool.pool_type) {
+ free(res->res_pool.pool_type);
+ }
+ if (res->res_pool.label_format) {
+ free(res->res_pool.label_format);
+ }
+ if (res->res_pool.cleaning_prefix) {
+ free(res->res_pool.cleaning_prefix);
+ }
+ break;
+ case R_SCHEDULE:
+ if (res->res_sch.run) {
+ RUN *nrun, *next;
+ nrun = res->res_sch.run;
+ while (nrun) {
+ next = nrun->next;
+ free(nrun);
+ nrun = next;
}
- break;
- case R_MSGS:
- if (res->res_msgs.mail_cmd)
- free(res->res_msgs.mail_cmd);
- if (res->res_msgs.operator_cmd)
- free(res->res_msgs.operator_cmd);
- free_msgs_res((MSGS *)res); /* free message resource */
- res = NULL;
- break;
- case R_GROUP:
- break;
- default:
- printf("Unknown resource type %d\n", type);
+ }
+ break;
+ case R_JOB:
+ 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)
+ free(res->res_msgs.mail_cmd);
+ if (res->res_msgs.operator_cmd)
+ free(res->res_msgs.operator_cmd);
+ free_msgs_res((MSGS *)res); /* free message resource */
+ res = NULL;
+ break;
+ case R_GROUP:
+ break;
+ default:
+ printf("Unknown resource type %d in free_resource.\n", type);
}
/* Common stuff again -- free the resource, recurse to next one */
if (res) {
*/
if (pass == 2) {
switch (type) {
- /* Resources not containing a resource */
- case R_CATALOG:
- case R_STORAGE:
- case R_FILESET:
- case R_GROUP:
- case R_POOL:
- case R_MSGS:
- break;
+ /* Resources not containing a resource */
+ case R_CONSOLE:
+ case R_CATALOG:
+ case R_STORAGE:
+ case R_GROUP:
+ case R_POOL:
+ case R_MSGS:
+ case R_FILESET:
+ break;
- /* Resources containing another resource */
- case R_DIRECTOR:
- if ((res = (URES *)GetResWithName(R_DIRECTOR, res_all.res_dir.hdr.name)) == NULL) {
- 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_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.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_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;
- for (i=0; joblevels[i].level_name; i++) {
- if (joblevels[i].level == res->res_job.level &&
- joblevels[i].job_type == res->res_job.JobType) {
- i = 0;
- break;
- }
- }
- if (i != 0) {
- Emsg1(M_ERROR_TERM, 0, "Inappropriate level specified in Job resource %s\n",
- res_all.res_dir.hdr.name);
+ /* Resources containing another resource */
+ case R_DIRECTOR:
+ if ((res = (URES *)GetResWithName(R_DIRECTOR, res_all.res_dir.hdr.name)) == NULL) {
+ 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_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.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_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;
+ for (i=0; joblevels[i].level_name; i++) {
+ if (joblevels[i].level == res->res_job.level &&
+ joblevels[i].job_type == res->res_job.JobType) {
+ i = 0;
+ break;
}
}
- break;
- case R_CLIENT:
- if ((res = (URES *)GetResWithName(R_CLIENT, res_all.res_client.hdr.name)) == NULL) {
- Emsg1(M_ERROR_TERM, 0, "Cannot find Client resource %s\n", res_all.res_client.hdr.name);
+ if (i != 0) {
+ Emsg1(M_ERROR_TERM, 0, "Inappropriate level specified in Job resource %s\n",
+ res_all.res_dir.hdr.name);
}
- res->res_client.catalog = res_all.res_client.catalog;
- break;
- case R_SCHEDULE:
- /* Schedule is a bit different in that it contains a RUN record
- * chain which isn't a "named" resource. This chain was linked
- * in by run_conf.c during pass 2, so here we jam the pointer
- * into the Schedule resource.
- */
- if ((res = (URES *)GetResWithName(R_SCHEDULE, res_all.res_client.hdr.name)) == NULL) {
- 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:
- Emsg1(M_ERROR, 0, "Unknown resource type %d\n", type);
- error = 1;
- break;
+ }
+ break;
+ case R_COUNTER:
+ if ((res = (URES *)GetResWithName(R_COUNTER, res_all.res_counter.hdr.name)) == NULL) {
+ Emsg1(M_ERROR_TERM, 0, "Cannot find Counter resource %s\n", res_all.res_counter.hdr.name);
+ }
+ res->res_counter.Catalog = res_all.res_counter.Catalog;
+ res->res_counter.WrapCounter = res_all.res_counter.WrapCounter;
+ break;
+
+ case R_CLIENT:
+ if ((res = (URES *)GetResWithName(R_CLIENT, res_all.res_client.hdr.name)) == NULL) {
+ 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;
+ case R_SCHEDULE:
+ /* Schedule is a bit different in that it contains a RUN record
+ * chain which isn't a "named" resource. This chain was linked
+ * in by run_conf.c during pass 2, so here we jam the pointer
+ * into the Schedule resource.
+ */
+ if ((res = (URES *)GetResWithName(R_SCHEDULE, res_all.res_client.hdr.name)) == NULL) {
+ 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:
+ Emsg1(M_ERROR, 0, "Unknown resource type %d in save_resource.\n", type);
+ error = 1;
+ break;
}
/* Note, the resource name was already saved during pass 1,
* so here, we can just release it.
/* The following code is only executed for pass 1 */
switch (type) {
- case R_DIRECTOR:
- size = sizeof(DIRRES);
- break;
- case R_CLIENT:
- size =sizeof(CLIENT);
- break;
- case R_STORAGE:
- size = sizeof(STORE);
- break;
- case R_CATALOG:
- size = sizeof(CAT);
- break;
- case R_JOB:
- size = sizeof(JOB);
- break;
- case R_FILESET:
- size = sizeof(FILESET);
- break;
- case R_SCHEDULE:
- size = sizeof(SCHED);
- break;
- case R_GROUP:
- size = sizeof(GROUP);
- break;
- case R_POOL:
- size = sizeof(POOL);
- break;
- case R_MSGS:
- size = sizeof(MSGS);
- break;
- default:
- printf("Unknown resource type %d\n", type);
- error = 1;
- size = 1;
- break;
+ case R_DIRECTOR:
+ size = sizeof(DIRRES);
+ break;
+ case R_CONSOLE:
+ size = sizeof(CONRES);
+ break;
+ case R_CLIENT:
+ size =sizeof(CLIENT);
+ break;
+ case R_STORAGE:
+ size = sizeof(STORE);
+ break;
+ case R_CATALOG:
+ size = sizeof(CAT);
+ break;
+ case R_JOB:
+ size = sizeof(JOB);
+ break;
+ case R_FILESET:
+ size = sizeof(FILESET);
+ break;
+ case R_SCHEDULE:
+ size = sizeof(SCHED);
+ break;
+ case R_GROUP:
+ size = sizeof(GROUP);
+ break;
+ case R_POOL:
+ size = sizeof(POOL);
+ break;
+ case R_MSGS:
+ size = sizeof(MSGS);
+ break;
+ case R_COUNTER:
+ size = sizeof(COUNTER);
+ break;
+ default:
+ printf("Unknown resource type %d in save_resrouce.\n", type);
+ error = 1;
+ size = 1;
+ break;
}
/* Common */
if (!error) {
memcpy(res, &res_all, size);
if (!resources[rindex].res_head) {
resources[rindex].res_head = (RES *)res; /* store first entry */
+ Dmsg3(200, "Inserting first %s res: %s index=%d\n", res_to_str(type),
+ res->res_dir.hdr.name, rindex);
} 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);
+ Dmsg3(200, "Inserting %s res: %s index=%d\n", res_to_str(type),
+ res->res_dir.hdr.name, rindex);
}
}
}
/* 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;
+ *(int *)(item->value) = ReplaceOptions[i].token;
i = 0;
break;
}
lc->options = options; /* reset original options */
set_bit(index, res_all.hdr.item_present);
}
-
-
-
-/*
- * Scan for Include options (keyword=option) is converted into one or
- * two characters. Verifyopts=xxxx is Vxxxx:
- */
-static void scan_include_options(LEX *lc, int keyword, char *opts, int optlen)
-{
- int token, i;
- 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 == 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;
- }
- }
- if (i != 0) {
- scan_err1(lc, "Expected a FileSet option keyword, got: %s", lc->str);
- }
- bstrncat(opts, option, optlen);
- }
-
- /* check if more options are specified */
- if (lc->ch != ',') {
- break; /* no, get out */
- }
- token = lex_get_token(lc, T_ALL); /* yes, eat comma */
- }
-}
-
-
-/* Store FileSet Include/Exclude info */
-static void store_inc(LEX *lc, struct res_items *item, int index, int pass)
-{
- 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 */
- 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_ALL)) != T_EQUALS) {
- scan_err1(lc, "expected an = following keyword, got: %s", lc->str);
- }
- scan_include_options(lc, keyword, inc_opts, sizeof(inc_opts));
- if (token == T_BOB) {
- break;
- }
- }
- 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);
- res_all.res_fs.have_MD5 = TRUE;
- }
- /* Pickup include/exclude names. Note, they are stored as
- * XYZ fname
- * where XYZ are the include/exclude options for the FileSet
- * a "0 " (zero) indicates no options,
- * and fname is the file/directory name given
- */
- while ((token = lex_get_token(lc, T_ALL)) != T_EOB) {
- switch (token) {
- case T_COMMA:
- case T_EOL:
- continue;
-
- 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);
- if (res_all.res_fs.have_MD5) {
- MD5Update(&res_all.res_fs.md5c, (unsigned char *) fname, inc_opts_len + 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);
- } 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[res_all.res_fs.num_includes++] =
- fname;
- } 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);
- } 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[res_all.res_fs.num_excludes++] =
- fname;
- }
- break;
- default:
- scan_err1(lc, "Expected a filename, got: %s", lc->str);
- }
- }
- } else { /* pass 2 */
- while (lex_get_token(lc, T_ALL) != T_EOB)
- {}
- }
- scan_to_eol(lc);
- lc->options = options;
- set_bit(index, res_all.hdr.item_present);
-}
projects / bacula / bacula / blobdiff