31 changed files with 1729 additions and 3469 deletions
--- a/.clang-format
+++ b/.clang-format
@ -1,111 +0,0 @@
 ---
 BasedOnStyle:  GNU
 AccessModifierOffset: -2
 AlignAfterOpenBracket: Align
 AlignConsecutiveMacros: false
 AlignConsecutiveAssignments: false
 AlignConsecutiveDeclarations: false
 AlignEscapedNewlines: Left
 AlignOperands:   true
 AlignTrailingComments: true
 AllowAllArgumentsOnNextLine: true
 AllowAllConstructorInitializersOnNextLine: true
 AllowAllParametersOfDeclarationOnNextLine: true
 AllowShortBlocksOnASingleLine: Never
 AllowShortCaseLabelsOnASingleLine: false
 AllowShortFunctionsOnASingleLine: All
 AllowShortLambdasOnASingleLine: All
 AllowShortIfStatementsOnASingleLine: Never
 AllowShortLoopsOnASingleLine: false
 AlwaysBreakAfterDefinitionReturnType: All
 AlwaysBreakAfterReturnType: AllDefinitions
 AlwaysBreakBeforeMultilineStrings: false
 AlwaysBreakTemplateDeclarations: MultiLine
 BinPackArguments: true
 BinPackParameters: true
 BraceWrapping:
  AfterCaseLabel:  true
  AfterClass:      true
  AfterControlStatement: true
  AfterEnum:       true
  AfterFunction:   true
  AfterNamespace:  true
  AfterObjCDeclaration: true
  AfterStruct:     true
  AfterUnion:      true
  BeforeCatch:     true
  BeforeElse:      true
  IndentBraces:    true
  SplitEmptyFunction: true
  SplitEmptyRecord: true
  SplitEmptyNamespace: true
 BreakBeforeBinaryOperators: All
 BreakBeforeBraces: Custom
 BreakBeforeInheritanceComma: false
 BreakInheritanceList: BeforeColon
 BreakBeforeTernaryOperators: true
 BreakConstructorInitializersBeforeComma: false
 BreakConstructorInitializers: BeforeColon
 BreakAfterJavaFieldAnnotations: false
 BreakStringLiterals: true
 ColumnLimit: 0
 ContinuationIndentWidth: 4
 DeriveLineEnding: true
 DerivePointerAlignment: false
 DisableFormat:   false
 ExperimentalAutoDetectBinPacking: false
 FixNamespaceComments: false
 ForEachMacros:
  - foreach
  - Q_FOREACH
  - BOOST_FOREACH
 IncludeBlocks:   Preserve
 IncludeIsMainRegex: '(Test)?$'
 IncludeIsMainSourceRegex: ''
 IndentCaseLabels: false
 IndentGotoLabels: true
 IndentPPDirectives: AfterHash
 IndentWidth:     2
 IndentWrappedFunctionNames: false
 JavaScriptQuotes: Leave
 JavaScriptWrapImports: true
 KeepEmptyLinesAtTheStartOfBlocks: true
 MacroBlockBegin: ''
 MacroBlockEnd:   ''
 MaxEmptyLinesToKeep: 1
 NamespaceIndentation: None
 ObjCBinPackProtocolList: Auto
 ObjCBlockIndentWidth: 2
 ObjCSpaceAfterProperty: false
 ObjCSpaceBeforeProtocolList: true
 PenaltyBreakAssignment: 2
 PenaltyBreakBeforeFirstCallParameter: 19
 PenaltyBreakComment: 300
 PenaltyBreakFirstLessLess: 120
 PenaltyBreakString: 1000
 PenaltyBreakTemplateDeclaration: 10
 PenaltyExcessCharacter: 1000000
 PenaltyReturnTypeOnItsOwnLine: 60
 PointerAlignment: Right
 ReflowComments:  true
 SortIncludes:    false
 SortUsingDeclarations: true
 SpaceAfterCStyleCast: true
 SpaceAfterLogicalNot: true
 SpaceAfterTemplateKeyword: true
 SpaceBeforeAssignmentOperators: true
 SpaceBeforeParens: Always
 SpaceInEmptyBlock: false
 SpaceInEmptyParentheses: false
 SpacesBeforeTrailingComments: 1
 SpacesInAngles:  false
 SpacesInConditionalStatement: false
 SpacesInContainerLiterals: true
 SpacesInCStyleCastParentheses: false
 SpacesInParentheses: false
 SpacesInSquareBrackets: false
 SpaceBeforeSquareBrackets: false
 TabWidth:        8
 UseCRLF:         false
 UseTab:          Never
 ...
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@ -1,77 +1,97 @@
 name: Release
 on:
  push:
-  pull_request:
+    tags:
    - 'test-cross-*'
    - 'v*'
 jobs:
  release:
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v2
-      with:
+    - name: "Register QEMU to /proc/sys/fs/binfmt_misc"
-        # Reproduce the exact commit hash value
+      run: docker run --rm --privileged linuxkit/binfmt:v0.8
-        fetch-depth: 0
+    - name: "Fetch buildx binary"
-        ref: ${{ github.event.pull_request.head.sha }}
+      run: |
-    - run: echo "SOURCE_DATE_EPOCH=$(git log -1 --pretty=%ct)" >> $GITHUB_ENV
+        wget -O buildx https://github.com/docker/buildx/releases/download/v0.4.1/buildx-v0.4.1.linux-amd64
-    - uses: docker/setup-buildx-action@v2
+        chmod +x buildx
-    - name: Cache var-cache-apt
+    - name: "Initialize buildx"
-      uses: actions/cache@v3
+      run: |
-      with:
+        ./buildx create --name cross --platform=amd64,arm,arm64,s390x,ppc64le  --use
-        path: var-cache-apt
+        ./buildx inspect --bootstrap
        key: var-cache-apt-${{ hashFiles('Containerfile.cross') }}
    - name: Cache var-lib-apt
      uses: actions/cache@v3
      with:
        path: var-lib-apt
        key: var-lib-apt-${{ hashFiles('Containerfile.cross') }}
    - name: inject var-cache-apt into docker
      uses: reproducible-containers/buildkit-cache-dance@v2.1.2
      with:
        cache-source: var-cache-apt
        cache-target: /var/cache/apt
    - name: inject var-lib-apt into docker
      uses: reproducible-containers/buildkit-cache-dance@v2.1.2
      with:
        cache-source: var-lib-apt
        cache-target: /var/lib/apt
    - name: "Build binaries from Containerfile.cross"
-      run: docker buildx build -o /tmp/fuse-overlayfs-builds --build-arg SOURCE_DATE_EPOCH --platform=amd64,arm64,arm,s390x,ppc64le,riscv64 -f Containerfile.cross .
+      run: ./buildx build -o /tmp --platform=amd64,arm64,arm,s390x,ppc64le -f Containerfile.cross .
    - name: "Create /tmp/artifact"
      run: |
        mkdir -p /tmp/artifact
