Changeset 206 for trunk/src

Timestamp:

08/25/10 11:20:32 (14 years ago)

Author:

tim

Message:

simplified part of regfi API to move string encoding to the REGFI_FILE object

additional pyregfi implementation

Location:

trunk/src

Files:

• common.c (modified) (2 diffs)
• reglookup-recover.c (modified) (1 diff)
• reglookup.c (modified) (5 diffs)

trunk/src/common.c

@@ -324 +324 @@
   char* ret_val;
 
-  if(nk->keyname == NULL)
-    ret_val = quote_buffer(nk->keyname_raw, nk->name_length, key_special_chars);
+  if(nk->name == NULL)
+    ret_val = quote_buffer(nk->name_raw, nk->name_length, key_special_chars);
   else
-    ret_val = quote_string(nk->keyname, key_special_chars);
+    ret_val = quote_string(nk->name, key_special_chars);
 
   return ret_val;
@@ -337 +337 @@
   char* ret_val;
 
-  if(vk->valuename == NULL)
-    ret_val = quote_buffer(vk->valuename_raw, vk->name_length, 
+  if(vk->name == NULL)
+    ret_val = quote_buffer(vk->name_raw, vk->name_length, 
                            key_special_chars);
   else
-    ret_val = quote_string(vk->valuename, key_special_chars);
+    ret_val = quote_string(vk->name, key_special_chars);
 
   return ret_val;

trunk/src/reglookup-recover.c

@@ -832 +832 @@
     regfi_log_set_mask(REGFI_LOG_ERROR);
 
-  f = regfi_alloc(fd);
+  /* XXX: add command line option to choose output encoding */
+  f = regfi_alloc(fd, REGFI_ENCODING_ASCII);
   if(f == NULL)
   {

trunk/src/reglookup.c

@@ -77 +77 @@
   }
   
-  data = regfi_iterator_fetch_data(iter, vk);
+  data = regfi_fetch_data(iter->f, vk);
 
   printMsgs(iter->f);
@@ -304 +304 @@
   formatTime(&key->mtime, mtime);
 
-  if(print_security && (sk=regfi_iterator_cur_sk(iter)))
+  if(print_security && (sk=regfi_fetch_sk(iter->f, key)))
   {
     owner = regfi_get_owner(sk->sec_desc);
@@ -321 +321 @@
       dacl = empty_str;
 
-    classname = regfi_iterator_fetch_classname(iter, key);
+    classname = regfi_fetch_classname(iter->f, key);
     printMsgs(iter->f);
     if(classname != NULL)
@@ -636 +636 @@
   }
     
-  f = regfi_alloc(fd);
+  /* XXX: add command line option to choose output encoding */
+  f = regfi_alloc(fd, REGFI_ENCODING_ASCII);
   if(f == NULL)
   {
@@ -643 +644 @@
   }
 
-
-  /* XXX: add command line option to choose output encoding */
-  iter = regfi_iterator_new(f, REGFI_ENCODING_ASCII);
+  iter = regfi_iterator_new(f);
   if(iter == NULL)
   {