Changeset 6

Timestamp:

02/20/05 22:35:41 (19 years ago)

Author:

tim

Message:

Updated MULTI_SZ output. Strings are now '|' delimited and quoted.

File:

• src/reglookup.c (modified) (6 diffs)

src/reglookup.c

@@ -417 +417 @@
 
 
+/* 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
+ * character.
+ */
+static
+char* quote_string(const char* str, char* special)
+{
+  unsigned int i;
+  unsigned int num_written=0;
+  unsigned int len = strlen(str);
+  unsigned int out_len = sizeof(char)*len+1;
+  char* ret_val = malloc(out_len);
+  if(ret_val == NULL)
+    return NULL;
+
+  for(i=0; i<len; i++)
+  {
+    if(str[i] < 32 || str[i] > 126 || strchr(special, str[i]) != NULL)
+    {
+      out_len += 3;
+      ret_val = realloc(ret_val, out_len);
+      if(ret_val == NULL)
+        break;
+      num_written += snprintf(ret_val+num_written, out_len-num_written,
+                              "\\x%.2X", str[i]);
+    }
+    else
+      ret_val[num_written++] = str[i];
+  }
+  ret_val[num_written] = '\0';
+
+  return ret_val;
+}
+
+
 /*
  * Iterate over the keys, depth first, calling a function for each key
@@ -886 +922 @@
   unsigned char* ascii;
   unsigned char* cur_str;
+  unsigned char* cur_ascii;
+  char* cur_quoted;
   unsigned int cur_str_len;
   unsigned int ascii_max, cur_str_max;
@@ -951 +989 @@
     cur_str_max = sizeof(char)*len+1;
     cur_str = malloc(cur_str_max);
+    cur_ascii = malloc(cur_str_max);
     ascii = malloc(ascii_max+4);
     if(ascii == NULL)
@@ -966 +1005 @@
     cur_str_len = 0;
 
-    *asciip = '"';
-    asciip +=1;
-    
     for(i=0; (i < len) && str_rem > 0; i++)
     {
@@ -980 +1016 @@
       if(num_nulls == 2)
       {
-        uni_to_ascii(cur_str, asciip, str_rem, 0);
-        alen = strlen((char*)asciip);
+        uni_to_ascii(cur_str, cur_ascii, cur_str_max, 0);
+        cur_quoted = quote_string((char*)cur_ascii, "|");
+        alen = snprintf((char*)asciip, str_rem, "%s", cur_quoted);
         asciip += alen;
         str_rem -= alen;
+        free(cur_quoted);
+
         if(*(datap+i+1) == 0 && *(datap+i+2) == 0)
           break;
         else
         {
-          alen = snprintf((char*)asciip, str_rem, "%s", "\" \"");
+          alen = snprintf((char*)asciip, str_rem, "%c", '|');
           asciip += alen;
           str_rem -= alen;
@@ -999 +1038 @@
       }
     }
-    snprintf((char*)asciip, str_rem, "%s", "\"");
+    *asciip = 0;
     return ascii;
     break;