Changeset 5150 in orxonox.OLD

Timestamp:

Aug 27, 2005, 12:48:47 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: SubString is now Safe also for NULL and 1 parameters

Location:

trunk/src

Files:

• lib/util/substring.cc (modified) (5 diffs)
• lib/util/substring.h (modified) (1 diff)
• util/shell_command.h (modified) (1 diff)

trunk/src/lib/util/substring.cc

@@ -31 +31 @@
 {
   this->splittersCount = 0;
+  if (string == NULL)
+  {
+    this->strings = NULL;
+    return;
+  }
 
-  assert( string != NULL);
-
-  for( int i = 0; i < strlen(string); i++) if( string[i] == splitter)
-      splittersCount++;
+  for( int i = 0; i < strlen(string); i++)
+    if( string[i] == splitter)
+      this->splittersCount++;
 
   this->splittersCount += 1;
@@ -45 +49 @@
   int l = 0;
 
-  const char* offset = string;
-  char* end = strchr( string, splitter);
-  while( end != NULL)
+  if( this->splittersCount > 1)
+  {
+    const char* offset = string;
+    char* end = strchr( string, splitter);
+    while( end != NULL)
     {
       assert( i < this->splittersCount);
@@ -61 +67 @@
     }
 
-  strings[i] = new char[l + 1];
-  l = strlen( offset);
-  strncpy( strings[i], offset, l);
-  strings[i][l] = '\0';
+    strings[i] = new char[l + 1];
+    l = strlen( offset);
+    strncpy( strings[i], offset, l);
+    strings[i][l] = '\0';
+  }
+  else
+  {
+    this->strings[0] = new char[strlen(string)];
+    strcpy(this->strings[0], string);
+  }
 }
 
@@ -72 +84 @@
 SubString::~SubString()
 {
-  for( int i = 0; i < this->splittersCount; i++)
-    delete this->strings[i];
-  delete this->strings;
+  if (this->strings)
+  {
+    for( int i = 0; i < this->splittersCount; i++)
+      delete[] this->strings[i];
+    delete[] this->strings;
+  }
 }
 
@@ -82 +97 @@
  * @returns the designated substring or NULL if an invalid ID was given
 */
-const char* SubString::getString( int i)
+const char* SubString::getString(unsigned int i)
 {
   if( i < this->splittersCount && i >= 0)

trunk/src/lib/util/substring.h

@@ -14 +14 @@
   ~SubString();
 
-  inline int getCount() { return this->splittersCount; };
-  const char* getString( int i);
+  inline unsigned int getCount() { return this->splittersCount; };
+  const char* getString(unsigned int i);
 
   void debug() const;
 
  private:
-  char**     strings;                      //!< strings produced from a single string splitted in multiple strings
-  int        splittersCount;               //!< how many splitted parts
+  char**          strings;                      //!< strings produced from a single string splitted in multiple strings
+  unsigned int    splittersCount;               //!< how many splitted parts
 };
 

trunk/src/util/shell_command.h

@@ -162 +162 @@
     {
 //      if (parameters != NULL)
-        //SubString params(parameters, ',');
+      SubString subLoads(parameters);
+      subLoads.debug();
 #define FUNCTOR_LIST(x) ShellCommandExecute ## x
 //#include "functor_list.h"