Changeset 126 for trunk/src/reglookup.c

Timestamp:

08/19/08 19:31:33 (16 years ago)

Author:

tim

Message:

improved validation and output of key class names, MULTI_SZ and other unicode strings, and improved warnings and other error messages.

File:

• trunk/src/reglookup.c (modified) (3 diffs)

trunk/src/reglookup.c

@@ -97 +97 @@
               "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', "
@@ -296 +295 @@
   char* dacl = NULL;
   char* quoted_classname;
+  char* error_msg = NULL;
   char mtime[20];
   time_t tmp_time[1];
@@ -322 +322 @@
 
     if(k->classname != NULL)
-      quoted_classname = quote_string(k->classname, key_special_chars);
+    {
+      quoted_classname = quote_unicode((uint8*)k->classname, k->classname_length,
+                                       key_special_chars, &error_msg);
+      if(quoted_classname == NULL)
+      {
+        if(error_msg == NULL)
+          fprintf(stderr, "ERROR: Could not quote classname"
+                  " for key '%s' due to unknown error.\n", full_path);
+        else
+        {
+          fprintf(stderr, "ERROR: Could not quote classname"
+                  " for key '%s' due to error: %s\n", full_path, error_msg);
+          free(error_msg);
+        }
+      }
+      else if (error_msg != NULL)
+      {
+        if(print_verbose)
+          fprintf(stderr, "WARNING: While converting classname"
+                  " for key '%s': %s.\n", full_path, error_msg);
+        free(error_msg);
+      }
+    }
     else
       quoted_classname = empty_str;