Changeset 93 for trunk/src/sh_utils.c

Timestamp:

Feb 26, 2007, 10:48:51 PM (18 years ago)

Author:

rainer

Message:

Add check for PCI ROMs; fix ticket #51 (symlinks in root directory reported with leading double slash).

File:

• trunk/src/sh_utils.c (modified) (5 diffs)

trunk/src/sh_utils.c

@@ -554 +554 @@
 }
 
-/* can't inline (AIX)
+/* read a hexchar, return int value (0-15)
+ * can't inline (AIX)
  */
 int sh_util_hexchar( const char c )
@@ -567 +568 @@
   else return -1;
   /*@-charint@*/
+}
+
+char * sh_util_charhex( unsigned char i )
+{
+  static char i2h[2];
+  int j, k;
+
+  j = i / 16;
+  k = i - (j*16);
+
+  if (j < 10) i2h[0] = '0'+j;
+  else        i2h[0] = 'A'+(j-10);
+  
+  if (k < 10) i2h[1] = '0'+k;
+  else        i2h[1] = 'A'+(k-10);
+
+  return i2h;
 }
 
@@ -1718 +1736 @@
   char * retval;
   size_t len;
+  char * tmp;
 
   SL_ENTER(_("sh_util_dirname"));
 
   ASSERT_RET ((fullpath != NULL), _("fullpath != NULL"), (NULL))
-
-  len = sl_strlen (fullpath);  /* fullpath[i] is terminating '\0' */
-
-  if (len > 1 && fullpath[len-1] == '/') /* skip trailing '/' */
+  ASSERT_RET ((*fullpath == '/'), _("*fullpath == '/'"), (NULL))
+
+  retval = sh_util_strdup(fullpath);
+
+  tmp    = retval;
+  while (*tmp == '/') ++tmp;
+
+  /* (1) only leading slashes -- return exact copy 
+   */
+  if (*tmp == '\0')
+    {
+      SL_RETURN(retval, _("sh_util_dirname"));
+    }
+
+  /* (2) there are non-slash characters, so delete trailing slashes
+   */
+  len    = sl_strlen (retval);     /* retval[len] is terminating '\0' */
+
+  while (len > 1 && retval[len-1] == '/')    /* delete trailing slash */
+    {
+      retval[len-1] = '\0';
+      --len;
+    }
+
+  /* (3) now delete all non-slash characters up to the preceding slash
+   */
+  while (len > 1 && retval[len-1] != '/') {
+    retval[len-1] = '\0';
     --len;
-
-  while (len > 0) {
+  }
+
+  /* (4a) only leading slashes left, so return this
+   */
+  if (&(retval[len]) == tmp)
+    {
+      SL_RETURN(retval, _("sh_util_dirname"));
+    }
+
+  /* (4b) strip trailing slash(es) of parent directory
+   */
+  while (len > 1 && retval[len-1] == '/') {
+    retval[len-1] = '\0';
     --len;
-    if (fullpath[len] == '/') 
-      {
-        if (len == 0) ++len; /* copy the '/' to output */
-        break;
-      }
   }
-
-  /* -- Not an absolute path. --
-   */
-  if ((len == 0) && (fullpath[len] != '/'))
-    { 
-      SL_RETURN(NULL, _("sh_util_dirname"));
-    }
-
-  retval = SH_ALLOC(len + 1);
-  (void) sl_strlcpy (retval, fullpath, len+1);
-
   SL_RETURN(retval, _("sh_util_dirname"));
+
 }
 
@@ -1754 +1793 @@
 char * sh_util_basename(const char * fullpath)
 {
-  char * retval = NULL;
-  char * tmp;
-  char * c;
-  size_t len;
+  char       * retval = NULL;
+  const char * tmp;
+  char       * tmp2;
+  char       * c;
+  size_t       len;
 
   SL_ENTER(_("sh_util_basename"));
@@ -1763 +1803 @@
   ASSERT_RET ((fullpath != NULL), _("fullpath != NULL"), (NULL))
 
-  c = strrchr(fullpath, '/');
-  len = sl_strlen (c);
-
-  if (c == fullpath)
-    {
-      if (len <= 1)
-        retval = sh_util_strdup(c);
+  tmp = fullpath; while (*tmp == '/') ++tmp;
+  if (*tmp == '\0')
+    {
+      retval = sh_util_strdup(fullpath);
+    }
+  else
+    {
+      tmp2 = sh_util_strdup(tmp);
+      len  = sl_strlen (tmp2);
+
+      while (len > 1 && tmp2[len-1] == '/')
+        {
+          tmp2[len-1] = '\0';
+          --len;
+        }
+
+      c = strrchr(tmp2, '/');
+      if (c)
+        {
+          retval = sh_util_strdup(++c);
+          SH_FREE(tmp2);
+        }
       else
-        retval = sh_util_strdup(++c);
-    }
-  else
-    {
-      if (len > 1)
-        {
-          retval = sh_util_strdup(++c);
-        }
-      else
-        {
-          /* input ends in '/' */
-          tmp = sh_util_strdup(fullpath);
-          tmp[strlen(tmp)-1] = '\0';
-          retval = sh_util_basename(tmp);
-          SH_FREE(tmp);
+        {
+          retval = tmp2;
         }
     }