path: root/filesystems/glusterfs/patches/patch-be

$NetBSD: patch-be,v 1.2 2011/04/18 16:19:48 manu Exp $

basename() and dirname() are not supposed to be thread-safe, and NetBSD's
implementation is not. glusterfs assume the functions are thread-safe. 
Borrow basename() and rdirname() form glibc and make NetBSD use them.

Also map Linux extended attribute system calls to NetBSD counterpart

--- libglusterfs/src/compat.c.orig	2011-04-09 10:09:02.000000000 +0200
+++ libglusterfs/src/compat.c	2011-04-14 10:36:40.000000000 +0200
@@ -547,4 +547,282 @@
 		len++;
 	return len;
 }
 #endif /* STRNLEN */
+
+#ifdef __NetBSD__
+/*
+ * basename() and dirname() are not supposed to be thread-safe. 
+ * SUSv2 states it can return a static pointer, and NetBSD does that. 
+ * glusterfs heavily assume basename() and dirname() thread-safety, 
+ * hence these replacement from glibc.
+ * compat.h defines basename() and dirname() as macro so that
+ * the replacement are used.
+ */
+
+/*
+ * borrowed from glibc-2.12.1/string/basename.c (GPL 2.1 or later)
+ * Copyright (C) 1996,97,98,2002 Free Software Foundation, Inc.
+ * Modified to return "." for NULL or "", as required for SUSv2.
+ */
+char *
+basename_r (filename)
+     const char *filename;
+{
+  char *p;
+
+  if ((filename == NULL) || (*filename == '\0'))
+    return ".";
+
+  p  = strrchr (filename, '/');
+  return p ? p + 1 : (char *) filename;
+}
+
+/*
+ * Borrowed from blibc-2.12.1/string/memrchr.c (GPL 2.1 or later)
+ * Copyright (C) 1991, 93, 96, 97, 99, 2000 Free Software Foundation, Inc.
+ * Based on strlen implementation by Torbjorn Granlund (tege@sics.se),
+ * Removed code for long bigger than 32 bytes, renamed __ptr_t as void *
+ * changed reg_char type to char.
+ */
+void *
+__memrchr (s, c_in, n)
+     const void * s;
+     int c_in;
+     size_t n;
+{
+  const unsigned char *char_ptr;
+  const unsigned long int *longword_ptr;
+  unsigned long int longword, magic_bits, charmask;
+  unsigned char c;
+
+  c = (unsigned char) c_in;
+
+  /* Handle the last few characters by reading one character at a time.
+     Do this until CHAR_PTR is aligned on a longword boundary.  */
+  for (char_ptr = (const unsigned char *) s + n;
+       n > 0 && ((unsigned long int) char_ptr
+		 & (sizeof (longword) - 1)) != 0;
+       --n)
+    if (*--char_ptr == c)
+      return (void *) char_ptr;
+
+  /* All these elucidatory comments refer to 4-byte longwords,
+     but the theory applies equally well to 8-byte longwords.  */
+
+  longword_ptr = (const unsigned long int *) char_ptr;
+
+  /* Bits 31, 24, 16, and 8 of this number are zero.  Call these bits
+     the "holes."  Note that there is a hole just to the left of
+     each byte, with an extra at the end:
+
+     bits:  01111110 11111110 11111110 11111111
+     bytes: AAAAAAAA BBBBBBBB CCCCCCCC DDDDDDDD
+
+     The 1-bits make sure that carries propagate to the next 0-bit.
+     The 0-bits provide holes for carries to fall into.  */
+
+  if (sizeof (longword) != 4 && sizeof (longword) != 8)
+    abort ();
+
+  magic_bits = 0x7efefeff;
+
+  /* Set up a longword, each of whose bytes is C.  */
+  charmask = c | (c << 8);
+  charmask |= charmask << 16;
+
+  /* Instead of the traditional loop which tests each character,
+     we will test a longword at a time.  The tricky part is testing
+     if *any of the four* bytes in the longword in question are zero.  */
+  while (n >= sizeof (longword))
+    {
+      /* We tentatively exit the loop if adding MAGIC_BITS to
+	 LONGWORD fails to change any of the hole bits of LONGWORD.
+
+	 1) Is this safe?  Will it catch all the zero bytes?
+	 Suppose there is a byte with all zeros.  Any carry bits
+	 propagating from its left will fall into the hole at its
+	 least significant bit and stop.  Since there will be no
+	 carry from its most significant bit, the LSB of the
+	 byte to the left will be unchanged, and the zero will be
+	 detected.
+
+	 2) Is this worthwhile?  Will it ignore everything except
+	 zero bytes?  Suppose every byte of LONGWORD has a bit set
+	 somewhere.  There will be a carry into bit 8.  If bit 8
+	 is set, this will carry into bit 16.  If bit 8 is clear,
+	 one of bits 9-15 must be set, so there will be a carry
+	 into bit 16.  Similarly, there will be a carry into bit
+	 24.  If one of bits 24-30 is set, there will be a carry
+	 into bit 31, so all of the hole bits will be changed.
+
+	 The one misfire occurs when bits 24-30 are clear and bit
+	 31 is set; in this case, the hole at bit 31 is not
+	 changed.  If we had access to the processor carry flag,
+	 we could close this loophole by putting the fourth hole
+	 at bit 32!
+
+	 So it ignores everything except 128's, when they're aligned
+	 properly.
+
+	 3) But wait!  Aren't we looking for C, not zero?
+	 Good point.  So what we do is XOR LONGWORD with a longword,
+	 each of whose bytes is C.  This turns each byte that is C
+	 into a zero.  */
+
+      longword = *--longword_ptr ^ charmask;
+
+      /* Add MAGIC_BITS to LONGWORD.  */
+      if ((((longword + magic_bits)
+
+	    /* Set those bits that were unchanged by the addition.  */
+	    ^ ~longword)
+
+	   /* Look at only the hole bits.  If any of the hole bits
+	      are unchanged, most likely one of the bytes was a
+	      zero.  */
+	   & ~magic_bits) != 0)
+	{
+	  /* Which of the bytes was C?  If none of them were, it was
+	     a misfire; continue the search.  */
+
+	  const unsigned char *cp = (const unsigned char *) longword_ptr;
+
+	  if (cp[3] == c)
+	    return (void *) &cp[3];
+	  if (cp[2] == c)
+	    return (void *) &cp[2];
+	  if (cp[1] == c)
+	    return (void *) &cp[1];
+	  if (cp[0] == c)
+	    return (void *) cp;
+	}
+
+      n -= sizeof (longword);
+    }
+
+  char_ptr = (const unsigned char *) longword_ptr;
+
+  while (n-- > 0)
+    {
+      if (*--char_ptr == c)
+	return (void *) char_ptr;
+    }
+
+  return 0;
+}
+
+/*
+ * Borrowed from glibc-2.12.1/misc/dirname.c (GPL 2.1 or later)
+ * Copyright (C) 1996, 2000, 2001, 2002 Free Software Foundation, Inc.
+ * Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
+ */
+char *
+dirname_r (char *path)
+{
+  static const char dot[] = ".";
+  char *last_slash;
+
+  /* Find last '/'.  */
+  last_slash = path != NULL ? strrchr (path, '/') : NULL;
+
+  if (last_slash != NULL && last_slash != path && last_slash[1] == '\0')
+    {
+      /* Determine whether all remaining characters are slashes.  */
+      char *runp;
+
+      for (runp = last_slash; runp != path; --runp)
+        if (runp[-1] != '/')
+          break;
+
+      /* The '/' is the last character, we have to look further.  */
+      if (runp != path)
+        last_slash = __memrchr (path, '/', runp - path);
+    }
+
+  if (last_slash != NULL)
+    {
+      /* Determine whether all remaining characters are slashes.  */
+      char *runp;
+
+      for (runp = last_slash; runp != path; --runp)
+        if (runp[-1] != '/')
+          break;
+
+      /* Terminate the path.  */
+      if (runp == path)
+        {
+          /* The last slash is the first character in the string.  We have to
+             return "/".  As a special case we have to return "//" if there
+             are exactly two slashes at the beginning of the string.  See
+             XBD 4.10 Path Name Resolution for more information.  */
+          if (last_slash == path + 1)
+            ++last_slash;
+          else
+            last_slash = path + 1;
+        }
+      else
+        last_slash = runp;
+
+      last_slash[0] = '\0';
+    }
+  else
+    /* This assignment is ill-designed but the XPG specs require to
+       return a string containing "." in any case no directory part is
+       found and so a static and constant string is required.  */
+    path = (char *) dot;
+
+  return path;
+}
+
+/*
+ * Extended attribute API for NetBSD
+ */
+int
+removexattr(const char *path, const char *key)
+{ return extattr_delete_file(path, EXTATTR_NAMESPACE_USER, key); }
+
+ssize_t
+listxattr(const char *path, void *value, size_t size) 
+{ return extattr_list_file(path, EXTATTR_NAMESPACE_USER, value, size); }
+
+ssize_t
+getxattr(const char *path, const char *key, void *value, size_t size)
+{ return extattr_get_file(path, EXTATTR_NAMESPACE_USER, key, value, size); }
+
+int
+setxattr(const char *path, const char *key, const void *value, size_t size)
+{ return extattr_set_file(path, EXTATTR_NAMESPACE_USER, key, value, size); }
+
+int
+fremovexattr(int fd, const char *key)
+{ return extattr_delete_fd(fd, EXTATTR_NAMESPACE_USER, key); }
+
+ssize_t
+flistxattr(int fd, void *value, size_t size) 
+{ return extattr_list_fd(fd, EXTATTR_NAMESPACE_USER, value, size); }
+
+ssize_t
+fgetxattr(int fd, const char *key, void *value, size_t size)
+{ return extattr_get_fd(fd, EXTATTR_NAMESPACE_USER, key, value, size); }
+
+int
+fsetxattr(int fd, const char *key, const void *value, size_t size)
+{ return extattr_set_fd(fd, EXTATTR_NAMESPACE_USER, key, value, size); }
+
+int
+lremovexattr(const char *path, const char *key)
+{ return extattr_delete_link(path, EXTATTR_NAMESPACE_USER, key); }
+
+ssize_t
+llistxattr(const char *path, void *value, size_t size) 
+{ return extattr_list_link(path, EXTATTR_NAMESPACE_USER, value, size); }
+
+ssize_t
+lgetxattr(const char *path, const char *key, void *value, size_t size)
+{ return extattr_get_link(path, EXTATTR_NAMESPACE_USER, key, value, size); }
+
+int
+lsetxattr(const char *path, const char *key, const void *value, size_t size)
+{ return extattr_set_link(path, EXTATTR_NAMESPACE_USER, key, value, size); }
+
+#endif /* __NetBSD__ */