开源软件构建与测试

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 4

_service:tar_scm:coreutils.spec Changed

@@ -1,6 +1,6 @@
 Name:       coreutils
-Version:    9.3
-Release:    3
+Version:    9.4
+Release:    2
 License:    GPLv3+
 Summary:    A set of basic GNU tools commonly used in shell scripts
 Url:        https://www.gnu.org/software/coreutils/
@@ -19,11 +19,11 @@
 Patch4:    bugfix-dummy_help2man.patch
 Patch6:    skip-the-tests-that-require-selinux-if-selinux-is-di.patch 
 Patch7:    backport-config-color-alias-for-ls.patch
-Patch8:    backport-coreutils-i18n.patch
-Patch9:    backport-pr-fix-infinite-loop-when-double-spacing.patch
+Patch8:    backport-coreutils-df-direct.patch
+Patch9:    backport-coreutils-i18n.patch
 patch10:   backport-CVE-2024-0684-split-do-not-shrink-hold-buffer.patch
+patch11:   test-skip-overlay-filesystem-because-of-no-inotify_add_watch.patch
 
-Patch9000:   openEuler-coreutils-df-direct.patch
 %ifarch sw_64
 Patch9001:   coreutils-9.0-sw.patch
 %endif
@@ -155,6 +155,13 @@
 %{_mandir}/man*/*
 
 %changelog
+* Fri Feb 2 2024 jiangchuangang <jiangchuangang@huawei.com> - 9.4-2
+- skip testcase for overlay filesystem because of no inotify_add_watch
+  add test-skip-overlay-filesystem-because-of-no-inotify_add_watch.patch 
+
+* Thu Feb 1 2024 lvgenggeng <lvgenggeng@uniontech.com> - 9.4-1
+- bump to 9.4
+
 * Wed Jan 24 2024 Jiangchuangang <jiangchuangang@huawei.com> - 9.3-3
 - fix CVE-2024-0684

_service:tar_scm:backport-coreutils-df-direct.patch Added

@@ -0,0 +1,187 @@
+From 6e36198f10a2f63b89c89ebb5d5c185b20fb3a63 Mon Sep 17 00:00:00 2001
+From: Kamil Dudka <kdudka@redhat.com>
+Date: Mon, 29 Mar 2010 17:20:34 +0000
+Subject: PATCH coreutils-df-direct.patch
+
+---
+ doc/coreutils.texi |  7 ++++++
+ src/df.c           | 34 ++++++++++++++++++++++++++--
+ tests/df/direct.sh | 55 ++++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 94 insertions(+), 2 deletions(-)
+ create mode 100755 tests/df/direct.sh
+
+diff --git a/doc/coreutils.texi b/doc/coreutils.texi
+index 5b9a597..6810c15 100644
+--- a/doc/coreutils.texi
++++ b/doc/coreutils.texi
+@@ -12074,6 +12074,13 @@ some systems (notably Solaris), doing this yields more up to date results,
+ but in general this option makes @command{df} much slower, especially when
+ there are many or very busy file systems.
+ 
++@item --direct
++@opindex --direct
++@cindex direct statfs for a file
++Do not resolve mount point and show statistics directly for a file. It can be
++especially useful for NFS mount points if there is a boundary between two
++storage policies behind the mount point.
++
+ @item --total
+ @opindex --total
+ @cindex grand total of file system size, usage and available space
+diff --git a/src/df.c b/src/df.c
+index 48025b9..c8efa5b 100644
+--- a/src/df.c
++++ b/src/df.c
+@@ -125,6 +125,9 @@ static bool print_type;
+ /* If true, print a grand total at the end.  */
+ static bool print_grand_total;
+ 
++/* If true, show statistics for a file instead of mount point.  */
++static bool direct_statfs;
++
+ /* Grand total data.  */
+ static struct fs_usage grand_fsu;
+ 
+@@ -252,13 +255,15 @@ enum
+   NO_SYNC_OPTION = CHAR_MAX + 1,
+   SYNC_OPTION,
+   TOTAL_OPTION,
+-  OUTPUT_OPTION
++  OUTPUT_OPTION,
++  DIRECT_OPTION
+ };
+ 
+ static struct option const long_options =
+ {
+   {"all", no_argument, nullptr, 'a'},
+   {"block-size", required_argument, nullptr, 'B'},
++  {"direct", no_argument, nullptr, DIRECT_OPTION},
+   {"inodes", no_argument, nullptr, 'i'},
+   {"human-readable", no_argument, nullptr, 'h'},
+   {"si", no_argument, nullptr, 'H'},
+@@ -583,7 +588,10 @@ get_header (void)
+   for (col = 0; col < ncolumns; col++)
+     {
+       char *cell = nullptr;
+-      char const *header = _(columnscol->caption);
++      char const *header = (columnscol->field == TARGET_FIELD
++                            && direct_statfs)?
++                            _("File") :
++                            _(columnscol->caption);
+ 
+       if (columnscol->field == SIZE_FIELD
+           && (header_mode == DEFAULT_MODE
+@@ -1486,6 +1494,17 @@ get_point (char const *point, const struct stat *statp)
+ static void
+ get_entry (char const *name, struct stat const *statp)
+ {
++  if (direct_statfs)
++    {
++      char *resolved = canonicalize_file_name (name);
++      if (resolved)
++        {
++          get_dev (NULL, resolved, name, NULL, NULL, false, false, NULL, false);
++          free (resolved);
++          return;
++        }
++    }
++
+   if ((S_ISBLK (statp->st_mode) || S_ISCHR (statp->st_mode))
+       && get_device (name))
+     return;
+@@ -1556,6 +1575,7 @@ or all file systems by default.\n\
+   -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n\
+                            '-BM' prints sizes in units of 1,048,576 bytes;\n\
+                            see SIZE format below\n\
++      --direct          show statistics for a file instead of mount point\n\
+   -h, --human-readable  print sizes in powers of 1024 (e.g., 1023M)\n\
+   -H, --si              print sizes in powers of 1000 (e.g., 1.1G)\n\
+ "), stdout);
+@@ -1646,6 +1666,9 @@ main (int argc, char **argv)
+               xstrtol_fatal (e, oi, c, long_options, optarg);
+           }
+           break;
++        case DIRECT_OPTION:
++          direct_statfs = true;
++          break;
+         case 'i':
+           if (header_mode == OUTPUT_MODE)
+             {
+@@ -1742,6 +1765,13 @@ main (int argc, char **argv)
+         }
+     }
+ 
++  if (direct_statfs && show_local_fs)
++    {
++      error (0, 0, _("options --direct and --local (-l) are mutually "
++                     "exclusive"));
++      usage (EXIT_FAILURE);
++    }
++
+   if (human_output_opts == -1)
+     {
+       if (posix_format)
+diff --git a/tests/df/direct.sh b/tests/df/direct.sh
+new file mode 100755
+index 0000000..8e4cfb8
+--- /dev/null
++++ b/tests/df/direct.sh
+@@ -0,0 +1,55 @@
++#!/bin/sh
++# Ensure "df --direct" works as documented
++
++# Copyright (C) 2010 Free Software Foundation, Inc.
++
++# This program is free software: you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation, either version 3 of the License, or
++# (at your option) any later version.
++
++# This program 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 General Public License for more details.
++
++# You should have received a copy of the GNU General Public License
++# along with this program.  If not, see <http://www.gnu.org/licenses/>.
++
++. "${srcdir=.}/init.sh"; path_prepend_ ../src
++print_ver_ df
++
++df || skip_ "df fails"
++
++DIR=`pwd` || framework_failure
++FILE="$DIR/file"
++touch "$FILE" || framework_failure
++echo "$FILE" > file_exp || framework_failure
++echo "Mounted on" > header_mounted_exp || framework_failure
++echo "File" > header_file_exp || framework_failure
++
++fail=0
++
++df --portability "$FILE" > df_out || fail=1
++df --portability --direct "$FILE" > df_direct_out || fail=1
++df --portability --direct --local "$FILE" > /dev/null 2>&1 && fail=1
++
++# check df header
++$AWK '{ if (NR==1) print $6 " " $7; }' df_out > header_mounted_out \
++  || framework_failure
++$AWK '{ if (NR==1) print $6; }' df_direct_out > header_file_out \
++  || framework_failure
++compare header_mounted_out header_mounted_exp || fail=1
++compare header_file_out header_file_exp || fail=1
++
++# check df output (without --direct)
++$AWK '{ if (NR==2) print $6; }' df_out > file_out \
++  || framework_failure
++compare file_out file_exp && fail=1
++
++# check df output (with --direct)
++$AWK '{ if (NR==2) print $6; }' df_direct_out > file_out \
++  || framework_failure
++compare file_out file_exp || fail=1
++
++Exit $fail
+-- 
+2.31.1
+

_service:tar_scm:backport-coreutils-i18n.patch Changed

@@ -1,14 +1,14 @@
-From 01010419a6499768563e7b2f3fd56cf16edda75e Mon Sep 17 00:00:00 2001
+From 3a1b92e80708319bcc89852e3da1029c3d1ff6b3 Mon Sep 17 00:00:00 2001
 From: rpm-build <rpm-build>
-Date: Mon, 4 Oct 2021 08:54:37 +0200
+Date: Wed, 30 Aug 2023 17:19:58 +0200
 Subject: PATCH coreutils-i18n.patch
 
 ---
  bootstrap.conf              |   1 +
- configure.ac                |   2 +
+ configure.ac                |   6 +
  lib/linebuffer.h            |   8 +
- lib/mbfile.c                |   3 +
- lib/mbfile.h                | 255 ++++++++++++
+ lib/mbfile.c                |  20 +
+ lib/mbfile.h                | 267 ++++++++++++
  m4/mbfile.m4                |  14 +
  src/cut.c                   | 508 +++++++++++++++++++++--
  src/expand-common.c         | 114 ++++++
@@ -29,13 +29,13 @@
  tests/misc/fold.pl          |  50 ++-
  tests/misc/join.pl          |  50 +++
  tests/misc/sort-mb-tests.sh |  45 ++
- tests/misc/sort-merge.pl    |  42 ++
- tests/misc/sort.pl          |  40 +-
  tests/misc/unexpand.pl      |  39 ++
- tests/misc/uniq.pl          |  55 +++
  tests/pr/pr-tests.pl        |  49 +++
+ tests/sort/sort-merge.pl    |  42 ++
+ tests/sort/sort.pl          |  40 +-
  tests/unexpand/mb.sh        | 172 ++++++++
- 31 files changed, 3699 insertions(+), 242 deletions(-)
+ tests/uniq/uniq.pl          |  55 +++
+ 31 files changed, 3732 insertions(+), 242 deletions(-)
  create mode 100644 lib/mbfile.c
  create mode 100644 lib/mbfile.h
  create mode 100644 m4/mbfile.m4
@@ -45,10 +45,10 @@
  create mode 100755 tests/unexpand/mb.sh
 
 diff --git a/bootstrap.conf b/bootstrap.conf
-index c1399e3..60b39cf 100644
+index bd73ff2..0e450cd 100644
 --- a/bootstrap.conf
 +++ b/bootstrap.conf
-@@ -165,6 +165,7 @@ gnulib_modules="
+@@ -167,6 +167,7 @@ gnulib_modules="
    maintainer-makefile
    malloc-gnu
    manywarnings
@@ -57,20 +57,24 @@
    mbrtowc
    mbsalign
 diff --git a/configure.ac b/configure.ac
-index 7e4afc9..4656a35 100644
+index 8ffc0b7..ca3305d 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -477,6 +477,8 @@ fi
+@@ -448,6 +448,12 @@ fi
  # I'm leaving it here for now.  This whole thing needs to be modernized...
  gl_WINSIZE_IN_PTEM
  
 +gl_MBFILE
++dnl Do not use gl_MODULE_INDICATOR(mbfile) here: we don't want 'struct mbchar'
++dnl to have a different size in lib/ than in tests/.
++AC_DEFINE(GNULIB_MBFILE, 1,
++  Define to 1 if the gnulib module 'mbfile' is in use.)
 +
  gl_HEADER_TIOCGWINSZ_IN_TERMIOS_H
  
  if test $gl_cv_sys_tiocgwinsz_needs_termios_h = no && \
 diff --git a/lib/linebuffer.h b/lib/linebuffer.h
-index 07d45ca..af62e6c 100644
+index b4cc8e4..f2bbb52 100644
 --- a/lib/linebuffer.h
 +++ b/lib/linebuffer.h
 @@ -22,6 +22,11 @@
@@ -97,34 +101,51 @@
  /* Initialize linebuffer LINEBUFFER for use. */
 diff --git a/lib/mbfile.c b/lib/mbfile.c
 new file mode 100644
-index 0000000..b0a468e
+index 0000000..8d2957b
 --- /dev/null
 +++ b/lib/mbfile.c
-@@ -0,0 +1,3 @@
+@@ -0,0 +1,20 @@
++/* Multibyte character I/O: macros for multi-byte encodings.
++   Copyright (C) 2012-2023 Free Software Foundation, Inc.
++
++   This file 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.
++
++   This file 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 this program.  If not, see <https://www.gnu.org/licenses/>.  */
++
 +#include <config.h>
++
 +#define MBFILE_INLINE _GL_EXTERN_INLINE
 +#include "mbfile.h"
 diff --git a/lib/mbfile.h b/lib/mbfile.h
 new file mode 100644
-index 0000000..11f1b12
+index 0000000..ad61c19
 --- /dev/null
 +++ b/lib/mbfile.h
-@@ -0,0 +1,255 @@
+@@ -0,0 +1,267 @@
 +/* Multibyte character I/O: macros for multi-byte encodings.
-+   Copyright (C) 2001, 2005, 2009-2015 Free Software Foundation, Inc.
++   Copyright (C) 2001, 2005, 2009-2023 Free Software Foundation, Inc.
 +
-+   This program is free software: you can redistribute it and/or modify
-+   it under the terms of the GNU General Public License as published by
-+   the Free Software Foundation; either version 3 of the License, or
-+   (at your option) any later version.
++   This file 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.
 +
-+   This program is distributed in the hope that it will be useful,
++   This file 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 General Public License for more details.
++   GNU Lesser General Public License for more details.
 +
-+   You should have received a copy of the GNU General Public License
-+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
++   You should have received a copy of the GNU Lesser General Public License
++   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 +
 +/* Written by Mitsuru Chinen <mchinen@yamato.ibm.com>
 +   and Bruno Haible <bruno@clisp.org>.  */
@@ -159,24 +180,18 @@
 +#ifndef _MBFILE_H
 +#define _MBFILE_H 1
 +
++/* This file uses _GL_INLINE_HEADER_BEGIN, _GL_INLINE.  */
++#if !_GL_CONFIG_H_INCLUDED
++ #error "Please include config.h first."
++#endif
++
 +#include <assert.h>
-+#include <stdbool.h>
 +#include <stdio.h>
 +#include <string.h>
-+
-+/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
-+   <wchar.h>.
-+   BSD/OS 4.1 has a bug: <stdio.h> and <time.h> must be included before
-+   <wchar.h>.  */
-+#include <stdio.h>
-+#include <time.h>
 +#include <wchar.h>
 +
 +#include "mbchar.h"
 +
-+#ifndef _GL_INLINE_HEADER_BEGIN
-+ #error "Please include config.h first."
-+#endif
 +_GL_INLINE_HEADER_BEGIN
 +#ifndef MBFILE_INLINE
 +# define MBFILE_INLINE _GL_INLINE
@@ -195,6 +210,7 @@
 +MBFILE_INLINE void
 +mbfile_multi_getc (struct mbchar *mbc, struct mbfile_multi *mbf)
 +{
++  unsigned int new_bufcount;
 +  size_t bytes;
 +
 +  /* If EOF has already been seen, don't use getc.  This matters if
@@ -210,64 +226,70 @@
 +      return;
 +    }
 +
-+  /* Before using mbrtowc, we need at least one byte.  */
-+  if (mbf->bufcount == 0)
++  new_bufcount = mbf->bufcount;
++
++  /* If mbf->state is not in an initial state, some more 32-bit wide character
++     may be hiding in the state.  We need to call mbrtoc32 again.  */
++  #if GNULIB_MBRTOC32_REGULAR
++  assert (mbsinit (&mbf->state));
++  #else
++  if (mbsinit (&mbf->state))
++  #endif
 +    {
-+      int c = getc (mbf->fp);
-+      if (c == EOF)

_service:tar_scm:backport-pr-fix-infinite-loop-when-double-spacing.patch Deleted

@@ -1,67 +0,0 @@
-From 3fb0cc80fa5e1cede9ec05303a70c26d0d23ca1d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
-Date: Tue, 25 Apr 2023 14:07:03 +0100
-Subject: PATCH pr: fix infinite loop when double spacing
-
-* src/pr.c (init_parameters): Ensure we avoid a 0 lines_per_body
-which was possible when adjusting for double spacing.
-That caused print_page() to always return true,
-causing an infinite loop.
-* tests/pr/pr-tests.pl: Add a test case.
-* NEWS: Mention the fix.
-Fixes https://bugs.debian.org/1034808
-
-Conflict:NEWS context adaption
-Reference:https://github.com/coreutils/coreutils/commit/3fb0cc80fa5e1cede9ec05303a70c26d0d23ca1d
-
----
- NEWS                 | 3 +++
- src/pr.c             | 2 +-
- tests/pr/pr-tests.pl | 3 +++
- 3 files changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/NEWS b/NEWS
-index f65eb95..5320b9c 100644
---- a/NEWS
-+++ b/NEWS
-@@ -3,6 +3,9 @@ GNU coreutils NEWS                                    -*- outline -*-
- * Noteworthy changes in release 9.3 (2023-04-18) stable
-
- ** Bug fixes
-+
-+  'pr --length=1 --double-space' no longer enters an infinite loop.
-+  This bug was present in "the beginning".
-
-   cp --reflink=auto (the default), mv, and install
-   will again fall back to a standard copy in more cases.
-   Previously copies could fail with permission errors on
-diff --git a/src/pr.c b/src/pr.c
-index 2c5cdceb1..14a368b6c 100644
---- a/src/pr.c
-+++ b/src/pr.c
-@@ -1209,7 +1209,7 @@ init_parameters (int number_of_files)
-     lines_per_body = lines_per_page;
- 
-   if (double_space)
--    lines_per_body = lines_per_body / 2;
-+    lines_per_body = MAX (1, lines_per_body / 2);
- 
-   /* If input is stdin, cannot print parallel files.  BSD dumps core
-      on this. */
-diff --git a/tests/pr/pr-tests.pl b/tests/pr/pr-tests.pl
-index 265e6e108..eafc13d81 100755
---- a/tests/pr/pr-tests.pl
-+++ b/tests/pr/pr-tests.pl
-@@ -415,6 +415,9 @@ my @tv = (
- 'padding2', '-t -n,64', "1\n", (" "x 63)."1,1\n", 0,
- # Ensure we handle buffer truncation correctly
- 'padding3', '-t -N1000000 -n,1', "1\n", "0,1\n", 0,
-+
-+# This entered an infinite loop before coreutils-9.4
-+'page-length1', '-dl1', "", "", 0,
- );
- 
- # Convert the above old-style test vectors to the newer
--- 
-2.36.1
-

_service:tar_scm:openEuler-coreutils-df-direct.patch Deleted

@@ -1,194 +0,0 @@
-From f11a739f6aabbf280fa68a8013974de7d0855ecd Mon Sep 17 00:00:00 2001
-From: xueyamao <xueyamao@kylinos.cn>
-Date: Wed, 20 Jul 2022 17:49:23 +0800
-Subject: PATCH 2/2 coreutils-df-direct add df --direct option,direct statfs
- for a file. Do not resolve mount point and show statistics directly for a
- file. Signed-off-by: xueyamao <xueyamao@kylinos.cn>
-
----
- doc/coreutils.texi |  7 ++++++
- src/df.c           | 38 ++++++++++++++++++++++++++++---
- tests/df/direct.sh | 56 ++++++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 98 insertions(+), 3 deletions(-)
- create mode 100644 tests/df/direct.sh
-
-diff --git a/doc/coreutils.texi b/doc/coreutils.texi
-index cb00eea..7667ace 100644
---- a/doc/coreutils.texi
-+++ b/doc/coreutils.texi
-@@ -12067,6 +12067,13 @@ some systems (notably Solaris), doing this yields more up to date results,
- but in general this option makes @command{df} much slower, especially when
- there are many or very busy file systems.
- 
-+@item --direct
-+@opindex --direct
-+@cindex direct statfs for a file
-+Do not resolve mount point and show statistics directly for a file. It can be
-+especially useful for NFS mount points if there is a boundary between two
-+storage policies behind the mount point.
-+
- @item --total
- @opindex --total
- @cindex grand total of file system size, usage and available space
-diff --git a/src/df.c b/src/df.c
-index 6256d0a..1c5fe5f 100644
---- a/src/df.c
-+++ b/src/df.c
-@@ -125,6 +125,9 @@ static bool print_type;
- /* If true, print a grand total at the end.  */
- static bool print_grand_total;
- 
-+/* If true, show statistics for a file instead of mount point.  */
-+static bool direct_statfs;
-+
- /* Grand total data.  */
- static struct fs_usage grand_fsu;
- 
-@@ -252,13 +255,15 @@ enum
-   NO_SYNC_OPTION = CHAR_MAX + 1,
-   SYNC_OPTION,
-   TOTAL_OPTION,
--  OUTPUT_OPTION
-+  OUTPUT_OPTION,
-+  DIRECT_OPTION
- };
- 
- static struct option const long_options =
- {
-   {"all", no_argument, NULL, 'a'},
-   {"block-size", required_argument, NULL, 'B'},
-+  {"direct",no_argument,NULL,DIRECT_OPTION},
-   {"inodes", no_argument, NULL, 'i'},
-   {"human-readable", no_argument, NULL, 'h'},
-   {"si", no_argument, NULL, 'H'},
-@@ -583,7 +588,10 @@ get_header (void)
-   for (col = 0; col < ncolumns; col++)
-     {
-       char *cell = NULL;
--      char const *header = _(columnscol->caption);
-+      char const *header = (columnscol->field == TARGET_FIELD
-+                            && direct_statfs)?
-+                            _("File") :
-+                            _(columnscol->caption);
- 
-       if (columnscol->field == SIZE_FIELD
-           && (header_mode == DEFAULT_MODE
-@@ -1480,7 +1488,20 @@ get_point (char const *point, const struct stat *statp)
- static void
- get_entry (char const *name, struct stat const *statp)
- {
--  if ((S_ISBLK (statp->st_mode) || S_ISCHR (statp->st_mode))
-+   if (direct_statfs)
-+    {
-+      char *resolved = canonicalize_file_name (name);
-+      if (resolved)
-+       {
-+         char *mp = find_mount_point (name, statp);
-+         get_dev (NULL, mp, resolved, NULL, NULL, false, false, NULL, false);
-+         free(mp);
-+         free (resolved);
-+         return;
-+       }
-+    }
-+   
-+    if ((S_ISBLK (statp->st_mode) || S_ISCHR (statp->st_mode))
-       && get_device (name))
-     return;
- 
-@@ -1550,6 +1571,7 @@ or all file systems by default.\n\
-   -B, --block-size=SIZE  scale sizes by SIZE before printing them; e.g.,\n\
-                            '-BM' prints sizes in units of 1,048,576 bytes;\n\
-                            see SIZE format below\n\
-+      --direct          show statistics for a file instead of mount point\n\
-   -h, --human-readable  print sizes in powers of 1024 (e.g., 1023M)\n\
-   -H, --si              print sizes in powers of 1000 (e.g., 1.1G)\n\
- "), stdout);
-@@ -1640,6 +1662,9 @@ main (int argc, char **argv)
-               xstrtol_fatal (e, oi, c, long_options, optarg);
-           }
-           break;
-+	case DIRECT_OPTION:
-+          direct_statfs = true;
-+          break;
-         case 'i':
-           if (header_mode == OUTPUT_MODE)
-             {
-@@ -1736,6 +1761,13 @@ main (int argc, char **argv)
-         }
-     }
- 
-+  if (direct_statfs && show_local_fs)
-+    {
-+      error (0, 0, _("options --direct and --local (-l) are mutually "
-+                    "exclusive"));
-+      usage (EXIT_FAILURE);
-+    }
-+
-   if (human_output_opts == -1)
-     {
-       if (posix_format)
-diff --git a/tests/df/direct.sh b/tests/df/direct.sh
-new file mode 100644
-index 0000000..25fbc57
---- /dev/null
-+++ b/tests/df/direct.sh
-@@ -0,0 +1,56 @@
-+#!/bin/sh
-+# Ensure "df --direct" works as documented
-+
-+# Copyright (C) 2010 Free Software Foundation, Inc.
-+
-+# This program is free software: you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation, either version 3 of the License, or
-+# (at your option) any later version.
-+
-+# This program 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 General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+
-+. "${srcdir=.}/init.sh"; path_prepend_ ../src
-+print_ver_ df
-+
-+df || skip_ "df fails"
-+
-+DIR=`pwd` || framework_failure
-+FILE="$DIR/file"
-+touch "$FILE" || framework_failure
-+echo "$FILE" > file_exp || framework_failure
-+echo "Mounted on" > header_mounted_exp || framework_failure
-+echo "File" > header_file_exp || framework_failure
-+
-+fail=0
-+
-+df --portability "$FILE" > df_out || fail=1
-+df --portability --direct "$FILE" > df_direct_out || fail=1
-+df --portability --direct --local "$FILE" > /dev/null 2>&1 && fail=1
-+
-+# check df header
-+$AWK '{ if (NR==1) print $6 " " $7; }' df_out > header_mounted_out \
-+  || framework_failure
-+$AWK '{ if (NR==1) print $6; }' df_direct_out > header_file_out \
-+  || framework_failure
-+compare header_mounted_out header_mounted_exp || fail=1
-+compare header_file_out header_file_exp || fail=1
-+
-+# check df output (without --direct)
-+$AWK '{ if (NR==2) print $6; }' df_out > file_out \
-+  || framework_failure
-+compare file_out file_exp && fail=1
-+
-+# check df output (with --direct)
-+$AWK '{ if (NR==2) print $6; }' df_direct_out > file_out \
-+  || framework_failure
-+compare file_out file_exp || fail=1
-+
-+Exit $fail
-+
--- 
-2.33.0
-

_service:tar_scm:test-skip-overlay-filesystem-because-of-no-inotify_add_watch.patch Added

@@ -0,0 +1,44 @@
+From 8dc094e77603c61a9b86b448c3128cf61ea66d8a Mon Sep 17 00:00:00 2001
+From: jiangchuangang <jiangchuangang@huawei.com>
+Date: Sat, 25 Nov 2023 09:11:43 +0800
+Subject: PATCH test: skip overlay filesystem because of no inotify_add_watch
+
+---
+ tests/tail/inotify-dir-recreate.sh     | 5 +++++
+ tests/tail/inotify-rotate-resources.sh | 5 +++++
+ 2 files changed, 10 insertions(+)
+
+diff --git a/tests/tail/inotify-dir-recreate.sh b/tests/tail/inotify-dir-recreate.sh
+index 469876b..2af2aed 100755
+--- a/tests/tail/inotify-dir-recreate.sh
++++ b/tests/tail/inotify-dir-recreate.sh
+@@ -21,6 +21,11 @@
+ . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
+ print_ver_ tail
+ 
++filesystem=$(df -T $(pwd) | awk 'NR==2 {print $2}')
++if  x"$filesystem" == x"overlay" ; then
++  skip_ 'overlay filesystem skipped, no inotify_add_watch'
++fi
++
+ grep '^#define HAVE_INOTIFY 1' "$CONFIG_HEADER" >/dev/null && is_local_dir_ . \
+   || skip_ 'inotify is not supported'
+ 
+diff --git a/tests/tail/inotify-rotate-resources.sh b/tests/tail/inotify-rotate-resources.sh
+index 6fa65ff..838a9a1 100755
+--- a/tests/tail/inotify-rotate-resources.sh
++++ b/tests/tail/inotify-rotate-resources.sh
+@@ -22,6 +22,11 @@ print_ver_ tail
+ # Inotify not used on remote file systems
+ require_local_dir_
+ 
++filesystem=$(df -T $(pwd) | awk 'NR==2 {print $2}')
++if  x"$filesystem" == x"overlay" ; then
++  skip_ 'overlay filesystem skipped, no inotify_add_watch'
++fi
++
+ grep '^#define HAVE_INOTIFY 1' "$CONFIG_HEADER" >/dev/null \
+   || skip_ 'inotify required'
+ 
+-- 
+2.36.1

_service:tar_scm:coreutils-9.3.tar.xz -> _service:tar_scm:coreutils-9.4.tar.xz Changed