-        mv /tmp/fuse-overlayfs-builds/linux_amd64/fuse-overlayfs   /tmp/artifact/fuse-overlayfs-x86_64
+        mv /tmp/linux_amd64/fuse-overlayfs /tmp/artifact/fuse-overlayfs-x86_64
-        mv /tmp/fuse-overlayfs-builds/linux_arm64/fuse-overlayfs   /tmp/artifact/fuse-overlayfs-aarch64
+        mv /tmp/linux_arm64/fuse-overlayfs /tmp/artifact/fuse-overlayfs-aarch64
-        mv /tmp/fuse-overlayfs-builds/linux_arm_v7/fuse-overlayfs  /tmp/artifact/fuse-overlayfs-armv7l
+        mv /tmp/linux_arm_v7/fuse-overlayfs /tmp/artifact/fuse-overlayfs-armv7l
-        mv /tmp/fuse-overlayfs-builds/linux_s390x/fuse-overlayfs   /tmp/artifact/fuse-overlayfs-s390x
+        mv /tmp/linux_s390x/fuse-overlayfs /tmp/artifact/fuse-overlayfs-s390x
-        mv /tmp/fuse-overlayfs-builds/linux_ppc64le/fuse-overlayfs /tmp/artifact/fuse-overlayfs-ppc64le
+        mv /tmp/linux_ppc64le/fuse-overlayfs /tmp/artifact/fuse-overlayfs-ppc64le
        mv /tmp/fuse-overlayfs-builds/linux_riscv64/fuse-overlayfs /tmp/artifact/fuse-overlayfs-riscv64
        echo "${SOURCE_DATE_EPOCH}" >/tmp/artifact/SOURCE_DATE_EPOCH
    - name: "SHA256SUMS"
      run: (cd /tmp/artifact; sha256sum *) | tee /tmp/SHA256SUMS
    - name: "The sha256sum of the SHA256SUMS file"
      run: sha256sum /tmp/SHA256SUMS
    - name: "Prepare the release note"
      run: |
        cat << EOF | tee /tmp/release-note.txt
        #### About the binaries
        The binaries were built automatically on GitHub Actions.
        The build log is available for 90 days: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
        The binaries should be reproducible with the following command:
        \`\`\`
        docker buildx build \
          -o /tmp/fuse-overlayfs-builds \
          --build-arg SOURCE_DATE_EPOCH=${SOURCE_DATE_EPOCH} \
          --build-arg BUILDKIT_CONTEXT_KEEP_GIT_DIR=1 \
          --platform=amd64,arm64,arm,s390x,ppc64le,riscv64 \
          -f Containerfile.cross \
          "https://github.com/${{ github.repository }}.git#${tag}"
        \`\`\`
        EOF
    - name: "Create release"
-      if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
+      uses: actions/create-release@v1
      id: create_release
      env:
        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      run: |
+      with:
-        tag="${GITHUB_REF##*/}"
+        tag_name: ${{ github.ref }}
-        gh release create -F /tmp/release-note.txt --draft --title "${tag}" "${tag}" /tmp/artifact/* /tmp/SHA256SUMS
+        release_name: ${{ github.ref }}
        draft: true
    - name: "Upload fuse-overlayfs-x86_64"
      uses: actions/upload-release-asset@v1.0.2
      env:
        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
      with:
        upload_url: ${{ steps.create_release.outputs.upload_url }}
        asset_path: /tmp/artifact/fuse-overlayfs-x86_64
        asset_name: fuse-overlayfs-x86_64
        asset_content_type: application/octet-stream
    - name: "Upload fuse-overlayfs-aarch64"
      uses: actions/upload-release-asset@v1.0.2
      env:
        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
      with:
        upload_url: ${{ steps.create_release.outputs.upload_url }}
        asset_path: /tmp/artifact/fuse-overlayfs-aarch64
        asset_name: fuse-overlayfs-aarch64
        asset_content_type: application/octet-stream
    - name: "Upload fuse-overlayfs-armv7l"
      uses: actions/upload-release-asset@v1.0.2
      env:
        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
      with:
        upload_url: ${{ steps.create_release.outputs.upload_url }}
        asset_path: /tmp/artifact/fuse-overlayfs-armv7l
        asset_name: fuse-overlayfs-armv7l
        asset_content_type: application/octet-stream
    - name: "Upload fuse-overlayfs-s390x"
      uses: actions/upload-release-asset@v1.0.2
      env:
        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
      with:
        upload_url: ${{ steps.create_release.outputs.upload_url }}
        asset_path: /tmp/artifact/fuse-overlayfs-s390x
        asset_name: fuse-overlayfs-s390x
        asset_content_type: application/octet-stream
    - name: "Upload fuse-overlayfs-ppc64le"
      uses: actions/upload-release-asset@v1.0.2
      env:
        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
      with:
        upload_url: ${{ steps.create_release.outputs.upload_url }}
        asset_path: /tmp/artifact/fuse-overlayfs-ppc64le
        asset_name: fuse-overlayfs-ppc64le
        asset_content_type: application/octet-stream
    - name: "Upload SHA256SUMS"
      uses: actions/upload-release-asset@v1.0.2
      env:
        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
      with:
        upload_url: ${{ steps.create_release.outputs.upload_url }}
        asset_path: /tmp/SHA256SUMS
        asset_name: SHA256SUMS
        asset_content_type: text/plain
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@ -4,23 +4,23 @@ on: [push, pull_request]
 jobs:
  build_job:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
    name: Build on ${{ matrix.arch }}
    strategy:
      matrix:
        include:
          - arch: armv7
-            distro: ubuntu_latest
+            distro: ubuntu20.04
          - arch: aarch64
-            distro: ubuntu_latest
+            distro: ubuntu20.04
          - arch: s390x
-            distro: ubuntu_latest
+            distro: ubuntu20.04
          - arch: ppc64le
-            distro: ubuntu_latest
+            distro: ubuntu20.04
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2.1.0
-      - uses: uraimo/run-on-arch-action@v3.0.1
+      - uses: uraimo/run-on-arch-action@v2.0.5
        name: Build
        id: build
        with:
@ -34,22 +34,15 @@ jobs:
          install: |
            apt-get update -q -y
-            apt-get install -q -y attr automake autotools-dev git make gcc pkg-config xz-utils python3 g++ python3-setuptools libdevmapper-dev btrfs-progs libbtrfs-dev go-md2man parallel libfuse3-dev bats
+            apt-get install -q -y attr automake autotools-dev git make gcc pkg-config xz-utils python3.8 g++ python3-setuptools libdevmapper-dev btrfs-progs libbtrfs-dev go-md2man parallel libfuse3-dev bats
          run: |
            ./autogen.sh
-            LIBS="-ldl" LDFLAGS="-static" ./configure
+            ./configure
            make -j $(nproc)
      - name: Archive build artifacts
        uses: actions/upload-artifact@v4.6.2
        with:
          name: fuse-overlayfs-${{ matrix.arch }}-${{ matrix.distro }}
          path: |
            fuse-overlayfs
  Test:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
    strategy:
      fail-fast: false
      matrix:
@ -61,15 +54,15 @@ jobs:
      TAGS: exclude_graphdriver_devicemapper exclude_graphdriver_btrfs no_libsubid
    steps:
    - name: checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v2
    - name: install dependencies
      run: |
            sudo apt-get update -q -y
-            sudo apt-get install -q -y attr automake autotools-dev git make gcc pkg-config xz-utils python3 g++ python3-setuptools libdevmapper-dev btrfs-progs libbtrfs-dev go-md2man parallel wget libfuse3-dev bats
+            sudo apt-get install -q -y attr automake autotools-dev git make gcc pkg-config xz-utils python3.8 g++ python3-setuptools libdevmapper-dev btrfs-progs libbtrfs-dev go-md2man parallel wget libfuse3-dev bats
-            sudo mkdir -p /lower /upper /mnt $GOPATH/src/github.com/containers
+            sudo mkdir -p /lower /upper /mnt
-            sudo sh -c "cd $GOPATH/src/github.com/containers; git clone --depth=1 https://github.com/containers/storage"
+            sudo GOPATH=$GOPATH go get -d github.com/containers/storage
            sudo TAGS="$TAGS" GOPATH=$GOPATH sh -c "(cd $GOPATH/src/github.com/containers/storage; sed -i -e 's|^AUTOTAGS.*$|AUTOTAGS := $TAGS|' Makefile; make GO111MODULE=on containers-storage)"
            sudo sh -c "(cd /; git clone https://github.com/amir73il/unionmount-testsuite.git)"
@ -79,7 +72,7 @@ jobs:
    - name: run configure
      run: |
-        LIBS="-ldl" LDFLAGS="-static" ./configure
+        ./configure
    - name: build and install
      run: |
@ -87,19 +80,8 @@ jobs:
        sudo make -j install
        sudo cp fuse-overlayfs /sbin
    - name: Archive build artifacts
      uses: actions/upload-artifact@v4.6.2
      with:
        name: fuse-overlayfs-x86_64-ubuntu-latest
        path: |
          fuse-overlayfs
      if: ${{ matrix.test == 'ovl-whiteouts' }}
    - name: run test
      run: |
        sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0
        sudo sysctl -w kernel.apparmor_restrict_unprivileged_unconfined=0
        case "${{ matrix.test }}" in
            ovl-whiteouts)
                sudo sh -c "(cd /unionmount-testsuite; unshare -m ./run --ov --fuse=fuse-overlayfs --xdev)"
--- a/.gitignore
+++ b/.gitignore
@ -1,20 +0,0 @@
 *.a
 *.cache
 *.o
 .deps
 Makefile
 Makefile.in
 aclocal.m4
 build-aux
 config.h
 config.h.in
 config.log
 config.status
 configure
 fuse-overlayfs
 lib/.deps
 lib/Makefile
 lib/Makefile.in
 lib/limits.h
 lib/sys/types.h
 stamp-h1
--- a/833
+++ b/833
@ -1,281 +1,622 @@
                    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
+                       Version 3, 29 June 2007
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.
                            Preamble
-  The licenses for most software are designed to take away your
+  The GNU General Public License is a free, copyleft license for
-freedom to share and change it.  By contrast, the GNU General Public
+software and other kinds of works.
-License is intended to guarantee your freedom to share and change free
+
-software--to make sure the software is free for all its users.  This
+  The licenses for most software and other practical works are designed
-General Public License applies to most of the Free Software
+to take away your freedom to share and change the works.  By contrast,
-Foundation's software and to any other program whose authors commit to
+the GNU General Public License is intended to guarantee your freedom to
-using it.  (Some other Free Software Foundation software is covered by
+share and change all versions of a program--to make sure it remains free
-the GNU Lesser General Public License instead.)  You can apply it to
+software for all its users.  We, the Free Software Foundation, use the
 GNU General Public License for most of our software; it applies also to
 any other work released this way by its authors.  You can apply it to
 your programs, too.
  When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
 have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
+them if you wish), that you receive source code or can get it if you
-if you want it, that you can change the software or use pieces of it
+want it, that you can change the software or use pieces of it in new
-in new free programs; and that you know you can do these things.
+free programs, and that you know you can do these things.
-  To protect your rights, we need to make restrictions that forbid
+  To protect your rights, we need to prevent others from denying you
-anyone to deny you these rights or to ask you to surrender the rights.
+these rights or asking you to surrender the rights.  Therefore, you have
-These restrictions translate to certain responsibilities for you if you
+certain responsibilities if you distribute copies of the software, or if
-distribute copies of the software, or if you modify it.
+you modify it: responsibilities to respect the freedom of others.
  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
+gratis or for a fee, you must pass on to the recipients the same
-you have.  You must make sure that they, too, receive or can get the
+freedoms that you received.  You must make sure that they, too, receive
-source code.  And you must show them these terms so they know their
+or can get the source code.  And you must show them these terms so they
-rights.
+know their rights.
-  We protect your rights with two steps: (1) copyright the software, and
+  Developers that use the GNU GPL protect your rights with two steps:
-(2) offer you this license which gives you legal permission to copy,
+(1) assert copyright on the software, and (2) offer you this License
-distribute and/or modify the software.
+giving you legal permission to copy, distribute and/or modify it.
-  Also, for each author's protection and ours, we want to make certain
+  For the developers' and authors' protection, the GPL clearly explains
-that everyone understands that there is no warranty for this free
+that there is no warranty for this free software.  For both users' and
-software.  If the software is modified by someone else and passed on, we
+authors' sake, the GPL requires that modified versions be marked as
-want its recipients to know that what they have is not the original, so
+changed, so that their problems will not be attributed erroneously to
-that any problems introduced by others will not reflect on the original
+authors of previous versions.
 authors' reputations.
-  Finally, any free program is threatened constantly by software
+  Some devices are designed to deny users access to install or run
-patents.  We wish to avoid the danger that redistributors of a free
+modified versions of the software inside them, although the manufacturer
-program will individually obtain patent licenses, in effect making the
+can do so.  This is fundamentally incompatible with the aim of
-program proprietary.  To prevent this, we have made it clear that any
+protecting users' freedom to change the software.  The systematic
-patent must be licensed for everyone's free use or not licensed at all.
+pattern of such abuse occurs in the area of products for individuals to
 use, which is precisely where it is most unacceptable.  Therefore, we
 have designed this version of the GPL to prohibit the practice for those
 products.  If such problems arise substantially in other domains, we
 stand ready to extend this provision to those domains in future versions
 of the GPL, as needed to protect the freedom of users.
  Finally, every program is threatened constantly by software patents.
 States should not allow patents to restrict development and use of
 software on general-purpose computers, but in those that do, we wish to
 avoid the special danger that patents applied to a free program could
 make it effectively proprietary.  To prevent this, the GPL assures that
 patents cannot be used to render the program non-free.
  The precise terms and conditions for copying, distribution and
 modification follow.
-                    GNU GENERAL PUBLIC LICENSE
+                       TERMS AND CONDITIONS
   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-  0. This License applies to any program or other work which contains
+  0. Definitions.
 a notice placed by the copyright holder saying it may be distributed
 under the terms of this General Public License.  The "Program", below,
 refers to any such program or work, and a "work based on the Program"
 means either the Program or any derivative work under copyright law:
 that is to say, a work containing the Program or a portion of it,
 either verbatim or with modifications and/or translated into another
 language.  (Hereinafter, translation is included without limitation in
 the term "modification".)  Each licensee is addressed as "you".
-Activities other than copying, distribution and modification are not
+  "This License" refers to version 3 of the GNU General Public License.
 covered by this License; they are outside its scope.  The act of
 running the Program is not restricted, and the output from the Program
 is covered only if its contents constitute a work based on the
 Program (independent of having been made by running the Program).
 Whether that is true depends on what the Program does.
-  1. You may copy and distribute verbatim copies of the Program's
+  "Copyright" also means copyright-like laws that apply to other kinds of
-source code as you receive it, in any medium, provided that you
+works, such as semiconductor masks.
 conspicuously and appropriately publish on each copy an appropriate
 copyright notice and disclaimer of warranty; keep intact all the
 notices that refer to this License and to the absence of any warranty;
 and give any other recipients of the Program a copy of this License
 along with the Program.
-You may charge a fee for the physical act of transferring a copy, and
+  "The Program" refers to any copyrightable work licensed under this
-you may at your option offer warranty protection in exchange for a fee.
+License.  Each licensee is addressed as "you".  "Licensees" and
 "recipients" may be individuals or organizations.
-  2. You may modify your copy or copies of the Program or any portion
+  To "modify" a work means to copy from or adapt all or part of the work
-of it, thus forming a work based on the Program, and copy and
+in a fashion requiring copyright permission, other than the making of an
-distribute such modifications or work under the terms of Section 1
+exact copy.  The resulting work is called a "modified version" of the
-above, provided that you also meet all of these conditions:
+earlier work or a work "based on" the earlier work.
-    a) You must cause the modified files to carry prominent notices
+  A "covered work" means either the unmodified Program or a work based
-    stating that you changed the files and the date of any change.
+on the Program.
-    b) You must cause any work that you distribute or publish, that in
+  To "propagate" a work means to do anything with it that, without
-    whole or in part contains or is derived from the Program or any
+permission, would make you directly or secondarily liable for
-    part thereof, to be licensed as a whole at no charge to all third
+infringement under applicable copyright law, except executing it on a
-    parties under the terms of this License.
+computer or modifying a private copy.  Propagation includes copying,
 distribution (with or without modification), making available to the
 public, and in some countries other activities as well.
-    c) If the modified program normally reads commands interactively
+  To "convey" a work means any kind of propagation that enables other
-    when run, you must cause it, when started running for such
+parties to make or receive copies.  Mere interaction with a user through
-    interactive use in the most ordinary way, to print or display an
+a computer network, with no transfer of a copy, is not conveying.
    announcement including an appropriate copyright notice and a
    notice that there is no warranty (or else, saying that you provide
    a warranty) and that users may redistribute the program under
    these conditions, and telling the user how to view a copy of this
    License.  (Exception: if the Program itself is interactive but
    does not normally print such an announcement, your work based on
    the Program is not required to print an announcement.)
-These requirements apply to the modified work as a whole.  If
+  An interactive user interface displays "Appropriate Legal Notices"
-identifiable sections of that work are not derived from the Program,
+to the extent that it includes a convenient and prominently visible
-and can be reasonably considered independent and separate works in
+feature that (1) displays an appropriate copyright notice, and (2)
-themselves, then this License, and its terms, do not apply to those
+tells the user that there is no warranty for the work (except to the
-sections when you distribute them as separate works.  But when you
+extent that warranties are provided), that licensees may convey the
-distribute the same sections as part of a whole which is a work based
+work under this License, and how to view a copy of this License.  If
-on the Program, the distribution of the whole must be on the terms of
+the interface presents a list of user commands or options, such as a
-this License, whose permissions for other licensees extend to the
+menu, a prominent item in the list meets this criterion.
 entire whole, and thus to each and every part regardless of who wrote it.
-Thus, it is not the intent of this section to claim rights or contest
+  1. Source Code.
 your rights to work written entirely by you; rather, the intent is to
 exercise the right to control the distribution of derivative or
 collective works based on the Program.
-In addition, mere aggregation of another work not based on the Program
+  The "source code" for a work means the preferred form of the work
-with the Program (or with a work based on the Program) on a volume of
+for making modifications to it.  "Object code" means any non-source
-a storage or distribution medium does not bring the other work under
+form of a work.
 the scope of this License.
-  3. You may copy and distribute the Program (or a work based on it,
+  A "Standard Interface" means an interface that either is an official
-under Section 2) in object code or executable form under the terms of
+standard defined by a recognized standards body, or, in the case of
-Sections 1 and 2 above provided that you also do one of the following:
+interfaces specified for a particular programming language, one that
 is widely used among developers working in that language.
-    a) Accompany it with the complete corresponding machine-readable
+  The "System Libraries" of an executable work include anything, other
-    source code, which must be distributed under the terms of Sections
+than the work as a whole, that (a) is included in the normal form of
-    1 and 2 above on a medium customarily used for software interchange; or,
+packaging a Major Component, but which is not part of that Major
 Component, and (b) serves only to enable use of the work with that
 Major Component, or to implement a Standard Interface for which an
 implementation is available to the public in source code form.  A
 "Major Component", in this context, means a major essential component
 (kernel, window system, and so on) of the specific operating system
 (if any) on which the executable work runs, or a compiler used to
 produce the work, or an object code interpreter used to run it.
-    b) Accompany it with a written offer, valid for at least three
+  The "Corresponding Source" for a work in object code form means all
-    years, to give any third party, for a charge no more than your
+the source code needed to generate, install, and (for an executable
-    cost of physically performing source distribution, a complete
+work) run the object code and to modify the work, including scripts to
-    machine-readable copy of the corresponding source code, to be
+control those activities.  However, it does not include the work's
-    distributed under the terms of Sections 1 and 2 above on a medium
+System Libraries, or general-purpose tools or generally available free
-    customarily used for software interchange; or,
+programs which are used unmodified in performing those activities but
 which are not part of the work.  For example, Corresponding Source
 includes interface definition files associated with source files for
 the work, and the source code for shared libraries and dynamically
 linked subprograms that the work is specifically designed to require,
 such as by intimate data communication or control flow between those
 subprograms and other parts of the work.
-    c) Accompany it with the information you received as to the offer
+  The Corresponding Source need not include anything that users
-    to distribute corresponding source code.  (This alternative is
+can regenerate automatically from other parts of the Corresponding
-    allowed only for noncommercial distribution and only if you
+Source.
    received the program in object code or executable form with such
    an offer, in accord with Subsection b above.)
-The source code for a work means the preferred form of the work for
+  The Corresponding Source for a work in source code form is that
-making modifications to it.  For an executable work, complete source
+same work.
 code means all the source code for all modules it contains, plus any
 associated interface definition files, plus the scripts used to
 control compilation and installation of the executable.  However, as a
 special exception, the source code distributed need not include
 anything that is normally distributed (in either source or binary
 form) with the major components (compiler, kernel, and so on) of the
 operating system on which the executable runs, unless that component
 itself accompanies the executable.
-If distribution of executable or object code is made by offering
+  2. Basic Permissions.
 access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-  4. You may not copy, modify, sublicense, or distribute the Program
+  All rights granted under this License are granted for the term of
-except as expressly provided under this License.  Any attempt
+copyright on the Program, and are irrevocable provided the stated
-otherwise to copy, modify, sublicense or distribute the Program is
+conditions are met.  This License explicitly affirms your unlimited
-void, and will automatically terminate your rights under this License.
+permission to run the unmodified Program.  The output from running a
-However, parties who have received copies, or rights, from you under
+covered work is covered by this License only if the output, given its
-this License will not have their licenses terminated so long as such
+content, constitutes a covered work.  This License acknowledges your
-parties remain in full compliance.
+rights of fair use or other equivalent, as provided by copyright law.
-  5. You are not required to accept this License, since you have not
+  You may make, run and propagate covered works that you do not
-signed it.  However, nothing else grants you permission to modify or
+convey, without conditions so long as your license otherwise remains
-distribute the Program or its derivative works.  These actions are
+in force.  You may convey covered works to others for the sole purpose
-prohibited by law if you do not accept this License.  Therefore, by
+of having them make modifications exclusively for you, or provide you
-modifying or distributing the Program (or any work based on the
+with facilities for running those works, provided that you comply with
-Program), you indicate your acceptance of this License to do so, and
+the terms of this License in conveying all material for which you do
-all its terms and conditions for copying, distributing or modifying
+not control copyright.  Those thus making or running the covered works
-the Program or works based on it.
+for you must do so exclusively on your behalf, under your direction
 and control, on terms that prohibit them from making any copies of
 your copyrighted material outside their relationship with you.
-  6. Each time you redistribute the Program (or any work based on the
+  Conveying under any other circumstances is permitted solely under
-Program), the recipient automatically receives a license from the
+the conditions stated below.  Sublicensing is not allowed; section 10
-original licensor to copy, distribute or modify the Program subject to
+makes it unnecessary.
-these terms and conditions.  You may not impose any further
+
-restrictions on the recipients' exercise of the rights granted herein.
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-You are not responsible for enforcing compliance by third parties to
+
  No covered work shall be deemed part of an effective technological
 measure under any applicable law fulfilling obligations under article
 11 of the WIPO copyright treaty adopted on 20 December 1996, or
 similar laws prohibiting or restricting circumvention of such
 measures.
  When you convey a covered work, you waive any legal power to forbid
 circumvention of technological measures to the extent such circumvention
 is effected by exercising rights under this License with respect to
 the covered work, and you disclaim any intention to limit operation or
 modification of the work as a means of enforcing, against the work's
 users, your or third parties' legal rights to forbid circumvention of
 technological measures.
  4. Conveying Verbatim Copies.
  You may convey verbatim copies of the Program's source code as you
 receive it, in any medium, provided that you conspicuously and
 appropriately publish on each copy an appropriate copyright notice;
 keep intact all notices stating that this License and any
 non-permissive terms added in accord with section 7 apply to the code;
 keep intact all notices of the absence of any warranty; and give all
 recipients a copy of this License along with the Program.
  You may charge any price or no price for each copy that you convey,
 and you may offer support or warranty protection for a fee.
  5. Conveying Modified Source Versions.
  You may convey a work based on the Program, or the modifications to
 produce it from the Program, in the form of source code under the
 terms of section 4, provided that you also meet all of these conditions:
    a) The work must carry prominent notices stating that you modified
    it, and giving a relevant date.
    b) The work must carry prominent notices stating that it is
    released under this License and any conditions added under section
    7.  This requirement modifies the requirement in section 4 to
    "keep intact all notices".
    c) You must license the entire work, as a whole, under this
    License to anyone who comes into possession of a copy.  This
    License will therefore apply, along with any applicable section 7
    additional terms, to the whole of the work, and all its parts,
    regardless of how they are packaged.  This License gives no
    permission to license the work in any other way, but it does not
    invalidate such permission if you have separately received it.
    d) If the work has interactive user interfaces, each must display
    Appropriate Legal Notices; however, if the Program has interactive
    interfaces that do not display Appropriate Legal Notices, your
    work need not make them do so.
  A compilation of a covered work with other separate and independent
 works, which are not by their nature extensions of the covered work,
 and which are not combined with it such as to form a larger program,
 in or on a volume of a storage or distribution medium, is called an
 "aggregate" if the compilation and its resulting copyright are not
 used to limit the access or legal rights of the compilation's users
 beyond what the individual works permit.  Inclusion of a covered work
 in an aggregate does not cause this License to apply to the other
 parts of the aggregate.
  6. Conveying Non-Source Forms.
  You may convey a covered work in object code form under the terms
 of sections 4 and 5, provided that you also convey the
 machine-readable Corresponding Source under the terms of this License,
 in one of these ways:
    a) Convey the object code in, or embodied in, a physical product
    (including a physical distribution medium), accompanied by the
    Corresponding Source fixed on a durable physical medium
    customarily used for software interchange.
    b) Convey the object code in, or embodied in, a physical product
    (including a physical distribution medium), accompanied by a
    written offer, valid for at least three years and valid for as
    long as you offer spare parts or customer support for that product
    model, to give anyone who possesses the object code either (1) a
    copy of the Corresponding Source for all the software in the
    product that is covered by this License, on a durable physical
    medium customarily used for software interchange, for a price no
    more than your reasonable cost of physically performing this
    conveying of source, or (2) access to copy the
    Corresponding Source from a network server at no charge.
    c) Convey individual copies of the object code with a copy of the
    written offer to provide the Corresponding Source.  This
    alternative is allowed only occasionally and noncommercially, and
    only if you received the object code with such an offer, in accord
    with subsection 6b.
    d) Convey the object code by offering access from a designated
    place (gratis or for a charge), and offer equivalent access to the
    Corresponding Source in the same way through the same place at no
    further charge.  You need not require recipients to copy the
    Corresponding Source along with the object code.  If the place to
    copy the object code is a network server, the Corresponding Source
    may be on a different server (operated by you or a third party)
    that supports equivalent copying facilities, provided you maintain
    clear directions next to the object code saying where to find the
    Corresponding Source.  Regardless of what server hosts the
    Corresponding Source, you remain obligated to ensure that it is
    available for as long as needed to satisfy these requirements.
    e) Convey the object code using peer-to-peer transmission, provided
    you inform other peers where the object code and Corresponding
    Source of the work are being offered to the general public at no
    charge under subsection 6d.
  A separable portion of the object code, whose source code is excluded
 from the Corresponding Source as a System Library, need not be
 included in conveying the object code work.
  A "User Product" is either (1) a "consumer product", which means any
 tangible personal property which is normally used for personal, family,
 or household purposes, or (2) anything designed or sold for incorporation
 into a dwelling.  In determining whether a product is a consumer product,
 doubtful cases shall be resolved in favor of coverage.  For a particular
 product received by a particular user, "normally used" refers to a
 typical or common use of that class of product, regardless of the status
 of the particular user or of the way in which the particular user
 actually uses, or expects or is expected to use, the product.  A product
 is a consumer product regardless of whether the product has substantial
 commercial, industrial or non-consumer uses, unless such uses represent
 the only significant mode of use of the product.
  "Installation Information" for a User Product means any methods,
 procedures, authorization keys, or other information required to install
 and execute modified versions of a covered work in that User Product from
 a modified version of its Corresponding Source.  The information must
 suffice to ensure that the continued functioning of the modified object
 code is in no case prevented or interfered with solely because
 modification has been made.
  If you convey an object code work under this section in, or with, or
 specifically for use in, a User Product, and the conveying occurs as
 part of a transaction in which the right of possession and use of the
 User Product is transferred to the recipient in perpetuity or for a
 fixed term (regardless of how the transaction is characterized), the
 Corresponding Source conveyed under this section must be accompanied
 by the Installation Information.  But this requirement does not apply
 if neither you nor any third party retains the ability to install
 modified object code on the User Product (for example, the work has
 been installed in ROM).
  The requirement to provide Installation Information does not include a
 requirement to continue to provide support service, warranty, or updates
 for a work that has been modified or installed by the recipient, or for
 the User Product in which it has been modified or installed.  Access to a
 network may be denied when the modification itself materially and
 adversely affects the operation of the network or violates the rules and
 protocols for communication across the network.
  Corresponding Source conveyed, and Installation Information provided,
 in accord with this section must be in a format that is publicly
 documented (and with an implementation available to the public in
 source code form), and must require no special password or key for
 unpacking, reading or copying.
  7. Additional Terms.
  "Additional permissions" are terms that supplement the terms of this
 License by making exceptions from one or more of its conditions.
 Additional permissions that are applicable to the entire Program shall
 be treated as though they were included in this License, to the extent
 that they are valid under applicable law.  If additional permissions
 apply only to part of the Program, that part may be used separately
 under those permissions, but the entire Program remains governed by
 this License without regard to the additional permissions.
  When you convey a copy of a covered work, you may at your option
 remove any additional permissions from that copy, or from any part of
 it.  (Additional permissions may be written to require their own
 removal in certain cases when you modify the work.)  You may place
 additional permissions on material, added by you to a covered work,
 for which you have or can give appropriate copyright permission.
  Notwithstanding any other provision of this License, for material you
 add to a covered work, you may (if authorized by the copyright holders of
 that material) supplement the terms of this License with terms:
    a) Disclaiming warranty or limiting liability differently from the
    terms of sections 15 and 16 of this License; or
    b) Requiring preservation of specified reasonable legal notices or
    author attributions in that material or in the Appropriate Legal
    Notices displayed by works containing it; or
    c) Prohibiting misrepresentation of the origin of that material, or
    requiring that modified versions of such material be marked in
    reasonable ways as different from the original version; or
    d) Limiting the use for publicity purposes of names of licensors or
    authors of the material; or
    e) Declining to grant rights under trademark law for use of some
    trade names, trademarks, or service marks; or
    f) Requiring indemnification of licensors and authors of that
    material by anyone who conveys the material (or modified versions of
    it) with contractual assumptions of liability to the recipient, for
    any liability that these contractual assumptions directly impose on
    those licensors and authors.
  All other non-permissive additional terms are considered "further
 restrictions" within the meaning of section 10.  If the Program as you
 received it, or any part of it, contains a notice stating that it is
 governed by this License along with a term that is a further
 restriction, you may remove that term.  If a license document contains
 a further restriction but permits relicensing or conveying under this
 License, you may add to a covered work material governed by the terms
 of that license document, provided that the further restriction does
 not survive such relicensing or conveying.
  If you add terms to a covered work in accord with this section, you
 must place, in the relevant source files, a statement of the
 additional terms that apply to those files, or a notice indicating
 where to find the applicable terms.
  Additional terms, permissive or non-permissive, may be stated in the
 form of a separately written license, or stated as exceptions;
 the above requirements apply either way.
  8. Termination.
  You may not propagate or modify a covered work except as expressly
 provided under this License.  Any attempt otherwise to propagate or
 modify it is void, and will automatically terminate your rights under
 this License (including any patent licenses granted under the third
 paragraph of section 11).
  However, if you cease all violation of this License, then your
 license from a particular copyright holder is reinstated (a)
 provisionally, unless and until the copyright holder explicitly and
 finally terminates your license, and (b) permanently, if the copyright
 holder fails to notify you of the violation by some reasonable means
 prior to 60 days after the cessation.
  Moreover, your license from a particular copyright holder is
 reinstated permanently if the copyright holder notifies you of the
 violation by some reasonable means, this is the first time you have
 received notice of violation of this License (for any work) from that
 copyright holder, and you cure the violation prior to 30 days after
 your receipt of the notice.
  Termination of your rights under this section does not terminate the
 licenses of parties who have received copies or rights from you under
 this License.  If your rights have been terminated and not permanently
 reinstated, you do not qualify to receive new licenses for the same
 material under section 10.
  9. Acceptance Not Required for Having Copies.
  You are not required to accept this License in order to receive or
 run a copy of the Program.  Ancillary propagation of a covered work
 occurring solely as a consequence of using peer-to-peer transmission
 to receive a copy likewise does not require acceptance.  However,
 nothing other than this License grants you permission to propagate or
 modify any covered work.  These actions infringe copyright if you do
 not accept this License.  Therefore, by modifying or propagating a
 covered work, you indicate your acceptance of this License to do so.
  10. Automatic Licensing of Downstream Recipients.
  Each time you convey a covered work, the recipient automatically
 receives a license from the original licensors, to run, modify and
 propagate that work, subject to this License.  You are not responsible
 for enforcing compliance by third parties with this License.
  An "entity transaction" is a transaction transferring control of an
 organization, or substantially all assets of one, or subdividing an
 organization, or merging organizations.  If propagation of a covered
 work results from an entity transaction, each party to that
 transaction who receives a copy of the work also receives whatever
 licenses to the work the party's predecessor in interest had or could
 give under the previous paragraph, plus a right to possession of the
 Corresponding Source of the work from the predecessor in interest, if
 the predecessor has it or can get it with reasonable efforts.
  You may not impose any further restrictions on the exercise of the
 rights granted or affirmed under this License.  For example, you may
 not impose a license fee, royalty, or other charge for exercise of
 rights granted under this License, and you may not initiate litigation
 (including a cross-claim or counterclaim in a lawsuit) alleging that
 any patent claim is infringed by making, using, selling, offering for
 sale, or importing the Program or any portion of it.
  11. Patents.
  A "contributor" is a copyright holder who authorizes use under this
 License of the Program or a work on which the Program is based.  The
 work thus licensed is called the contributor's "contributor version".
  A contributor's "essential patent claims" are all patent claims
 owned or controlled by the contributor, whether already acquired or
 hereafter acquired, that would be infringed by some manner, permitted
 by this License, of making, using, or selling its contributor version,
 but do not include claims that would be infringed only as a
 consequence of further modification of the contributor version.  For
 purposes of this definition, "control" includes the right to grant
 patent sublicenses in a manner consistent with the requirements of
 this License.
-  7. If, as a consequence of a court judgment or allegation of patent
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
-infringement or for any other reason (not limited to patent issues),
+patent license under the contributor's essential patent claims, to
-conditions are imposed on you (whether by court order, agreement or
+make, use, sell, offer for sale, import and otherwise run, modify and
 propagate the contents of its contributor version.
  In the following three paragraphs, a "patent license" is any express
 agreement or commitment, however denominated, not to enforce a patent
 (such as an express permission to practice a patent or covenant not to
 sue for patent infringement).  To "grant" such a patent license to a
 party means to make such an agreement or commitment not to enforce a
 patent against the party.
  If you convey a covered work, knowingly relying on a patent license,
 and the Corresponding Source of the work is not available for anyone
 to copy, free of charge and under the terms of this License, through a
 publicly available network server or other readily accessible means,
 then you must either (1) cause the Corresponding Source to be so
 available, or (2) arrange to deprive yourself of the benefit of the
 patent license for this particular work, or (3) arrange, in a manner
 consistent with the requirements of this License, to extend the patent
 license to downstream recipients.  "Knowingly relying" means you have
 actual knowledge that, but for the patent license, your conveying the
 covered work in a country, or your recipient's use of the covered work
 in a country, would infringe one or more identifiable patents in that
 country that you have reason to believe are valid.
  If, pursuant to or in connection with a single transaction or
 arrangement, you convey, or propagate by procuring conveyance of, a
 covered work, and grant a patent license to some of the parties
 receiving the covered work authorizing them to use, propagate, modify
 or convey a specific copy of the covered work, then the patent license
 you grant is automatically extended to all recipients of the covered
 work and works based on it.
  A patent license is "discriminatory" if it does not include within
 the scope of its coverage, prohibits the exercise of, or is
 conditioned on the non-exercise of one or more of the rights that are
 specifically granted under this License.  You may not convey a covered
 work if you are a party to an arrangement with a third party that is
 in the business of distributing software, under which you make payment
 to the third party based on the extent of your activity of conveying
 the work, and under which the third party grants, to any of the
 parties who would receive the covered work from you, a discriminatory
 patent license (a) in connection with copies of the covered work
 conveyed by you (or copies made from those copies), or (b) primarily
 for and in connection with specific products or compilations that
 contain the covered work, unless you entered into that arrangement,
 or that patent license was granted, prior to 28 March 2007.
  Nothing in this License shall be construed as excluding or limiting
 any implied license or other defenses to infringement that may
 otherwise be available to you under applicable patent law.
  12. No Surrender of Others' Freedom.
  If conditions are imposed on you (whether by court order, agreement or
 otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
+excuse you from the conditions of this License.  If you cannot convey a
-distribute so as to satisfy simultaneously your obligations under this
+covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
+License and any other pertinent obligations, then as a consequence you may
-may not distribute the Program at all.  For example, if a patent
+not convey it at all.  For example, if you agree to terms that obligate you
-license would not permit royalty-free redistribution of the Program by
+to collect a royalty for further conveying from those to whom you convey
-all those who receive copies directly or indirectly through you, then
+the Program, the only way you could satisfy both those terms and this
-the only way you could satisfy both it and this License would be to
+License would be to refrain entirely from conveying the Program.
 refrain entirely from distribution of the Program.
-If any portion of this section is held invalid or unenforceable under
+  13. Use with the GNU Affero General Public License.
 any particular circumstance, the balance of the section is intended to
 apply and the section as a whole is intended to apply in other
 circumstances.
-It is not the purpose of this section to induce you to infringe any
+  Notwithstanding any other provision of this License, you have
-patents or other property right claims or to contest validity of any
+permission to link or combine any covered work with a work licensed
-such claims; this section has the sole purpose of protecting the
+under version 3 of the GNU Affero General Public License into a single
-integrity of the free software distribution system, which is
+combined work, and to convey the resulting work.  The terms of this
-implemented by public license practices.  Many people have made
+License will continue to apply to the part which is the covered work,
-generous contributions to the wide range of software distributed
+but the special requirements of the GNU Affero General Public License,
-through that system in reliance on consistent application of that
+section 13, concerning interaction through a network will apply to the
-system; it is up to the author/donor to decide if he or she is willing
+combination as such.
 to distribute software through any other system and a licensee cannot
 impose that choice.
-This section is intended to make thoroughly clear what is believed to
+  14. Revised Versions of this License.
 be a consequence of the rest of this License.
-  8. If the distribution and/or use of the Program is restricted in
+  The Free Software Foundation may publish revised and/or new versions of
-certain countries either by patents or by copyrighted interfaces, the
+the GNU General Public License from time to time.  Such new versions will
 original copyright holder who places the Program under this License
 may add an explicit geographical distribution limitation excluding
 those countries, so that distribution is permitted only in or among
 countries not thus excluded.  In such case, this License incorporates
 the limitation as if written in the body of this License.
  9. The Free Software Foundation may publish revised and/or new versions
 of the General Public License from time to time.  Such new versions will
 be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.
-Each version is given a distinguishing version number.  If the Program
+  Each version is given a distinguishing version number.  If the
-specifies a version number of this License which applies to it and "any
+Program specifies that a certain numbered version of the GNU General
-later version", you have the option of following the terms and conditions
+Public License "or any later version" applies to it, you have the
-either of that version or of any later version published by the Free
+option of following the terms and conditions either of that numbered
-Software Foundation.  If the Program does not specify a version number of
+version or of any later version published by the Free Software
-this License, you may choose any version ever published by the Free Software
+Foundation.  If the Program does not specify a version number of the
-Foundation.
+GNU General Public License, you may choose any version ever published
 by the Free Software Foundation.
-  10. If you wish to incorporate parts of the Program into other free
+  If the Program specifies that a proxy can decide which future
-programs whose distribution conditions are different, write to the author
+versions of the GNU General Public License can be used, that proxy's
-to ask for permission.  For software which is copyrighted by the Free
+public statement of acceptance of a version permanently authorizes you
-Software Foundation, write to the Free Software Foundation; we sometimes
+to choose that version for the Program.
 make exceptions for this.  Our decision will be guided by the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
-                            NO WARRANTY
+  Later license versions may give you additional or different
 permissions.  However, no additional obligations are imposed on any
 author or copyright holder as a result of your choosing to follow a
 later version.
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+  15. Disclaimer of Warranty.
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
 OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
 PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
 OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
 MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
 TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
 PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
 REPAIR OR CORRECTION.
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-POSSIBILITY OF SUCH DAMAGES.
+
  16. Limitation of Liability.
  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
 WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
 THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
 GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
 USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
 DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
 PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
 EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGES.
  17. Interpretation of Sections 15 and 16.
  If the disclaimer of warranty and limitation of liability provided
 above cannot be given local legal effect according to their terms,
 reviewing courts shall apply local law that most closely approximates
 an absolute waiver of all civil liability in connection with the
 Program, unless a warranty or assumption of liability accompanies a
 copy of the Program in return for a fee.
                     END OF TERMS AND CONDITIONS
@ -287,15 +628,15 @@ free software which everyone can redistribute and change under these terms.
  To do so, attach the following notices to the program.  It is safest
 to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
+state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
    <one line to give the program's name and a brief idea of what it does.>
    Copyright (C) <year>  <name of author>
-    This program is free software; you can redistribute it and/or modify
+    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 2 of the License, or
+    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,
@ -303,37 +644,31 @@ the "copyright" line and a pointer to where the full notice is found.
    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
+    You should have received a copy of the GNU General Public License
-    with this program; if not, write to the Free Software Foundation, Inc.,
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 Also add information on how to contact you by electronic and paper mail.
-If the program is interactive, make it output a short notice like this
+  If the program does terminal interaction, make it output a short
-when it starts in an interactive mode:
+notice like this when it starts in an interactive mode:
-    Gnomovision version 69, Copyright (C) year name of author
+    <program>  Copyright (C) <year>  <name of author>
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
    This is free software, and you are welcome to redistribute it
    under certain conditions; type `show c' for details.
 The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
