From: Karel Zak <kzak@redhat.com>
Date: Fri, 26 Nov 2021 11:12:54 +0000 (+0100)
Subject: Merge branch 'topic/lsfd'
X-Git-Tag: v2.38-rc1~144
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1b44d0923281173409c71aef551334e78820878d;p=thirdparty%2Futil-linux.git

Merge branch 'topic/lsfd'
---

1b44d0923281173409c71aef551334e78820878d
diff --cc misc-utils/hardlink.c
index 7c11f644a5,88959caf02..2abd6d6644
--- a/misc-utils/hardlink.c
+++ b/misc-utils/hardlink.c
@@@ -43,13 -43,11 +43,13 @@@
  #include "strutils.h"
  #include "monotonic.h"
  #include "optutils.h"
 +#include "fileeq.h"
  
- #include <regex.h>		/* regcomp(), regsearch() */
+ #include <regex.h>		/* regcomp(), regexec() */
  
 -#ifdef HAVE_SYS_XATTR_H
 -# include <sys/xattr.h>		/* listxattr, getxattr */
 +#if defined(HAVE_SYS_XATTR_H) && defined(HAVE_LLISTXATTR) && defined(HAVE_LGETXATTR)
 +# include <sys/xattr.h>
 +# define USE_XATTR 1
  #endif
  
  static int quiet;		/* don't print anything */