Changeset 8397 for branches/cu-security-branch/src/common/misc/str-utils.c

Timestamp:

06/18/10 20:02:50 (3 years ago)

Author:

nlmills

Message:

initial merge with Orange-Branch. much will be broken

Location:

branches/cu-security-branch

Files:

• . (modified) (1 prop)
• src/common/misc (modified) (1 prop)
• src/common/misc/str-utils.c (modified) (6 diffs)

branches/cu-security-branch

@@ -3 +3 @@
 aclocal.m4
 autom4te.cache
-config.status
-Makefile
-pvfs2-config.h
-module.mk

@@ -3 +3 @@
 aclocal.m4
 autom4te.cache
-config.status
-Makefile
-pvfs2-config.h
-module.mk

branches/cu-security-branch/src/common/misc/str-utils.c

@@ -144 +144 @@
 
     /* initialize our starting position */
-    if (*inout_segp == NULL) {
-        ptr = pathname;
-    }
-    else if (*opaquep != NULL) {
-        /* replace the '/', point just past it */
-        ptr = (char *) *opaquep;
-        *ptr = '/';
-        ptr++;
-    }
-    else return -1; /* NULL *opaquep indicates last segment returned last time */
+    if (*inout_segp == NULL)
+    {
+        ptr = pathname;
+    }
+    else if (*opaquep != NULL)
+    {
+        /* replace the '/', point just past it */
+        ptr = (char *) *opaquep;
+        *ptr = '/';
+        ptr++;
+    }
+    else
+        return -1; /* NULL *opaquep indicates last segment returned last time */
 
     /* at this point, the string is back in its original state */
 
     /* jump past separators */
-    while ((*ptr != '\0') && (*ptr == '/')) ptr++;
-    if (*ptr == '\0') return -1; /* all that was left was trailing '/'s */
+    while ((*ptr != '\0') && (*ptr == '/'))
+        ptr++;
+    if (*ptr == '\0')
+        return -1; /* all that was left was trailing '/'s */
 
     *inout_segp = ptr;
 
     /* find next separator */
-    while ((*ptr != '\0') && (*ptr != '/')) ptr++;
-    if (*ptr == '\0') *opaquep = NULL; /* indicate last segment */
-    else {
-        /* terminate segment and save position of terminator */
-        *ptr = '\0';
-        *opaquep = ptr;
+    while ((*ptr != '\0') && (*ptr != '/'))
+        ptr++;
+    if (*ptr == '\0')
+        *opaquep = NULL; /* indicate last segment */
+    else
+    {
+        /* terminate segment and save position of terminator */
+        *ptr = '\0';
+        *opaquep = ptr;
     }
     return 0;
@@ -312 +320 @@
     for(i =0; i < pathlen; i++)
     {
-        if (path[i] == '/')
-        {
-            num_slashes_seen++;
-            if (num_slashes_seen > skip)
-            {
-                break;
-            }
-        }
+        if (path[i] == '/')
+        {
+                 num_slashes_seen++;
+            if (num_slashes_seen > skip)
+            {
+                break;
+            }
+        }
     }
 
@@ -356 +364 @@
     if (!comma_list || !tokens)
     {
-        return (0);
+        return (0);
     }
 
@@ -363 +371 @@
     while ((holder = index(holder, ',')))
     {
-        tokencount++;
-        holder++;
+        tokencount++;
+        holder++;
     }
 
@@ -380 +388 @@
     if (!(*tokens))
     {
-        return 0;
+        return 0;
     }
 
     if(1 == tokencount)
     {
-        (*tokens)[0] = strdup(comma_list);
-        if(!(*tokens)[0])
-        {
-            tokencount = 0;
-            goto failure;
-        }
-        return tokencount;
+        (*tokens)[0] = strdup(comma_list);
+        if(!(*tokens)[0])
+        {
+            tokencount = 0;
+            goto failure;
+        }
+        return tokencount;
     }
 
@@ -399 +407 @@
     for (i = 0; i < tokencount && holder; i++)
     {
-        holder2 = index(holder, ',');
-        if (!holder2)
-        {
-            holder2 = end;
-        }
+        holder2 = index(holder, ',');
+        if (!holder2)
+        {
+            holder2 = end;
+        }
         if (holder2 - holder == 0) {
             retval--;
-            goto out;
-        }
-        (*tokens)[i] = (char *) malloc((holder2 - holder) + 1);
-        if (!(*tokens)[i])
-        {
-            goto failure;
-        }
-        strncpy((*tokens)[i], holder, (holder2 - holder));
-        (*tokens)[i][(holder2 - holder)] = '\0';
+            return (retval);
+        }
+        (*tokens)[i] = (char *) malloc((holder2 - holder) + 1);
+        if (!(*tokens)[i])
+        {
+            goto failure;
+        }
+        strncpy((*tokens)[i], holder, (holder2 - holder));
+        (*tokens)[i][(holder2 - holder)] = '\0';
         assert(strlen((*tokens)[i]) != 0);
-        holder = holder2 + 1;
-    }
-
-out:
+        holder = holder2 + 1;
+    }
+
     return (retval);
 
-  failure:
+failure:
 
     /* free up any memory we allocated if we failed */
     if (*tokens)
     {
-        for (i = 0; i < tokencount; i++)
-        {
-            if ((*tokens)[i])
-            {
-                free((*tokens)[i]);
-            }
-        }
-        free(*tokens);
+        for (i = 0; i < tokencount; i++)
+        {
+            if ((*tokens)[i])
+            {
+                free((*tokens)[i]);
+            }
+        }
+        free(*tokens);
     }
     return (0);

@@ -3 +3 @@
 aclocal.m4
 autom4te.cache
-config.status
-Makefile
-pvfs2-config.h
-module.mk