Changeset 256 for trunk/lib

Timestamp:

06/15/11 18:05:37 (14 years ago)

Author:

tim

Message:

switched to %XX encoding in command line tool output

fixed limitation with NULL/None/(default) value name lookups

corrected an nttime bug

File:

• trunk/lib/regfi.c (modified) (6 diffs)

trunk/lib/regfi.c

@@ -1190 +1190 @@
     ? REGFI_ENCODING_ASCII : REGFI_ENCODING_UTF16LE;
 
+  if(vk->name_length == 0)
+    return;
+
   if(from_encoding == output_encoding)
   {
@@ -1280 +1283 @@
   REGFI_ENCODING from_encoding = (nk->flags & REGFI_NK_FLAG_ASCIINAME) 
     ? REGFI_ENCODING_ASCII : REGFI_ENCODING_UTF16LE;
-  
+
+  if(nk->name_length == 0)
+    return;  
+
   if(from_encoding == output_encoding)
   {
@@ -2345 +2351 @@
   bool found = false;
 
-  /* XXX: cur->name can be NULL in the registry.  
-   *      Should we allow for a way to search for that? 
+  /* XXX: should we allow "(default)" subkey names? 
+   *      Do realistically they exist?
    */
   if(name == NULL)
@@ -2357 +2363 @@
       return false;
 
-    if((cur->name != NULL)
-       && (strcasecmp(cur->name, name) == 0))
+    /* A NULL name signifies the "(default)" value for a key */
+    if(cur->name != NULL && (strcasecmp(cur->name, name) == 0))
     {
       found = true;
@@ -2382 +2388 @@
   bool found = false;
 
-  /* XXX: cur->name can be NULL in the registry.  
-   *      Should we allow for a way to search for that? 
-   */
-  if(name == NULL)
-    return false;
-
   for(i=0; (i < num_values) && (found == false); i++)
   {
@@ -2394 +2394 @@
       return false;
 
-    if((cur->name != NULL)
-       && (strcasecmp(cur->name, name) == 0))
+    /* A NULL name signifies the "(default)" value for a key */
+    if(((name == NULL) && (cur->name == NULL))
+       || ((name != NULL) && (cur->name != NULL) 
+           && (strcasecmp(cur->name, name) == 0)))
     {
       found = true;