diff options
| -rw-r--r-- | lib/util/config.mk | 1 | ||||
| -rw-r--r-- | lib/util/parmlist.c | 62 | ||||
| -rw-r--r-- | lib/util/parmlist.h | 39 | ||||
| -rw-r--r-- | source4/param/generic.c | 81 | ||||
| -rw-r--r-- | source4/param/param.h | 15 |
5 files changed, 139 insertions, 59 deletions
diff --git a/lib/util/config.mk b/lib/util/config.mk index 6dc8354948..9f33b0f568 100644 --- a/lib/util/config.mk +++ b/lib/util/config.mk @@ -33,6 +33,7 @@ LIBSAMBA-UTIL_OBJ_FILES = $(addprefix $(libutilsrcdir)/, \ talloc_stack.o \ smb_threads.o \ params.o \ + parmlist.o \ util_id.o) PUBLIC_HEADERS += $(addprefix $(libutilsrcdir)/, util.h \ diff --git a/lib/util/parmlist.c b/lib/util/parmlist.c new file mode 100644 index 0000000000..4ab660197d --- /dev/null +++ b/lib/util/parmlist.c @@ -0,0 +1,62 @@ +/* + * Unix SMB/CIFS implementation. + * Copyright (C) Jelmer Vernooij 2009 + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. + */ + +#include "includes.h" +#include "../lib/util/dlinklist.h" +#include "../lib/util/parmlist.h" + +struct parmlist_entry *parmlist_get(struct parmlist *ctx, const char *name) +{ + struct parmlist_entry *e; + for (e = ctx->entries; e; e = e->next) { + if (strcasecmp(e->key, name) == 0) + return e; + } + + return NULL; +} + +int parmlist_get_int(struct parmlist *ctx, const char *name, int default_v) +{ + struct parmlist_entry *p = parmlist_get(ctx, name); + + if (p != NULL) + return strtol(p->value, NULL, 0); + + return default_v; +} + +const char *parmlist_get_string(struct parmlist *ctx, const char *name, const char *default_v) +{ + struct parmlist_entry *p = parmlist_get(ctx, name); + + if (p == NULL) + return default_v; + + return p->value; +} + +const char **parmlist_get_string_list(struct parmlist *ctx, const char *name, const char *separator) +{ + struct parmlist_entry *p = parmlist_get(ctx, name); + + if (p == NULL) + return NULL; + + return (const char **)str_list_make(ctx, p->value, separator); +} diff --git a/lib/util/parmlist.h b/lib/util/parmlist.h new file mode 100644 index 0000000000..0fa518d1c4 --- /dev/null +++ b/lib/util/parmlist.h @@ -0,0 +1,39 @@ +/* + Unix SMB/CIFS implementation. + Generic parameter parsing interface + Copyright (C) Jelmer Vernooij 2009 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ + +#ifndef _PARMLIST_H /* _PARMLIST_H */ +#define _PARMLIST_H + +struct parmlist_entry { + struct parmlist_entry *prev, *next; + char *key; + char *value; + int priority; +}; + +struct parmlist { + struct parmlist_entry *entries; +}; + +int parmlist_get_int(struct parmlist *ctx, const char *name, int default_v); +const char *parmlist_get_string(struct parmlist *ctx, const char *name, const char *default_v); +struct parmlist_entry *parmlist_get(struct parmlist *ctx, const char *name); +const char **parmlist_get_string_list(struct parmlist *ctx, const char *name, const char *separator); + +#endif /* _PARMLIST_H */ diff --git a/source4/param/generic.c b/source4/param/generic.c index ba5464a0f0..802f90764c 100644 --- a/source4/param/generic.c +++ b/source4/param/generic.c @@ -37,26 +37,9 @@ struct param_section *param_get_section(struct param_context *ctx, const char *n return NULL; } -struct param_opt *param_section_get(struct param_section *section, - const char *name) +struct parmlist_entry *param_section_get(struct param_section *section, const char *name) { - struct param_opt *p; - - for (p = section->parameters; p; p = p->next) { - if (strcasecmp_m(p->key, name) == 0) - return p; - } - - return NULL; -} - -struct param_opt *param_get (struct param_context *ctx, const char *name, const char *section_name) -{ - struct param_section *section = param_get_section(ctx, section_name); - if (section == NULL) - return NULL; - - return param_section_get(section, name); + return parmlist_get(section->parameters, name); } struct param_section *param_add_section(struct param_context *ctx, const char *section_name) @@ -72,10 +55,10 @@ struct param_section *param_add_section(struct param_context *ctx, const char *s } /* Look up parameter. If it is not found, add it */ -struct param_opt *param_get_add(struct param_context *ctx, const char *name, const char *section_name) +struct parmlist_entry *param_get_add(struct param_context *ctx, const char *name, const char *section_name) { struct param_section *section; - struct param_opt *p; + struct parmlist_entry *p; SMB_ASSERT(section_name != NULL); SMB_ASSERT(name != NULL); @@ -88,30 +71,30 @@ struct param_opt *param_get_add(struct param_context *ctx, const char *name, con p = param_section_get(section, name); if (p == NULL) { - p = talloc_zero(section, struct param_opt); + p = talloc_zero(section, struct parmlist_entry); if (p == NULL) return NULL; p->key = talloc_strdup(p, name); - DLIST_ADD_END(section->parameters, p, struct param_opt *); + DLIST_ADD_END(section->parameters->entries, p, struct parmlist_entry *); } return p; } -const char *param_get_string(struct param_context *ctx, const char *param, const char *section) +const char *param_get_string(struct param_context *ctx, const char *param, const char *section_name) { - struct param_opt *p = param_get(ctx, param, section); + struct param_section *section = param_get_section(ctx, section_name); - if (p == NULL) + if (section == NULL) return NULL; - return p->value; + return parmlist_get_string(section->parameters, param, NULL); } int param_set_string(struct param_context *ctx, const char *param, const char *value, const char *section) { - struct param_opt *p = param_get_add(ctx, param, section); + struct parmlist_entry *p = param_get_add(ctx, param, section); if (p == NULL) return -1; @@ -121,38 +104,38 @@ int param_set_string(struct param_context *ctx, const char *param, const char *v return 0; } -const char **param_get_string_list(struct param_context *ctx, const char *param, const char *separator, const char *section) +const char **param_get_string_list(struct param_context *ctx, const char *param, const char *separator, const char *section_name) { - struct param_opt *p = param_get(ctx, param, section); - - if (p == NULL) + struct param_section *section = param_get_section(ctx, section_name); + + if (section == NULL) return NULL; - return (const char **)str_list_make(ctx, p->value, separator); + return parmlist_get_string_list(section->parameters, param, separator); } int param_set_string_list(struct param_context *ctx, const char *param, const char **list, const char *section) { - struct param_opt *p = param_get_add(ctx, param, section); + struct parmlist_entry *p = param_get_add(ctx, param, section); p->value = str_list_join(p, list, ' '); return 0; } -int param_get_int(struct param_context *ctx, const char *param, int default_v, const char *section) +int param_get_int(struct param_context *ctx, const char *param, int default_v, const char *section_name) { - const char *value = param_get_string(ctx, param, section); - - if (value) - return strtol(value, NULL, 0); + struct param_section *section = param_get_section(ctx, section_name); - return default_v; + if (section == NULL) + return default_v; + + return parmlist_get_int(section->parameters, param, default_v); } void param_set_int(struct param_context *ctx, const char *param, int value, const char *section) { - struct param_opt *p = param_get_add(ctx, section, param); + struct parmlist_entry *p = param_get_add(ctx, section, param); if (!p) return; @@ -172,7 +155,7 @@ unsigned long param_get_ulong(struct param_context *ctx, const char *param, unsi void param_set_ulong(struct param_context *ctx, const char *name, unsigned long value, const char *section) { - struct param_opt *p = param_get_add(ctx, name, section); + struct parmlist_entry *p = param_get_add(ctx, name, section); if (!p) return; @@ -204,16 +187,16 @@ static bool param_sfunc (const char *name, void *_ctx) static bool param_pfunc (const char *name, const char *value, void *_ctx) { struct param_context *ctx = (struct param_context *)_ctx; - struct param_opt *p = param_section_get(ctx->sections, name); + struct parmlist_entry *p = param_section_get(ctx->sections, name); if (!p) { - p = talloc_zero(ctx->sections, struct param_opt); + p = talloc_zero(ctx->sections, struct parmlist_entry); if (p == NULL) return false; p->key = talloc_strdup(p, name); p->value = talloc_strdup(p, value); - DLIST_ADD(ctx->sections->parameters, p); + DLIST_ADD(ctx->sections->parameters->entries, p); } else { /* Replace current value */ talloc_free(p->value); p->value = talloc_strdup(p, value); @@ -247,9 +230,9 @@ int param_use(struct loadparm_context *lp_ctx, struct param_context *ctx) struct param_section *section; for (section = ctx->sections; section; section = section->next) { - struct param_opt *param; + struct parmlist_entry *param; bool isglobal = strcmp(section->name, "global") == 0; - for (param = section->parameters; param; param = param->next) { + for (param = section->parameters->entries; param; param = param->next) { if (isglobal) lp_do_global_parameter(lp_ctx, param->key, param->value); @@ -279,10 +262,10 @@ int param_write(struct param_context *ctx, const char *fn) return -1; for (section = ctx->sections; section; section = section->next) { - struct param_opt *param; + struct parmlist_entry *param; fdprintf(file, "[%s]\n", section->name); - for (param = section->parameters; param; param = param->next) { + for (param = section->parameters->entries; param; param = param->next) { fdprintf(file, "\t%s = %s\n", param->key, param->value); } fdprintf(file, "\n"); diff --git a/source4/param/param.h b/source4/param/param.h index 27bc32f9b9..5c49f34e2a 100644 --- a/source4/param/param.h +++ b/source4/param/param.h @@ -20,12 +20,7 @@ #ifndef _PARAM_H /* _PARAM_H */ #define _PARAM_H -struct param_opt { - struct param_opt *prev, *next; - char *key; - char *value; - int priority; -}; +#include "../lib/util/parmlist.h" struct param_context { struct param_section *sections; @@ -34,7 +29,7 @@ struct param_context { struct param_section { const char *name; struct param_section *prev, *next; - struct param_opt *parameters; + struct parmlist *parameters; }; struct param_context; @@ -334,11 +329,11 @@ struct gensec_settings *lp_gensec_settings(TALLOC_CTX *, struct loadparm_context /* The following definitions come from param/generic.c */ struct param_section *param_get_section(struct param_context *ctx, const char *name); -struct param_opt *param_section_get(struct param_section *section, +struct parmlist_entry *param_section_get(struct param_section *section, const char *name); -struct param_opt *param_get (struct param_context *ctx, const char *name, const char *section_name); +struct parmlist_entry *param_get (struct param_context *ctx, const char *name, const char *section_name); struct param_section *param_add_section(struct param_context *ctx, const char *section_name); -struct param_opt *param_get_add(struct param_context *ctx, const char *name, const char *section_name); +struct parmlist_entry *param_get_add(struct param_context *ctx, const char *name, const char *section_name); const char *param_get_string(struct param_context *ctx, const char *param, const char *section); int param_set_string(struct param_context *ctx, const char *param, const char *value, const char *section); const char **param_get_string_list(struct param_context *ctx, const char *param, const char *separator, const char *section); |