+parts of the General Public License.  Of course, your program's commands
-be called something other than `show w' and `show c'; they could even be
+might be different; for a GUI interface, you would use an "about box".
 mouse-clicks or menu items--whatever suits your program.
-You should also get your employer (if you work as a programmer) or your
+  You should also get your employer (if you work as a programmer) or school,
-school, if any, to sign a "copyright disclaimer" for the program, if
+if any, to sign a "copyright disclaimer" for the program, if necessary.
-necessary.  Here is a sample; alter the names:
+For more information on this, and how to apply and follow the GNU GPL, see
 <http://www.gnu.org/licenses/>.
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  The GNU General Public License does not permit incorporating your program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+into proprietary programs.  If your program is a subroutine library, you
-
+may consider it more useful to permit linking proprietary applications with
-  <signature of Ty Coon>, 1 April 1989
+the library.  If this is what you want to do, use the GNU Lesser General
-  Ty Coon, President of Vice
+Public License instead of this License.  But first, please read
-
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
 library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.
--- a/Containerfile.alpine
+++ b/Containerfile.alpine
@ -3,7 +3,7 @@ WORKDIR /build
 RUN apk add git make gcc libc-dev musl-dev glib-static gettext eudev-dev \
 	linux-headers automake autoconf cmake meson ninja clang go-md2man
