summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmmanuel Dreyfus <manu@netbsd.org>2012-08-31 03:23:33 +0200
committerAnand Avati <avati@redhat.com>2012-09-09 11:20:44 -0700
commit87e88243e827d7c1dc5b5138ac966b41002564e4 (patch)
tree4142be044ebb4fe86e9d4c903d2317465e4cefb0
parent0b60e7252650355f412974bfc840bc2fc81b4157 (diff)
Add missing contrib/libgen files to distribution
This is a backport of I3f49eb4a1a186cb2d178539ada6a05c8c1aa8265 BUG: 764655 Change-Id: I32264acec0f122d045f369a254df17b488962b9f Signed-off-by: Emmanuel Dreyfus <manu@netbsd.org> Reviewed-on: http://review.gluster.org/3884 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com> Reviewed-by: Anand Avati <avati@redhat.com>
-rw-r--r--contrib/libgen/basename_r.c4
-rw-r--r--contrib/libgen/dirname_r.c4
-rw-r--r--libglusterfs/src/Makefile.am4
-rw-r--r--libglusterfs/src/compat.c7
4 files changed, 11 insertions, 8 deletions
diff --git a/contrib/libgen/basename_r.c b/contrib/libgen/basename_r.c
index e3fae60..d63bce4 100644
--- a/contrib/libgen/basename_r.c
+++ b/contrib/libgen/basename_r.c
@@ -1,7 +1,10 @@
+#ifdef THREAD_UNSAFE_BASENAME
/*
* borrowed from glibc-2.12.1/string/basename.c
* Modified to return "." for NULL or "", as required for SUSv2.
*/
+#include <string.h>
+#include <stdlib.h>
/* Return the name-within-directory of a file name.
Copyright (C) 1996,97,98,2002 Free Software Foundation, Inc.
@@ -34,3 +37,4 @@ basename_r (filename)
p = strrchr (filename, '/');
return p ? p + 1 : (char *) filename;
}
+#endif /* THREAD_UNSAFE_BASENAME */
diff --git a/contrib/libgen/dirname_r.c b/contrib/libgen/dirname_r.c
index 78fe0ee..02981f5 100644
--- a/contrib/libgen/dirname_r.c
+++ b/contrib/libgen/dirname_r.c
@@ -1,9 +1,12 @@
+#ifdef THREAD_UNSAFE_DIRNAME
/*
* Borrowed from glibc-2.12.1/string/memrchr.c
* 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.
*/
+#include <string.h>
+#include <stdlib.h>
/* memrchr -- find the last occurrence of a byte in a memory block
Copyright (C) 1991, 93, 96, 97, 99, 2000 Free Software Foundation, Inc.
@@ -237,3 +240,4 @@ dirname_r (char *path)
return path;
}
+#endif /* THREAD_UNSAFE_DIRNAME */
diff --git a/libglusterfs/src/Makefile.am b/libglusterfs/src/Makefile.am
index 2dab873..d708f98 100644
--- a/libglusterfs/src/Makefile.am
+++ b/libglusterfs/src/Makefile.am
@@ -22,7 +22,9 @@ libglusterfs_la_SOURCES = dict.c xlator.c logging.c \
$(CONTRIBDIR)/uuid/parse.c $(CONTRIBDIR)/uuid/unparse.c \
$(CONTRIBDIR)/uuid/uuid_time.c $(CONTRIBDIR)/uuid/compare.c \
$(CONTRIBDIR)/uuid/isnull.c $(CONTRIBDIR)/uuid/unpack.c syncop.c \
- graph-print.c trie.c run.c options.c fd-lk.c circ-buff.c event-history.c
+ graph-print.c trie.c run.c options.c fd-lk.c circ-buff.c \
+ event-history.c \
+ $(CONTRIBDIR)/libgen/basename_r.c $(CONTRIBDIR)/libgen/dirname_r.c
nodist_libglusterfs_la_SOURCES = y.tab.c graph.lex.c
diff --git a/libglusterfs/src/compat.c b/libglusterfs/src/compat.c
index 99a0041..2dcd56a 100644
--- a/libglusterfs/src/compat.c
+++ b/libglusterfs/src/compat.c
@@ -550,10 +550,3 @@ strnlen(const char *string, size_t maxlen)
return len;
}
#endif /* STRNLEN */
-
-#ifdef THREAD_UNSAFE_BASENAME
-#include "../../contrib/libgen/basename_r.c"
-#endif
-#ifdef THREAD_UNSAFE_DIRNAME
-#include "../../contrib/libgen/dirname_r.c"
-#endif