Changeset 200 for trunk/python2/regfi/regfi.c

Timestamp:

06/03/10 01:08:20 (14 years ago)

Author:

tim

Message:

redesigned python key iterator and test script
updated documentation

File:

• trunk/python2/regfi/regfi.c (modified) (8 diffs)

trunk/python2/regfi/regfi.c

@@ -30 +30 @@
 
   if(!self->reg) {
-    /*RaiseError(ERuntimeError, "REGFI Error: %s", regfi_log_get_str());*/
+    RaiseError(ERuntimeError, "REGFI Error: %s", regfi_log_get_str());
     /*char* e = regfi_log_get_str();*/
     /*fprintf(stderr, "%p\n", e);*/
@@ -61 +61 @@
 }
 
-static KeyIterator KeyIterator_Con(KeyIterator self, RegistryFile file, char **path,
-                             REGFI_ENCODING encoding) {
+static KeyIterator KeyIterator_Con(KeyIterator self, 
+                                   RegistryFile file, 
+                                   char **path,
+                                   REGFI_ENCODING encoding) 
+{
   self->iter = regfi_iterator_new(file->reg, encoding);
 
@@ -80 +83 @@
   }
 
-  fprintf(stderr, "Con called\n");
-  self->first_called = false;
+  self->root_traversed = false;
 
   return self;
@@ -88 +90 @@
 }
 
-static KeyIterator KeyIterator__iter__(KeyIterator self) {
-  return self;
-}
-
-
-static const REGFI_NK_REC* KeyIterator_next(KeyIterator self) {
-
-  fprintf(stderr, "next called\n");
-
-  if(!self->first_called)
+static void KeyIterator__iter__(KeyIterator self) 
+{
+  return;
+}
+
+
+static const REGFI_NK_REC *KeyIterator_next(KeyIterator self) 
+{
+  if(!self->root_traversed)
+    self->root_traversed = true;
+  else if(!regfi_iterator_down(self->iter))
   {
-    regfi_iterator_first_subkey(self->iter);
-    self->first_called = true;
-  }
-  else
-    regfi_iterator_next_subkey(self->iter);
-    
-  return regfi_iterator_cur_subkey(self->iter);
+    do
+    {
+      if(!regfi_iterator_up(self->iter))
+        return NULL;
+    } while(!regfi_iterator_next_subkey(self->iter));
+
+    /* XXX: This is an error condition.  
+     *      Probably should throw an exception or something. */
+    if(!regfi_iterator_down(self->iter))
+      return NULL;
+  }
+
+  regfi_iterator_first_subkey(self->iter);
+  return regfi_iterator_cur_key(self->iter);
 }
 
 
 static int KeyIterator_down(KeyIterator self) {
-  fprintf(stderr, "down cur_subkey: %d\n", self->iter->cur_subkey);
   int result = regfi_iterator_down(self->iter);
-  fprintf(stderr, "down result: %d\n", result);
   regfi_iterator_first_subkey(self->iter);
   regfi_iterator_first_value(self->iter);
@@ -153 +161 @@
 }
 
-static ValueIterator ValueIterator__iter__(ValueIterator self) {
-  return self;
-}
-
-static RawData ValueIterator_iternext(ValueIterator self) {
+static void ValueIterator__iter__(ValueIterator self) {
+  return;
+}
+
+static REGFI_VK_REC* ValueIterator_iternext(ValueIterator self) {
   RawData result;
   const REGFI_DATA* data;
@@ -172 +180 @@
   rec = regfi_iterator_cur_value(self->iter);
 
+  return rec;
+
   if(!rec) return NULL;
 
@@ -177 +187 @@
    *      Instead, make data fetching a method and parse it then. 
    */
+  /*
   data = (REGFI_DATA *)regfi_iterator_fetch_data(self->iter, rec);
   if(!data) {
@@ -198 +209 @@
     break;
   }
+  */
 
   return result;