-RUN git clone https://github.com/libfuse/libfuse -b fuse-3.16.2 && \
+RUN git clone https://github.com/libfuse/libfuse && \
    cd libfuse && \
    mkdir build && \
    cd build && \
--- a/Containerfile.cross
+++ b/Containerfile.cross
@ -1,40 +1,14 @@
-# Usage:
+FROM --platform=$BUILDPLATFORM debian:10 AS fuse-overlayfs
-# docker buildx build \
+RUN apt-get update && \
 #   -o /tmp/fuse-overlayfs-builds \
 #   --build-arg SOURCE_DATE_EPOCH=$(git log -1 --pretty=%ct) \
 #   --platform=amd64,arm64,arm,s390x,ppc64le,riscv64 \
 #   -f Containerfile.cross .
 FROM --platform=$BUILDPLATFORM tonistiigi/xx:1.2.1 AS xx
 FROM --platform=$BUILDPLATFORM ubuntu:jammy-20230804 AS fuse-overlayfs
 ADD --chmod=0755 \
  https://raw.githubusercontent.com/reproducible-containers/repro-sources-list.sh/v0.1.0/repro-sources-list.sh \
  /usr/local/bin/repro-sources-list.sh
 RUN \
  --mount=type=cache,target=/var/cache/apt,sharing=locked \
  --mount=type=cache,target=/var/lib/apt,sharing=locked \
  repro-sources-list.sh && \
  apt-get update && \
  apt-get install --no-install-recommends -y \
-  git make automake autoconf pkgconf file go-md2man
+  git ca-certificates libc6-dev gcc make automake autoconf pkgconf libfuse3-dev file curl go-md2man
-# Set SOURCE_DATE_EPOCH after running repro-sources-list.sh, for cache efficiency
+RUN curl -o /cross.sh https://raw.githubusercontent.com/tonistiigi/binfmt/18c3d40ae2e3485e4de5b453e8460d6872b24d6b/binfmt/scripts/cross.sh && chmod +x /cross.sh
 ARG SOURCE_DATE_EPOCH
 COPY . /fuse-overlayfs
 WORKDIR /fuse-overlayfs
 COPY --from=xx / /
 ARG TARGETPLATFORM
-ENV DEBIAN_FRONTEND=noninteractive
+RUN /cross.sh install gcc pkgconf libfuse3-dev | sh
 # xx-apt-get cannot be used, as it clobbers /etc/apt/sources.list created by repro-sources-list.sh
 RUN \
  --mount=type=cache,target=/var/cache/apt,sharing=locked \
  --mount=type=cache,target=/var/lib/apt,sharing=locked \
  darch="$(xx-info debian-arch)" && \
  dpkg --add-architecture ${darch} && \
  apt-get update && \
  gcc="gcc" && \
  if xx-info is-cross; then gcc="gcc-$(xx-info triple)"; fi; \
  apt-get install -y "${gcc}" "libfuse3-dev:${darch}"
 RUN ./autogen.sh && \
-  LIBS="-ldl" LDFLAGS="-static" ./configure --host=$(xx-info) && \
+  CC=$(/cross.sh cross-prefix)-gcc LD=$(/cross.sh cross-prefix)-ld LIBS="-ldl" LDFLAGS="-static" ./configure && \
  make && mkdir /out && cp fuse-overlayfs /out && \
  file /out/fuse-overlayfs | grep "statically linked"
--- a/Containerfile.static.fedora
+++ b/Containerfile.static.fedora
@ -3,7 +3,7 @@ WORKDIR /build
 RUN dnf update -y && \
    dnf install -y git make automake autoconf gcc glibc-static meson ninja-build clang
-RUN git clone https://github.com/libfuse/libfuse -b fuse-3.16.2 && \
+RUN git clone https://github.com/libfuse/libfuse && \
    cd libfuse && \
    mkdir build && \
    cd build && \
--- a/Makefile.am
+++ b/Makefile.am
@ -36,6 +36,3 @@ srpm: dist-gzip fuse-overlayfs.spec
 	echo $(VERSION)
 	$(MAKE) -C $(WD) dist-xz
 	rpmbuild -bs --define "_sourcedir $(WD)" --define "_specdir $(WD)" --define "_builddir $(WD)" --define "_srcrpmdir $(WD)" --define "_rpmdir $(WD)" --define "_buildrootdir $(WD)/.build" fuse-overlayfs.spec
 clang-format:
 	git ls-files | grep -E "\\.[hc]$$" | grep -v "^lib/" | xargs clang-format -style=file -i
--- a/56
+++ b/56
@ -1,59 +1,3 @@
 * fuse-overlayfs-1.15
 - main: lookup upperdir only for created directories.
 - main: allow escaped colons in directory paths.
 - main: use extended override xattr to support devices.
 - remove unsupported option "lazytime".
 * fuse-overlayfs-1.14
 - isolate security xattrs for STAT_OVERRIDE_CONTAINERS.  Prefix all
  security xattrs with XATTR_CONTAINERS_OVERRIDE_PREFIX.
 - prefer user.containers.override_stat over user.fuseoverlayfs.
 - do not force -1 for owner overriding extended attributes.  Otherwise
  the value is written to the override extended attribute.
 - fix file owner retrieval for chmod.
 - honor umask with xattr_permissions.
 - honor mode for devices with xattr_permissions.
 - propagate extended attributes permissions with copyup.
 * fuse-overlayfs-1.13
 - fix a performance issue when dealing with big directories.
 * fuse-overlayfs-1.12
 - change license to GPL-2.0-or-later.
 - main: if a lower layer doesn't support ACLs do not enable them.
 * fuse-overlayfs-1.11
 - main: if a lower layer doesn't support ACLs do not enable them.
 * fuse-overlayfs-1.10
 - main: use /proc/self/fd to read xattrs.
 - main: inherit ACLs for new files/dirs.
 - main: fix passing noatime.
 - main: add checks for valid /proc mount.
 - main: fix copy_file_range for deleted files.
 - main: fix creating links of just deleted files.
 * fuse-overlayfs-1.9
 - main: fix setting attributes on file without permissions.
 - main: ignore EOVERFLOW when copying xattrs.
 - main: set the correct value for RENAME_NOREPLACE when it is not already
  defined in the system headers.
 - main: create source whiteout only when needed
 - main: fix missing source whiteout when destination is whiteout
 * fuse-overlayfs-1.8.2
 - main: fix lookup if underlying path is a symlink, but a directory on
  a upper directory.
 * fuse-overlayfs-1.8.1
 - main: fix race when looking up an inode that was renamed.
--- a/README.md
+++ b/README.md
@ -19,7 +19,7 @@ $ fuse-overlayfs -o uidmapping=0:10:100:100:10000:2000,gidmapping=0:10:100:100:1
 Requirements:
 =======================================================
-If you are not using the static build as explained in the next chapter, your system needs `libfuse` > v3.2.1.
+If your are not using the static build as explained in the next chapter, your system needs `libfuse` > v3.2.1.
 * On Fedora: `dnf install fuse3-devel`
 * On Ubuntu > v19.04: `apt install libfuse3-dev`
--- a/configure.ac
+++ b/configure.ac
@ -1,5 +1,5 @@
 AC_PREREQ([2.69])
-AC_INIT([fuse-overlayfs], [1.16-dev], [giuseppe@scrivano.org])
+AC_INIT([fuse-overlayfs], [1.8.1], [giuseppe@scrivano.org])
 AC_CONFIG_SRCDIR([main.c])
 AC_CONFIG_HEADERS([config.h])
@ -30,7 +30,7 @@ AC_CHECK_TYPES([ptrdiff_t])
 AC_DEFINE([USE_DIFF_HASH], 1, [Use the same hashing function as GNU diff])
-PKG_CHECK_MODULES([FUSE], [fuse3 >= 3.2.1], [AC_DEFINE([HAVE_FUSE], 1, [Define if libfuse3 is available])], [AC_MSG_ERROR([*** libfuse3 not found])]])
+PKG_CHECK_MODULES([FUSE], [fuse3 >= 3.2.1], [AC_DEFINE([HAVE_FUSE], 1, [Define if libfuse is available])], [AC_MSG_ERROR([*** libfuse not found])]])
 old_CFLAGS=$CFLAGS
 old_LDFLAGS=$LDFLAGS
--- a/contrib/fix-mode.py
+++ b/contrib/fix-mode.py
@ -6,12 +6,12 @@ import stat
 import errno
 XATTR_OVERRIDE_STAT_PRIVILEGED = "security.fuseoverlayfs.override_stat"
-XATTR_OVERRIDE_CONTAINERS_STAT = "user.fuseoverlayfs.override_stat"
+XATTR_OVERRIDE_STAT = "user.fuseoverlayfs.override_stat"
 if os.geteuid() == 0:
    xattr_name = XATTR_OVERRIDE_STAT_PRIVILEGED
 else:
-    xattr_name = XATTR_OVERRIDE_CONTAINERS_STAT
+    xattr_name = XATTR_OVERRIDE_STAT
 cwd_fd = os.open(".", os.O_PATH)
@ -23,7 +23,7 @@ def fix_path(path):
        os.setxattr(path, xattr_name, str.encode(content), flags=os.XATTR_CREATE, follow_symlinks=False)
    except Exception as e:
        if e.errno == errno.EEXIST:
-            print("attr %s already present for %s: %s" % (xattr_name, path, e.errno))
+            print("attr %s already present for %s: %s" % (XATTR_OVERRIDE_STAT, path, e.errno))
            return
        raise e
--- a/direct.c
+++ b/direct.c
@ -6,7 +6,7 @@
   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 2 of the License, or
+   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,
@ -44,13 +44,8 @@ static int
 direct_listxattr (struct ovl_layer *l, const char *path, char *buf, size_t size)
 {
  char full_path[PATH_MAX];
-  int ret;
+
-  ret = snprintf (full_path, sizeof (full_path), "/proc/self/fd/%d/%s", l->fd, path);
+  strconcat3 (full_path, PATH_MAX, l->path, "/", path);
  if (ret >= sizeof (full_path))
    {
      errno = ENAMETOOLONG;
      return -1;
    }
  return llistxattr (full_path, buf, size);
 }
@ -59,13 +54,9 @@ static int
 direct_getxattr (struct ovl_layer *l, const char *path, const char *name, char *buf, size_t size)
 {
  char full_path[PATH_MAX];
-  int ret;
+
-  ret = snprintf (full_path, sizeof (full_path), "/proc/self/fd/%d/%s", l->fd, path);
+  strconcat3 (full_path, PATH_MAX, l->path, "/", path);
-  if (ret >= sizeof (full_path))
+
    {
      errno = ENAMETOOLONG;
      return -1;
    }
  return lgetxattr (full_path, name, buf, size);
 }
