summaryrefslogtreecommitdiff
path: root/libbtrfsutil
diff options
context:
space:
mode:
authorDavid Sterba <dsterba@suse.com>2018-02-22 12:45:14 +0100
committerDavid Sterba <dsterba@suse.com>2018-03-06 11:28:37 +0100
commite0d173c6c44d52287f2e20ec104cb3840e558343 (patch)
treee62f10a19d4381703b6420884d699b04bbeab264 /libbtrfsutil
parent624e0233e09a034a0b8a6da445f725706ef2d9f8 (diff)
libbtrfsutil: add stub for reallocarray
This function is new in glibc 2.26 and breaks build in CI and possibly other environments. Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'libbtrfsutil')
-rw-r--r--libbtrfsutil/stubs.c35
-rw-r--r--libbtrfsutil/stubs.h22
-rw-r--r--libbtrfsutil/subvolume.c1
3 files changed, 58 insertions, 0 deletions
diff --git a/libbtrfsutil/stubs.c b/libbtrfsutil/stubs.c
new file mode 100644
index 0000000..9b9e037
--- /dev/null
+++ b/libbtrfsutil/stubs.c
@@ -0,0 +1,35 @@
+/*
+ * This file is part of libbtrfsutil.
+ *
+ * libbtrfsutil is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * libbtrfsutil is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with libbtrfsutil. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#if HAVE_REALLOCARRAY != 1
+
+#include <stdlib.h>
+#include <errno.h>
+
+void *reallocarray(void *ptr, size_t nmemb, size_t size)
+{
+ size_t res;
+
+ res = nmemb * size;
+ if (res < nmemb || res < size) {
+ errno = ENOMEM;
+ return NULL;
+ }
+ return realloc(ptr, res);
+}
+
+#endif
diff --git a/libbtrfsutil/stubs.h b/libbtrfsutil/stubs.h
new file mode 100644
index 0000000..cb6d43c
--- /dev/null
+++ b/libbtrfsutil/stubs.h
@@ -0,0 +1,22 @@
+/*
+ * This file is part of libbtrfsutil.
+ *
+ * libbtrfsutil is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * libbtrfsutil is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with libbtrfsutil. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _LIBBTRFSUTIL_STUBS_H_
+
+void *reallocarray(void *ptr, size_t nmemb, size_t size);
+
+#endif
diff --git a/libbtrfsutil/subvolume.c b/libbtrfsutil/subvolume.c
index 965376e..b9bb99f 100644
--- a/libbtrfsutil/subvolume.c
+++ b/libbtrfsutil/subvolume.c
@@ -27,6 +27,7 @@
#include <sys/types.h>
#include <sys/vfs.h>
#include <linux/magic.h>
+#include "stubs.h"
#include "btrfsutil_internal.h"