Changeset 11 for trunk/src/sh_tools.c

Timestamp:

Jan 2, 2006, 12:03:25 AM (19 years ago)

Author:

rainer

Message:

Minor optimisations for server

File:

• trunk/src/sh_tools.c (modified) (7 diffs)

trunk/src/sh_tools.c

@@ -78 +78 @@
 #endif
 
+#define SH_REAL_SET
+
 #include "samhain.h"
 #include "sh_mem.h"
@@ -121 +123 @@
 char * sh_tools_safe_name (const char * instr, int flag)
 {
+  static   char ctest = ~('\\'|'&'|'='|'\'');
   unsigned char c;
   const  char * p;
   char   tmp[4];
   char * outstr;
-  int    len;
+  int    len = 1;
   int    i = 0;
   unsigned char   val_octal = '\0';
@@ -133 +136 @@
   if (instr)
     len = (3 * strlen(instr)) + 4;
-  else
-    len = 1;
 
   outstr = SH_ALLOC(len);
@@ -143 +144 @@
   p = instr;
 
-  while (p && *p)
+#if !defined(SH_USE_XML)
+  (void) flag; /* fix compiler warning */
+#endif
+
+  if (!p)
+    goto end;
+
+  while (*p)
     {
       c = *p;
@@ -154 +162 @@
 
 #ifdef SH_USE_XML
-      if (flag == 1 && (*p) == '"')
-        { 
-          sprintf(&outstr[i], "=%02x", c);   i+=3; ++p;  /* known to fit  */
-          continue;
-        } 
-      else if (flag == 1 && (*p) == '&')
-        { 
-          sprintf(&outstr[i], "=%02x", c);   i+=3; ++p;  /* known to fit  */
-          continue;
-        } 
-      else if (flag == 1 && (*p) == '<') 
-        {     /* left angle       */
-          sprintf(&outstr[i], "=%02x", c);   i+=3; ++p;  /* known to fit  */
-          continue;
-        } 
-      else if (flag == 1 && (*p) == '>') 
-        {     /* right angle      */
-          sprintf(&outstr[i], "=%02x", c);   i+=3; ++p;  /* known to fit  */
-          continue;
+      if (flag == 1)
+        {
+          if ((*p) == '"')
+            { 
+              sprintf(&outstr[i], "=%02x", c);i+=3; ++p; /* known to fit  */
+              continue;
+            } 
+          else if ((*p) == '&')
+            { 
+              sprintf(&outstr[i], "=%02x", c);i+=3; ++p; /* known to fit  */
+              continue;
+            } 
+          else if ((*p) == '<') 
+            {     /* left angle       */
+              sprintf(&outstr[i], "=%02x", c);i+=3; ++p; /* known to fit  */
+              continue;
+            } 
+          else if ((*p) == '>') 
+            {     /* right angle      */
+              sprintf(&outstr[i], "=%02x", c);i+=3; ++p; /* known to fit  */
+              continue;
+            }
         }
-#else
-      (void) flag; /* fix compiler warning */
-#endif
-
-      if ( (*p) != '\\' && (*p) != '&' && (*p) != '='  && (*p) != '\'') 
+#endif
+
+      /* if ( (*p) != '\\' && (*p) != '&' && (*p) != '='  && (*p) != '\'') */
+      if (((*p) & ctest) != 0)
         {
+          outstr[i] = *p; ++i;
+          ++p;
+              
           if (c < 31 || c > 126)
             {
-              sprintf(&outstr[i], "=%02x", c); i+=3; ++p;/* known to fit  */
+              --i;
+              sprintf(&outstr[i], "=%02x", c);          /* known to fit  */
             }
-          else
-            {
-              outstr[i] = *p;
-              ++i; ++p;
-            }
+
           continue;
         }
@@ -272 +282 @@
           }
         }
-      else /* *p == '&' */
+      else if (*p == '&')
         {
           ++p;
@@ -303 +313 @@
               outstr[i] = '&'; ++i;
             }
-        }     
+        }
+      else
+        {
+          outstr[i] = *p; ++i;
+          ++p;
+        }
     } /* while (p && *p) */
+
+ end:
   
   outstr[i] = '\0';