Changeset 138 for trunk/src/reglookup-recover.c

Timestamp:

02/08/09 14:53:48 (15 years ago)

Author:

tim

Message:

extended error message logging to allow for message type filtering

fine tuned message verbosity to more reasonable default levels for reglookup and reglookup-recover

updated related documentation

File:

• trunk/src/reglookup-recover.c (modified) (12 diffs)

trunk/src/reglookup-recover.c

@@ -2 +2 @@
  * This program attempts to recover deleted data structures in a registry hive.
  *
- * Copyright (C) 2008 Timothy D. Morgan
+ * Copyright (C) 2008-2009 Timothy D. Morgan
  *
  * This program is free software; you can redistribute it and/or modify
@@ -87 +87 @@
     quoted_name[0] = '\0';
 
-    fprintf(stderr, "WARNING: NULL key name in NK record at offset %.8X.\n",
+    fprintf(stderr, "WARN: NULL key name in NK record at offset %.8X.\n",
             nk->offset);
   }
@@ -125 +125 @@
   if(size > REGFI_VK_MAX_DATA_LENGTH)
   {
-    fprintf(stderr, "WARNING: value data size %d larger than "
+    fprintf(stderr, "WARN: value data size %d larger than "
             "%d, truncating...\n", size, REGFI_VK_MAX_DATA_LENGTH);
     size = REGFI_VK_MAX_DATA_LENGTH;
@@ -153 +153 @@
 
     if(conv_error == NULL)
-      fprintf(stderr, "WARNING: Could not quote value for '%s/%s'.  "
+      fprintf(stderr, "WARN: Could not quote value for '%s/%s'.  "
               "Memory allocation failure likely.\n", prefix, quoted_name);
     else if(print_verbose)
-      fprintf(stderr, "WARNING: Could not quote value for '%s/%s'.  "
+      fprintf(stderr, "WARN: Could not quote value for '%s/%s'.  "
               "Returned error: %s\n", prefix, quoted_name, conv_error);
   }
   /* XXX: should these always be printed? */
   else if(conv_error != NULL && print_verbose)
-    fprintf(stderr, "VERBOSE: While quoting value for '%s/%s', "
+    fprintf(stderr, "INFO: While quoting value for '%s/%s', "
             "warning returned: %s\n", prefix, quoted_name, conv_error);
 
@@ -279 +279 @@
       cur_ancestor = regfi_parse_nk(f, virt_offset+REGFI_REGF_SIZE, 
                                     max_length, true);
+      printMsgs(f);
+
       if(cur_ancestor == NULL)
         virt_offset = REGFI_OFFSET_NONE;
@@ -426 +428 @@
   for(i=0; i < range_list_size(unalloc_cells); i++)
   {
+    printMsgs(f);
     cur_elem = range_list_get(unalloc_cells, i);
     for(j=0; cur_elem->length > REGFI_NK_MIN_LENGTH 
@@ -432 +435 @@
       key = regfi_parse_nk(f, cur_elem->offset+j,
                            cur_elem->length-j, false);
+      printMsgs(f);
+
       if(key != NULL)
       {
@@ -587 +592 @@
   for(i=0; i < range_list_size(unalloc_cells); i++)
   {
+    printMsgs(f);
     cur_elem = range_list_get(unalloc_cells, i);
     for(j=0; j <= cur_elem->length; j+=8)
@@ -592 +598 @@
       vk = regfi_parse_vk(f, cur_elem->offset+j, 
                            cur_elem->length-j, false);
+      printMsgs(f);
+
       if(vk != NULL)
       {
@@ -654 +662 @@
   for(i=0; i < range_list_size(unalloc_cells); i++)
   {
+    printMsgs(f);
     cur_elem = range_list_get(unalloc_cells, i);
     for(j=0; j <= cur_elem->length; j+=8)
@@ -659 +668 @@
       sk = regfi_parse_sk(f, cur_elem->offset+j, 
                           cur_elem->length-j, false);
+      printMsgs(f);
+
       if(sk != NULL)
       {
@@ -741 +752 @@
     bailOut(EX_NOINPUT, "");
   }
+  if(print_verbose)
+    regfi_set_message_mask(f, REGFI_MSG_ERROR|REGFI_MSG_WARN|REGFI_MSG_INFO);
+  else
+    regfi_set_message_mask(f, REGFI_MSG_ERROR);
 
   if(print_header)