Changeset 256

Timestamp:

06/15/11 18:05:37 (13 years ago)

Author:

tim

Message:

switched to %XX encoding in command line tool output

fixed limitation with NULL/None/(default) value name lookups

corrected an nttime bug

Location:

trunk

Files:

• lib/regfi.c (modified) (6 diffs)
• pyregfi-distutils.py (modified) (1 diff)
• python/pyregfi/__init__.py (modified) (2 diffs)
• python/pyregfi/structures.py (modified) (2 diffs)
• src/common.c (modified) (4 diffs)

trunk/lib/regfi.c

@@ -1190 +1190 @@
     ? REGFI_ENCODING_ASCII : REGFI_ENCODING_UTF16LE;
 
+  if(vk->name_length == 0)
+    return;
+
   if(from_encoding == output_encoding)
   {
@@ -1280 +1283 @@
   REGFI_ENCODING from_encoding = (nk->flags & REGFI_NK_FLAG_ASCIINAME) 
     ? REGFI_ENCODING_ASCII : REGFI_ENCODING_UTF16LE;
-  
+
+  if(nk->name_length == 0)
+    return;  
+
   if(from_encoding == output_encoding)
   {
@@ -2345 +2351 @@
   bool found = false;
 
-  /* XXX: cur->name can be NULL in the registry.  
-   *      Should we allow for a way to search for that? 
+  /* XXX: should we allow "(default)" subkey names? 
+   *      Do realistically they exist?
    */
   if(name == NULL)
@@ -2357 +2363 @@
       return false;
 
-    if((cur->name != NULL)
-       && (strcasecmp(cur->name, name) == 0))
+    /* A NULL name signifies the "(default)" value for a key */
+    if(cur->name != NULL && (strcasecmp(cur->name, name) == 0))
     {
       found = true;
@@ -2382 +2388 @@
   bool found = false;
 
-  /* XXX: cur->name can be NULL in the registry.  
-   *      Should we allow for a way to search for that? 
-   */
-  if(name == NULL)
-    return false;
-
   for(i=0; (i < num_values) && (found == false); i++)
   {
@@ -2394 +2394 @@
       return false;
 
-    if((cur->name != NULL)
-       && (strcasecmp(cur->name, name) == 0))
+    /* A NULL name signifies the "(default)" value for a key */
+    if(((name == NULL) && (cur->name == NULL))
+       || ((name != NULL) && (cur->name != NULL) 
+           && (strcasecmp(cur->name, name) == 0)))
     {
       found = true;

trunk/pyregfi-distutils.py

@@ -2 +2 @@
 
 from distutils.core import setup
-setup(name='pyregfi', version='0.1', package_dir={'':'python'}, packages=['pyregfi'])
+setup(name='pyregfi', version='1.0', package_dir={'':'python'}, packages=['pyregfi'])

trunk/python/pyregfi/__init__.py

@@ -509 +509 @@
         
         elif name == "modified":
-            ret_val = regfi.regfi_nt2unix_time(byref(self._base.contents.mtime))
+            ret_val = regfi.regfi_nt2unix_time(self._base.contents.mtime)
 
         else:
@@ -764 +764 @@
 
         elif name == "modified":
-            return regfi.regfi_nt2unix_time(byref(self._base.contents.mtime))
+            return regfi.regfi_nt2unix_time(self._base.contents.mtime)
 
         return getattr(self.file.contents, name)

trunk/python/pyregfi/structures.py

@@ -279 +279 @@
 
 regfi.regfi_find_value.argtypes = [POINTER(REGFI_FILE), POINTER(REGFI_NK),
-                                    c_char_p, POINTER(c_uint32)]
+                                   c_char_p, POINTER(c_uint32)]
 regfi.regfi_find_value.restype = c_bool
 
@@ -287 +287 @@
 
 regfi.regfi_get_value.argtypes = [POINTER(REGFI_FILE), POINTER(REGFI_NK),
-                                   c_uint32]
+                                  c_uint32]
 regfi.regfi_get_value.restype = POINTER(REGFI_VK)
 

trunk/src/common.c

@@ -25 +25 @@
 iconv_t conv_desc;
 
-const char* key_special_chars = ",\"\\/";
-const char* subfield_special_chars = ",\"\\|";
-const char* common_special_chars = ",\"\\";
+const char* key_special_chars = ",\"/";
+const char* subfield_special_chars = ",\"|";
+const char* common_special_chars = ",\"";
 
 #define REGLOOKUP_EXIT_OK       0
@@ -70 +70 @@
 /* Returns a newly malloc()ed string which contains original buffer,
  * except for non-printable or special characters are quoted in hex
- * with the syntax '\xQQ' where QQ is the hex ascii value of the quoted
+ * with the syntax '%QQ' where QQ is the hex ascii value of the quoted
  * character.  A null terminator is added, since only ascii, not binary,
  * is returned.
@@ -119 +119 @@
     }
     
-    if(str[i] < 32 || str[i] > 126 || strchr(special, str[i]) != NULL)
+    if(str[i] < 32 || str[i] > 126 
+       || str[i] == '%' || strchr(special, str[i]) != NULL)
     {
       num_written += snprintf(ret_val + num_written, buf_len - num_written,
-                              "\\x%.2X", str[i]);
+                              "%%%.2X", str[i]);
     }
     else
@@ -135 +136 @@
 /* Returns a newly malloc()ed string which contains original string, 
  * except for non-printable or special characters are quoted in hex
- * with the syntax '\xQQ' where QQ is the hex ascii value of the quoted
+ * with the syntax '%QQ' where QQ is the hex ascii value of the quoted
  * character.
  */