svn commit: samba r24495 - in branches: SAMBA_3_2/source/param
SAMBA_3_2_0/source/param
obnox at samba.org
obnox at samba.org
Thu Aug 16 15:27:07 GMT 2007
Author: obnox
Date: 2007-08-16 15:27:06 +0000 (Thu, 16 Aug 2007)
New Revision: 24495
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24495
Log:
Add a function lp_canonicalize_parameter: It takes a name of a parameter
and produces the "canonical" (or main) name of the parameter (the one
synonym that does not have the flag FLAG_HIDE). The function also sets
a flag as to whether the synonym is a reverse boolean synonym.
Add some functions for the handling of string representations of boolean
values: return the canonical string representation of a bool, invert
a bool given as a string, canonicalize a bool given as a string.
Michael
Modified:
branches/SAMBA_3_2/source/param/loadparm.c
branches/SAMBA_3_2_0/source/param/loadparm.c
Changeset:
Modified: branches/SAMBA_3_2/source/param/loadparm.c
===================================================================
--- branches/SAMBA_3_2/source/param/loadparm.c 2007-08-16 14:45:46 UTC (rev 24494)
+++ branches/SAMBA_3_2/source/param/loadparm.c 2007-08-16 15:27:06 UTC (rev 24495)
@@ -2191,6 +2191,7 @@
static int map_parameter(const char *pszParmName);
static BOOL set_boolean(BOOL *pb, const char *pszParmValue);
+static const char *get_boolean(BOOL bool_value);
static int getservicebyname(const char *pszServiceName,
service * pserviceDest);
static void copy_service(service * pserviceDest,
@@ -2813,6 +2814,49 @@
return False;
}
+/**************************************************************************
+ Determine the canonical name for a parameter.
+ Indicate when it is an inverse (boolean) synonym instead of a
+ "usual" synonym.
+**************************************************************************/
+
+BOOL lp_canonicalize_parameter(const char *parm_name, const char **canon_parm,
+ BOOL *inverse)
+{
+ int num, canon_num;
+
+ if (!lp_parameter_is_valid(parm_name)) {
+ *canon_parm = NULL;
+ return False;
+ }
+
+ *inverse = False;
+ num = map_parameter(parm_name);
+ if (num < 0 && !(parm_table[num].flags & FLAG_HIDE)) {
+ /* it is already canonical (parametric are canonical anyways) */
+ *canon_parm = parm_name;
+ return True;
+ }
+
+ for (canon_num = 0; parm_table[canon_num].label; canon_num++) {
+ if (!(parm_table[canon_num].flags & FLAG_HIDE) &&
+ (parm_table[num].ptr == parm_table[canon_num].ptr))
+ {
+ *canon_parm = parm_table[canon_num].label;
+ if ((parm_table[canon_num].type == P_BOOL) &&
+ (parm_table[num].type == P_BOOLREV))
+ {
+ *inverse = True;
+ }
+ return True;
+ }
+ }
+
+ /* 'include', 'copy', 'config file' and friends left */
+ *canon_parm = parm_name;
+ return True;
+}
+
/***************************************************************************
Map a parameter's string representation to something we can use.
Returns False if the parameter string is not recognised, else TRUE.
@@ -2920,6 +2964,54 @@
}
/***************************************************************************
+ Get the standard string representation of a boolean value ("yes" or "no")
+***************************************************************************/
+
+static const char *get_boolean(BOOL bool_value)
+{
+ static const char *yes_str = "yes";
+ static const char *no_str = "no";
+
+ return (bool_value ? yes_str : no_str);
+}
+
+/***************************************************************************
+ Provide the string of the negated boolean value associated to the boolean
+ given as a string. Returns False if the passed string does not correctly
+ represent a boolean.
+***************************************************************************/
+
+BOOL lp_invert_boolean(const char *str, const char **inverse_str)
+{
+ BOOL val;
+
+ if (!set_boolean(&val, str)) {
+ return False;
+ }
+
+ *inverse_str = get_boolean(!val);
+ return True;
+}
+
+/***************************************************************************
+ Provide the canonical string representation of a boolean value given
+ as a string. Return True on success, False if the string given does
+ not correctly represent a boolean.
+***************************************************************************/
+
+BOOL lp_canonicalize_boolean(const char *str, const char**canon_str)
+{
+ BOOL val;
+
+ if (!set_boolean(&val, str)) {
+ return False;
+ }
+
+ *canon_str = get_boolean(val);
+ return True;
+}
+
+/***************************************************************************
Find a service by name. Otherwise works like get_service.
***************************************************************************/
@@ -4321,6 +4413,22 @@
}
/***************************************************************************
+ Return info about the requested parameter (given as a string).
+ Return NULL when the string is not a valid parameter name.
+***************************************************************************/
+
+struct parm_struct *lp_get_parameter(const char *param_name)
+{
+ int num = map_parameter(param_name);
+
+ if (num < 0) {
+ return NULL;
+ }
+
+ return &parm_table[num];
+}
+
+/***************************************************************************
Return info about the next parameter in a service.
snum==GLOBAL_SECTION_SNUM gives the globals.
Return NULL when out of parameters.
Modified: branches/SAMBA_3_2_0/source/param/loadparm.c
===================================================================
--- branches/SAMBA_3_2_0/source/param/loadparm.c 2007-08-16 14:45:46 UTC (rev 24494)
+++ branches/SAMBA_3_2_0/source/param/loadparm.c 2007-08-16 15:27:06 UTC (rev 24495)
@@ -2196,6 +2196,7 @@
static int map_parameter(const char *pszParmName);
static BOOL set_boolean(BOOL *pb, const char *pszParmValue);
+static const char *get_boolean(BOOL bool_value);
static int getservicebyname(const char *pszServiceName,
service * pserviceDest);
static void copy_service(service * pserviceDest,
@@ -2818,6 +2819,49 @@
return False;
}
+/**************************************************************************
+ Determine the canonical name for a parameter.
+ Indicate when it is an inverse (boolean) synonym instead of a
+ "usual" synonym.
+**************************************************************************/
+
+BOOL lp_canonicalize_parameter(const char *parm_name, const char **canon_parm,
+ BOOL *inverse)
+{
+ int num, canon_num;
+
+ if (!lp_parameter_is_valid(parm_name)) {
+ *canon_parm = NULL;
+ return False;
+ }
+
+ *inverse = False;
+ num = map_parameter(parm_name);
+ if (num < 0 && !(parm_table[num].flags & FLAG_HIDE)) {
+ /* it is already canonical (parametric are canonical anyways) */
+ *canon_parm = parm_name;
+ return True;
+ }
+
+ for (canon_num = 0; parm_table[canon_num].label; canon_num++) {
+ if (!(parm_table[canon_num].flags & FLAG_HIDE) &&
+ (parm_table[num].ptr == parm_table[canon_num].ptr))
+ {
+ *canon_parm = parm_table[canon_num].label;
+ if ((parm_table[canon_num].type == P_BOOL) &&
+ (parm_table[num].type == P_BOOLREV))
+ {
+ *inverse = True;
+ }
+ return True;
+ }
+ }
+
+ /* 'include', 'copy', 'config file' and friends left */
+ *canon_parm = parm_name;
+ return True;
+}
+
/***************************************************************************
Map a parameter's string representation to something we can use.
Returns False if the parameter string is not recognised, else TRUE.
@@ -2925,6 +2969,54 @@
}
/***************************************************************************
+ Get the standard string representation of a boolean value ("yes" or "no")
+***************************************************************************/
+
+static const char *get_boolean(BOOL bool_value)
+{
+ static const char *yes_str = "yes";
+ static const char *no_str = "no";
+
+ return (bool_value ? yes_str : no_str);
+}
+
+/***************************************************************************
+ Provide the string of the negated boolean value associated to the boolean
+ given as a string. Returns False if the passed string does not correctly
+ represent a boolean.
+***************************************************************************/
+
+BOOL lp_invert_boolean(const char *str, const char **inverse_str)
+{
+ BOOL val;
+
+ if (!set_boolean(&val, str)) {
+ return False;
+ }
+
+ *inverse_str = get_boolean(!val);
+ return True;
+}
+
+/***************************************************************************
+ Provide the canonical string representation of a boolean value given
+ as a string. Return True on success, False if the string given does
+ not correctly represent a boolean.
+***************************************************************************/
+
+BOOL lp_canonicalize_boolean(const char *str, const char**canon_str)
+{
+ BOOL val;
+
+ if (!set_boolean(&val, str)) {
+ return False;
+ }
+
+ *canon_str = get_boolean(val);
+ return True;
+}
+
+/***************************************************************************
Find a service by name. Otherwise works like get_service.
***************************************************************************/
@@ -4328,6 +4420,22 @@
}
/***************************************************************************
+ Return info about the requested parameter (given as a string).
+ Return NULL when the string is not a valid parameter name.
+***************************************************************************/
+
+struct parm_struct *lp_get_parameter(const char *param_name)
+{
+ int num = map_parameter(param_name);
+
+ if (num < 0) {
+ return NULL;
+ }
+
+ return &parm_table[num];
+}
+
+/***************************************************************************
Return info about the next parameter in a service.
snum==GLOBAL_SECTION_SNUM gives the globals.
Return NULL when out of parameters.
More information about the samba-cvs
mailing list