Merge branch 'upstream'

Conflicts:
	glusterfs.spec.in
	xlators/mgmt/glusterd/src/Makefile.am
	xlators/mgmt/glusterd/src/glusterd-utils.c
	xlators/mgmt/glusterd/src/glusterd.h

Change-Id: I27bdcf42b003cfc42d6ad981bd2bf8180176806d

1 files changed, 29 insertions, 0 deletions

diff --git a/contrib/argp-standalone/strcasecmp.c b/contrib/argp-standalone/strcasecmp.c
new file mode 100644
index 000000000..9c1637232
--- /dev/null
+++ b/contrib/argp-standalone/strcasecmp.c
@@ -0,0 +1,29 @@
+/* strcasecmp.c
+ *
+ */
+
+/* Written by Niels Möller <nisse@lysator.liu.se>
+ *
+ * This file is hereby placed in the public domain.
+ */
+
+#include <ctype.h>
+int strcasecmp(const char *, const char *);
+
+int strcasecmp(const char *s1, const char *s2)
+{
+  unsigned i;
+  
+  for (i = 0; s1[i] && s2[i]; i++)
+    {
+      unsigned char c1 = tolower( (unsigned char) s1[i]);
+      unsigned char c2 = tolower( (unsigned char) s2[i]);
+
+      if (c1 < c2)
+	return -1;
+      else if (c1 > c2)
+	return 1;
+    }
+
+  return !s2[i] - !s1[i];	
+}