mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git
synced 2024-12-12 05:33:25 +08:00
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>
This commit is contained in:
parent
624e0233e0
commit
e0d173c6c4
3
Makefile
3
Makefile
@ -136,7 +136,8 @@ libbtrfsutil_minor := $(shell sed -rn 's/^\#define BTRFS_UTIL_VERSION_MINOR ([0-
|
||||
libbtrfsutil_patch := $(shell sed -rn 's/^\#define BTRFS_UTIL_VERSION_PATCH ([0-9])+$$/\1/p' libbtrfsutil/btrfsutil.h)
|
||||
libbtrfsutil_version := $(libbtrfsutil_major).$(libbtrfsutil_minor).$(libbtrfsutil_patch)
|
||||
libbtrfsutil_objects = libbtrfsutil/errors.o libbtrfsutil/filesystem.o \
|
||||
libbtrfsutil/subvolume.o libbtrfsutil/qgroup.o
|
||||
libbtrfsutil/subvolume.o libbtrfsutil/qgroup.o \
|
||||
libbtrfsutil/stubs.o
|
||||
convert_objects = convert/main.o convert/common.o convert/source-fs.o \
|
||||
convert/source-ext2.o convert/source-reiserfs.o
|
||||
mkfs_objects = mkfs/main.o mkfs/common.o mkfs/rootdir.o
|
||||
|
@ -43,6 +43,8 @@ AC_PATH_PROG([RMDIR], [rmdir], [rmdir])
|
||||
AC_CHECK_FUNCS([openat], [],
|
||||
[AC_MSG_ERROR([cannot find openat() function])])
|
||||
|
||||
AC_CHECK_FUNCS([reallocarray])
|
||||
|
||||
m4_ifndef([PKG_PROG_PKG_CONFIG],
|
||||
[m4_fatal([Could not locate the pkg-config autoconf
|
||||
macros. These are usually located in /usr/share/aclocal/pkg.m4.
|
||||
|
35
libbtrfsutil/stubs.c
Normal file
35
libbtrfsutil/stubs.c
Normal file
@ -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
|
22
libbtrfsutil/stubs.h
Normal file
22
libbtrfsutil/stubs.h
Normal file
@ -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
|
@ -27,6 +27,7 @@
|
||||
#include <sys/types.h>
|
||||
#include <sys/vfs.h>
|
||||
#include <linux/magic.h>
|
||||
#include "stubs.h"
|
||||
|
||||
#include "btrfsutil_internal.h"
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user