Changeset 107 for trunk

Timestamp:

04/18/08 00:51:21 (17 years ago)

Author:

tim

Message:

removed redundant hbin parsing

added flags parameter to regfi_open

Location:

trunk

Files:

• include/regfi.h (modified) (2 diffs)
• lib/regfi.c (modified) (6 diffs)
• src/reglookup.c (modified) (1 diff)

trunk/include/regfi.h

@@ -71 +71 @@
 #define REG_KEY                        0x7FFFFFFF
 
+#define REGFI_FLAG_NONE         0x0
+#define REGFI_FLAG_SAVE_UNALLOC 0x1
 
 #define REGF_BLOCKSIZE          0x1000
@@ -322 +324 @@
 char*                 regfi_get_group(SEC_DESC* sec_desc);
 
-REGF_FILE*            regfi_open(const char* filename);
+REGF_FILE*            regfi_open(const char* filename, uint32 flags);
 int                   regfi_close(REGF_FILE* r);
 

trunk/lib/regfi.c

@@ -883 +883 @@
  * first hbin offset.
  *******************************************************************/
-REGF_FILE* regfi_open(const char* filename)
+REGF_FILE* regfi_open(const char* filename, uint32 flags)
 {
   REGF_FILE* rb;
@@ -889 +889 @@
   uint32 hbin_off;
   int fd;
-  int flags = O_RDONLY;
-  bool rla;
+  bool rla, save_unalloc = false;
+
+  if(flags & REGFI_FLAG_SAVE_UNALLOC)
+    save_unalloc = true;
 
   /* open an existing file */
-  if ((fd = open(filename, flags)) == -1) 
+  if ((fd = open(filename, O_RDONLY)) == -1) 
   {
     /* DEBUG(0,("regfi_open: failure to open %s (%s)\n", filename, strerror(errno)));*/
@@ -920 +922 @@
   rla = true;
   hbin_off = REGF_BLOCKSIZE;
-  hbin = regfi_parse_hbin(rb, hbin_off, true, false);
+  hbin = regfi_parse_hbin(rb, hbin_off, true, save_unalloc);
   while(hbin && rla)
   {
     hbin_off = hbin->file_off + hbin->block_size;
     rla = range_list_add(rb->hbins, hbin->file_off, hbin->block_size, hbin);
-    hbin = regfi_parse_hbin(rb, hbin_off, true, false); 
+    hbin = regfi_parse_hbin(rb, hbin_off, true, save_unalloc);
   }
 
@@ -968 +970 @@
   REGF_NK_REC* nk = NULL;
   REGF_HBIN*   hbin;
-  uint32       offset = REGF_BLOCKSIZE;
-  uint32       root_offset;
+  uint32       root_offset, i, num_hbins;
   
   if(!file)
@@ -979 +980 @@
      block (but I'm not assuming that for now) */
 
-  while((hbin = regfi_parse_hbin(file, offset, true, false))) 
-  {
+  num_hbins = range_list_size(file->hbins);
+  for(i=0; i < num_hbins; i++)
+  {
+    hbin = (REGF_HBIN*)range_list_get(file->hbins, i)->data;
     if(regfi_find_root_nk(file, hbin->file_off+HBIN_HEADER_REC_SIZE, 
                           hbin->block_size-HBIN_HEADER_REC_SIZE, &root_offset))
@@ -987 +990 @@
       break;
     }
-
-    offset += hbin->block_size;
   }
 

trunk/src/reglookup.c

@@ -899 +899 @@
     bailOut(EX_OSERR, "ERROR: Memory allocation problem.\n");
 
-  f = regfi_open(registry_file);
+  f = regfi_open(registry_file, 0);
   if(f == NULL)
   {