Changeset 161 for trunk/src

Timestamp:

12/07/09 12:01:22 (15 years ago)

Author:

tim

Message:

added support for UTF-16LE key names

Location:

trunk/src

Files:

• reglookup-recover.c (modified) (2 diffs)
• reglookup.c (modified) (4 diffs)

trunk/src/reglookup-recover.c

@@ -127 +127 @@
   /* XXX: Add command line option to choose output encoding */
   if(vk->data != NULL 
-     && !regfi_interpret_data(f, "US-ASCII//TRANSLIT", vk->type, vk->data))
+     && !regfi_interpret_data(f, REGFI_ENCODING_ASCII, vk->type, vk->data))
   {
     fprintf(stderr, "WARN: Error occurred while interpreting data for VK record"
@@ -271 +271 @@
       else
       {
-        if(cur_ancestor->key_type & REGFI_NK_FLAG_ROOT)
+        if(cur_ancestor->flags & REGFI_NK_FLAG_ROOT)
           virt_offset = REGFI_OFFSET_NONE;
         else

trunk/src/reglookup.c

@@ -191 +191 @@
 {
   const REGFI_ITER_POSITION* cur;
+  const REGFI_NK_REC* tmp_key;
   uint32 buf_left = 127;
   uint32 buf_len = buf_left+1;
@@ -198 +199 @@
   char* new_buf;
   char* name;
-  const char* cur_name;
   void_stack_iterator* iter;
   
@@ -226 +226 @@
     cur = void_stack_iterator_next(iter);
     if (cur == NULL)
-      cur_name = i->cur_key->keyname;
-    else
-      cur_name = cur->nk->keyname;
+      tmp_key = i->cur_key;
+    else
+      tmp_key = cur->nk;
+
+    if(tmp_key->keyname == NULL)
+      name = quote_buffer(i->cur_key->keyname_raw, i->cur_key->name_length,
+                          key_special_chars);
+    else
+      name = quote_string(tmp_key->keyname, key_special_chars);
 
     buf[buf_len-buf_left-1] = '/';
     buf_left -= 1;
-    name = quote_string(cur_name, key_special_chars);
     name_len = strlen(name);
     if(name_len+1 > buf_left)
@@ -617 +622 @@
 
   /* XXX: add command line option to choose output encoding */
-  iter = regfi_iterator_new(f, 0);
+  iter = regfi_iterator_new(f, REGFI_ENCODING_ASCII);
   if(iter == NULL)
   {