core: first attempt at keyname overhaul

src/include/kdbos.h

@@ -188,7 +188,8 @@ typedef int option_t;
 
 typedef int keyswitch_t;
 
-typedef int elektraNamespace;
+// defined as char to allow ++ for iteration over namespaces
+typedef char elektraNamespace;
 
 /**@brief Separator for key names.
  *

src/include/kdbprivate.h

@@ -212,8 +212,8 @@ struct _Key
 	size_t dataSize;
 
 	/**
-	 * The name of the key.
-	 * @see keySetName(), keySetName()
+	 * The canonical (escaped) name of the key.
+	 * @see keyGetName(), keySetName()
 	 */
 	char * key;
 
@@ -223,6 +223,13 @@ struct _Key
 	 */
 	size_t keySize;
 
+	/**
+	 * The unescaped name of the key.
+	 * Note: This is NOT a standard null-terminated string.
+	 * @see keyGetName(), keySetName()
+	 */
+	char * ukey;
+
 	/**
 	 * Size of the unescaped key name in bytes, including all NULL.
 	 * @see keyBaseName(), keyUnescapedName()
@@ -566,18 +573,7 @@ ssize_t ksSearchInternal (const KeySet * ks, const Key * toAppend);
 ssize_t elektraMemcpy (Key ** array1, Key ** array2, size_t size);
 ssize_t elektraMemmove (Key ** array1, Key ** array2, size_t size);
 
-ssize_t elektraFinalizeName (Key * key);
-ssize_t elektraFinalizeEmptyName (Key * key);
-
-char * elektraEscapeKeyNamePart (const char * source, char * dest);
-
-size_t elektraUnescapeKeyName (const char * source, char * dest);
-int elektraUnescapeKeyNamePartBegin (const char * source, size_t size, char ** dest);
-char * elektraUnescapeKeyNamePart (const char * source, size_t size, char * dest);
-
-
 /*Internally used for array handling*/
-int elektraValidateKeyName (const char * name, size_t size);
 int elektraReadArrayNumber (const char * baseName, kdb_long_long_t * oldIndex);
 
 
@@ -598,6 +594,15 @@ int keyNameIsDir (const char * keyname);
 int keyNameIsSystem (const char * keyname);
 int keyNameIsUser (const char * keyname);
 
+int keySetNamespace (Key * key, elektraNamespace ns);
+
+elektraNamespace elektraReadNamespace (const char * namespaceStr, size_t len);
+
+int elektraKeyNameValidate (const char * name, int fullKey);
+size_t elektraKeyNameCanonicalize (const char * name, char ** canonicalName, size_t offset);
+size_t elektraKeyNameUnescape (const char * name, char ** unescapedName, size_t offset);
+size_t elektraKeyNameEscapePart (const char * part, char ** escapedPart);
+
 /* global plugin calls */
 int elektraGlobalGet (KDB * handle, KeySet * ks, Key * parentKey, int position, int subPosition);
 int elektraGlobalSet (KDB * handle, KeySet * ks, Key * parentKey, int position, int subPosition);

src/libs/ease/keyname.c

@@ -27,6 +27,8 @@
  */
 const char * elektraKeyGetRelativeName (Key const * cur, Key const * parentKey)
 {
+	if (cur == NULL || parentKey == NULL) return NULL;
+
 	ssize_t offset = 0;
 
 	if (strcmp (keyName (parentKey), "/"))