@ -76,7 +67,7 @@ direct_fstat (struct ovl_layer *l, int fd, const char *path, unsigned int mask,
 #ifdef HAVE_STATX
  struct statx stx;
-  ret = statx (fd, "", AT_STATX_DONT_SYNC | AT_EMPTY_PATH, mask, &stx);
+  ret = statx (fd, "", AT_STATX_DONT_SYNC|AT_EMPTY_PATH, mask, &stx);
  if (ret < 0 && (errno == ENOSYS || errno == EINVAL))
    goto fallback;
  if (ret == 0)
@ -88,7 +79,7 @@ direct_fstat (struct ovl_layer *l, int fd, const char *path, unsigned int mask,
  return ret;
 #endif
-fallback:
+ fallback:
  ret = fstat (fd, st);
  if (ret != 0)
    return ret;
@ -103,7 +94,7 @@ direct_statat (struct ovl_layer *l, const char *path, struct stat *st, int flags
 #ifdef HAVE_STATX
  struct statx stx;
-  ret = statx (l->fd, path, AT_STATX_DONT_SYNC | flags, mask, &stx);
+  ret = statx (l->fd, path, AT_STATX_DONT_SYNC|flags, mask, &stx);
  if (ret < 0 && (errno == ENOSYS || errno == EINVAL))
    goto fallback;
  if (ret == 0)
@ -114,7 +105,7 @@ direct_statat (struct ovl_layer *l, const char *path, struct stat *st, int flags
  return ret;
 #endif
-fallback:
+ fallback:
  ret = fstatat (l->fd, path, st, flags);
  if (ret != 0)
    return ret;
@ -186,10 +177,10 @@ direct_load_data_source (struct ovl_layer *l, const char *opaque, const char *pa
  if (fgetxattr (l->fd, XATTR_PRIVILEGED_OVERRIDE_STAT, tmp, sizeof (tmp)) >= 0)
    l->stat_override_mode = STAT_OVERRIDE_PRIVILEGED;
  else if (fgetxattr (l->fd, XATTR_OVERRIDE_CONTAINERS_STAT, tmp, sizeof (tmp)) >= 0)
    l->stat_override_mode = STAT_OVERRIDE_CONTAINERS;
  else if (fgetxattr (l->fd, XATTR_OVERRIDE_STAT, tmp, sizeof (tmp)) >= 0)
    l->stat_override_mode = STAT_OVERRIDE_USER;
  else if (fgetxattr (l->fd, XATTR_OVERRIDE_CONTAINERS_STAT, tmp, sizeof (tmp)) >= 0)
    l->stat_override_mode = STAT_OVERRIDE_CONTAINERS;
  return 0;
 }
@ -206,16 +197,8 @@ direct_num_of_layers (const char *opaque, const char *path)
  return 1;
 }
-static bool
+struct data_source direct_access_ds =
-direct_support_acls (struct ovl_layer *l)
+  {
 {
  char value[32];
  return fgetxattr (l->fd, ACL_XATTR, value, sizeof (value)) >= 0
         || errno != ENOTSUP;
 }
 struct data_source direct_access_ds = {
   .num_of_layers = direct_num_of_layers,
   .load_data_source = direct_load_data_source,
   .cleanup = direct_cleanup,
@ -229,5 +212,4 @@ struct data_source direct_access_ds = {
   .getxattr = direct_getxattr,
   .listxattr = direct_listxattr,
   .readlinkat = direct_readlinkat,
-  .support_acls = direct_support_acls,
+  };
 };
--- a/fuse-overlayfs.h
+++ b/fuse-overlayfs.h
@ -4,7 +4,7 @@
   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 2 of the License, or
+   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,
@ -16,15 +16,13 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #ifndef FUSE_OVERLAYFS_H
-#define FUSE_OVERLAYFS_H
+# define FUSE_OVERLAYFS_H
-#define _GNU_SOURCE
+# define _GNU_SOURCE
-#include <sys/stat.h>
+# include <sys/stat.h>
-#include <plugin-manager.h>
+# include <plugin-manager.h>
-#include <stdbool.h>
+# include <stdbool.h>
-#include <sys/types.h>
+# include <sys/types.h>
 #define ACL_XATTR "system.posix_acl_default"
 typedef struct hash_table Hash_table;
@ -54,8 +52,6 @@ struct ovl_node
  struct ovl_node *next_link;
  unsigned int in_readdir;
  size_t n_links;
  unsigned int do_unlink : 1;
  unsigned int do_rmdir : 1;
  unsigned int hidden : 1;
@ -106,8 +102,6 @@ struct ovl_data
  int squash_to_gid;
  int static_nlink;
  int volatile_mode;
  /* current uid/gid*/
  uid_t uid;
  uid_t gid;
@ -143,25 +137,24 @@ struct ovl_layer
 struct data_source
 {
  int (*num_of_layers) (const char *opaque, const char *path);
-  int (*load_data_source) (struct ovl_layer *l, const char *opaque, const char *path, int n_layer);
+  int (*load_data_source)(struct ovl_layer *l, const char *opaque, const char *path, int n_layer);
-  int (*cleanup) (struct ovl_layer *l);
+  int (*cleanup)(struct ovl_layer *l);
-  int (*file_exists) (struct ovl_layer *l, const char *pathname);
+  int (*file_exists)(struct ovl_layer *l, const char *pathname);
-  int (*statat) (struct ovl_layer *l, const char *path, struct stat *st, int flags, unsigned int mask);
+  int (*statat)(struct ovl_layer *l, const char *path, struct stat *st, int flags, unsigned int mask);
-  int (*fstat) (struct ovl_layer *l, int fd, const char *path, unsigned int mask, struct stat *st);
+  int (*fstat)(struct ovl_layer *l, int fd, const char *path, unsigned int mask, struct stat *st);
-  void *(*opendir) (struct ovl_layer *l, const char *path);
+  void *(*opendir)(struct ovl_layer *l, const char *path);
-  struct dirent *(*readdir) (void *dirp);
+  struct dirent *(*readdir)(void *dirp);
-  int (*closedir) (void *dirp);
+  int (*closedir)(void *dirp);
-  int (*openat) (struct ovl_layer *l, const char *path, int flags, mode_t mode);
+  int (*openat)(struct ovl_layer *l, const char *path, int flags, mode_t mode);
-  int (*listxattr) (struct ovl_layer *l, const char *path, char *buf, size_t size);
+  int (*listxattr)(struct ovl_layer *l, const char *path, char *buf, size_t size);
-  int (*getxattr) (struct ovl_layer *l, const char *path, const char *name, char *buf, size_t size);
+  int (*getxattr)(struct ovl_layer *l, const char *path, const char *name, char *buf, size_t size);
-  ssize_t (*readlinkat) (struct ovl_layer *l, const char *path, char *buf, size_t bufsiz);
+  ssize_t (*readlinkat)(struct ovl_layer *l, const char *path, char *buf, size_t bufsiz);
  bool (*support_acls) (struct ovl_layer *l);
 };
 /* passthrough to the file system.  */
 extern struct data_source direct_access_ds;
-#ifndef HAVE_STATX
+# ifndef HAVE_STATX
 #  define STATX_TYPE		0x00000001U	/* Want/got stx_mode & S_IFMT */
 #  define STATX_MODE		0x00000002U	/* Want/got stx_mode & ~S_IFMT */
 #  define STATX_NLINK		0x00000004U	/* Want/got stx_nlink */
@ -176,6 +169,6 @@ extern struct data_source direct_access_ds;
 #  define STATX_BASIC_STATS	0x000007ffU	/* The stuff in the normal stat struct */
 #  define STATX_BTIME		0x00000800U	/* Want/got stx_btime */
 #  define STATX_ALL		0x00000fffU	/* All currently supported flags */
-#endif
+# endif
 #endif
--- a/fuse_overlayfs_error.h
+++ b/fuse_overlayfs_error.h
@ -4,7 +4,7 @@
   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 2 of the License, or
+   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,
@ -17,16 +17,14 @@
 */
 #ifndef FUSE_OVERLAYFS_ERROR_H
-#define FUSE_OVERLAYFS_ERROR_H
+# define FUSE_OVERLAYFS_ERROR_H
-#include <config.h>
+# include <config.h>
-#ifdef HAVE_ERROR_H
+# ifdef HAVE_ERROR_H
 #  include <error.h>
-#else
+# else
-#  define error(status, errno, fmt, ...)                                \
+#  define error(status, errno, fmt, ...) do {                           \
    do                                                                  \
      {                                                                 \
    if (errno == 0)                                                     \
      fprintf (stderr, "fuse-overlayfs: " fmt "\n", ##__VA_ARGS__);     \
    else                                                                \
@ -36,7 +34,7 @@
      }                                                                 \
    if (status)                                                         \
      exit (status);                                                    \
-    } while (0)
+  } while(0)
-#endif
+# endif
 #endif
--- a/lib/hash.c
+++ b/lib/hash.c
@ -1,20 +1,20 @@
 /* hash - hashing table processing.
-   Copyright (C) 1998-2004, 2006-2007, 2009-2025 Free Software Foundation, Inc.
+   Copyright (C) 1998-2004, 2006-2007, 2009-2019 Free Software Foundation, Inc.
   Written by Jim Meyering, 1992.
-   This file is free software: you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU Lesser General Public License as
+   it under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2.1 of the
+   the Free Software Foundation; either version 3 of the License, or
-   License, or (at your option) any later version.
+   (at your option) any later version.
-   This file is distributed in the hope that it will be useful,
+   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 Lesser General Public License for more details.
+   GNU General Public License for more details.
-   You should have received a copy of the GNU Lesser General Public License
+   You should have received a copy of the GNU General Public License
   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 /* A generic hash table package.  */
@ -29,7 +29,6 @@
 #include "bitrotate.h"
 #include "xalloc-oversized.h"
 #include <errno.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
@ -139,24 +138,38 @@ static const Hash_tuning default_tuning =
 /* Information and lookup.  */
 /* The following few functions provide information about the overall hash
   table organization: the number of entries, number of buckets and maximum
   length of buckets.  */
 /* Return the number of buckets in the hash table.  The table size, the total
   number of buckets (used plus unused), or the maximum number of slots, are
   the same quantity.  */
 size_t
 hash_get_n_buckets (const Hash_table *table)
 {
  return table->n_buckets;
 }
 /* Return the number of slots in use (non-empty buckets).  */
 size_t
 hash_get_n_buckets_used (const Hash_table *table)
 {
  return table->n_buckets_used;
 }
 /* Return the number of active entries.  */
 size_t
 hash_get_n_entries (const Hash_table *table)
 {
  return table->n_entries;
 }
 /* Return the length of the longest chain (bucket).  */
 size_t
 hash_get_max_bucket_length (const Hash_table *table)
 {
@ -181,6 +194,9 @@ hash_get_max_bucket_length (const Hash_table *table)
  return max_bucket_length;
 }
 /* Do a mild validation of a hash table, by traversing it and checking two
   statistics.  */
 bool
 hash_table_ok (const Hash_table *table)
 {
@ -238,6 +254,9 @@ safe_hasher (const Hash_table *table, const void *key)
  return table->bucket + n;
 }
 /* If ENTRY matches an entry already in the hash table, return the
   entry from the table.  Otherwise, return NULL.  */
 void *
 hash_lookup (const Hash_table *table, const void *entry)
 {
@ -256,6 +275,15 @@ hash_lookup (const Hash_table *table, const void *entry)
 /* Walking.  */
 /* The functions in this page traverse the hash table and process the
   contained entries.  For the traversal to work properly, the hash table
   should not be resized nor modified while any particular entry is being
   processed.  In particular, entries should not be added, and an entry
   may be removed only if there is no shrink threshold and the entry being
   removed has already been passed to hash_get_next.  */
 /* Return the first data in the table, or NULL if the table is empty.  */
 void *
 hash_get_first (const Hash_table *table)
 {
@ -271,6 +299,10 @@ hash_get_first (const Hash_table *table)
      return bucket->data;
 }
 /* Return the user data for the entry following ENTRY, where ENTRY has been
   returned by a previous call to either 'hash_get_first' or 'hash_get_next'.
   Return NULL if there are no more entries.  */
 void *
 hash_get_next (const Hash_table *table, const void *entry)
 {
@ -296,6 +328,10 @@ hash_get_next (const Hash_table *table, const void *entry)
  return NULL;
 }
 /* Fill BUFFER with pointers to active user entries in the hash table, then
   return the number of pointers copied.  Do not copy more than BUFFER_SIZE
   pointers.  */
 size_t
 hash_get_entries (const Hash_table *table, void **buffer,
                  size_t buffer_size)
@ -320,6 +356,14 @@ hash_get_entries (const Hash_table *table, void **buffer,
  return counter;
 }
 /* Call a PROCESSOR function for each entry of a hash table, and return the
   number of entries for which the processor function returned success.  A
   pointer to some PROCESSOR_DATA which will be made available to each call to
   the processor function.  The PROCESSOR accepts two arguments: the first is
   the user entry being walked into, the second is the value of PROCESSOR_DATA
   as received.  The walking continue for as long as the PROCESSOR function
   returns nonzero.  When it returns zero, the walking is interrupted.  */
 size_t
 hash_do_for_each (const Hash_table *table, Hash_processor processor,
                  void *processor_data)
@ -346,6 +390,9 @@ hash_do_for_each (const Hash_table *table, Hash_processor processor,
 /* Allocation and clean-up.  */
 /* Return a hash index for a NUL-terminated STRING between 0 and N_BUCKETS-1.
   This is a convenience routine for constructing other hashing functions.  */
 #if USE_DIFF_HASH
 /* About hashings, Paul Eggert writes to me (FP), on 1994-01-01: "Please see
@ -499,20 +546,50 @@ compute_bucket_size (size_t candidate, const Hash_tuning *tuning)
  if (!tuning->is_n_buckets)
    {
      float new_candidate = candidate / tuning->growth_threshold;
-      if ((float) SIZE_MAX <= new_candidate)
+      if (SIZE_MAX <= new_candidate)
-        goto nomem;
+        return 0;
      candidate = new_candidate;
    }
  candidate = next_prime (candidate);
  if (xalloc_oversized (candidate, sizeof (struct hash_entry *)))
    goto nomem;
  return candidate;
 nomem:
  errno = ENOMEM;
    return 0;
  return candidate;
 }
 /* Allocate and return a new hash table, or NULL upon failure.  The initial
   number of buckets is automatically selected so as to _guarantee_ that you
   may insert at least CANDIDATE different user entries before any growth of
   the hash table size occurs.  So, if have a reasonably tight a-priori upper
   bound on the number of entries you intend to insert in the hash table, you
   may save some table memory and insertion time, by specifying it here.  If
   the IS_N_BUCKETS field of the TUNING structure is true, the CANDIDATE
   argument has its meaning changed to the wanted number of buckets.
   TUNING points to a structure of user-supplied values, in case some fine
   tuning is wanted over the default behavior of the hasher.  If TUNING is
   NULL, the default tuning parameters are used instead.  If TUNING is
   provided but the values requested are out of bounds or might cause
   rounding errors, return NULL.
   The user-supplied HASHER function, when not NULL, accepts two
   arguments ENTRY and TABLE_SIZE.  It computes, by hashing ENTRY contents, a
   slot number for that entry which should be in the range 0..TABLE_SIZE-1.
   This slot number is then returned.
   The user-supplied COMPARATOR function, when not NULL, accepts two
   arguments pointing to user data, it then returns true for a pair of entries
   that compare equal, or false otherwise.  This function is internally called
   on entries which are already known to hash to the same bucket index,
   but which are distinct pointers.
   The user-supplied DATA_FREER function, when not NULL, may be later called
   with the user data as an argument, just before the entry containing the
   data gets freed.  This happens from within 'hash_free' or 'hash_clear'.
   You should specify this function only if you want these functions to free
   all of your 'data' data.  This is typically the case when your data is
   simply an auxiliary struct that you have malloc'd to aggregate several
   values.  */
 Hash_table *
 hash_initialize (size_t candidate, const Hash_tuning *tuning,
                 Hash_hasher hasher, Hash_comparator comparator,
@ -539,7 +616,6 @@ hash_initialize (size_t candidate, const Hash_tuning *tuning,
         if the user provides invalid tuning options, we silently revert to
         using the defaults, and ignore further request to change the tuning
         options.  */
      errno = EINVAL;
      goto fail;
    }
@ -569,6 +645,10 @@ hash_initialize (size_t candidate, const Hash_tuning *tuning,
  return NULL;
 }
 /* Make all buckets empty, placing any chained entries on the free list.
   Apply the user-specified function data_freer (if any) to the data of any
   affected entries.  */
 void
 hash_clear (Hash_table *table)
 {
@ -607,13 +687,17 @@ hash_clear (Hash_table *table)
  table->n_entries = 0;
 }
 /* Reclaim all storage associated with a hash table.  If a data_freer
   function has been supplied by the user when the hash table was created,
   this function applies it to the data of each entry before freeing that
   entry.  */
 void
 hash_free (Hash_table *table)
 {
  struct hash_entry *bucket;
  struct hash_entry *cursor;
  struct hash_entry *next;
  int err = errno;
  /* Call the user data_freer function.  */
  if (table->data_freer && table->n_entries)
@ -656,8 +740,6 @@ hash_free (Hash_table *table)
  /* Free the remainder of the hash table structure.  */
  free (table->bucket);
  free (table);
  errno = err;
 }
 /* Insertion and deletion.  */
@ -771,8 +853,8 @@ hash_find_entry (Hash_table *table, const void *entry,
 /* Internal helper, to move entries from SRC to DST.  Both tables must
   share the same free entry list.  If SAFE, only move overflow
   entries, saving bucket heads for later, so that no allocations will
-   occur.  Return false (setting errno) if the free entry list is
+   occur.  Return false if the free entry list is exhausted and an
-   exhausted and an allocation fails.  */
+   allocation fails.  */
 static bool
 transfer_entries (Hash_table *dst, Hash_table *src, bool safe)
@ -849,6 +931,14 @@ transfer_entries (Hash_table *dst, Hash_table *src, bool safe)
  return true;
 }
 /* For an already existing hash table, change the number of buckets through
   specifying CANDIDATE.  The contents of the hash table are preserved.  The
   new number of buckets is automatically selected so as to _guarantee_ that
   the table may receive at least CANDIDATE different user entries, including
   those already in the table, before any other growth of the hash table size
   occurs.  If TUNING->IS_N_BUCKETS is true, then CANDIDATE specifies the
   exact number of buckets desired.  Return true iff the rehash succeeded.  */
 bool
 hash_rehash (Hash_table *table, size_t candidate)
 {
@ -919,17 +1009,31 @@ hash_rehash (Hash_table *table, size_t candidate)
     passes.  Two passes give worse cache performance and takes
     longer, but at this point, we're already out of memory, so slow
     and safe is better than failure.  */
  int err = errno;
  table->free_entry_list = new_table->free_entry_list;
  if (! (transfer_entries (table, new_table, true)
         && transfer_entries (table, new_table, false)))
    abort ();
  /* table->n_entries already holds its value.  */
  free (new_table->bucket);
  errno = err;
  return false;
 }
 /* Insert ENTRY into hash TABLE if there is not already a matching entry.
   Return -1 upon memory allocation failure.
   Return 1 if insertion succeeded.
   Return 0 if there is already a matching entry in the table,
   and in that case, if MATCHED_ENT is non-NULL, set *MATCHED_ENT
   to that entry.
   This interface is easier to use than hash_insert when you must
   distinguish between the latter two cases.  More importantly,
   hash_insert is unusable for some types of ENTRY values.  When using
   hash_insert, the only way to distinguish those cases is to compare
   the return value and ENTRY.  That works only when you can have two
   different ENTRY values that point to data that compares "equal".  Thus,
   when the ENTRY value is a simple scalar, you must use
   hash_insert_if_absent.  ENTRY must not be NULL.  */
 int
 hash_insert_if_absent (Hash_table *table, void const *entry,
                       void const **matched_ent)
@ -972,11 +1076,8 @@ hash_insert_if_absent (Hash_table *table, void const *entry,
             : (table->n_buckets * tuning->growth_factor
                * tuning->growth_threshold));
-          if ((float) SIZE_MAX <= candidate)
+          if (SIZE_MAX <= candidate)
            {
              errno = ENOMEM;
            return -1;
            }
          /* If the rehash fails, arrange to return NULL.  */
          if (!hash_rehash (table, candidate))
@ -1015,6 +1116,12 @@ hash_insert_if_absent (Hash_table *table, void const *entry,
  return 1;
 }
 /* If ENTRY matches an entry already in the hash table, return the pointer
   to the entry from the table.  Otherwise, insert ENTRY and return ENTRY.
   Return NULL if the storage required for insertion cannot be allocated.
   This implementation does not support duplicate entries or insertion of
   NULL.  */
 void *
 hash_insert (Hash_table *table, void const *entry)
 {
@ -1025,8 +1132,12 @@ hash_insert (Hash_table *table, void const *entry)
          : (void *) (err == 0 ? matched_ent : entry));
 }
 /* If ENTRY is already in the table, remove it and return the just-deleted
   data (the user may want to deallocate its storage).  If ENTRY is not in the
   table, don't modify the table and return NULL.  */
 void *
-hash_remove (Hash_table *table, const void *entry)
+hash_delete (Hash_table *table, const void *entry)
 {
  void *data;
  struct hash_entry *bucket;
@ -1085,12 +1196,6 @@ hash_remove (Hash_table *table, const void *entry)
  return data;
 }
 void *
 hash_delete (Hash_table *table, const void *entry)
 {
  return hash_remove (table, entry);
 }
 /* Testing.  */
 #if TESTING
@ -1110,7 +1215,6 @@ hash_print (const Hash_table *table)
      for (cursor = bucket; cursor; cursor = cursor->next)
        {
          char const *s = cursor->data;
          /* FIXME */
          if (s)
            printf ("  %s\n", s);
        }
--- a/lib/hash.h
+++ b/lib/hash.h
@ -1,19 +1,19 @@
 /* hash - hashing table processing.
-   Copyright (C) 1998-1999, 2001, 2003, 2009-2025 Free Software Foundation,
+   Copyright (C) 1998-1999, 2001, 2003, 2009-2019 Free Software Foundation,
   Inc.
   Written by Jim Meyering <meyering@ascend.com>, 1998.
-   This file is free software: you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU Lesser General Public License as
+   it under the terms of the GNU General Public License as published by
-   published by the Free Software Foundation; either version 2.1 of the
+   the Free Software Foundation; either version 3 of the License, or
-   License, or (at your option) any later version.
+   (at your option) any later version.
-   This file is distributed in the hope that it will be useful,
+   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 Lesser General Public License for more details.
+   GNU General Public License for more details.
-   You should have received a copy of the GNU Lesser General Public License
+   You should have received a copy of the GNU General Public License
   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 /* A generic hash table package.  */
@ -27,10 +27,29 @@
 # include <stdio.h>
 # include <stdbool.h>
-# ifdef __cplusplus
+/* The __attribute__ feature is available in gcc versions 2.5 and later.
-extern "C" {
+   The warn_unused_result attribute appeared first in gcc-3.4.0.  */
 # if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
 #  define _GL_ATTRIBUTE_WUR __attribute__ ((__warn_unused_result__))
 # else
 #  define _GL_ATTRIBUTE_WUR /* empty */
 # endif
 # ifndef _GL_ATTRIBUTE_DEPRECATED
 /* The __attribute__((__deprecated__)) feature
   is available in gcc versions 3.1 and newer.  */
 #  if __GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ < 1)
 #   define _GL_ATTRIBUTE_DEPRECATED /* empty */
 #  else
 #   define _GL_ATTRIBUTE_DEPRECATED __attribute__ ((__deprecated__))
 #  endif
 # endif
 typedef size_t (*Hash_hasher) (const void *, size_t);
 typedef bool (*Hash_comparator) (const void *, const void *);
 typedef void (*Hash_data_freer) (void *);
 typedef bool (*Hash_processor) (void *, void *);
 struct hash_tuning
  {
    /* This structure is mainly used for 'hash_initialize', see the block
@ -49,234 +68,36 @@ struct hash_table;
 typedef struct hash_table Hash_table;
-/*
+/* Information and lookup.  */
- * Information and lookup.
+size_t hash_get_n_buckets (const Hash_table *) _GL_ATTRIBUTE_PURE;
- */
+size_t hash_get_n_buckets_used (const Hash_table *) _GL_ATTRIBUTE_PURE;
 size_t hash_get_n_entries (const Hash_table *) _GL_ATTRIBUTE_PURE;
 size_t hash_get_max_bucket_length (const Hash_table *) _GL_ATTRIBUTE_PURE;
 bool hash_table_ok (const Hash_table *) _GL_ATTRIBUTE_PURE;
 void hash_print_statistics (const Hash_table *, FILE *);
 void *hash_lookup (const Hash_table *, const void *);
-/* The following few functions provide information about the overall hash
+/* Walking.  */
-   table organization: the number of entries, number of buckets and maximum
+void *hash_get_first (const Hash_table *) _GL_ATTRIBUTE_PURE;
-   length of buckets.  */
+void *hash_get_next (const Hash_table *, const void *);
 size_t hash_get_entries (const Hash_table *, void **, size_t);
 size_t hash_do_for_each (const Hash_table *, Hash_processor, void *);
-/* Return the number of buckets in the hash table.  The table size, the total
+/* Allocation and clean-up.  */
-   number of buckets (used plus unused), or the maximum number of slots, are
+size_t hash_string (const char *, size_t) _GL_ATTRIBUTE_PURE;
-   the same quantity.  */
+void hash_reset_tuning (Hash_tuning *);
-extern size_t hash_get_n_buckets (const Hash_table *table)
+Hash_table *hash_initialize (size_t, const Hash_tuning *,
-       _GL_ATTRIBUTE_PURE;
+                             Hash_hasher, Hash_comparator,
                             Hash_data_freer) _GL_ATTRIBUTE_WUR;
 void hash_clear (Hash_table *);
 void hash_free (Hash_table *);
-/* Return the number of slots in use (non-empty buckets).  */
+/* Insertion and deletion.  */
-extern size_t hash_get_n_buckets_used (const Hash_table *table)
+bool hash_rehash (Hash_table *, size_t) _GL_ATTRIBUTE_WUR;
-       _GL_ATTRIBUTE_PURE;
+void *hash_insert (Hash_table *, const void *) _GL_ATTRIBUTE_WUR;
-/* Return the number of active entries.  */
+int hash_insert_if_absent (Hash_table *table, const void *entry,
 extern size_t hash_get_n_entries (const Hash_table *table)
       _GL_ATTRIBUTE_PURE;
 /* Return the length of the longest chain (bucket).  */
 extern size_t hash_get_max_bucket_length (const Hash_table *table)
       _GL_ATTRIBUTE_PURE;
 /* Do a mild validation of a hash table, by traversing it and checking two
   statistics.  */
 extern bool hash_table_ok (const Hash_table *table)
       _GL_ATTRIBUTE_PURE;
 extern void hash_print_statistics (const Hash_table *table, FILE *stream);
 /* If ENTRY matches an entry already in the hash table, return the
   entry from the table.  Otherwise, return NULL.  */
 extern void *hash_lookup (const Hash_table *table, const void *entry);
 /*
 * Walking.
 */
 /* The functions in this page traverse the hash table and process the
   contained entries.  For the traversal to work properly, the hash table
   should not be resized nor modified while any particular entry is being
   processed.  In particular, entries should not be added, and an entry
   may be removed only if there is no shrink threshold and the entry being
   removed has already been passed to hash_get_next.  */
 /* Return the first data in the table, or NULL if the table is empty.  */
 extern void *hash_get_first (const Hash_table *table)
       _GL_ATTRIBUTE_PURE;
 /* Return the user data for the entry following ENTRY, where ENTRY has been
   returned by a previous call to either 'hash_get_first' or 'hash_get_next'.
   Return NULL if there are no more entries.  */
 extern void *hash_get_next (const Hash_table *table, const void *entry);
 /* Fill BUFFER with pointers to active user entries in the hash table, then
   return the number of pointers copied.  Do not copy more than BUFFER_SIZE
   pointers.  */
 extern size_t hash_get_entries (const Hash_table *table, void **buffer,
                                size_t buffer_size);
 typedef bool (*Hash_processor) (void *entry, void *processor_data);
 /* Call a PROCESSOR function for each entry of a hash table, and return the
   number of entries for which the processor function returned success.  A
   pointer to some PROCESSOR_DATA which will be made available to each call to
   the processor function.  The PROCESSOR accepts two arguments: the first is
   the user entry being walked into, the second is the value of PROCESSOR_DATA
   as received.  The walking continue for as long as the PROCESSOR function
   returns nonzero.  When it returns zero, the walking is interrupted.  */
 extern size_t hash_do_for_each (const Hash_table *table,
                                Hash_processor processor, void *processor_data);
 /* Return a hash index for a NUL-terminated STRING between 0 and N_BUCKETS-1.
   This is a convenience routine for constructing other hashing functions.  */
 extern size_t hash_string (const char *string, size_t n_buckets)
       _GL_ATTRIBUTE_PURE;
 /* Return a hash code of ENTRY, in the range 0..TABLE_SIZE-1.
   This hash code function must have the property that if the comparator of
   ENTRY1 and ENTRY2 returns true, the hasher returns the same value for ENTRY1
   and for ENTRY2.
   The hash code function typically computes an unsigned integer and at the end
   performs a % TABLE_SIZE modulo operation.  This modulo operation is performed
   as part of this hash code function, not by the caller, because in some cases
   the unsigned integer will be a 'size_t', in other cases an 'uintmax_t' or
   even larger.  */
 typedef size_t (*Hash_hasher) (const void *entry, size_t table_size);
 /* Compare two entries, ENTRY1 (being looked up or being inserted) and
   ENTRY2 (already in the table) for equality.  Return true for equal,
   false otherwise.  */
 typedef bool (*Hash_comparator) (const void *entry1, const void *entry2);
 /* This function is invoked when an ENTRY is removed from the hash table.  */
 typedef void (*Hash_data_freer) (void *entry);
 /*
 * Allocation and clean-up.
 */
 extern void hash_reset_tuning (Hash_tuning *tuning);
 /* Reclaim all storage associated with a hash table.  If a data_freer
   function has been supplied by the user when the hash table was created,
   this function applies it to the data of each entry before freeing that
   entry.  This function preserves errno, like 'free'.  */
 extern void hash_free (Hash_table *table);
 /* Allocate and return a new hash table, or NULL upon failure.  The initial
   number of buckets is automatically selected so as to _guarantee_ that you
   may insert at least CANDIDATE different user entries before any growth of
   the hash table size occurs.  So, if have a reasonably tight a-priori upper
   bound on the number of entries you intend to insert in the hash table, you
   may save some table memory and insertion time, by specifying it here.  If
   the IS_N_BUCKETS field of the TUNING structure is true, the CANDIDATE
   argument has its meaning changed to the wanted number of buckets.
   TUNING points to a structure of user-supplied values, in case some fine
   tuning is wanted over the default behavior of the hasher.  If TUNING is
   NULL, the default tuning parameters are used instead.  If TUNING is
   provided but the values requested are out of bounds or might cause
   rounding errors, return NULL.
   The user-supplied HASHER function, when not NULL, accepts two
   arguments ENTRY and TABLE_SIZE.  It computes, by hashing ENTRY contents, a
   slot number for that entry which should be in the range 0..TABLE_SIZE-1.
   This slot number is then returned.
   The user-supplied COMPARATOR function, when not NULL, accepts two
   arguments pointing to user data, it then returns true for a pair of entries
   that compare equal, or false otherwise.  This function is internally called
   on entries which are already known to hash to the same bucket index,
   but which are distinct pointers.
   The user-supplied DATA_FREER function, when not NULL, may be later called
   with the user data as an argument, just before the entry containing the
   data gets freed.  This happens from within 'hash_free' or 'hash_clear'.
   You should specify this function only if you want these functions to free
   all of your 'data' data.  This is typically the case when your data is
   simply an auxiliary struct that you have malloc'd to aggregate several
   values.
   Set errno on failure; otherwise errno is unspecified.  */
 _GL_ATTRIBUTE_NODISCARD
 extern Hash_table *hash_initialize (size_t candidate,
                                    const Hash_tuning *tuning,
                                    Hash_hasher hasher,
                                    Hash_comparator comparator,
                                    Hash_data_freer data_freer)
  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC (hash_free, 1);
 /* Like hash_initialize, but invokes xalloc_die instead of returning NULL.  */
 /* This function is defined by module 'xhash'.  */
 _GL_ATTRIBUTE_NODISCARD
 extern Hash_table *hash_xinitialize (size_t candidate,
                                     const Hash_tuning *tuning,
                                     Hash_hasher hasher,
                                     Hash_comparator comparator,
                                     Hash_data_freer data_freer)
  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC (hash_free, 1)
  _GL_ATTRIBUTE_RETURNS_NONNULL;
 /* Make all buckets empty, placing any chained entries on the free list.
   Apply the user-specified function data_freer (if any) to the data of any
   affected entries.  */
 extern void hash_clear (Hash_table *table);
 /*
 * Insertion and deletion.
 */
 /* For an already existing hash table, change the number of buckets through
   specifying CANDIDATE.  The contents of the hash table are preserved.  The
   new number of buckets is automatically selected so as to _guarantee_ that
   the table may receive at least CANDIDATE different user entries, including
   those already in the table, before any other growth of the hash table size
   occurs.  If TUNING->IS_N_BUCKETS is true, then CANDIDATE specifies the
   exact number of buckets desired.  Return true iff the rehash succeeded,
   false (setting errno) otherwise.  */
 _GL_ATTRIBUTE_NODISCARD
 extern bool hash_rehash (Hash_table *table, size_t candidate);
 /* If ENTRY matches an entry already in the hash table, return the pointer
   to the entry from the table.  Otherwise, insert ENTRY and return ENTRY.
   Return NULL (setting errno) if the storage required for insertion
   cannot be allocated.  This implementation does not support
   duplicate entries or insertion of NULL.  */
 _GL_ATTRIBUTE_NODISCARD
 extern void *hash_insert (Hash_table *table, const void *entry);
 /* Same as hash_insert, but invokes xalloc_die instead of returning NULL.  */
 /* This function is defined by module 'xhash'.  */
 extern void *hash_xinsert (Hash_table *table, const void *entry);
 /* Insert ENTRY into hash TABLE if there is not already a matching entry.
   Return -1 (setting errno) upon memory allocation failure.
   Return 1 if insertion succeeded.
   Return 0 if there is already a matching entry in the table,
   and in that case, if MATCHED_ENT is non-NULL, set *MATCHED_ENT
   to that entry.
   This interface is easier to use than hash_insert when you must
   distinguish between the latter two cases.  More importantly,
   hash_insert is unusable for some types of ENTRY values.  When using
   hash_insert, the only way to distinguish those cases is to compare
   the return value and ENTRY.  That works only when you can have two
   different ENTRY values that point to data that compares "equal".  Thus,
   when the ENTRY value is a simple scalar, you must use
   hash_insert_if_absent.  ENTRY must not be NULL.  */
 extern int hash_insert_if_absent (Hash_table *table, const void *entry,
                           const void **matched_ent);
-
+void *hash_delete (Hash_table *, const void *);
 /* If ENTRY is already in the table, remove it and return the just-deleted
   data (the user may want to deallocate its storage).  If ENTRY is not in the
   table, don't modify the table and return NULL.  */
 extern void *hash_remove (Hash_table *table, const void *entry);
 /* Same as hash_remove.  This interface is deprecated.
   FIXME: Remove in 2022.  */
 _GL_ATTRIBUTE_DEPRECATED
 extern void *hash_delete (Hash_table *table, const void *entry);
 # ifdef __cplusplus
 }
 # endif
 #endif
--- a/m4/00gnulib.m4
+++ b/m4/00gnulib.m4
@ -1,84 +1,43 @@
-# 00gnulib.m4
+# 00gnulib.m4 serial 3
-# serial 9
+dnl Copyright (C) 2009-2019 Free Software Foundation, Inc.
 dnl Copyright (C) 2009-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 dnl This file is offered as-is, without any warranty.
 dnl This file must be named something that sorts before all other
-dnl gnulib-provided .m4 files.  It is needed until the clang fix has
+dnl gnulib-provided .m4 files.  It is needed until such time as we can
-dnl been included in Autoconf.
+dnl assume Autoconf 2.64, with its improved AC_DEFUN_ONCE and
 dnl m4_divert semantics.
-# The following definitions arrange to use a compiler option
+# Until autoconf 2.63, handling of the diversion stack required m4_init
-# -Werror=implicit-function-declaration in AC_CHECK_DECL, when the
+# to be called first; but this does not happen with aclocal.  Wrapping
-# compiler is clang.  Without it, clang implicitly declares "known"
+# the entire execution in another layer of the diversion stack fixes this.
-# library functions in C mode, but not in C++ mode, which would cause
+# Worse, prior to autoconf 2.62, m4_wrap depended on the underlying m4
-# Gnulib to omit a declaration and thus later produce an error in C++
+# for whether it was FIFO or LIFO; in order to properly balance with
-# mode.  As of clang 9.0, these "known" functions are identified through
+# m4_init, we need to undo our push just before anything wrapped within
-# LIBBUILTIN invocations in the LLVM source file
+# the m4_init body.  The way to ensure this is to wrap both sides of
-# llvm/tools/clang/include/clang/Basic/Builtins.def.
+# m4_init with a one-shot macro that does the pop at the right time.
-# It's not possible to AC_REQUIRE the extra tests from AC_CHECK_DECL,
+m4_ifndef([_m4_divert_diversion],
-# because AC_CHECK_DECL, like other Autoconf built-ins, is not supposed
+[m4_divert_push([KILL])
-# to AC_REQUIRE anything: some configure.ac files have their first
+m4_define([gl_divert_fixup], [m4_divert_pop()m4_define([$0])])
-# AC_CHECK_DECL executed conditionally.  Therefore append the extra tests
+m4_define([m4_init],
-# to AC_PROG_CC.
+  [gl_divert_fixup()]m4_defn([m4_init])[gl_divert_fixup()])])
-AC_DEFUN([gl_COMPILER_CLANG],
+
-[
+
-dnl AC_REQUIRE([AC_PROG_CC])
+# AC_DEFUN_ONCE([NAME], VALUE)
-  AC_CACHE_CHECK([whether the compiler is clang],
+# ----------------------------
-    [gl_cv_compiler_clang],
+# Define NAME to expand to VALUE on the first use (whether by direct
-    [dnl Use _AC_COMPILE_IFELSE instead of AC_EGREP_CPP, to avoid error
+# expansion, or by AC_REQUIRE), and to nothing on all subsequent uses.
-     dnl "circular dependency of AC_LANG_COMPILER(C)" if AC_PROG_CC has
+# Avoid bugs in AC_REQUIRE in Autoconf 2.63 and earlier.  This
-     dnl not yet been invoked.
+# definition is slower than the version in Autoconf 2.64, because it
-     _AC_COMPILE_IFELSE(
+# can only use interfaces that existed since 2.59; but it achieves the
-        [AC_LANG_PROGRAM([[
+# same effect.  Quoting is necessary to avoid confusing Automake.
-           #ifdef __clang__
+m4_version_prereq([2.63.263], [],
-           barfbarf
+[m4_define([AC][_DEFUN_ONCE],
-           #endif
+  [AC][_DEFUN([$1],
-           ]],[[]])
+    [AC_REQUIRE([_gl_DEFUN_ONCE([$1])],
-        ],
+      [m4_indir([_gl_DEFUN_ONCE([$1])])])])]dnl
-        [gl_cv_compiler_clang=no],
+[AC][_DEFUN([_gl_DEFUN_ONCE([$1])], [$2])])])
        [gl_cv_compiler_clang=yes])
    ])
 ])
 AC_DEFUN([gl_COMPILER_PREPARE_CHECK_DECL],
 [
 dnl AC_REQUIRE([AC_PROG_CC])
 dnl AC_REQUIRE([gl_COMPILER_CLANG])
  AC_CACHE_CHECK([for compiler option needed when checking for declarations],
    [gl_cv_compiler_check_decl_option],
    [if test $gl_cv_compiler_clang = yes; then
       dnl Test whether the compiler supports the option
       dnl '-Werror=implicit-function-declaration'.
       saved_ac_compile="$ac_compile"
       ac_compile="$ac_compile -Werror=implicit-function-declaration"
       dnl Use _AC_COMPILE_IFELSE instead of AC_COMPILE_IFELSE, to avoid a
       dnl warning "AC_COMPILE_IFELSE was called before AC_USE_SYSTEM_EXTENSIONS".
       _AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]],[[]])],
         [gl_cv_compiler_check_decl_option='-Werror=implicit-function-declaration'],
         [gl_cv_compiler_check_decl_option=none])
       ac_compile="$saved_ac_compile"
     else
       gl_cv_compiler_check_decl_option=none
     fi
    ])
  if test "x$gl_cv_compiler_check_decl_option" != xnone; then
    ac_compile_for_check_decl="$ac_compile $gl_cv_compiler_check_decl_option"
  else
    ac_compile_for_check_decl="$ac_compile"
  fi
 ])
 dnl Redefine _AC_CHECK_DECL_BODY so that it references ac_compile_for_check_decl
 dnl instead of ac_compile.  If, for whatever reason, the override of AC_PROG_CC
 dnl in zzgnulib.m4 is inactive, use the original ac_compile.
 m4_define([_AC_CHECK_DECL_BODY],
 [  ac_saved_ac_compile="$ac_compile"
  if test -n "$ac_compile_for_check_decl"; then
    ac_compile="$ac_compile_for_check_decl"
  fi]
 m4_defn([_AC_CHECK_DECL_BODY])[  ac_compile="$ac_saved_ac_compile"
 ])
 # gl_00GNULIB
 # -----------
--- a/m4/gnulib-common.m4
+++ b/m4/gnulib-common.m4
--- a/m4/zzgnulib.m4
+++ b/m4/zzgnulib.m4
@ -1,25 +0,0 @@
 # zzgnulib.m4
 # serial 1
 dnl Copyright (C) 2020-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 dnl This file is offered as-is, without any warranty.
 dnl This file must be named something that sorts after all other
 dnl package- or gnulib-provided .m4 files - at least for those packages
 dnl that redefine AC_PROG_CC.
 dnl Redefine AC_PROG_CC so that it ends with invocations of gl_COMPILER_CLANG
 dnl and gl_COMPILER_PREPARE_CHECK_DECL.
 m4_define([AC_PROG_CC],
  m4_defn([AC_PROG_CC])[
 gl_COMPILER_CLANG
 gl_COMPILER_PREPARE_CHECK_DECL
 ])
 # gl_ZZGNULIB
 # -----------
 # Witness macro that this file has been included.  Needed to force
 # Automake to include this file after all other gnulib .m4 files.
 AC_DEFUN([gl_ZZGNULIB])
--- a/main.c
+++ b/main.c
--- a/plugin-manager.c
+++ b/plugin-manager.c
@ -4,7 +4,7 @@
   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 2 of the License, or
+   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,
@ -52,9 +52,9 @@ plugin_load_one (struct ovl_plugin_context *context, const char *path)
  plugin_name name;
  struct ovl_plugin *p;
  plugin_version version;
-  void *handle = dlopen (path, RTLD_NOW | RTLD_LOCAL);
+  void *handle = dlopen (path, RTLD_NOW|RTLD_LOCAL);
  if (! handle)
-    error (EXIT_FAILURE, 0, "cannot load plugin %s: %s", path, dlerror ());
+    error (EXIT_FAILURE, 0, "cannot load plugin %s: %s", path, dlerror());
  p = calloc (1, sizeof (*p));
  if (p == NULL)
--- a/plugin-manager.h
+++ b/plugin-manager.h
@ -4,7 +4,7 @@
   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 2 of the License, or
+   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,
@ -17,10 +17,10 @@
 */
 #ifndef PLUGIN_MANAGER_H
-#define PLUGIN_MANAGER_H
+# define PLUGIN_MANAGER_H
-#include <config.h>
+# include <config.h>
-#include <dlfcn.h>
+# include <dlfcn.h>
 struct ovl_plugin_context
 {
@ -37,7 +37,8 @@ struct ovl_plugin_context *load_plugins (const char *plugins);
 /* taken from glibc unistd.h and fixes musl */
 #ifndef TEMP_FAILURE_RETRY
 #define TEMP_FAILURE_RETRY(expression) \
-  (__extension__ ({ long int __result;                                                     \
+  (__extension__                                                              \
    ({ long int __result;                                                     \
       do __result = (long int) (expression);                                 \
       while (__result == -1L && errno == EINTR);                             \
       __result; }))
--- a/plugin.h
+++ b/plugin.h
@ -4,7 +4,7 @@
   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 2 of the License, or
+   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,
@ -17,16 +17,16 @@
 */
 #ifndef PLUGIN_H
-#define PLUGIN_H
+# define PLUGIN_H
-#include <config.h>
+# include <config.h>
-#include <utils.h>
+# include <utils.h>
-#include <fuse-overlayfs.h>
+# include <fuse-overlayfs.h>
-typedef struct data_source *(*plugin_load_data_source) (const char *opaque, const char *path);
+typedef struct data_source *(*plugin_load_data_source)(const char *opaque, const char *path);
-typedef int (*plugin_release) ();
+typedef int (*plugin_release)();
-typedef const char *(*plugin_name) ();
+typedef const char *(*plugin_name)();
-typedef int (*plugin_version) ();
+typedef int (*plugin_version)();
 struct ovl_plugin
 {
--- a/rpm/fuse-overlayfs.spec.template
+++ b/rpm/fuse-overlayfs.spec.template
@ -3,7 +3,7 @@ Name: fuse-overlayfs
 Version: #VERSION#
 Release: 1%{?dist}
 Source0: %{url}/archive/%{name}-%{version}.tar.gz
-License: GPLv2+
+License: GPLv3+
 URL: https://github.com/giuseppe/fuse-overlayfs
 # We always run autogen.sh
--- a/tests/fedora-installs.sh
+++ b/tests/fedora-installs.sh
@ -2,17 +2,17 @@
 set -xeuo pipefail
-mkdir lower:1 upper:2 workdir:3 merged
+mkdir lower upper workdir merged
-fuse-overlayfs -o 'sync=0,lowerdir=lower\\:1,upperdir=upper\\:2,workdir=workdir\\:3,suid,dev' merged
+fuse-overlayfs -o sync=0,lowerdir=lower,upperdir=upper,workdir=workdir,suid,dev merged
-docker run --rm -v $(pwd)/merged:/merged fedora dnf --use-host-config --installroot /merged --releasever 41 install -y glibc-common gedit
+docker run --rm -v $(pwd)/merged:/merged fedora dnf --installroot /merged --releasever 30 install -y glibc-common gedit
 umount merged
 # Make sure workdir is empty, and move the upper layer down
-rm -rf lower:1 workdir:3
+rm -rf workdir lower
-mv upper:2 lower
+mv upper lower
 mkdir upper workdir
 gcc -static -o suid-test $(dirname $0)/suid-test.c
@ -30,7 +30,7 @@ stat -c %A upper/suid | grep s
 stat -c %a upper/nosuid | grep -v s
 # Install some big packages
-docker run --rm -v $(pwd)/merged:/merged fedora dnf --use-host-config --installroot /merged --releasever 41 install -y emacs texlive
+docker run --rm -v $(pwd)/merged:/merged fedora dnf --installroot /merged --releasever 30 install -y emacs texlive
 docker run --rm -v $(pwd)/merged:/merged fedora sh -c 'rm /merged/usr/share/glib-2.0/schemas/gschemas.compiled; glib-compile-schemas /merged/usr/share/glib-2.0/schemas/'
@ -45,10 +45,17 @@ umount merged
 rm -rf workdir lower upper
 mkdir upper workdir lower
 fuse-overlayfs -o sync=0,lowerdir=lower,upperdir=upper,workdir=workdir,suid,dev merged
 # https://github.com/containers/fuse-overlayfs/issues/86
 docker run --rm -v $(pwd)/merged:/merged centos:8 yum --installroot /merged -y --releasever 8 install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
 umount merged
 # fast_ino_check
 fuse-overlayfs -o fast_ino_check=1,sync=0,lowerdir=lower,upperdir=upper,workdir=workdir,suid,dev merged
-docker run --rm -v $(pwd)/merged:/merged fedora dnf --use-host-config --installroot /merged --releasever 41 install -y glibc-common gedit
+docker run --rm -v $(pwd)/merged:/merged centos:8 yum --installroot /merged -y --releasever 8 install nano
 mkdir merged/a-directory
@ -244,32 +251,5 @@ test \! -e upper/a/b
 mknod merged/dev-foo c 10 175
 attr -l merged/dev-foo
 # https://github.com/containers/fuse-overlayfs/issues/337
 umount -l merged
 rm -rf lower upper workdir merged
 mkdir lower upper workdir merged
 mkdir upper/foo
 ln -s not/existing lower/foo
 fuse-overlayfs -o lowerdir=lower,upperdir=upper,workdir=workdir merged
 stat merged/foo
 umount merged
 # https://github.com/containers/fuse-overlayfs/issues/444
 rm -rf lower upper workdir merged
 mkdir lower upper workdir merged
 mkdir -p lower/base/test/test1
 touch lower/base/test/test1/test1-file
 fuse-overlayfs -o lowerdir=lower,upperdir=upper,workdir=workdir merged
 mv merged/base/test/test1 merged/base/test/tmp
 cp -r merged/base/test/tmp merged/base/test/test1
 umount merged
--- a/tests/suid-test.c
+++ b/tests/suid-test.c
@ -14,13 +14,13 @@ main ()
  unlink ("suid");
  unlink ("nosuid");
-  fd = open ("suid", O_WRONLY | O_CREAT | O_EXCL);
+  fd = open ("suid", O_WRONLY|O_CREAT|O_EXCL);
  write (fd, "1", 1);
  fchown (fd, 0, 0);
  fchmod (fd, S_ISUID | 0755);
  close (fd);
-  fd = open ("nosuid", O_WRONLY | O_CREAT | O_EXCL);
+  fd = open ("nosuid", O_WRONLY|O_CREAT|O_EXCL);
  write (fd, "1", 1);
  fchown (fd, 0, 0);
  fchmod (fd, S_ISUID | 0755);
--- a/tests/unpriv.sh
+++ b/tests/unpriv.sh
@ -29,27 +29,3 @@ else
 fi
 fusermount -u merged || [ $? -eq "${EXPECT_UMOUNT_STATUS:-0}" ]
 # xattr_permissions=2
 rm -rf lower upper workdir merged
 mkdir lower upper workdir merged
 touch upper/file
 unshare -r setcap cap_net_admin+ep upper/file
 fuse-overlayfs -o lowerdir=lower,upperdir=upper,workdir=workdir,xattr_permissions=2 merged
 # Ensure the security xattr namespace is isolated.
 test "$(unshare -r getcap merged/file)" = ''
 unshare -r setcap cap_net_admin+ep merged/file
 test "$(unshare -r getcap merged/file)" = 'merged/file cap_net_admin=ep'
 # Ensure UID is preserved with chgrp.
 podman unshare chgrp 1 merged/file
 test $(podman unshare stat -c %u:%g merged/file) = 0:1
 # Ensure UID and GID are preserved with chmod.
 chmod 600 merged/file
 test $(podman unshare stat -c %u:%g merged/file) = 0:1
 fusermount -u merged || [ $? -eq "${EXPECT_UMOUNT_STATUS:-0}" ]
--- a/utils.c
+++ b/utils.c
@ -4,7 +4,7 @@
   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 2 of the License, or
+   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,
@ -32,8 +32,9 @@
 #include <sys/xattr.h>
 #ifndef TEMP_FAILURE_RETRY
-#  define TEMP_FAILURE_RETRY(expression) \
+#define TEMP_FAILURE_RETRY(expression) \
-    (__extension__ ({ long int __result;                                                     \
+  (__extension__                                                              \
    ({ long int __result;                                                     \
       do __result = (long int) (expression);                                 \
       while (__result == -1L && errno == EINTR);                             \
       __result; }))
@ -53,7 +54,10 @@
 /* List of all valid flags for the open/openat flags argument: */
 #define VALID_OPEN_FLAGS \
-  (O_RDONLY | O_WRONLY | O_RDWR | O_CREAT | O_EXCL | O_NOCTTY | O_TRUNC | O_APPEND | O_NDELAY | O_NONBLOCK | O_NDELAY | O_SYNC | O_DSYNC | FASYNC | O_DIRECT | O_LARGEFILE | O_DIRECTORY | O_NOFOLLOW | O_NOATIME | O_CLOEXEC | O_PATH | O_TMPFILE)
+  (O_RDONLY | O_WRONLY | O_RDWR | O_CREAT | O_EXCL | O_NOCTTY | O_TRUNC | \
   O_APPEND | O_NDELAY | O_NONBLOCK | O_NDELAY | O_SYNC | O_DSYNC |     \
   FASYNC | O_DIRECT | O_LARGEFILE | O_DIRECTORY | O_NOFOLLOW |         \
   O_NOATIME | O_CLOEXEC | O_PATH | O_TMPFILE)
 static int
 syscall_openat2 (int dirfd, const char *path, uint64_t flags, uint64_t mode, uint64_t resolve)
@ -63,7 +67,9 @@ syscall_openat2 (int dirfd, const char *path, uint64_t flags, uint64_t mode, uin
      uint64_t flags;
      uint64_t mode;
      uint64_t resolve;
-  } how = {
+    }
  how =
    {
     .flags = flags & VALID_OPEN_FLAGS,
     .mode = (flags & O_CREAT) ? (mode & 07777) : 0,
     .resolve = resolve,
@ -91,16 +97,15 @@ safe_openat (int dirfd, const char *pathname, int flags, mode_t mode)
        }
      return ret;
    }
-fallback:
+ fallback:
  return openat (dirfd, pathname, flags, mode);
 }
 int
 file_exists_at (int dirfd, const char *pathname)
 {
-  int ret = faccessat (dirfd, pathname, F_OK, AT_SYMLINK_NOFOLLOW | AT_EACCESS);
+  int ret = faccessat (dirfd, pathname, F_OK, AT_SYMLINK_NOFOLLOW|AT_EACCESS);
-  if (ret < 0 && errno == EINVAL)
+  if (ret < 0 && errno == EINVAL) {
    {
    struct stat buf;
    return fstatat (dirfd, pathname, &buf, AT_SYMLINK_NOFOLLOW);
  }
@ -214,7 +219,7 @@ open_fd_or_get_path (struct ovl_layer *l, const char *path, char *out, int *fd,
 {
  out[0] = '\0';
-  *fd = l->ds->openat (l, path, O_NONBLOCK | O_NOFOLLOW | flags, 0);
+  *fd = l->ds->openat (l, path, O_NONBLOCK|O_NOFOLLOW|flags, 0);
  if (*fd < 0 && (errno == ELOOP || errno == EISDIR || errno == ENXIO))
    {
      strconcat3 (out, PATH_MAX, l->path, "/", path);
@ -224,38 +229,16 @@ open_fd_or_get_path (struct ovl_layer *l, const char *path, char *out, int *fd,
  return *fd;
 }
 int
 read_device (const char *s, dev_t *dev)
 {
  unsigned int major, minor;
  int ret;
  while (*s == '-')
    s++;
  ret = sscanf (s, "%u-%u", &major, &minor);
  if (ret != 2)
    {
      errno = EINVAL;
      return -1;
    }
  *dev = makedev (major, minor);
  return 0;
 }
 int
 override_mode (struct ovl_layer *l, int fd, const char *abs_path, const char *path, struct stat *st)
 {
  int ret;
  uid_t uid;
  gid_t gid;
-  mode_t mode = 0;
+  mode_t mode;
  char buf[64];
  cleanup_close int cleanup_fd = -1;
  const char *xattr_name;
  cleanup_free char *type = NULL;
  switch (st->st_mode & S_IFMT)
    {
@ -292,10 +275,14 @@ override_mode (struct ovl_layer *l, int fd, const char *abs_path, const char *pa
  if (fd >= 0)
    {
      ret = fgetxattr (fd, xattr_name, buf, sizeof (buf) - 1);
      if (ret < 0)
        return ret;
    }
  else if (abs_path)
    {
      ret = lgetxattr (abs_path, xattr_name, buf, sizeof (buf) - 1);
      if (ret < 0)
        return ret;
    }
  else
    {
@ -310,53 +297,20 @@ override_mode (struct ovl_layer *l, int fd, const char *abs_path, const char *pa
      if (fd >= 0)
        ret = fgetxattr (fd, xattr_name, buf, sizeof (buf) - 1);
      else
        {
          ret = lgetxattr (full_path, xattr_name, buf, sizeof (buf) - 1);
          if (ret < 0 && errno == ENODATA)
            return 0;
        }
      if (ret < 0)
-    return errno == ENODATA ? 0 : ret;
+        return ret;
    }
  buf[ret] = '\0';
-  ret = sscanf (buf, "%d:%d:%o:%ms", &uid, &gid, &mode, &type);
+  ret = sscanf (buf, "%d:%d:%o", &uid, &gid, &mode);
-  if (ret == 4)
+  if (ret != 3)
    {
      if (has_prefix (type, "dir"))
        mode |= S_IFDIR;
      else if (has_prefix (type, "file"))
        mode |= S_IFREG;
      else if (has_prefix (type, "symlink"))
        mode |= S_IFLNK;
      else if (has_prefix (type, "pipe"))
        mode |= S_IFIFO;
      else if (has_prefix (type, "socket"))
        mode |= S_IFSOCK;
      else if (has_prefix (type, "block"))
        {
          mode |= S_IFBLK;
          ret = read_device (type + strlen ("block"), &st->st_rdev);
          if (ret < 0)
            return ret;
        }
      else if (has_prefix (type, "char"))
        {
          mode |= S_IFCHR;
          ret = read_device (type + strlen ("char"), &st->st_rdev);
          if (ret < 0)
            return ret;
        }
      else
        {
          errno = EINVAL;
          return -1;
        }
    }
  else if (ret == 3)
    {
      /* If a type is not specified, keep the original one.  */
      mode |= (st->st_mode & S_IFMT);
    }
  else
    {
      errno = EINVAL;
      return -1;
@ -364,24 +318,7 @@ override_mode (struct ovl_layer *l, int fd, const char *abs_path, const char *pa
  st->st_uid = uid;
  st->st_gid = gid;
-  st->st_mode = mode;
+  st->st_mode = (st->st_mode & S_IFMT) | mode;
  return 0;
 }
 bool
 has_prefix (const char *str, const char *pref)
 {
  while (1)
    {
      if (*pref == '\0')
        return true;
      if (*str == '\0')
        return false;
      if (*pref != *str)
        return false;
      str++;
      pref++;
    }
  return false;
 }
--- a/utils.h
+++ b/utils.h
@ -4,7 +4,7 @@
   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 2 of the License, or
+   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,
@ -16,25 +16,26 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #ifndef UTILS_H
-#define UTILS_H
+# define UTILS_H
 #ifndef _GNU_SOURCE
 # define _GNU_SOURCE
 #endif
-#include <config.h>
+# include <config.h>
 #include <dirent.h>
 #include <fcntl.h>
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include "fuse-overlayfs.h"
-#define XATTR_OVERRIDE_STAT "user.fuseoverlayfs.override_stat"
+# include <unistd.h>
-#define XATTR_PRIVILEGED_OVERRIDE_STAT "security.fuseoverlayfs.override_stat"
+# include <stdio.h>
-#define XATTR_OVERRIDE_CONTAINERS_STAT "user.containers.override_stat"
+# include <sys/types.h>
 # include <dirent.h>
 # include <stdlib.h>
 # include <sys/types.h>
 # include <fcntl.h>
 # include "fuse-overlayfs.h"
 # define XATTR_OVERRIDE_STAT "user.fuseoverlayfs.override_stat"
 # define XATTR_PRIVILEGED_OVERRIDE_STAT "security.fuseoverlayfs.override_stat"
 # define XATTR_OVERRIDE_CONTAINERS_STAT "user.containers.override_stat"
 void cleanup_freep (void *p);
 void cleanup_filep (FILE **f);
@ -46,22 +47,20 @@ int file_exists_at (int dirfd, const char *pathname);
 int strconcat3 (char *dest, size_t size, const char *s1, const char *s2, const char *s3);
 int open_fd_or_get_path (struct ovl_layer *l, const char *path, char *out, int *fd, int flags);
-#define cleanup_file __attribute__ ((cleanup (cleanup_filep)))
+# define cleanup_file __attribute__((cleanup (cleanup_filep)))
-#define cleanup_free __attribute__ ((cleanup (cleanup_freep)))
+# define cleanup_free __attribute__((cleanup (cleanup_freep)))
-#define cleanup_close __attribute__ ((cleanup (cleanup_closep)))
+# define cleanup_close __attribute__((cleanup (cleanup_closep)))
-#define cleanup_dir __attribute__ ((cleanup (cleanup_dirp)))
+# define cleanup_dir __attribute__((cleanup (cleanup_dirp)))
-#define LIKELY(x) __builtin_expect ((x), 1)
+# define LIKELY(x) __builtin_expect((x),1)
-#define UNLIKELY(x) __builtin_expect ((x), 0)
+# define UNLIKELY(x) __builtin_expect((x),0)
-#ifdef HAVE_STATX
+# ifdef HAVE_STATX
 void statx_to_stat (struct statx *stx, struct stat *st);
-#endif
+# endif
 int safe_openat (int dirfd, const char *pathname, int flags, mode_t mode);
 int override_mode (struct ovl_layer *l, int fd, const char *abs_path, const char *path, struct stat *st);
 bool has_prefix (const char *str, const char *pref);
 #endif