s3: remove unused regval_convert_multi_sz().

[ira/wip.git] / source3 / registry / reg_util.c

diff --git a/source3/registry/reg_util.c b/source3/registry/reg_util.c
index 9120ce0e0a4d96d4ed26d4747794f78934f4a0c8..fd7652116f91d5b5d3c6ba030ebebb2a9cfe2549 100644 (file)
--- a/source3/registry/reg_util.c
+++ b/source3/registry/reg_util.c
@@ -5,17 +5,16 @@
  *
  *  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 2 of the License, or
+ *  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, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* Implementation of registry frontend view functions. */
@@ -23,66 +22,139 @@
 #include "includes.h"
 
 #undef DBGC_CLASS
-#define DBGC_CLASS DBGC_RPC_SRV
+#define DBGC_CLASS DBGC_REGISTRY
 
 /***********************************************************************
  Utility function for splitting the base path of a registry path off
  by setting base and new_path to the apprapriate offsets withing the
  path.
- 
+
  WARNING!!  Does modify the original string!
  ***********************************************************************/
 
-BOOL reg_split_path( char *path, char **base, char **new_path )
+bool reg_split_path(char *path, char **base, char **new_path)
 {
        char *p;
-       
+
        *new_path = *base = NULL;
-       
-       if ( !path)
-               return False;
-       
+
+       if (!path) {
+               return false;
+       }
        *base = path;
-       
-       p = strchr( path, '\\' );
-       
+
+       p = strchr(path, '\\');
+
        if ( p ) {
                *p = '\0';
                *new_path = p+1;
        }
-       
-       return True;
-}
 
+       return true;
+}
 
 /***********************************************************************
  Utility function for splitting the base path of a registry path off
  by setting base and new_path to the appropriate offsets withing the
  path.
- 
+
  WARNING!!  Does modify the original string!
  ***********************************************************************/
 
-BOOL reg_split_key( char *path, char **base, char **key )
+bool reg_split_key(char *path, char **base, char **key)
 {
        char *p;
-       
+
        *key = *base = NULL;
-       
-       if ( !path)
-               return False;
-       
+
+       if (!path) {
+               return false;
+       }
+
        *base = path;
-       
-       p = strrchr( path, '\\' );
-       
-       if ( p ) {
+
+       p = strrchr(path, '\\');
+
+       if (p) {
                *p = '\0';
                *key = p+1;
        }
-       
-       return True;
+
+       return true;
 }
 
+/**
+ * The full path to the registry key is used as database key
+ * after the \'s are converted to /'s.
+ * Leading and trailing '/' and '\' characters are stripped.
+ * Key string is also normalized to UPPER case.
+ */
 
+char *normalize_reg_path(TALLOC_CTX *ctx, const char *keyname )
+{
+       char *p;
+       char *nkeyname;
 
+       /* skip leading '/' and '\' chars */
+       p = (char *)keyname;
+       while ((*p == '/') || (*p == '\\')) {
+               p++;
+       }
+
+       nkeyname = talloc_string_sub(ctx, p, "\\", "/");
+       if (nkeyname == NULL) {
+               return NULL;
+       }
+
+       /* strip trailing '/' chars */
+       p = strrchr(nkeyname, '/');
+       while ((p != NULL) && (p[1] == '\0')) {
+               *p = '\0';
+               p = strrchr(nkeyname, '/');
+       }
+
+       strupper_m(nkeyname);
+
+       return nkeyname;
+}
+
+/**
+ * normalize ther registry path in place.
+ */
+void normalize_dbkey(char *key)
+{
+       size_t len = strlen(key);
+       string_sub(key, "\\", "/", len+1);
+       strupper_m(key);
+}
+
+/**********************************************************************
+ move to next non-delimter character
+*********************************************************************/
+
+char *reg_remaining_path(TALLOC_CTX *ctx, const char *key)
+{
+       char *new_path = NULL;
+       char *p = NULL;
+
+       if (!key || !*key) {
+               return NULL;
+       }
+
+       new_path = talloc_strdup(ctx, key);
+       if (!new_path) {
+               return NULL;
+       }
+       /* normalize_reg_path( new_path ); */
+       if (!(p = strchr(new_path, '\\')) ) {
+               if (!(p = strchr( new_path, '/'))) {
+                       p = new_path;
+               } else {
+                       p++;
+               }
+       } else {
+               p++;
+       }
+
+       return p;
+}