util1: handle out-of-range times in timestring

fixes a one byte stack overflow when using RSYNC_PROXY with a
malicious proxy.

Reach: only when RSYNC_PROXY is set and a malicious or MITM'd
proxy returns the pathological response.  The byte written is
always '\0' and the attacker doesn't choose the offset, so impact
is corruption of one adjacent stack byte and possible later
misbehaviour or crash -- no information disclosure beyond the
existing rprintf of buffer contents.

Reported by Aisle Research via Michal Ruprich

.cirrus.yml

@@ -0,0 +1,23 @@
+freebsd_task:
+  name: FreeBSD
+  freebsd_instance:
+    image_family: freebsd-13-1
+  env:
+    PATH: /usr/local/bin:$PATH
+  prep_script:
+    - dd if=/dev/zero of=/tmp/zpool bs=1M count=1024
+    - zpool create -m `pwd`/testtmp zpool /tmp/zpool
+    - pkg install -y bash autotools m4 xxhash zstd liblz4 wget
+    - wget -O git-version.h https://gist.githubusercontent.com/WayneD/c11243fa374fc64d4e42f2855c8e3827/raw/rsync-git-version.h
+  configure_script:
+    - CPPFLAGS=-I/usr/local/include/ LDFLAGS=-L/usr/local/lib/ ./configure --disable-md2man
+  make_script:
+    - make
+  install_script:
+    - make install
+  info_script:
+    - rsync --version
+  test_script:
+    - RSYNC_EXPECT_SKIPPED=acls-default,acls,crtimes,protected-regular make check
+  ssl_file_list_script:
+    - rsync-ssl --no-motd download.samba.org::rsyncftp/ || true

.gitattributes

@@ -1,17 +1 @@
 * text=auto eol=lf
-
-# The rsync-web/ subdirectory holds the project website source content
-# (mirrors what gets pushed to https://rsync.samba.org).  Exclude it from
-# `git archive` output so the release source tarball produced by
-# packaging/release.py step_7_tarball does not bloat with HTML the
-# tarball doesn't need.
-/rsync-web/ export-ignore
-
-# old_versions/ holds static binaries of historical rsync releases, used by the
-# version-mixing test suite (.github/workflows/ubuntu-version-mix.yml) to run
-# the current code against a real old peer over the daemon / remote-shell.
-# Mark the binaries as binary so the `text=auto eol=lf` rule above can't try to
-# normalise line endings and corrupt them; export-ignore keeps them out of the
-# release source tarball.
-/old_versions/rsync_* binary
-/old_versions/rsync_* export-ignore

.github/workflows/actionlint.yml

@@ -1,43 +0,0 @@
-name: Lint GitHub Actions workflows
-
-# Static-check the workflow YAML with rhysd/actionlint.  Catches missing
-# secrets, bad expressions, expression-type errors, unsupported runner
-# images, and (via embedded shellcheck) common pitfalls in `run:` scripts.
-# Trigger only on changes under .github/workflows/ so the rest of the
-# matrix isn't billed when nothing here moves.
-
-on:
-  push:
-    branches: [ master ]
-    paths:
-      - '.github/workflows/*.yml'
-      - '.github/actionlint.yaml'
-      - '.github/actionlint.yml'
-  pull_request:
-    branches: [ master ]
-    paths:
-      - '.github/workflows/*.yml'
-      - '.github/actionlint.yaml'
-      - '.github/actionlint.yml'
-
-permissions:
-  contents: read
-
-jobs:
-  actionlint:
-    runs-on: ubuntu-latest
-    name: actionlint
-    steps:
-      - uses: actions/checkout@v4
-      - name: install actionlint
-        # Pin a version so this job is reproducible; bump deliberately.
-        # The download script verifies a SHA256 of the release tarball.
-        run: |
-          bash <(curl --proto '=https' --tlsv1.2 -fsSL \
-              https://raw.githubusercontent.com/rhysd/actionlint/main/scripts/download-actionlint.bash) \
-              1.7.12
-          echo "$PWD" >>"$GITHUB_PATH"
-      - name: actionlint --version
-        run: actionlint -version
-      - name: actionlint .github/workflows/*.yml
-        run: actionlint -color

.github/workflows/almalinux-8-build.yml

@@ -13,12 +13,11 @@ on:
       - '.github/workflows/*.yml'
       - '!.github/workflows/almalinux-8-build.yml'
   pull_request:
-    branches: [ master ]
     paths-ignore:
       - '.github/workflows/*.yml'
       - '!.github/workflows/almalinux-8-build.yml'
   schedule:
-    - cron: '42 8 * * 1'
+    - cron: '42 8 * * *'
 
 jobs:
   test:
@@ -59,19 +58,13 @@ jobs:
       run: ./rsync --version
     - name: check
       # In the container we already run as root, so no sudo. The
-      # crtimes-not-supported skip matches the other Linux jobs;
-      # daemon-chroot-acl and proxy-response-line-too-long skip because
-      # the default (secure) transport opens no listening socket.
-      run: RSYNC_EXPECT_SKIPPED=crtimes,daemon-access-ip,daemon-chroot-acl,proxy-response-line-too-long,recv-discard-nullderef make check
-    - name: check (TCP daemon transport)
-      # Second run exercising the real loopback-TCP daemon path.
-      run: ./runtests.py --rsync-bin="$PWD/rsync" --use-tcp -j 8
+      # crtimes-not-supported skip matches the other Linux jobs.
+      run: RSYNC_EXPECT_SKIPPED=crtimes make check
     - name: ssl file list
       run: ./rsync-ssl --no-motd download.samba.org::rsyncftp/ || true
     - name: save artifact
       uses: actions/upload-artifact@v4
       with:
-        retention-days: 45
         name: almalinux-8-bin
         path: |
           rsync

.github/workflows/android-static-build.yml

@@ -1,121 +0,0 @@
-name: Build static rsync for Android
-
-# Cross-compiles statically-linked rsync binaries with the Android NDK,
-# suitable for dropping onto a phone (adb push / Termux) with no shared
-# libraries. arm64-v8a covers all modern phones; armeabi-v7a covers older
-# 32-bit devices. The binaries are uploaded as workflow artifacts.
-#
-# These are cross-compiled, so the test suite can't run here; we sanity
-# check that each binary is the right architecture, is static, and that
-# it executes (`--version`) under qemu-user.
-
-on:
-  push:
-    branches: [ master ]
-    paths-ignore:
-      - '.github/workflows/*.yml'
-      - '!.github/workflows/android-static-build.yml'
-  pull_request:
-    branches: [ master ]
-    paths-ignore:
-      - '.github/workflows/*.yml'
-      - '!.github/workflows/android-static-build.yml'
-  schedule:
-    - cron: '42 8 * * 1'
-  workflow_dispatch:
-
-env:
-  # Minimum supported API level. 24 (Android 7.0) runs on every modern
-  # phone while keeping broad reach; bump if you need newer Bionic APIs.
-  ANDROID_API: 24
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    name: ${{ matrix.abi }}
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - abi: arm64-v8a       # modern phones
-            triple: aarch64-linux-android
-            qemu: qemu-aarch64-static
-          - abi: armeabi-v7a     # older 32-bit phones
-            triple: armv7a-linux-androideabi
-            qemu: qemu-arm-static
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Install build prerequisites
-        run: sudo apt-get update && sudo apt-get install -y autoconf automake gawk qemu-user-static
-
-      - name: Configure and build (${{ matrix.abi }})
-        shell: bash
-        run: |
-          set -euo pipefail
-          NDK="${ANDROID_NDK_LATEST_HOME:-$ANDROID_NDK_ROOT}"
-          TC="$NDK/toolchains/llvm/prebuilt/linux-x86_64/bin"
-          export CC="$TC/${{ matrix.triple }}${ANDROID_API}-clang"
-          export AR="$TC/llvm-ar" RANLIB="$TC/llvm-ranlib" STRIP="$TC/llvm-strip"
-          export CFLAGS="-O2" LDFLAGS="-static"
-
-          # Bionic doesn't declare lchmod()/lutimes() until API 36, but the
-          # symbols link, so configure mis-detects them -- force them off so
-          # rsync uses its fallbacks. The other cache vars restore values
-          # that configure can't probe when cross-compiling (Android runs a
-          # normal Linux kernel, so these match the native Linux result).
-          export ac_cv_func_lchmod=no ac_cv_func_lutimes=no \
-                 rsync_cv_HAVE_SOCKETPAIR=yes \
-                 rsync_cv_MKNOD_CREATES_FIFOS=yes \
-                 rsync_cv_MKNOD_CREATES_SOCKETS=yes
-
-          # Self-contained build: drop optional external libraries so the
-          # static binary needs nothing at runtime. rsync keeps md5/md4
-          # checksums and its bundled zlib.
-          ./configure --host=${{ matrix.triple }} --build=x86_64-pc-linux-gnu \
-            --enable-ipv6 \
-            --disable-zstd --disable-lz4 --disable-xxhash --disable-openssl \
-            --disable-iconv --disable-iconv-open \
-            --disable-acl-support --disable-xattr-support \
-            --disable-md2man --disable-roll-simd \
-            --with-included-popt --with-included-zlib
-
-          # Generate the awk-built headers serially first so the parallel
-          # build can't race on proto.h <- daemon-parm.h.
-          make proto.h
-          make -j"$(nproc)" rsync
-          "$STRIP" rsync
-
-      - name: Verify binary
-        shell: bash
-        run: |
-          set -euo pipefail
-          file rsync
-          # Gate: must be a statically-linked executable (no interpreter).
-          file rsync | grep -q "statically linked"
-          if file rsync | grep -q "dynamically linked"; then
-            echo "ERROR: binary is not static" >&2; exit 1
-          fi
-          # Best-effort: confirm it actually runs under qemu-user.
-          ${{ matrix.qemu }} ./rsync --version | head -3 || \
-            echo "WARNING: qemu smoke test did not run cleanly (check on a real device)"
-
-      - name: Package
-        shell: bash
-        run: |
-          set -euo pipefail
-          VER=$(sed -n 's/.*RSYNC_VERSION "\([^"]*\)".*/\1/p' version.h)
-          out="rsync-${VER}-android-${{ matrix.abi }}"
-          mkdir -p dist
-          cp rsync "dist/$out"
-          ( cd dist && sha256sum "$out" > "$out.sha256" )
-          echo "ARTIFACT_NAME=rsync-android-${{ matrix.abi }}" >>"$GITHUB_ENV"
-
-      - name: Upload artifact
-        uses: actions/upload-artifact@v4
-        with:
-          retention-days: 45
-          name: ${{ env.ARTIFACT_NAME }}
-          path: dist/

.github/workflows/asan-build.yml

@@ -1,72 +0,0 @@
-name: rsync ASan+UBSan (clang)
-
-on:
-  push:
-    branches: [ master ]
-    paths-ignore:
-      - '.github/workflows/*.yml'
-      - '!.github/workflows/asan-build.yml'
-  pull_request:
-    branches: [ master ]
-    paths-ignore:
-      - '.github/workflows/*.yml'
-      - '!.github/workflows/asan-build.yml'
-  schedule:
-    # Weekly (Mon 09:42 UTC): catch breakage from a moving ubuntu-latest/clang
-    # toolchain (a new clang can add a UBSan check, or change ASan behaviour)
-    # that no code push would otherwise trigger.  Push/PR already gate every
-    # code change, so daily would just re-run an unchanged tree.
-    - cron: '42 9 * * 1'
-  workflow_dispatch:
-
-jobs:
-  asan:
-    runs-on: ubuntu-latest
-    name: rsync ASan+UBSan (clang)
-    env:
-      # rsync intentionally leaks small allocations at process exit, so leak
-      # detection would be all noise; chase only memory-safety errors.
-      ASAN_OPTIONS: detect_leaks=0:abort_on_error=1
-      # UBSan is a gate: -fno-sanitize-recover=undefined (below) aborts on the
-      # first finding and halt_on_error=1 makes that fatal, so any undefined
-      # behaviour fails the run.  This needs the tree to be UBSan-clean: the
-      # remaining findings are fixed in code (hashtable/mdfour shifts, xattrs,
-      # and log.c's file_struct, kept aligned via rounding.h); only byteorder.h's
-      # intentional unaligned accessors are suppressed, with no_sanitize.
-      UBSAN_OPTIONS: print_stacktrace=1:halt_on_error=1
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-    - name: prep
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y clang acl libacl1-dev attr libattr1-dev liblz4-dev libzstd-dev libxxhash-dev openssl
-        echo "/usr/local/bin" >>"$GITHUB_PATH"
-    - name: configure
-      # -DNDEBUG builds as a shipped release does (assert() compiled out), so
-      # AddressSanitizer catches the over-reads/over-writes that an "assert()
-      # instead of a real bounds check" bug would cause in a production build.
-      # UBSan rides along on the same build; -fno-sanitize-recover=undefined
-      # makes any undefined behaviour abort (and thus fail the run) instead of
-      # merely printing it.
-      run: |
-        CC=clang \
-        CFLAGS="-fsanitize=address,undefined -fno-sanitize-recover=undefined -fno-omit-frame-pointer -g -O1 -DNDEBUG" \
-        LDFLAGS="-fsanitize=address,undefined" \
-        ./configure --with-rrsync --disable-md2man
-    - name: make
-      # check-progs builds rsync plus the test helper programs (tls, trimslash,
-      # t_unsafe, ...) that runtests.py requires; plain "make" builds only rsync
-      # and runtests aborts on the missing helpers.
-      run: make check-progs
-    - name: info
-      run: ./rsync --version
-    - name: check (stdio-pipe transport)
-      # ASan+UBSan-instrumented coverage of the transfer, daemon, sender,
-      # receiver and metadata paths over the default stdio-pipe transport.
-      run: ./runtests.py --rsync-bin="$PWD/rsync" -j8
-    - name: check (TCP daemon transport)
-      # --use-tcp also exercises the loopback rsyncd listener and the client's
-      # TCP connection path.
-      run: ./runtests.py --rsync-bin="$PWD/rsync" --use-tcp -j8

.github/workflows/coverage.yml

@@ -1,72 +0,0 @@
-name: Coverage (Ubuntu)
-
-on:
-  push:
-    branches: [ master ]
-    paths-ignore:
-      - '.github/workflows/*.yml'
-      - '!.github/workflows/coverage.yml'
-  pull_request:
-    branches: [ master ]
-    paths-ignore:
-      - '.github/workflows/*.yml'
-      - '!.github/workflows/coverage.yml'
-  schedule:
-    - cron: '42 9 * * 1'
-  workflow_dispatch:
-
-jobs:
-  coverage:
-    runs-on: ubuntu-latest
-    name: gcov coverage
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-    - name: prep
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y acl libacl1-dev attr libattr1-dev liblz4-dev libzstd-dev libxxhash-dev python3-cmarkgfm openssl gcovr
-        echo "/usr/local/bin" >>"$GITHUB_PATH"
-    - name: configure
-      run: ./configure --enable-coverage --with-rrsync
-    - name: make
-      run: make
-    - name: info
-      run: rsync --version
-    # Two coverage runs: the default pipe transport, then a second pass over a
-    # real loopback rsyncd (--use-tcp) which also exercises the require_tcp-only
-    # tests. gcovr's --print-summary line/branch/decision totals go to the step
-    # log (and the job summary below), so the numbers are visible in CI.
-    # `make coverage` exits with the suite's status, so a regression fails CI.
-    - name: coverage (pipe transport)
-      run: |
-        set -o pipefail
-        sudo make coverage 2>&1 | tee cov-pipe.log
-    - name: coverage (TCP transport)
-      run: |
-        set -o pipefail
-        sudo make coverage-tcp 2>&1 | tee cov-tcp.log
-    - name: coverage summary
-      if: always()
-      run: |
-        {
-          echo "## gcov coverage"
-          echo "### Pipe transport (\`make coverage\`)"
-          echo '```'
-          grep -E '^(lines|functions|branches|decisions):' cov-pipe.log || echo '(no summary -- see step log)'
-          echo '```'
-          echo "### TCP transport (\`make coverage-tcp\`)"
-          echo '```'
-          grep -E '^(lines|functions|branches|decisions):' cov-tcp.log || echo '(no summary -- see step log)'
-          echo '```'
-        } >> "$GITHUB_STEP_SUMMARY"
-    - name: upload HTML reports
-      if: always()
-      uses: actions/upload-artifact@v4
-      with:
-        retention-days: 45
-        name: coverage-html
-        path: |
-          coverage
-          coverage-tcp

.github/workflows/cygwin-build.yml

@@ -7,12 +7,11 @@ on:
       - '.github/workflows/*.yml'
       - '!.github/workflows/cygwin-build.yml'
   pull_request:
-    branches: [ master ]
     paths-ignore:
       - '.github/workflows/*.yml'
       - '!.github/workflows/cygwin-build.yml'
   schedule:
-    - cron: '42 8 * * 1'
+    - cron: '42 8 * * *'
 
 jobs:
   test:
@@ -39,24 +38,12 @@ jobs:
     - name: info
       run: bash -c '/usr/local/bin/rsync --version'
     - name: check
-      # chown-fake / devices-fake / xattrs / xattrs-hlink now RUN on Cygwin
-      # (rsyncfns.py drives xattrs via getfattr/setfattr from the `attr`
-      # package installed above), verified on a real Cygwin host. The real
-      # chown/devices tests still skip (need root/mknod), as do the
-      # RESOLVE_BENEATH symlink-race tests.  symlink-dirlink-basis also now
-      # RUNS (the #915 non-daemon basis open uses a plain do_open, restoring
-      # following an in-tree dir-symlink basis without RESOLVE_BENEATH).
-      run: bash -c 'RSYNC_EXPECT_SKIPPED=acls-default,acls-depth,acls,bare-do-open-symlink-race,chdir-symlink-race,chown,daemon-access-ip,daemon-chroot-acl,devices,dir-sgid,open-noatime,protected-regular,proxy-response-line-too-long,recv-discard-nullderef,sender-flist-symlink-leak,simd-checksum make check'
-    - name: check (TCP daemon transport)
-      # Second run with daemon tests over a real loopback rsyncd; the default
-      # 'make check' above uses the secure stdio-pipe transport.
-      run: bash -c './runtests.py --rsync-bin=`pwd`/rsync.exe --use-tcp -j 8'
+      run: bash -c 'RSYNC_EXPECT_SKIPPED=acls-default,acls,bare-do-open-symlink-race,chdir-symlink-race,chmod-symlink-race,chown,clean-fname-underflow,daemon-chroot-acl,devices,dir-sgid,protected-regular,sender-flist-symlink-leak,simd-checksum,symlink-dirlink-basis make check'
     - name: ssl file list
       run: bash -c 'PATH="/usr/local/bin:$PATH" rsync-ssl --no-motd download.samba.org::rsyncftp/ || true'
     - name: save artifact
       uses: actions/upload-artifact@v4
       with:
-        retention-days: 45
         name: cygwin-bin
         path: |
           rsync.exe

.github/workflows/fleettest.yml

@@ -1,64 +0,0 @@
-name: Test fleettest harness
-
-# Bitrot check for testsuite/fleettest.py (the developer fleet CI harness).
-# fleettest is meant to be run by developers on a modern Ubuntu box, so this
-# job runs only on ubuntu-latest: it stands up a one-host "fleet" of two
-# targets that both ssh to localhost and runs a real fleettest pass against it.
-# It does not run on the BSD/Solaris/macOS/Cygwin matrix.
-
-on:
-  push:
-    branches: [ master ]
-    paths:
-      - 'testsuite/fleettest.py'
-      - '.github/workflows/fleettest.yml'
-  pull_request:
-    branches: [ master ]
-    paths:
-      - 'testsuite/fleettest.py'
-      - '.github/workflows/fleettest.yml'
-  workflow_dispatch:
-  schedule:
-    - cron: '17 7 * * 1'
-
-jobs:
-  fleettest:
-    runs-on: ubuntu-latest
-    name: fleettest against localhost
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-    - name: prep
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y gcc g++ gawk autoconf automake \
-          acl libacl1-dev attr libattr1-dev liblz4-dev libzstd-dev libxxhash-dev \
-          python3-cmarkgfm openssl rsync openssh-server
-    - name: set up ssh to localhost
-      run: |
-        mkdir -p ~/.ssh && chmod 700 ~/.ssh
-        ssh-keygen -t ed25519 -N '' -f ~/.ssh/id_ed25519
-        cat ~/.ssh/id_ed25519.pub >> ~/.ssh/authorized_keys
-        chmod 600 ~/.ssh/authorized_keys
-        sudo systemctl start ssh || sudo service ssh start
-        # fleettest connects with `ssh -o BatchMode=yes localhost`, which won't
-        # answer a host-key prompt -- so pre-trust localhost in known_hosts.
-        ssh-keyscan -H localhost 127.0.0.1 >> ~/.ssh/known_hosts 2>/dev/null
-        ssh -o BatchMode=yes -o ConnectTimeout=15 localhost 'echo ssh-to-localhost-ok'
-    - name: write localhost fleet config
-      run: |
-        cat > fleettest-ci.json <<'EOF'
-        { "targets": [
-          { "name": "local-a", "ssh_host": "localhost", "workflow": "none.yml",
-            "configure_flags": [], "builddir": "rsync-citest-a", "privilege": "sudo" },
-          { "name": "local-b", "ssh_host": "localhost", "workflow": "none.yml",
-            "configure_flags": [], "builddir": "rsync-citest-b", "privilege": "sudo" }
-        ] }
-        EOF
-    - name: fleettest --list (config sanity)
-      run: python3 testsuite/fleettest.py --fleet fleettest-ci.json --list
-    - name: run fleettest against localhost
-      # Two targets both on localhost exercise the parallel multi-target path
-      # and the per-run dir / port isolation; exit 0 iff every cell is OK.
-      run: python3 testsuite/fleettest.py --fleet fleettest-ci.json --timing

.github/workflows/freebsd-build.yml

@@ -7,12 +7,11 @@ on:
       - '.github/workflows/*.yml'
       - '!.github/workflows/freebsd-build.yml'
   pull_request:
-    branches: [ master ]
     paths-ignore:
       - '.github/workflows/*.yml'
       - '!.github/workflows/freebsd-build.yml'
   schedule:
-    - cron: '42 8 * * 1'
+    - cron: '42 8 * * *'
 
 jobs:
   test:
@@ -35,12 +34,10 @@ jobs:
           make
           ./rsync --version
           make check
-          ./runtests.py --rsync-bin=`pwd`/rsync --use-tcp -j 8
           ./rsync-ssl --no-motd download.samba.org::rsyncftp/ || true
     - name: save artifact
       uses: actions/upload-artifact@v4
       with:
-        retention-days: 45
         name: freebsd-bin
         path: |
           rsync

.github/workflows/macos-build.yml

@@ -7,12 +7,11 @@ on:
       - '.github/workflows/*.yml'
       - '!.github/workflows/macos-build.yml'
   pull_request:
-    branches: [ master ]
     paths-ignore:
       - '.github/workflows/*.yml'
       - '!.github/workflows/macos-build.yml'
   schedule:
-    - cron: '42 8 * * 1'
+    - cron: '42 8 * * *'
 
 jobs:
   test:
@@ -26,7 +25,7 @@ jobs:
       run: |
         brew install automake openssl xxhash zstd lz4
         pip3 install --user --break-system-packages commonmark
-        echo "$(brew --prefix)/bin" >>"$GITHUB_PATH"
+        echo "$(brew --prefix)/bin" >>$GITHUB_PATH
     - name: configure
       run: |
         BREW_PREFIX=$(brew --prefix)
@@ -41,20 +40,12 @@ jobs:
     - name: info
       run: rsync --version
     - name: check
-      # chown-fake / devices-fake / xattrs / xattrs-hlink now RUN on macOS
-      # (rsyncfns.py drives xattrs via the `xattr` command), verified on a
-      # real macOS host, so they're no longer in the skip set.
-      run: sudo RSYNC_EXPECT_SKIPPED=acls-default,acls-depth,chmod-temp-dir,daemon-access-ip,daemon-chroot-acl,dir-sgid,open-noatime,preallocate,protected-regular,proxy-response-line-too-long,recv-discard-nullderef,simd-checksum,sparse make check
-    - name: check (TCP daemon transport)
-      # Second run with daemon tests over a real loopback rsyncd; the default
-      # 'make check' above uses the secure stdio-pipe transport.
-      run: sudo ./runtests.py --rsync-bin="$PWD/rsync" --use-tcp -j 8
+      run: sudo RSYNC_EXPECT_SKIPPED=acls-default,chmod-temp-dir,chown-fake,clean-fname-underflow,daemon-chroot-acl,devices-fake,dir-sgid,protected-regular,simd-checksum,xattrs-hlink,xattrs make check
     - name: ssl file list
       run: rsync-ssl --no-motd download.samba.org::rsyncftp/ || true
     - name: save artifact
       uses: actions/upload-artifact@v4
       with:
-        retention-days: 45
         name: macos-bin
         path: |
           rsync

.github/workflows/netbsd-build.yml

@@ -12,7 +12,7 @@ on:
       - '.github/workflows/*.yml'
       - '!.github/workflows/netbsd-build.yml'
   schedule:
-    - cron: '42 8 * * 1'
+    - cron: '42 8 * * *'
 
 jobs:
   test:
@@ -36,12 +36,10 @@ jobs:
           make
           ./rsync --version
           make check
-          ./runtests.py --rsync-bin=`pwd`/rsync --use-tcp -j 8
           ./rsync-ssl --no-motd download.samba.org::rsyncftp/ || true
     - name: save artifact
       uses: actions/upload-artifact@v4
       with:
-        retention-days: 45
         name: netbsd-bin
         path: |
           rsync

.github/workflows/openbsd-build.yml

@@ -12,7 +12,7 @@ on:
       - '.github/workflows/*.yml'
       - '!.github/workflows/openbsd-build.yml'
   schedule:
-    - cron: '42 8 * * 1'
+    - cron: '42 8 * * *'
 
 jobs:
   test:
@@ -37,20 +37,10 @@ jobs:
           make
           ./rsync --version
           make check
-          # The --use-tcp daemon tests run at -j2 here (vs -j8 elsewhere): this
-          # job runs inside a nested VM, and at -j8 the many concurrent loopback
-          # daemons occasionally lose a connection-handshake timing race under
-          # that resource pressure, hanging one test to the 300s timeout. It is
-          # an environment artifact, not an rsync bug (the handshake is
-          # deadlock-free and unreproducible elsewhere, even pinned to 1 CPU at
-          # -j8); -j2 keeps the VM from over-subscribing. The pipe `make check`
-          # above stays at the default parallelism.
-          ./runtests.py --rsync-bin=`pwd`/rsync --use-tcp -j 2
           ./rsync-ssl --no-motd download.samba.org::rsyncftp/ || true
     - name: save artifact
       uses: actions/upload-artifact@v4
       with:
-        retention-days: 45
         name: openbsd-bin
         path: |
           rsync

.github/workflows/scan-build.yml

@@ -1,51 +0,0 @@
-name: rsync scan-build (clang analyzer)
-
-on:
-  push:
-    branches: [ master ]
-    paths-ignore:
-      - '.github/workflows/*.yml'
-      - '!.github/workflows/scan-build.yml'
-  pull_request:
-    branches: [ master ]
-    paths-ignore:
-      - '.github/workflows/*.yml'
-      - '!.github/workflows/scan-build.yml'
-  workflow_dispatch:
-
-jobs:
-  scan-build:
-    runs-on: ubuntu-latest
-    name: rsync scan-build (clang analyzer)
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-    - name: prep
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y clang clang-tools acl libacl1-dev attr libattr1-dev liblz4-dev libzstd-dev libxxhash-dev openssl
-    - name: configure (under scan-build)
-      # Run configure under scan-build so its analyzer compiler-wrapper is baked
-      # into the Makefile's $(CC); --disable-md2man avoids the doc toolchain.
-      run: scan-build ./configure --with-rrsync --disable-md2man
-    - name: scan-build (informational)
-      # Static analysis only -- INFORMATIONAL, not a gate.  rsync currently has
-      # a fair number of reports that are overwhelmingly known false positives
-      # (e.g. unix.Chroot "no chdir after chroot", core.NonNullParamChecker
-      # against functions that can't actually receive NULL).  We publish the
-      # HTML report as an artifact and print the bug count to the run summary,
-      # but do NOT pass --status-bugs, so this surfaces new analyzer findings
-      # without going red on arrival.  check-progs builds rsync + the test
-      # helpers without needing the man-page toolchain.
-      run: |
-        scan-build -o "$PWD/scan-report" make check-progs -j"$(nproc)" 2>&1 | tee scan-build.out
-        echo '## scan-build summary' >>"$GITHUB_STEP_SUMMARY"
-        grep -E 'scan-build: .* bugs? found|scan-build: No bugs found' scan-build.out >>"$GITHUB_STEP_SUMMARY" || true
-    - name: upload report
-      if: always()
-      uses: actions/upload-artifact@v4
-      with:
-        name: scan-build-report
-        path: scan-report
-        if-no-files-found: ignore

.github/workflows/solaris-build.yml

@@ -7,12 +7,11 @@ on:
       - '.github/workflows/*.yml'
       - '!.github/workflows/solaris-build.yml'
   pull_request:
-    branches: [ master ]
     paths-ignore:
       - '.github/workflows/*.yml'
       - '!.github/workflows/solaris-build.yml'
   schedule:
-    - cron: '42 8 * * 1'
+    - cron: '42 8 * * *'
 
 jobs:
   test:
@@ -35,12 +34,10 @@ jobs:
           make
           ./rsync --version
           make check
-          ./runtests.py --rsync-bin=`pwd`/rsync --use-tcp -j 8
           ./rsync-ssl --no-motd download.samba.org::rsyncftp/ || true
     - name: save artifact
       uses: actions/upload-artifact@v4
       with:
-        retention-days: 45
         name: solaris-bin
         path: |
           rsync

.github/workflows/ubuntu-22.04-build.yml

@@ -11,12 +11,11 @@ on:
       - '.github/workflows/*.yml'
       - '!.github/workflows/ubuntu-22.04-build.yml'
   pull_request:
-    branches: [ master ]
     paths-ignore:
       - '.github/workflows/*.yml'
       - '!.github/workflows/ubuntu-22.04-build.yml'
   schedule:
-    - cron: '42 8 * * 1'
+    - cron: '42 8 * * *'
 
 jobs:
   test:
@@ -29,7 +28,7 @@ jobs:
     - name: prep
       run: |
         sudo apt-get install acl libacl1-dev attr libattr1-dev liblz4-dev libzstd-dev libxxhash-dev python3-cmarkgfm openssl
-        echo "/usr/local/bin" >>"$GITHUB_PATH"
+        echo "/usr/local/bin" >>$GITHUB_PATH
     - name: configure
       run: ./configure --with-rrsync
     - name: make
@@ -39,21 +38,16 @@ jobs:
     - name: info
       run: rsync --version
     - name: check
-      run: sudo RSYNC_EXPECT_SKIPPED=crtimes,daemon-access-ip,daemon-chroot-acl,proxy-response-line-too-long,recv-discard-nullderef make check
+      run: sudo RSYNC_EXPECT_SKIPPED=crtimes make check
     - name: check30
-      run: sudo RSYNC_EXPECT_SKIPPED=crtimes,daemon-access-ip,daemon-chroot-acl,proxy-response-line-too-long,recv-discard-nullderef make check30
+      run: sudo RSYNC_EXPECT_SKIPPED=crtimes make check30
     - name: check29
-      run: sudo RSYNC_EXPECT_SKIPPED=crtimes,daemon-access-ip,daemon-chroot-acl,proxy-response-line-too-long,recv-discard-nullderef make check29
-    - name: check (TCP daemon transport)
-      # Second run with daemon tests over a real loopback rsyncd; the default
-      # 'make check' above uses the secure stdio-pipe transport.
-      run: sudo ./runtests.py --rsync-bin="$PWD/rsync" --use-tcp -j 8
+      run: sudo RSYNC_EXPECT_SKIPPED=crtimes make check29
     - name: ssl file list
       run: rsync-ssl --no-motd download.samba.org::rsyncftp/ || true
     - name: save artifact
       uses: actions/upload-artifact@v4
       with:
-        retention-days: 45
         name: ubuntu-22.04-bin
         path: |
           rsync

.github/workflows/ubuntu-build.yml

@@ -7,12 +7,11 @@ on:
       - '.github/workflows/*.yml'
       - '!.github/workflows/ubuntu-build.yml'
   pull_request:
-    branches: [ master ]
     paths-ignore:
       - '.github/workflows/*.yml'
       - '!.github/workflows/ubuntu-build.yml'
   schedule:
-    - cron: '42 8 * * 1'
+    - cron: '42 8 * * *'
 
 jobs:
   test:
@@ -25,61 +24,26 @@ jobs:
     - name: prep
       run: |
         sudo apt-get install acl libacl1-dev attr libattr1-dev liblz4-dev libzstd-dev libxxhash-dev python3-cmarkgfm openssl
-        echo "/usr/local/bin" >>"$GITHUB_PATH"
+        echo "/usr/local/bin" >>$GITHUB_PATH
     - name: configure
       run: ./configure --with-rrsync
     - name: make
       run: make
-    - name: install/uninstall DESTDIR smoke test
-      run: |
-        set -e
-        tmp="$(mktemp -d)"
-        trap 'rm -rf "$tmp"' EXIT
-
-        make install-all DESTDIR="$tmp"
-
-        for path in \
-          /usr/local/bin/rsync \
-          /usr/local/bin/rsync-ssl \
-          /usr/local/bin/rrsync \
-          /usr/local/share/man/man1/rsync.1 \
-          /usr/local/share/man/man1/rsync-ssl.1 \
-          /usr/local/share/man/man1/rrsync.1 \
-          /usr/local/share/man/man5/rsyncd.conf.5 \
-          /etc/stunnel/rsyncd.conf
-        do
-          test -e "$tmp$path"
-        done
-
-        make uninstall-all DESTDIR="$tmp"
-
-        leftover="$(find "$tmp" -type f -print)"
-        if [ -n "$leftover" ]; then
-          printf '%s\n' "$leftover"
-          exit 1
-        fi
     - name: install
       run: sudo make install
     - name: info
       run: rsync --version
     - name: check
-      run: sudo RSYNC_EXPECT_SKIPPED=crtimes,daemon-access-ip,daemon-chroot-acl,proxy-response-line-too-long,recv-discard-nullderef make check
+      run: sudo RSYNC_EXPECT_SKIPPED=crtimes make check
     - name: check30
-      run: sudo RSYNC_EXPECT_SKIPPED=crtimes,daemon-access-ip,daemon-chroot-acl,proxy-response-line-too-long,recv-discard-nullderef make check30
+      run: sudo RSYNC_EXPECT_SKIPPED=crtimes make check30
     - name: check29
-      run: sudo RSYNC_EXPECT_SKIPPED=crtimes,daemon-access-ip,daemon-chroot-acl,proxy-response-line-too-long,recv-discard-nullderef make check29
-    - name: check (TCP daemon transport)
-      # Second run with daemon tests over a real loopback rsyncd. The default
-      # 'make check' above uses the secure stdio-pipe transport (no listening
-      # sockets); this run exercises the real TCP accept/auth path. Skip-set
-      # is env-dependent here (chroot-acl), so leave RSYNC_EXPECT_SKIPPED unset.
-      run: sudo ./runtests.py --rsync-bin="$PWD/rsync" --use-tcp -j 8
+      run: sudo RSYNC_EXPECT_SKIPPED=crtimes make check29
     - name: ssl file list
       run: rsync-ssl --no-motd download.samba.org::rsyncftp/ || true
     - name: save artifact
       uses: actions/upload-artifact@v4
       with:
-        retention-days: 45
         name: ubuntu-bin
         path: |
           rsync

.github/workflows/ubuntu-version-mix.yml

@@ -1,77 +0,0 @@
-name: Test rsync version mixing on Ubuntu
-
-# Runs the CURRENT test suite with two different rsync binaries: the freshly
-# built ./rsync as the client/driver, and a committed OLD static binary
-# (old_versions/rsync_<ver>) as the daemon / remote-shell peer. This exercises
-# real version mixing over the wire -- more convincing than --protocol forcing,
-# which only makes the current binary speak an old protocol.
-#
-# Direction is fixed: the current binary always drives (only it understands the
-# new test scripts); the old binary is only ever the server/daemon side. The
-# reverse (old client driving new scripts) is not possible -- but one test,
-# reverse-daemon-delta, swaps the roles internally (current build as the daemon,
-# old binary as the client) to cover the backward-compat direction: a current
-# daemon serving the installed base of old clients.
-#
-# The per-version manifest testsuite/expect/rsync_<ver>.expect lists exactly
-# which tests run and each one's expected outcome (pass/skip/fail/xfail), so an
-# old peer's known feature gaps are recorded rather than treated as breakage.
-#
-# All peers run in a SINGLE job (looped, not a matrix) so the PR shows one check
-# line rather than one per version. Each peer/transport is a foldable ::group::
-# in the log, and a failure annotates which peer/transport broke.
-
-on:
-  push:
-    branches: [ master ]
-    paths-ignore:
-      - '.github/workflows/*.yml'
-      - '!.github/workflows/ubuntu-version-mix.yml'
-  pull_request:
-    branches: [ master ]
-    paths-ignore:
-      - '.github/workflows/*.yml'
-      - '!.github/workflows/ubuntu-version-mix.yml'
-  schedule:
-    - cron: '52 8 * * 1'
-
-jobs:
-  version-mix:
-    runs-on: ubuntu-latest
-    name: rsync version-mix
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-    - name: prep
-      run: |
-        sudo apt-get install acl libacl1-dev attr libattr1-dev liblz4-dev libzstd-dev libxxhash-dev python3-cmarkgfm openssl
-        echo "/usr/local/bin" >>"$GITHUB_PATH"
-    - name: configure
-      run: ./configure --with-rrsync
-    - name: make
-      # check-progs builds rsync AND the test helper programs (tls, trimslash,
-      # t_unsafe, ...) that runtests.py requires; plain `make` does not.
-      run: make check-progs
-    - name: info
-      run: ./rsync --version | head -1
-    - name: version mixing (all peers, pipe + TCP transports)
-      run: |
-        rc=0
-        for peer in old_versions/rsync_*; do
-          chmod +x "$peer"
-          name=$(basename "$peer")
-          expect="testsuite/expect/$name.expect"
-          for transport in pipe tcp; do
-            tcp=()
-            [ "$transport" = tcp ] && tcp=(--use-tcp)
-            echo "::group::$name ($transport): $("$peer" --version | head -1)"
-            if ! ./runtests.py --rsync-bin="$PWD/rsync" --rsync-bin2="$PWD/$peer" \
-                  --expect-result "$expect" "${tcp[@]}" -j 8; then
-              echo "::error::version-mix failed: $name ($transport)"
-              rc=1
-            fi
-            echo "::endgroup::"
-          done
-        done
-        exit $rc

.gitignore

@@ -52,11 +52,9 @@ aclocal.m4
 /testsuite/chown-fake.test
 /testsuite/devices-fake.test
 /testsuite/xattrs-hlink.test
-/testsuite/fleettest.json
 /patches
 /patches.gen
 /build
 /auto-build-save
 .deps
 /*.exe
-*.dSYM/

INSTALL.md

@@ -7,34 +7,6 @@ option to use if you want to just skip that feature.  What follows are various
 support libraries that you may want to install to build rsync with the maximum
 features (the impatient can skip down to the package summary):
 
-## Ubuntu users: skip the build, use the PPA
-
-If you are on a currently supported Ubuntu series (jammy 22.04 LTS, noble
-24.04 LTS, questing 25.10, resolute 26.04 LTS) and just want the latest
-upstream rsync, the rsync project maintains a Launchpad PPA that tracks
-stable releases:
-
->     sudo add-apt-repository ppa:rsyncproject/rsync
->     sudo apt update && sudo apt install rsync
-
-See [the PPA page][ppa] for current build status across architectures.
-
-[ppa]: https://launchpad.net/~rsyncproject/+archive/ubuntu/rsync
-
-To test the upcoming release instead, there is also a [`rsync-latest`
-PPA][ppa-latest] that is rebuilt from the tip of the git master branch.  These
-are development snapshots whose version numbers (such as
-`3.5.0~git20260601...`) deliberately sort below the matching stable release, so
-the stable PPA above will never silently move you from a release onto a
-snapshot.  Use it for testing only -- it may contain unreleased changes:
-
->     sudo add-apt-repository ppa:rsyncproject/rsync-latest
->     sudo apt update && sudo apt install rsync
-
-[ppa-latest]: https://launchpad.net/~rsyncproject/+archive/ubuntu/rsync-latest
-
-The rest of this document covers building from source.
-
 ## The basic setup
 
 You need to have a C compiler installed and optionally a C++ compiler in order
@@ -132,8 +104,6 @@ like.
     >     sudo apt install -y liblz4-dev
     >     sudo apt install -y libssl-dev
 
-Or run support/install_deps_ubuntu.sh
-
  -  For CentOS (use EPEL for python3-pip):
 
     >     sudo yum -y install epel-release
@@ -260,9 +230,6 @@ not completely implement the "New Sockets" API.
 [This site][5] says that Apple started to support IPv6 in 10.2 (Jaguar).  If
 your build fails, try again after running configure with `--disable-ipv6`.
 
-Apple Silicon macs may install packages in a slightly different location and require flags.
-CFLAGS="-I /opt/homebrew/include" LDFLAGS="-L /opt/homebrew/lib"
-
 [5]: http://www.ipv6.org/impl/mac.html
 
 ## IBM AIX notes

Makefile.in

@@ -44,24 +44,23 @@ LIBOBJ=lib/wildmatch.o lib/compat.o lib/snprintf.o lib/mdfour.o lib/md5.o \
 zlib_OBJS=zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o \
 	zlib/trees.o zlib/zutil.o zlib/adler32.o zlib/compress.o zlib/crc32.o
 OBJS1=flist.o rsync.o generator.o receiver.o cleanup.o sender.o exclude.o \
-	util1.o util2.o main.o checksum.o match.o syscall.o android.o log.o backup.o delete.o
+	util1.o util2.o main.o checksum.o match.o syscall.o log.o backup.o delete.o
 OBJS2=options.o io.o compat.o hlink.o token.o uidlist.o socket.o hashtable.o \
 	usage.o fileio.o batch.o clientname.o chmod.o acls.o xattrs.o
 OBJS3=progress.o pipe.o @MD5_ASM@ @ROLL_SIMD@ @ROLL_ASM@
 DAEMON_OBJ = params.o loadparm.o clientserver.o access.o connection.o authenticate.o
-popt_OBJS= popt/popt.o  popt/poptconfig.o \
-	popt/popthelp.o popt/poptparse.o popt/poptint.o
+popt_OBJS=popt/findme.o  popt/popt.o  popt/poptconfig.o \
+	popt/popthelp.o popt/poptparse.o
 OBJS=$(OBJS1) $(OBJS2) $(OBJS3) $(DAEMON_OBJ) $(LIBOBJ) @BUILD_ZLIB@ @BUILD_POPT@
 
-TLS_OBJ = tls.o syscall.o android.o util2.o t_stub.o lib/compat.o lib/snprintf.o lib/permstring.o lib/sysxattrs.o @BUILD_POPT@
+TLS_OBJ = tls.o syscall.o util2.o t_stub.o lib/compat.o lib/snprintf.o lib/permstring.o lib/sysxattrs.o @BUILD_POPT@
 
 # Programs we must have to run the test cases
 CHECK_PROGS = rsync$(EXEEXT) tls$(EXEEXT) getgroups$(EXEEXT) getfsdev$(EXEEXT) \
 	testrun$(EXEEXT) trimslash$(EXEEXT) t_unsafe$(EXEEXT) t_chmod_secure$(EXEEXT) \
 	t_secure_relpath$(EXEEXT) wildtest$(EXEEXT) simdtest$(EXEEXT)
 
-CHECK_SYMLINKS = testsuite/chown-fake_test.py testsuite/devices-fake_test.py \
-	testsuite/xattrs-hlink_test.py testsuite/exclude-lsh_test.py
+CHECK_SYMLINKS = testsuite/chown-fake.test testsuite/devices-fake.test testsuite/xattrs-hlink.test
 
 # Objects for CHECK_PROGS to clean
 CHECK_OBJS=tls.o testrun.o getgroups.o getfsdev.o t_stub.o t_unsafe.o t_chmod_secure.o t_secure_relpath.o trimslash.o wildtest.o
@@ -84,19 +83,12 @@ install: all
 	$(INSTALLCMD) -m 755 $(srcdir)/rsync-ssl $(DESTDIR)$(bindir)
 	-$(MKDIR_P) $(DESTDIR)$(mandir)/man1
 	-$(MKDIR_P) $(DESTDIR)$(mandir)/man5
-	for fn in rsync.1 rsync-ssl.1; do \
-	    if test -f $$fn; then $(INSTALLMAN) -m 644 $$fn $(DESTDIR)$(mandir)/man1; \
-	    elif test -f $(srcdir)/$$fn; then $(INSTALLMAN) -m 644 $(srcdir)/$$fn $(DESTDIR)$(mandir)/man1; fi; \
-	done
-	for fn in rsyncd.conf.5; do \
-	    if test -f $$fn; then $(INSTALLMAN) -m 644 $$fn $(DESTDIR)$(mandir)/man5; \
-	    elif test -f $(srcdir)/$$fn; then $(INSTALLMAN) -m 644 $(srcdir)/$$fn $(DESTDIR)$(mandir)/man5; fi; \
-	done
+	if test -f rsync.1; then $(INSTALLMAN) -m 644 rsync.1 $(DESTDIR)$(mandir)/man1; fi
+	if test -f rsync-ssl.1; then $(INSTALLMAN) -m 644 rsync-ssl.1 $(DESTDIR)$(mandir)/man1; fi
+	if test -f rsyncd.conf.5; then $(INSTALLMAN) -m 644 rsyncd.conf.5 $(DESTDIR)$(mandir)/man5; fi
 	if test "$(with_rrsync)" = yes; then \
 	    $(INSTALLCMD) -m 755 rrsync $(DESTDIR)$(bindir); \
-	    fn=rrsync.1; \
-	    if test -f $$fn; then $(INSTALLMAN) -m 644 $$fn $(DESTDIR)$(mandir)/man1; \
-	    elif test -f $(srcdir)/$$fn; then $(INSTALLMAN) -m 644 $(srcdir)/$$fn $(DESTDIR)$(mandir)/man1; fi; \
+	    if test -f rrsync.1; then $(INSTALLMAN) -m 644 rrsync.1 $(DESTDIR)$(mandir)/man1; fi; \
 	fi
 
 install-ssl-daemon: stunnel-rsyncd.conf
@@ -111,21 +103,6 @@ install-all: install install-ssl-daemon
 install-strip:
 	$(MAKE) INSTALL_STRIP='-s' install
 
-.PHONY: uninstall
-uninstall:
-	rm -f $(DESTDIR)$(bindir)/rsync$(EXEEXT) $(DESTDIR)$(bindir)/rsync-ssl
-	rm -f $(DESTDIR)$(bindir)/rrsync
-	rm -f $(DESTDIR)$(mandir)/man1/rsync.1 $(DESTDIR)$(mandir)/man1/rsync-ssl.1
-	rm -f $(DESTDIR)$(mandir)/man1/rrsync.1
-	rm -f $(DESTDIR)$(mandir)/man5/rsyncd.conf.5
-
-.PHONY: uninstall-ssl-daemon
-uninstall-ssl-daemon:
-	rm -f $(DESTDIR)/etc/stunnel/rsyncd.conf
-
-.PHONY: uninstall-all
-uninstall-all: uninstall uninstall-ssl-daemon
-
 rsync$(EXEEXT): $(OBJS)
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
 
@@ -139,7 +116,6 @@ usage.o: version.h latest-year.h help-rsync.h help-rsyncd.h git-version.h defaul
 loadparm.o: default-dont-compress.h daemon-parm.h
 
 flist.o: rounding.h
-log.o: rounding.h
 
 default-cvsignore.h default-dont-compress.h: rsync.1.md define-from-md.awk
 	$(AWK) -f $(srcdir)/define-from-md.awk -v hfile=$@ $(srcdir)/rsync.1.md
@@ -195,19 +171,19 @@ getgroups$(EXEEXT): getgroups.o
 getfsdev$(EXEEXT): getfsdev.o
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ getfsdev.o $(LIBS)
 
-TRIMSLASH_OBJ = trimslash.o syscall.o android.o util2.o t_stub.o lib/compat.o lib/snprintf.o
+TRIMSLASH_OBJ = trimslash.o syscall.o util2.o t_stub.o lib/compat.o lib/snprintf.o
 trimslash$(EXEEXT): $(TRIMSLASH_OBJ)
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(TRIMSLASH_OBJ) $(LIBS)
 
-T_UNSAFE_OBJ = t_unsafe.o syscall.o android.o util1.o util2.o t_stub.o lib/compat.o lib/snprintf.o lib/wildmatch.o
+T_UNSAFE_OBJ = t_unsafe.o syscall.o util1.o util2.o t_stub.o lib/compat.o lib/snprintf.o lib/wildmatch.o
 t_unsafe$(EXEEXT): $(T_UNSAFE_OBJ)
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(T_UNSAFE_OBJ) $(LIBS)
 
-T_CHMOD_SECURE_OBJ = t_chmod_secure.o syscall.o android.o util1.o util2.o t_stub.o lib/compat.o lib/snprintf.o lib/wildmatch.o lib/permstring.o
+T_CHMOD_SECURE_OBJ = t_chmod_secure.o syscall.o util1.o util2.o t_stub.o lib/compat.o lib/snprintf.o lib/wildmatch.o lib/permstring.o
 t_chmod_secure$(EXEEXT): $(T_CHMOD_SECURE_OBJ)
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(T_CHMOD_SECURE_OBJ) $(LIBS)
 
-T_SECURE_RELPATH_OBJ = t_secure_relpath.o syscall.o android.o util1.o util2.o t_stub.o lib/compat.o lib/snprintf.o lib/wildmatch.o lib/permstring.o
+T_SECURE_RELPATH_OBJ = t_secure_relpath.o syscall.o util1.o util2.o t_stub.o lib/compat.o lib/snprintf.o lib/wildmatch.o lib/permstring.o
 t_secure_relpath$(EXEEXT): $(T_SECURE_RELPATH_OBJ)
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(T_SECURE_RELPATH_OBJ) $(LIBS)
 
@@ -217,6 +193,14 @@ conf: configure.sh config.h.in
 .PHONY: gen
 gen: conf proto.h man git-version.h
 
+.PHONY: gensend
+gensend: gen
+	if ! diff git-version.h $(srcdir)/gists/rsync-git-version.h >/dev/null; then \
+	    ./rsync -ai git-version.h $(srcdir)/gists/rsync-git-version.h && \
+	    (cd $(srcdir)/gists && git commit --allow-empty-message -m '' rsync-git-version.h && git push) ; \
+	fi
+	rsync -aic $(GENFILES) git-version.h $${SAMBA_HOST-samba.org}:/home/ftp/pub/rsync/generated-files/ || true
+
 aclocal.m4: $(srcdir)/m4/*.m4
 	aclocal -I $(srcdir)/m4
 
@@ -303,8 +287,6 @@ clean: cleantests
 	rm -f *~ $(OBJS) $(CHECK_PROGS) $(CHECK_OBJS) $(CHECK_SYMLINKS) @MAKE_RRSYNC@ \
 		git-version.h rounding rounding.h *.old rsync*.1 rsync*.5 @MAKE_RRSYNC_1@ \
 		*.html daemon-parm.h help-*.h default-*.h proto.h proto.h-tstamp
-	rm -f *.gcno *.gcda lib/*.gcno lib/*.gcda zlib/*.gcno zlib/*.gcda popt/*.gcno popt/*.gcda
-	rm -rf coverage coverage-tcp coverage-all coverage-fallback
 
 .PHONY: cleantests
 cleantests:
@@ -345,115 +327,17 @@ test: check
 # catch Bash-isms earlier even if we're running on GNU.  Of course, we
 # might lose in the future where POSIX diverges from old sh.
 
-# `make check` runs tests in parallel by default. Override with
-# `make check CHECK_J=1` (serial) or any other value.
-CHECK_J = 8
-
-# Parallelism for `make coverage`. Defaults to the same as CHECK_J: the
-# coverage build sets -fprofile-update=atomic (atomic in-memory counters) and
-# gcc's libgcov serializes the per-source .gcda read-modify-write merge with a
-# file lock, so concurrent rsync processes (incl. the forked sender/generator/
-# receiver) accumulate exactly -- verified by a count-linearity check (a hot
-# line accumulates identically at -j1 and -P16). Override with
-# `make coverage COVERAGE_J=1` if your libgcov does not lock .gcda merges.
-COVERAGE_J = $(CHECK_J)
-
-# Output directory and extra runtests.py flags for `make coverage`. The
-# `coverage-tcp` target reuses the coverage recipe with --use-tcp (real
-# loopback rsyncd, which exercises the TCP accept/auth path and the
-# require_tcp-only tests) and a separate output directory.
-COVERAGE_DIR = coverage
-COVERAGE_RUNFLAGS =
-
-# Bundled third-party code that rsync ships but does not own; excluded from the
-# coverage report so the percentages reflect rsync's own source. zlib/ and popt/
-# are wholly vendored; the named lib/ files are PostgreSQL (getaddrinfo) and ISC
-# (inet_ntop/inet_pton) / standalone (getpass) imports. The other lib/*.c
-# (md5, mdfour, wildmatch, permstring, pool_alloc, snprintf, sysacls, sysxattrs,
-# compat) are rsync's own and stay in the report.
-COVERAGE_EXCLUDE = -e '(^|/)zlib/' -e '(^|/)popt/' \
-	-e '(^|/)lib/(getaddrinfo|getpass|inet_ntop|inet_pton)\.'
-
-# Build everything the test suite needs (rsync + helper programs + symlinks)
-# WITHOUT running it. Used by CI jobs that invoke runtests.py directly with
-# custom options (e.g. the version-mix workflow's --rsync-bin2/--expect-result).
-.PHONY: check-progs
-check-progs: all $(CHECK_PROGS) $(CHECK_SYMLINKS)
-
 .PHONY: check
 check: all $(CHECK_PROGS) $(CHECK_SYMLINKS)
-	$(srcdir)/runtests.py --rsync-bin=`pwd`/rsync$(EXEEXT) -j $(CHECK_J)
+	rsync_bin=`pwd`/rsync$(EXEEXT) $(srcdir)/runtests.sh
 
 .PHONY: check29
 check29: all $(CHECK_PROGS) $(CHECK_SYMLINKS)
-	$(srcdir)/runtests.py --rsync-bin=`pwd`/rsync$(EXEEXT) -j $(CHECK_J) --protocol=29
+	rsync_bin=`pwd`/rsync$(EXEEXT) $(srcdir)/runtests.sh --protocol=29
 
 .PHONY: check30
 check30: all $(CHECK_PROGS) $(CHECK_SYMLINKS)
-	$(srcdir)/runtests.py --rsync-bin=`pwd`/rsync$(EXEEXT) -j $(CHECK_J) --protocol=30
-
-# Whole-suite gcov coverage report (HTML, with branch + decision coverage).
-# Requires a build configured with --enable-coverage and the `gcovr` tool
-# (pip install gcovr). Runs the suite in parallel (COVERAGE_J, default CHECK_J):
-# this is safe because the coverage build uses -fprofile-update=atomic and
-# libgcov locks the per-source .gcda during its merge, so concurrent rsync
-# processes accumulate exactly (see COVERAGE_J above). Use COVERAGE_J=1 if your
-# toolchain's libgcov does not lock .gcda merges.
-.PHONY: coverage
-coverage: all $(CHECK_PROGS) $(CHECK_SYMLINKS)
-	@case '$(CFLAGS)' in *--coverage*) ;; \
-	  *) echo "*** not a coverage build; reconfigure with --enable-coverage"; exit 1 ;; esac
-	@command -v gcovr >/dev/null 2>&1 || { echo "*** gcovr not found (pip install gcovr)"; exit 1; }
-	find . -name '*.gcda' -delete
-	@rc=0; $(srcdir)/runtests.py --rsync-bin=`pwd`/rsync$(EXEEXT) -j $(COVERAGE_J) $(COVERAGE_RUNFLAGS) || rc=$$?; \
-	  rm -rf $(COVERAGE_DIR) && mkdir -p $(COVERAGE_DIR); \
-	  gcovr --root $(srcdir) $(COVERAGE_EXCLUDE) --decisions --print-summary \
-	      --html-details -o $(COVERAGE_DIR)/index.html . || exit $$?; \
-	  echo "Coverage report written to $(COVERAGE_DIR)/index.html"; \
-	  if test $$rc != 0; then \
-	    echo "*** test suite FAILED (status $$rc) -- coverage report still written above"; \
-	  fi; \
-	  exit $$rc
-
-# Same as `make coverage` but with the daemon tests run over a real loopback
-# rsyncd (--use-tcp), into a separate report directory.
-.PHONY: coverage-tcp
-coverage-tcp:
-	$(MAKE) coverage COVERAGE_RUNFLAGS=--use-tcp COVERAGE_DIR=coverage-tcp
-
-# Comprehensive single report: run the suite under several configurations,
-# accumulating into the shared .gcda counters (NOT cleared between runs), then
-# emit one merged, rsync-scoped report. Covers the default (pipe) transport, the
-# protocol-29/30 compat branches, and the real-TCP daemon path (which also runs
-# the require_tcp-only tests). Run under sudo to additionally cover root-only
-# paths (devices, chown, use-chroot, protected-regular). Local target -- CI uses
-# the plain `coverage`/`coverage-tcp` targets.
-.PHONY: coverage-all
-coverage-all: all $(CHECK_PROGS) $(CHECK_SYMLINKS)
-	@case '$(CFLAGS)' in *--coverage*) ;; \
-	  *) echo "*** not a coverage build; reconfigure with --enable-coverage"; exit 1 ;; esac
-	@command -v gcovr >/dev/null 2>&1 || { echo "*** gcovr not found (pip install gcovr)"; exit 1; }
-	find . -name '*.gcda' -delete
-	@rc=0; \
-	  for cfg in '' '--protocol=30' '--protocol=29' '--use-tcp'; do \
-	    echo "===== coverage-all: runtests.py $$cfg ====="; \
-	    $(srcdir)/runtests.py --rsync-bin=`pwd`/rsync$(EXEEXT) -j $(COVERAGE_J) $$cfg || rc=$$?; \
-	  done; \
-	  rm -rf coverage-all && mkdir -p coverage-all; \
-	  gcovr --root $(srcdir) $(COVERAGE_EXCLUDE) --decisions --print-summary \
-	      --html-details -o coverage-all/index.html . || exit $$?; \
-	  echo "Merged coverage report written to coverage-all/index.html"; \
-	  if test $$rc != 0; then \
-	    echo "*** some suite runs FAILED (status $$rc) -- report still written above"; \
-	  fi; \
-	  exit $$rc
-
-# Coverage for the portable (non-openat2) resolver tier. Requires a SEPARATE
-# build configured with --enable-coverage --disable-openat2: its .gcno differ
-# from the openat2 build, so this report cannot be merged with the others.
-.PHONY: coverage-fallback
-coverage-fallback:
-	$(MAKE) coverage COVERAGE_DIR=coverage-fallback
+	rsync_bin=`pwd`/rsync$(EXEEXT) $(srcdir)/runtests.sh --protocol=30
 
 wildtest.o: wildtest.c t_stub.o lib/wildmatch.c rsync.h config.h
 wildtest$(EXEEXT): wildtest.o lib/compat.o lib/snprintf.o @BUILD_POPT@
@@ -467,17 +351,14 @@ simdtest$(EXEEXT): simd-checksum-x86_64.cpp $(HEADERS)
 	    touch $@; \
 	fi
 
-testsuite/chown-fake_test.py:
-	ln -s chown_test.py $(srcdir)/testsuite/chown-fake_test.py
+testsuite/chown-fake.test:
+	ln -s chown.test $(srcdir)/testsuite/chown-fake.test
 
-testsuite/devices-fake_test.py:
-	ln -s devices_test.py $(srcdir)/testsuite/devices-fake_test.py
+testsuite/devices-fake.test:
+	ln -s devices.test $(srcdir)/testsuite/devices-fake.test
 
-testsuite/xattrs-hlink_test.py:
-	ln -s xattrs_test.py $(srcdir)/testsuite/xattrs-hlink_test.py
-
-testsuite/exclude-lsh_test.py:
-	ln -s exclude_test.py $(srcdir)/testsuite/exclude-lsh_test.py
+testsuite/xattrs-hlink.test:
+	ln -s xattrs.test $(srcdir)/testsuite/xattrs-hlink.test
 
 # This does *not* depend on building or installing: you can use it to
 # check a version installed from a binary or some other source tree,
@@ -485,7 +366,7 @@ testsuite/exclude-lsh_test.py:
 
 .PHONY: installcheck
 installcheck: $(CHECK_PROGS) $(CHECK_SYMLINKS)
-	$(srcdir)/runtests.py --rsync-bin="$(bindir)/rsync$(EXEEXT)" --srcdir="$(srcdir)" --tooldir=`pwd` -j $(CHECK_J)
+	POSIXLY_CORRECT=1 TOOLDIR=`pwd` rsync_bin="$(bindir)/rsync$(EXEEXT)" srcdir="$(srcdir)" $(srcdir)/runtests.sh
 
 # TODO: Add 'dist' target; need to know which files will be included
 
@@ -502,4 +383,4 @@ doxygen:
 .PHONY: doxygen-upload
 doxygen-upload:
 	rsync -avzv $(srcdir)/dox/html/ --delete \
-	$${RSYNC_SAMBA_HOST-samba.org}:/home/httpd/html/rsync/doxygen/head/
+	$${SAMBA_HOST-samba.org}:/home/httpd/html/rsync/doxygen/head/

NEWS.md

@@ -1,475 +1,3 @@
-# NEWS for rsync 3.4.3 (20 May 2026)
-
-## Changes in this version:
-
-### SECURITY FIXES:
-
-Six CVEs are fixed in this release.  All six are assigned by
-VulnCheck as CNA.  Affected versions are 3.4.2 and earlier in every
-case.  Three of the six (CVE-2026-29518, CVE-2026-43617,
-CVE-2026-43619) require non-default daemon configuration to reach:
-the first and third need `use chroot = no` for a module, the second
-needs `daemon chroot = ...` set in rsyncd.conf.  Two (CVE-2026-43618,
-CVE-2026-43620) are reachable from a normal pull or a normal
-authenticated daemon connection.  The sixth (CVE-2026-45232) is
-reachable only when `RSYNC_PROXY` is set and the proxy (or a MITM)
-returns a pathological response.  Many thanks to the external
-researchers who reported these issues.
-
-- CVE-2026-29518 (CVSS v4.0 7.3, HIGH): TOCTOU symlink race condition
-  allowing local privilege escalation in daemon mode without chroot.
-  An rsync daemon configured with "use chroot = no" was exposed to a
-  time-of-check / time-of-use race on parent path components: a local
-  attacker with write access to a module could replace a parent
-  directory component with a symlink between the receiver's check and
-  its open(), redirecting reads (basis-file disclosure) and writes
-  (file overwrite) outside the module.  Default "use chroot = yes" is
-  not exposed.  `secure_relative_open()` (added in 3.4.0 for
-  CVE-2024-12086) was previously unused in the daemon-no-chroot
-  case; the fix enables it there and reroutes the sender's
-  read-path opens through it.  Reported by Nullx3D (Batuhan Sancak),
-  Damien Neil and Michael Stapelberg.
-
-- CVE-2026-43617 (CVSS v3.1 4.8, MEDIUM): Hostname/ACL bypass on an
-  rsync daemon configured with `daemon chroot = /X` in rsyncd.conf
-  when the chroot tree lacks DNS resolution support.  The
-  reverse-DNS lookup of the connecting client was performed *after*
-  the daemon chroot had been entered; if /X did not contain the
-  libc resolver fixtures (`/etc/resolv.conf`, `/etc/nsswitch.conf`,
-  `/etc/hosts`, NSS service modules) the lookup failed and the
-  connecting hostname was set to "UNKNOWN", causing hostname-based
-  deny rules to silently fail open.  IP-based ACLs are unaffected.
-  The per-module `use chroot` setting is unrelated to this issue.
-  The fix performs the lookup before entering the daemon chroot.
-  Reported by MegaManSec.
-
-- CVE-2026-43618 (CVSS v3.1 8.1, HIGH): Integer overflow in the
-  compressed-token decoder enabling remote memory disclosure to an
-  authenticated daemon peer.  The receiver accumulated a 32-bit
-  signed counter without overflow checking; a malicious sender could
-  trigger an overflow that, with careful manipulation, leaked process
-  memory contents to the attacker -- environment variables,
-  passwords, heap and library pointers -- significantly weakening
-  ASLR.  The fix bounds the counter and adds wire-input validation in
-  several adjacent places (defence-in-depth).  Workaround for older
-  releases: `refuse options = compress` in rsyncd.conf.  Reported by
-  Omar Elsayed.
-
-- CVE-2026-43619 (CVSS v3.1 6.3, MEDIUM): Symlink races on path-based
-  system calls in "use chroot = no" daemon mode (generalisation of
-  CVE-2026-29518).  Earlier fixes for symlink races on the receiver's
-  open() call missed the same race class on every other path-based
-  system call: chmod, lchown, utimes, rename, unlink, mkdir, symlink,
-  mknod, link, rmdir and lstat.  The fix routes each affected
-  path-based syscall through a parent dirfd opened under
-  RESOLVE_BENEATH-equivalent kernel-enforced confinement (openat2 on
-  Linux 5.6+, O_RESOLVE_BENEATH on FreeBSD 13+ and macOS 15+,
-  per-component O_NOFOLLOW walk elsewhere).  Default "use chroot =
-  yes" is not exposed.  Reported by Andrew Tridgell as a follow-on
-  audit of CVE-2026-29518.
-
-- CVE-2026-43620 (CVSS v3.1 6.5, MEDIUM): Out-of-bounds read in the
-  receiver's recv_files() enabling remote denial-of-service of any
-  client pulling from a malicious server (incomplete fix of commit
-  797e17f).  The earlier parent_ndx<0 guard added to send_files() was
-  not applied to the visually-identical block in recv_files().  A
-  malicious rsync server can drive any connecting client into a
-  deterministic SIGSEGV by setting CF_INC_RECURSE in the
-  compatibility flags and sending a crafted file list and transfer
-  record.  inc_recurse is the protocol-30+ default, so no special
-  options are required on the victim.  Workaround for older
-  releases: `--no-inc-recursive` on the client.  Reported by Pratham
-  Gupta.
-
-- CVE-2026-45232 (CVSS v3.1 3.1, LOW): Off-by-one out-of-bounds stack
-  write in the rsync client's HTTP CONNECT proxy handler
-  (`establish_proxy_connection()` in `socket.c`).  After issuing the
-  CONNECT request, rsync read the proxy's first response line one
-  byte at a time into a 1024-byte stack buffer with the bound
-  `cp < &buffer[sizeof buffer - 1]`.  If the proxy (or a MITM in
-  front of it) returned 1023+ bytes on that first line without a
-  newline terminator, `cp` exited the loop pointing at a buffer slot
-  the loop never wrote, leaving `*cp` holding stale stack data from
-  the earlier `snprintf()` of the outgoing CONNECT request.  The
-  post-loop logic then wrote a single `\0` one byte past the end of
-  the buffer on the stack.  Reach is client-side only, and only when
-  `RSYNC_PROXY` is set so rsync tunnels an `rsync://` connection
-  through an HTTP CONNECT proxy.  The written byte is always `\0`
-  and the offset is fixed by the buffer size, not attacker-chosen,
-  so this is not an arbitrary-write primitive: practical impact is
-  corruption of one adjacent stack byte and possible later
-  misbehaviour or crash.  The fix detects the "buffer filled without
-  finding `\n`" case explicitly by position and refuses the response
-  with "proxy response line too long".  Reported by Aisle Research
-  via Michal Ruprich (rsync-3.4.1-2.el10 QE).
-
-In addition to the six CVE fixes, this release adds defence-in-depth
-hardening on several adjacent paths: bounded wire-supplied counts and
-lengths in flist/io/acls/xattrs, a guard against length underflow in
-cumulative `snprintf()` callers, a parent block-index bounds check on
-the receiver, a NULL check in `read_delay_line()`, a lower ceiling on
-`MAX_WIRE_DEL_STAT` to avoid signed-int overflow in the
-`read_del_stats()` accumulator, rejection of hyphen-prefixed
-remote-shell hostnames (defence-in-depth against argv-injection in
-tooling that forwards untrusted input into the hostspec position;
-reported by Aisle Research via Michal Ruprich), and a NULL-check on
-`localtime_r()` in `timestring()` to keep a malicious server from
-crashing the client by advertising a file with an out-of-range
-modtime.
-
-### BUG FIXES:
-
-- Fixed a regression introduced by the 3.4.0 secure_relative_open()
-  CVE fix where legitimate directory symlinks on the receiver side
-  (e.g. when using `-K` / `--copy-dirlinks`) caused "failed
-  verification -- update discarded" errors on delta transfers. The
-  old code rejected every symlink in the path with a per-component
-  `O_NOFOLLOW` walk; the receiver now uses kernel-enforced "stay
-  below dirfd" path resolution where available. Fixes #715.
-
-### PORTABILITY / BUILD:
-
-- secure_relative_open() now uses `openat2(RESOLVE_BENEATH |
-  RESOLVE_NO_MAGICLINKS)` on Linux 5.6+, and `openat()` with
-  `O_RESOLVE_BENEATH` on FreeBSD 13+ and macOS 15+ (Sequoia) /
-  iOS 18+. The kernel rejects ".." escapes, absolute symlinks, and
-  symlinks whose target lies outside the starting directory, while
-  still following symlinks that resolve within it -- the same
-  trade-off that fixes the issue #715 regression without weakening
-  the original CVE protection. Other platforms (Solaris, OpenBSD,
-  NetBSD, Cygwin) retain the previous per-component `O_NOFOLLOW`
-  walk; on those platforms the issue #715 regression remains
-  visible.
-
-- testsuite/xattrs: ignore `SUNWattr_*` in the Solaris `xls`
-  helper.
-
-### DEVELOPER RELATED:
-
-- Added testsuite/symlink-dirlink-basis.test (taken from PR #864
-  by Samuel Henrique) covering the issue #715 regression and
-  several edge cases (`--backup`, `--inplace`, `--partial-dir`
-  with protocol < 29, top-level files). The test skips on
-  platforms without a RESOLVE_BENEATH equivalent.
-
-- Added regression tests for the new security fixes:
-  `chmod-symlink-race.test`, `chdir-symlink-race.test`,
-  `bare-do-open-symlink-race.test`, `alt-dest-symlink-race.test`,
-  `copy-dest-source-symlink.test`, `sender-flist-symlink-leak.test`,
-  `secure-relpath-validation.test`, `daemon-chroot-acl.test` and
-  `daemon-refuse-compress.test`. The symlink-race tests skip on
-  Cygwin, Solaris, OpenBSD and NetBSD (no RESOLVE_BENEATH
-  equivalent on those platforms).
-
-- runtests.py now errors early with a clear message when any of
-  the test helper programs (`tls`, `trimslash`, `t_unsafe`,
-  `t_chmod_secure`, `t_secure_relpath`, `wildtest`, `getgroups`,
-  `getfsdev`) are missing, instead of letting many tests fail with
-  confusing "not found" errors.
-
-- Added OpenBSD and NetBSD CI jobs that run `make check` on those
-  platforms.
-
-- Added Ubuntu 22.04 and AlmaLinux 8 CI workflows so future
-  backports to the two mainstream LTS families build and test on
-  the same CI surface as trunk.
-
-- testsuite/protected-regular.test now runs unprivileged via
-  `unshare` with user-namespace UID mapping, falling back to skip
-  if `unshare`/`uidmap` is not available; previously it required
-  real root.
-
-- Added `symlink-dirlink-basis` to the Cygwin CI's expected-skipped
-  list.
-
-- Removed the old release system (replaced by the new release
-  script in 3.4.2).
-
-------------------------------------------------------------------------------
-
-# NEWS for rsync 3.4.2 (28 Apr 2026)
-
-## Changes in this version:
-
-### SECURITY RELATED:
-
-Several security-relevant defects were reported and fixed since 3.4.1.
-None were assigned a CVE — rsync's fork-per-connection design scopes
-the impact of each of these to the attacker's own connection, which is
-equivalent to the client closing the socket itself — but they are
-fixed here as a matter of hygiene and to reduce the chances of a
-future exploitable combination.  Many thanks to the external
-researchers who reported these issues.
-
-- Fixed a signed integer overflow in the PROXY protocol v2 header
-  parser: a negative `len` field could bypass the size check and cause
-  a stack buffer overflow in `read_buf()`.  Reported by John Walker of
-  ZeroPath.
-
-- Fixed an invalid access to the files array.  Reported by Calum
-  Hutton of Rapid7.
-
-- Reject negative token values in the compressed-stream token
-  decoder; a negative value could cause callers to misinterpret a
-  missing data pointer as literal data.  Reported by Will Sergeant.
-
-- Fixed the element count passed to the xattr `qsort()` (see
-  https://www.openwall.com/lists/oss-security/2026/04/16/2).
-
-- Fixed a buffer underflow in `clean_fname()`, and added a regression
-  test.
-
-- Fixed an uninitialized `mul_one` in the AVX2 get_checksum1 path
-  (undefined behaviour), and added a SIMD-checksum self-test that
-  cross-checks SSE2, SSSE3 and AVX2 against the C reference on both
-  aligned and unaligned buffers.
-
-- Fixed an uninitialized `buf1` on the first call to
-  `get_checksum2()` in the MD4 path (fixes #673).
-
-- Zero all new memory from internal allocations: `my_alloc()` now uses
-  `calloc`, and `expand_item_list()` zeros the expanded portion after
-  `realloc`.  This gives more predictable behaviour if stale or
-  uninitialised memory is ever accidentally read.
-
-### BUG FIXES:
-
-- Call `tzset()` before chroot so that log timestamps continue to
-  reflect the configured local timezone after the daemon chroots
-  (glibc needs `/etc/localtime`, which is unreachable post-chroot).
-
-- Use the correct time when writing to the log file.
-
-- Do not clear `DISPLAY` unconditionally.
-
-- Fixed a Y2038 bug in `syscall.c` by replacing the `Int32x32To64`
-  macro (which truncates its arguments to 32 bits) with a plain
-  64-bit multiplication.
-
-- Fixed ACL ID mapping for non-root users (closes #618).
-
-- Fixed handling of objects with many xattrs on FreeBSD.
-
-- Fixed `--open-noatime` not taking effect when opening regular
-  files: `O_NOATIME` is now also passed to `do_open_nofollow()`, which
-  has been used for regular files since the CVE fix "fixed symlink
-  race condition in sender".
-
-- Ignore "directory has vanished" errors.
-
-- Fixed the removal of multiple leading slashes.
-
-- Added the missing `--dirs` long option.
-
-- Fixed a segfault if `poptGetContext()` returns NULL (e.g. under
-  OOM) by not passing NULL to `poptReadDefaultConfig()`.  Reported by
-  Ronnie Sahlberg; found with `malloc-fail-tester`.
-
-- Fixed a build error on ia64 NonStop (which treats missing
-  prototypes as an error, not a warning).
-
-- Fixed a flaky hardlinks test (fixes #735).
-
-### ENHANCEMENTS:
-
-- Added multi-threaded `zstd` compression, gated by a new
-  `--compress-threads=N` option, with validation and man-page
-  coverage.
-
-- Documented the `temp dir` parameter in the rsyncd.conf man page
-  (fixes #820).
-
-- Improved rendering of interior dashes in long-option names in
-  `md-convert` (perhaps fixes #686).
-
-### PORTABILITY / BUILD:
-
-- Fixed glibc 2.43 const-preserving overloads of `strtok()`,
-  `strchr()` etc. by declaring the affected locals with the right
-  constness.  Contributed by Holger Hoffstätte.
-
-- Converted the bundled zlib 1.2.8 from K&R-style function
-  definitions to ANSI prototypes, so it builds with clang 16+.
-
-- Avoid using `bool` as an identifier; it is a keyword in C23.
-
-- `configure.ac`: check for xattr functions in libc first and only
-  fall back to `-lattr`, avoiding spurious overlinking when `-lattr`
-  happens to be installed.  Contributed by Eli Schwartz.
-
-- Made the build reproducible by honouring `SOURCE_DATE_EPOCH` for
-  the manpage date.
-
-- Removed obsolete `popt/findme.c` and `popt/findme.h` that upstream
-  popt 1.14 folded into `popt.c` (fixes #710).  Contributed by Alan
-  Coopersmith.
-
-### INTERNAL:
-
-- Made many module-global variables `const` so they can live in
-  `.rodata` and enable additional compiler optimization.
-
-### DEVELOPER RELATED:
-
-- Replaced `runtests.sh` with `runtests.py`, a Python test runner
-  that supports `--valgrind` (with per-process log files so valgrind
-  output no longer interferes with output comparisons) and
-  `-j/--parallel` execution for roughly a 7× speed-up on typical
-  hardware.
-
-- Added a SIMD checksum self-test and a `clean-fname-underflow`
-  regression test.
-
-- Various CI fixes for macOS and Cygwin (including adding
-  `simd-checksum` to the expected-skipped lists on platforms without
-  SIMD), and tests now run on `ubuntu-latest`.
-
-- removed support for the unmaintained rsync-patches archive
-
-------------------------------------------------------------------------------
-
-# NEWS for rsync 3.4.1 (16 Jan 2025)
-
-Release 3.4.1 is a fix for regressions introduced in 3.4.0
-
-## Changes in this version:
-
-### BUG FIXES:
-
- - fixed handling of -H flag with conflict in internal flag values
-
- - fixed a user after free in logging of failed rename
-
- - fixed build on systems without openat()
-
- - removed dependency on alloca() in bundled popt
-
-### DEVELOPER RELATED:
-
- - fix to permissions handling in the developer release script
-
-------------------------------------------------------------------------------
-
-# NEWS for rsync 3.4.0 (15 Jan 2025)
-
-Release 3.4.0 is a security release that fixes a number of important vulnerabilities.
-
-For more details on the vulnerabilities please see the CERT report
-https://kb.cert.org/vuls/id/952657
-
-## Changes in this version:
-
-### PROTOCOL NUMBER:
-
- - The protocol number was changed to 32 to make it easier for
-   administrators to check their servers have been updated
-
-### SECURITY FIXES:
-
-Many thanks to Simon Scannell, Pedro Gallegos, and Jasiel Spelman at
-Google Cloud Vulnerability Research and Aleksei Gorban (Loqpa) for
-discovering these vulnerabilities and working with the rsync project
-to develop and test fixes.
-
-- CVE-2024-12084 - Heap Buffer Overflow in Checksum Parsing.
-
-- CVE-2024-12085 - Info Leak via uninitialized Stack contents defeats ASLR.
-  
-- CVE-2024-12086 - Server leaks arbitrary client files.
-
-- CVE-2024-12087 - Server can make client write files outside of destination directory using symbolic links.
-
-- CVE-2024-12088 - --safe-links Bypass.
-
-- CVE-2024-12747 - symlink race condition.
-
-### BUG FIXES:
-
-- Fixed the included popt to avoid a memory error on modern gcc versions.
-
-- Fixed an incorrect extern variable's type that caused an ACL issue on macOS.
-
-- Fixed IPv6 configure check
-
-### INTERNAL:
-
-- Updated included popt to version 1.19.
-
-### DEVELOPER RELATED:
-
-- Various improvements to the release scripts and git setup.
-
-- Improved packaging/var-checker to identify variable type issues.
-
-- added FreeBSD and Solaris CI builds
-
-------------------------------------------------------------------------------
-
-# NEWS for rsync 3.3.0 (6 Apr 2024)
-
-## Changes in this version:
-
-### BUG FIXES:
-
-- Fixed a bug with `--sparse --inplace` where a trailing gap in the source
-  file would not clear out the trailing data in the destination file.
-
-- Fixed an buffer overflow in the checksum2 code if SHA1 is being used for
-  the checksum2 algorithm.
-
-- Fixed an issue when rsync is compiled using `_FORTIFY_SOURCE` so that the
-  extra tests don't complain about a strlcpy() limit value (which was too
-  large, even though it wasn't possible for the larger value to cause an
-  overflow).
-
-- Add a backtick to the list of characters that the filename quoting needs to
-  escape using backslashes.
-
-- Fixed a string-comparison issue in the internal handling of `--progress` (a
-  locale such as tr_TR.utf-8 needed the internal triggering of `--info` options
-  to use upper-case flag names to ensure that they match).
-
-- Make sure that a local transfer marks the sender side as trusted.
-
-- Change the argv handling to work with a newer popt library -- one that likes
-  to free more data than it used to.
-
-- Rsync now calls `OpenSSL_add_all_algorithms()` when compiled against an older
-  openssl library.
-
-- Fixed a problem in the daemon auth for older protocols (29 and before) if the
-  openssl library is being used to compute MD4 checksums.
-
-- Fixed `rsync -VV` on Cygwin -- it needed a flush of stdout.
-
-- Fixed an old stats bug that counted devices as symlinks.
-
-### ENHANCEMENTS:
-
-- Enhanced rrsync with the `-no-overwrite` option that allows you to ensure
-  that existing files on your restricted but writable directory can't be
-  modified.
-
-- Enhanced the manpages to mark links with .UR & .UE. If your nroff doesn't
-  support these idioms, touch the file `.md2man-force` in the source directory
-  so that `md-convert` gets called with the `--force-link-text` option, and
-  that should ensure that your manpages are still readable even with the
-  ignored markup.
-
-- Some manpage improvements on the handling of [global] modules.
-
-- Changed the mapfrom & mapto perl scripts (in the support dir) into a single
-  python script named idmap.  Converted a couple more perl scripts into python.
-
-- Changed the mnt-excl perl script (in the support dir) into a python script.
-
-### DEVELOPER RELATED:
-
- - Updated config.guess (timestamp 2023-01-01) and config.sub (timestamp
-   2023-01-21).
-
-------------------------------------------------------------------------------
-
 # NEWS for rsync 3.2.7 (20 Oct 2022)
 
 ## Changes in this version:
@@ -522,7 +50,7 @@ to develop and test fixes.
 
 - The `--fuzzy` option was optimized a bit to try to cut down on the amount of
   computations when considering a big pool of files. The simple heuristic from
-  Kenneth Finnegan resulted in about a 2x speedup.
+  Kenneth Finnegan resuled in about a 2x speedup.
 
 - If rsync is forced to use protocol 29 or before (perhaps due to talking to an
   rsync before 3.0.0), the modify time of a file is limited to 4-bytes.  Rsync
@@ -689,10 +217,9 @@ to develop and test fixes.
  - A new form of arg protection was added that works similarly to the older
    `--protect-args` ([`-s`](rsync.1#opt)) option but in a way that avoids
    breaking things like rrsync (the restricted rsync script): rsync now uses
-   backslash escaping for sending "shell-active" characters to the remote shell
-   (such as `$(){}<>#&` and others). This includes spaces, so fetching a remote
-   file via a quoted filename value now works by default without any extra
-   quoting:
+   backslash escaping for sending "shell-active" characters to the remote
+   shell. This includes spaces, so fetching a remote file via a simple quoted
+   filename value now works by default without any extra quoting:
 
    ```shell
        rsync -aiv host:'a simple file.pdf' .
@@ -700,14 +227,10 @@ to develop and test fixes.
 
    Wildcards are not escaped in filename args, but they are escaped in options
    like the [`--suffix`](rsync.1#opt) and [`--usermap`](rsync.1#opt) values.
-
-   If a script depends on the old arg behavior (perhaps because it quotes or
-   protects the args already, or perhaps because it expects arg splitting),
-   there are two easy ways to get things going with a modern rsync: either
-   `export RSYNC_OLD_ARGS=1` in the script's environment (perhaps in the script
-   itself) or add the option [`--old-args`](rsync.1#opt) to the rsync commands
-   that are run.  See also the [ADVANCED USAGE](rsync.1#) section of rsync's
-   manpage for how to use a more modern arg style.
+   If your rsync script depends on the old arg-splitting behavior, either run
+   it with the [`--old-args`](rsync.1#opt) option or `export RSYNC_OLD_ARGS=1`
+   in the script's environment.  See also the [ADVANCED USAGE](rsync.1#)
+   section of rsync's manpage for how to use a more modern arg style.
 
  - A long-standing bug was preventing rsync from figuring out the current
    locale's decimal point character, which made rsync always output numbers
@@ -5169,11 +4692,6 @@ to develop and test fixes.
 
 | RELEASE DATE | VER.   | DATE OF COMMIT\* | PROTOCOL    |
 |--------------|--------|------------------|-------------|
-| 20 May 2026  | 3.4.3  |                  | 32          |
-| 28 Apr 2026  | 3.4.2  |                  | 32          |
-| 16 Jan 2025  | 3.4.1  |                  | 32          |
-| 15 Jan 2025  | 3.4.0  | 15 Jan 2025      | 32          |
-| 06 Apr 2024  | 3.3.0  |                  | 31          |
 | 20 Oct 2022  | 3.2.7  |                  | 31          |
 | 09 Sep 2022  | 3.2.6  |                  | 31          |
 | 14 Aug 2022  | 3.2.5  |                  | 31          |

README.md

@@ -34,7 +34,7 @@ If you need to build rsync yourself, check out the [INSTALL][1] page for
 information on what libraries and packages you can use to get the maximum
 features in your build.
 
-[1]: https://github.com/RsyncProject/rsync/blob/master/INSTALL.md
+[1]: https://github.com/WayneD/rsync/blob/master/INSTALL.md
 
 SETUP
 -----
@@ -93,15 +93,6 @@ details.
 [3]: https://rsync.samba.org/lists.html
 
 
-DISCORD
--------
-
-There is also an rsync [Discord server][d] for real-time chat about rsync
-and its development.
-
-[d]: https://discord.gg/Avfvy9zhdp
-
-
 BUG REPORTS
 -----------
 
@@ -121,7 +112,6 @@ page of the web site.
 
 Alternately, email your bug report to <rsync@lists.samba.org>.
 
-For security issues please email details of the issue to <rsync.project@gmail.com>.
 
 GIT REPOSITORY
 --------------
@@ -130,7 +120,7 @@ If you want to get the very latest version of rsync direct from the
 source code repository, then you will need to use git.  The git repo
 is hosted [on GitHub][6] and [on Samba's site][7].
 
-[6]: https://github.com/RsyncProject/rsync
+[6]: https://github.com/WayneD/rsync
 [7]: https://git.samba.org/?p=rsync.git;a=summary
 
 See [the download page][8] for full details on all the ways to grab the
@@ -142,12 +132,13 @@ source.
 COPYRIGHT
 ---------
 
-Rsync was originally written by Andrew Tridgell and Paul Mackerras.  Many
-people from around the world have helped to maintain and improve it.
+Rsync was originally written by Andrew Tridgell and is currently
+maintained by Wayne Davison.  It has been improved by many developers
+from around the world.
 
 Rsync may be used, modified and redistributed only under the terms of
 the GNU General Public License, found in the file [COPYING][9] in this
 distribution, or at [the Free Software Foundation][10].
 
-[9]: https://github.com/RsyncProject/rsync/blob/master/COPYING
+[9]: https://github.com/WayneD/rsync/blob/master/COPYING
 [10]: https://www.fsf.org/licenses/gpl.html

SECURITY.md

@@ -9,5 +9,4 @@ help backporting fixes into an older release, feel free to ask.
 
 Email your vulnerability information to rsync's maintainer:
 
-  Rsync Project <rsync.project@gmail.com>
-
+  Wayne Davison <wayne@opencoder.net>

TODO

@@ -15,6 +15,7 @@ Create more granular verbosity					2003/05/15
 
 DOCUMENTATION --------------------------------------------------------
 Keep list of open issues and todos on the web site
+Perhaps redo manual as SGML
 
 LOGGING --------------------------------------------------------------
 Memory accounting
@@ -212,6 +213,16 @@ DOCUMENTATION --------------------------------------------------------
 
 Keep list of open issues and todos on the web site
 
+                      --          --
+
+
+Perhaps redo manual as SGML
+
+  The man page is getting rather large, and there is more information
+  that ought to be added.
+
+  TexInfo source is probably a dying format.
+
   Linuxdoc looks like the most likely contender.  I know DocBook is
   favoured by some people, but it's so bloody verbose, even with emacs
   support.

acls.c

@@ -28,7 +28,7 @@ extern int dry_run;
 extern int am_root;
 extern int read_only;
 extern int list_only;
-extern mode_t orig_umask;
+extern int orig_umask;
 extern int numeric_ids;
 extern int inc_recurse;
 extern int preserve_devices;
@@ -765,7 +765,6 @@ static int recv_rsync_acl(int f, item_list *racl_list, SMB_ACL_TYPE_T type, mode
 	/* If we received a superfluous mask, throw it away. */
 	duo_item->racl.mask_obj = NO_ENTRY;
 	(void)mode;
-	(void)computed_mask_bits;
 #else
 	if (duo_item->racl.names.count && duo_item->racl.mask_obj == NO_ENTRY) {
 		/* Mask must be non-empty with lists. */
@@ -982,7 +981,7 @@ static int set_rsync_acl(const char *fname, acl_duo *duo_item,
 		 && !pack_smb_acl(&duo_item->sacl, &duo_item->racl))
 			return -1;
 #ifdef HAVE_OSX_ACLS
-		(void)mode; /* eliminate compiler warning */
+		mode = 0; /* eliminate compiler warning */
 #else
 		if (type == SMB_ACL_TYPE_ACCESS) {
 			cur_mode = change_sacl_perms(duo_item->sacl, &duo_item->racl, cur_mode, mode);

android.c

@@ -1,82 +0,0 @@
-/*
- * Android-specific helpers.
- *
- * openat2() usability probe
- * -------------------------
- * openat2(2) is invoked directly via syscall() because the C library lacked a
- * wrapper for it for years.  Under a seccomp filter that uses
- * SECCOMP_RET_TRAP -- as the Android application sandbox does -- a disallowed
- * syscall raises SIGSYS and *kills the process* rather than failing with
- * ENOSYS, so inspecting errno after the call is too late.  We therefore probe
- * openat2() once, behind a temporary SIGSYS handler, so a trapped syscall is
- * caught and secure_relative_open_linux() can fall back to the portable
- * per-component O_NOFOLLOW resolver instead of the whole process dying.
- *
- * This is only needed on Android, so the probe body is compiled only there.
- * __ANDROID__ is defined by Bionic's headers and reflects the *target*, not
- * the build host: it is set both for NDK cross-compiles (from a Linux/macOS
- * host) and for native Termux builds, and is unset on every other platform.
- * That makes it a reliable compile-time switch for cross builds -- there is
- * nothing to detect in configure.  Everywhere else openat2() is never
- * seccomp-trapped to SIGSYS (a missing syscall simply returns ENOSYS), so
- * openat2_usable() collapses to a constant 1 with no run-time cost.
- */
-
-#include "rsync.h"
-
-#if defined(__ANDROID__) && defined(HAVE_OPENAT2)
-
-#include <setjmp.h>
-#include <sys/syscall.h>
-#include <linux/openat2.h>
-
-static sigjmp_buf openat2_probe_env;
-
-static void openat2_probe_handler(int signo)
-{
-	(void)signo;
-	siglongjmp(openat2_probe_env, 1);
-}
-
-#endif
-
-int openat2_usable(void)
-{
-#if defined(__ANDROID__) && defined(HAVE_OPENAT2)
-	static int cached = -1;
-	struct sigaction sa, old_sa;
-
-	if (cached >= 0)
-		return cached;
-
-	memset(&sa, 0, sizeof sa);
-	sa.sa_handler = openat2_probe_handler;
-	sigemptyset(&sa.sa_mask);
-	if (sigaction(SIGSYS, &sa, &old_sa) != 0)
-		return cached = 0;
-
-	if (sigsetjmp(openat2_probe_env, 1) != 0) {
-		/* SIGSYS delivered: openat2 is blocked by a seccomp filter. */
-		cached = 0;
-	} else {
-		struct open_how how;
-		int fd;
-		memset(&how, 0, sizeof how);
-		how.flags = O_RDONLY | O_DIRECTORY;
-		how.resolve = RESOLVE_BENEATH | RESOLVE_NO_MAGICLINKS;
-		fd = syscall(SYS_openat2, AT_FDCWD, ".", &how, sizeof how);
-		if (fd >= 0)
-			close(fd);
-		/* Usable only if the probe actually succeeded.  Any failure --
-		 * ENOSYS (kernel < 5.6), a seccomp SECCOMP_RET_ERRNO denial
-		 * (EPERM/EACCES), or EINVAL (RESOLVE_BENEATH unsupported) --
-		 * means we must fall back to the portable O_NOFOLLOW walk. */
-		cached = fd >= 0;
-	}
-
-	sigaction(SIGSYS, &old_sa, NULL);
-	return cached;
-#else
-	return 1;
-#endif
-}

batch.c

@@ -75,7 +75,7 @@ static int *flag_ptr[] = {
 	NULL
 };
 
-static const char *const flag_name[] = {
+static char *flag_name[] = {
 	"--recurse (-r)",
 	"--owner (-o)",
 	"--group (-g)",

byteorder.h

@@ -68,26 +68,10 @@ SIVAL64(char *buf, int pos, int64 val)
 
 #else /* !CAREFUL_ALIGNMENT */
 
-/* We don't want false positives about alignment from UBSAN, see:
-   https://github.com/WayneD/rsync/issues/427#issuecomment-1375132291
-*/
-
-/* From https://gcc.gnu.org/onlinedocs/cpp/Common-Predefined-Macros.html */
-#ifndef GCC_VERSION
-#define GCC_VERSION (__GNUC__ * 10000 \
-                     + __GNUC_MINOR__ * 100 \
-                     + __GNUC_PATCHLEVEL__)
-#endif
-
 /* This handles things for architectures like the 386 that can handle alignment errors.
  * WARNING: This section is dependent on the length of an int32 (and thus a uint32)
  * being correct (4 bytes)!  Set CAREFUL_ALIGNMENT if it is not. */
 
-#ifdef __clang__
-__attribute__((no_sanitize("undefined")))
-#elif GCC_VERSION >= 409
-__attribute__((no_sanitize_undefined))
-#endif
 static inline uint32
 IVALu(const uchar *buf, int pos)
 {
@@ -99,11 +83,6 @@ IVALu(const uchar *buf, int pos)
 	return *u.num;
 }
 
-#ifdef __clang__
-__attribute__((no_sanitize("undefined")))
-#elif GCC_VERSION >= 409
-__attribute__((no_sanitize_undefined))
-#endif
 static inline void
 SIVALu(uchar *buf, int pos, uint32 val)
 {
@@ -115,11 +94,6 @@ SIVALu(uchar *buf, int pos, uint32 val)
 	*u.num = val;
 }
 
-#ifdef __clang__
-__attribute__((no_sanitize("undefined")))
-#elif GCC_VERSION >= 409
-__attribute__((no_sanitize_undefined))
-#endif
 static inline int64
 IVAL64(const char *buf, int pos)
 {
@@ -131,11 +105,6 @@ IVAL64(const char *buf, int pos)
 	return *u.num;
 }
 
-#ifdef __clang__
-__attribute__((no_sanitize("undefined")))
-#elif GCC_VERSION >= 409
-__attribute__((no_sanitize_undefined))
-#endif
 static inline void
 SIVAL64(char *buf, int pos, int64 val)
 {

checksum.c

@@ -3,7 +3,7 @@
  *
  * Copyright (C) 1996 Andrew Tridgell
  * Copyright (C) 1996 Paul Mackerras
- * Copyright (C) 2004-2023 Wayne Davison
+ * Copyright (C) 2004-2022 Wayne Davison
  *
  * 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
@@ -154,7 +154,7 @@ static const EVP_MD *csum_evp_md(struct name_num_item *nni)
 		emd = NULL;
 	else
 #endif
-		emd = EVP_get_digestbyname(nni->name);
+		emd = EVP_get_digestbyname(nni->name);                                               
 	if (emd && !(nni->flags & NNI_EVP_OK)) { /* Make sure it works before we advertise it */
 		if (!ctx_evp && !(ctx_evp = EVP_MD_CTX_create()))
 			out_of_memory("csum_evp_md");
@@ -300,7 +300,6 @@ uint32 get_checksum1(char *buf1, int32 len)
 }
 #endif
 
-/* The "sum" buffer must be at least MAX_DIGEST_LEN bytes! */
 void get_checksum2(char *buf, int32 len, char *sum)
 {
 #ifdef USE_OPENSSL
@@ -787,10 +786,6 @@ void init_checksum_choices()
 	if (initialized_choices)
 		return;
 
-#if defined USE_OPENSSL && OPENSSL_VERSION_NUMBER < 0x10100000L
-	OpenSSL_add_all_algorithms();
-#endif
-
 #if defined SUPPORT_XXH3 || defined USE_OPENSSL
 	for (nni = valid_checksums.list; nni->name; nni++)
 		verify_digest(nni, True);

cleanup.c

@@ -269,16 +269,8 @@ NORETURN void _exit_cleanup(int code, const char *file, int line)
 		break;
 	}
 
-	if (called_from_signal_handler) {
-#ifdef GCOV_COVERAGE
-		/* _exit() bypasses the gcov atexit flush; rsync's generator (and
-		 * other processes) normally finish via the signal handler, so
-		 * without this they would write no .gcda. Harmless otherwise. */
-		extern void __gcov_dump(void);
-		__gcov_dump();
-#endif
+	if (called_from_signal_handler)
 		_exit(exit_code);
-	}
 	exit(exit_code);
 }
 

clientserver.c

@@ -1070,7 +1070,7 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
 
 	io_printf(f_out, "@RSYNCD: OK\n");
 
-	read_args(f_in, name, line, sizeof line, rl_nulls, 1, &argv, &argc, &request);
+	read_args(f_in, name, line, sizeof line, rl_nulls, &argv, &argc, &request);
 	orig_argv = argv;
 
 	save_munge_symlinks = munge_symlinks;
@@ -1080,7 +1080,7 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
 	if (protect_args && ret) {
 		orig_early_argv = orig_argv;
 		protect_args = 2;
-		read_args(f_in, name, line, sizeof line, 1, 0, &argv, &argc, &request);
+		read_args(f_in, name, line, sizeof line, 1, &argv, &argc, &request);
 		orig_argv = argv;
 		ret = parse_arguments(&argc, (const char ***) &argv);
 	} else

compat.c

@@ -52,7 +52,6 @@ extern int need_messages_from_generator;
 extern int delete_mode, delete_before, delete_during, delete_after;
 extern int do_compression;
 extern int do_compression_level;
-extern int do_compression_threads;
 extern int saw_stderr_opt;
 extern int msgs2stderr;
 extern char *shell_cmd;
@@ -835,8 +834,6 @@ void output_daemon_greeting(int f_out, int am_client)
 	char tmpbuf[MAX_NSTR_STRLEN];
 	int our_sub = get_subprotocol_version();
 
-	init_checksum_choices();
-
 	get_default_nno_list(&valid_auth_checksums, tmpbuf, MAX_NSTR_STRLEN, '\0');
 
 	io_printf(f_out, "@RSYNCD: %d.%d %s\n", protocol_version, our_sub, tmpbuf);
@@ -876,10 +873,8 @@ void negotiate_daemon_auth(int f_out, int am_client)
 		}
 	}
 	am_server = save_am_server;
-	if (md4_is_old && valid_auth_checksums.negotiated_nni->num == CSUM_MD4) {
+	if (md4_is_old && valid_auth_checksums.negotiated_nni->num == CSUM_MD4)
 		valid_auth_checksums.negotiated_nni->num = CSUM_MD4_OLD;
-		valid_auth_checksums.negotiated_nni->flags = 0;
-	}
 }
 
 int get_subprotocol_version()

configure.ac

@@ -82,28 +82,6 @@ if test x"$enable_profile" = x"yes"; then
 	CFLAGS="$CFLAGS -pg"
 fi
 
-dnl Coverage build (gcov) for `make coverage`. NOTE: --enable-profile above is
-dnl gprof (-pg) and is NOT coverage. -O0 keeps branch coverage meaningful;
-dnl -fprofile-update=atomic keeps the shared .gcda counters correct while the
-dnl suite runs many rsync processes in parallel.
-AC_ARG_ENABLE(coverage,
-	AS_HELP_STRING([--enable-coverage],[build with gcov instrumentation for `make coverage`]))
-if test x"$enable_coverage" = x"yes"; then
-	CFLAGS="$CFLAGS --coverage -fprofile-update=atomic -O0"
-	CXXFLAGS="$CXXFLAGS --coverage -fprofile-update=atomic -O0"
-	LDFLAGS="$LDFLAGS --coverage"
-	AC_DEFINE([GCOV_COVERAGE], 1,
-		[Flush gcov counters at exit_cleanup: rsync's children exit via _exit(), which bypasses the gcov atexit handler, so without this no .gcda is written for the receiver/generator/daemon-worker processes.])
-fi
-
-dnl openat2(RESOLVE_BENEATH) is used on Linux 5.6+ for the secure resolver.
-dnl --disable-openat2 forces the portable per-component O_NOFOLLOW fallback to
-dnl run as the primary resolver on ordinary Linux, so that tier is exercised
-dnl (and coverage-counted) without needing a pre-5.6 kernel. Behaviour-neutral
-dnl by default (the knob only REMOVES a tier when explicitly disabled).
-AC_ARG_ENABLE(openat2,
-	AS_HELP_STRING([--disable-openat2],[do not use Linux openat2(RESOLVE_BENEATH); force the portable resolver (for exercising the fallback tier)]))
-
 AC_MSG_CHECKING([if md2man can create manpages])
 if test x"$ac_cv_path_PYTHON3" = x; then
     AC_MSG_RESULT(no - python3 not found)
@@ -353,28 +331,6 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ ]], [[return 0;]])],
 CFLAGS="$OLD_CFLAGS"
 AC_SUBST(NOEXECSTACK)
 
-dnl We need both the SYS_openat2 syscall number and <linux/openat2.h> (for
-dnl struct open_how / RESOLVE_BENEATH); some setups have one without the other.
-AC_CACHE_CHECK([for openat2],rsync_cv_HAVE_OPENAT2,[
-    AC_COMPILE_IFELSE([
-        AC_LANG_PROGRAM([[
-#include <sys/syscall.h>
-#include <linux/openat2.h>
-]], [[
-struct open_how how;
-how.resolve = RESOLVE_BENEATH;
-return SYS_openat2 + (int)how.resolve;
-]])
-    ],
-    [rsync_cv_HAVE_OPENAT2=yes], [rsync_cv_HAVE_OPENAT2=no])
-])
-if test x"$enable_openat2" != x"no"; then
-    if test x"$rsync_cv_HAVE_OPENAT2" = x"yes"; then
-      AC_DEFINE([HAVE_OPENAT2], 1,
-        [Define to use Linux openat2(RESOLVE_BENEATH) in secure_relative_open where available.])
-    fi
-fi
-
 # arrgh. libc in some old debian version screwed up the largefile
 # stuff, getting byte range locking wrong
 AC_CACHE_CHECK([for broken largefile support],rsync_cv_HAVE_BROKEN_LARGEFILE,[
@@ -432,17 +388,21 @@ AS_HELP_STRING([--disable-ipv6],[disable to omit ipv6 support]),
 	;;
   esac ],
 
-  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+  AC_RUN_IFELSE([AC_LANG_SOURCE([[ /* AF_INET6 availability check */
+#include <stdlib.h>
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <netinet/in.h>
-]], [[
-struct sockaddr_in6 sa6;
-(void)sa6;
-(void)AF_INET6;
+main()
+{
+   if (socket(AF_INET6, SOCK_STREAM, 0) < 0)
+     exit(1);
+   else
+     exit(0);
+}
 ]])],
   [AC_MSG_RESULT(yes)
-  AC_DEFINE(INET6, 1, [true if you have IPv6])],
+  AC_DEFINE(INET6, 1, true if you have IPv6)],
+  [AC_MSG_RESULT(no)],
   [AC_MSG_RESULT(no)]
 ))
 
@@ -464,26 +424,6 @@ case $host_os in
 	       * ) AC_MSG_RESULT(no);;
 esac
 
-# We default to using our zlib unless --with-included-zlib=no is given.
-if test x"$with_included_zlib" != x"no"; then
-    with_included_zlib=yes
-elif test x"$ac_cv_header_zlib_h" != x"yes"; then
-    with_included_zlib=yes
-fi
-if test x"$with_included_zlib" != x"yes"; then
-    AC_CHECK_LIB(z, deflateParams, , [with_included_zlib=yes])
-fi
-
-AC_MSG_CHECKING([whether to use included zlib])
-if test x"$with_included_zlib" = x"yes"; then
-    AC_MSG_RESULT($srcdir/zlib)
-    BUILD_ZLIB='$(zlib_OBJS)'
-    CFLAGS="-I$srcdir/zlib $CFLAGS"
-else
-    AC_DEFINE(EXTERNAL_ZLIB, 1, [Define to 1 if using external zlib])
-    AC_MSG_RESULT(no)
-fi
-
 AC_MSG_CHECKING([whether to enable use of openssl crypto library])
 AC_ARG_ENABLE([openssl],
 	AS_HELP_STRING([--disable-openssl],[disable to omit openssl crypto library]))
@@ -492,10 +432,10 @@ AH_TEMPLATE([USE_OPENSSL],
 if test x"$enable_openssl" != x"no"; then
     if test x"$ac_cv_header_openssl_md4_h" = x"yes" && test x"$ac_cv_header_openssl_md5_h" = x"yes"; then
       AC_MSG_RESULT(yes)
-      AC_SEARCH_LIBS(EVP_MD_CTX_copy, crypto,
+      AC_SEARCH_LIBS(MD5_Init, crypto,
           [AC_DEFINE(USE_OPENSSL)
 	   enable_openssl=yes],
-          [err_msg="$err_msg$nl- Failed to find EVP_MD_CTX_copy function in openssl crypto lib.";
+          [err_msg="$err_msg$nl- Failed to find MD5_Init function in openssl crypto lib.";
 	   no_lib="$no_lib openssl"])
     else
         AC_MSG_RESULT(no)
@@ -633,7 +573,7 @@ if test x"$no_lib" != x; then
     echo ""
     echo "See the INSTALL file for hints on how to install the missing libraries and/or"
     echo "how to generate (or fetch) manpages:"
-    echo "    https://github.com/RsyncProject/rsync/blob/master/INSTALL.md"
+    echo "    https://github.com/WayneD/rsync/blob/master/INSTALL.md"
     echo ""
     echo "To disable one or more features, the relevant configure options are:"
     for lib in $no_lib; do
@@ -928,9 +868,9 @@ AC_FUNC_UTIME_NULL
 AC_FUNC_ALLOCA
 AC_CHECK_FUNCS(waitpid wait4 getcwd chown chmod lchmod mknod mkfifo \
     fchmod fstat ftruncate strchr readlink link utime utimes lutimes strftime \
-    chflags getattrlist mktime innetgr linkat mknodat mkfifoat \
+    chflags getattrlist mktime innetgr linkat \
     memmove lchown vsnprintf snprintf vasprintf asprintf setsid strpbrk \
-    strlcat strlcpy stpcpy strtol mallinfo mallinfo2 getgroups setgroups geteuid getegid \
+    strlcat strlcpy strtol mallinfo mallinfo2 getgroups setgroups geteuid getegid \
     setlocale setmode open64 lseek64 mkstemp64 mtrace va_copy __va_copy \
     seteuid strerror putenv iconv_open locale_charset nl_langinfo getxattr \
     extattr_get_link sigaction sigprocmask setattrlist getgrouplist \
@@ -1144,8 +1084,6 @@ if test x"$with_included_popt" = x"yes"; then
     AC_MSG_RESULT($srcdir/popt)
     BUILD_POPT='$(popt_OBJS)'
     CFLAGS="-I$srcdir/popt $CFLAGS"
-    AC_DEFINE(POPT_SYSCONFDIR, "/etc", [sysconfig dir for popt])
-    AC_DEFINE(PACKAGE, "rsync", [package name for rsync])
     if test x"$ALLOCA" != x
     then
 	# this can be removed when/if we add an included alloca.c;
@@ -1156,6 +1094,26 @@ else
     AC_MSG_RESULT(no)
 fi
 
+# We default to using our zlib unless --with-included-zlib=no is given.
+if test x"$with_included_zlib" != x"no"; then
+    with_included_zlib=yes
+elif test x"$ac_cv_header_zlib_h" != x"yes"; then
+    with_included_zlib=yes
+fi
+if test x"$with_included_zlib" != x"yes"; then
+    AC_CHECK_LIB(z, deflateParams, , [with_included_zlib=yes])
+fi
+
+AC_MSG_CHECKING([whether to use included zlib])
+if test x"$with_included_zlib" = x"yes"; then
+    AC_MSG_RESULT($srcdir/zlib)
+    BUILD_ZLIB='$(zlib_OBJS)'
+    CFLAGS="-I$srcdir/zlib $CFLAGS"
+else
+    AC_DEFINE(EXTERNAL_ZLIB, 1, [Define to 1 if using external zlib])
+    AC_MSG_RESULT(no)
+fi
+
 AC_CACHE_CHECK([for unsigned char],rsync_cv_SIGNED_CHAR_OK,[
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[signed char *s = (signed char *)""]])],[rsync_cv_SIGNED_CHAR_OK=yes],[rsync_cv_SIGNED_CHAR_OK=no])])
 if test x"$rsync_cv_SIGNED_CHAR_OK" = x"yes"; then

daemon-parm.awk

@@ -6,7 +6,7 @@
 BEGIN {
     heading = "/* DO NOT EDIT THIS FILE!  It is auto-generated from a list of values in " ARGV[1] "! */\n\n"
     sect = psect = defines = accessors = prior_ptype = ""
-    parms = "\nstatic const struct parm_struct parm_table[] = {"
+    parms = "\nstatic struct parm_struct parm_table[] = {"
     comment_fmt = "\n/********** %s **********/\n"
     tdstruct = "typedef struct {"
 }

delete.c

@@ -4,7 +4,7 @@
  * Copyright (C) 1996-2000 Andrew Tridgell
  * Copyright (C) 1996 Paul Mackerras
  * Copyright (C) 2002 Martin Pool <mbp@samba.org>
- * Copyright (C) 2003-2024 Wayne Davison
+ * Copyright (C) 2003-2020 Wayne Davison
  *
  * 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
@@ -188,7 +188,7 @@ enum delret delete_item(char *fbuf, uint16 mode, uint16 flags)
 				stats.deleted_symlinks++;
 #endif
 			else if (IS_DEVICE(mode))
-				stats.deleted_devices++;
+				stats.deleted_symlinks++;
 			else
 				stats.deleted_specials++;
 		}

doc/README-SGML

@@ -0,0 +1,20 @@
+Handling the rsync SGML documentation
+
+rsync documentation is now primarily in Docbook format.  Docbook is an
+SGML/XML documentation format that is becoming standard on free
+operating systems.  It's also used for Samba documentation.
+
+The SGML files are source code that can be translated into various
+useful output formats, primarily PDF, HTML, Postscript and plain text.  
+
+To do this transformation on Debian, you should install the
+docbook-utils package.  Having done that, you can say 
+
+  docbook2pdf rsync.sgml
+
+and so on.
+
+On other systems you probably need James Clark's "sp" and "JadeTeX"
+packages.  Work it out for yourself and send a note to the mailing
+list.
+

doc/profile.txt

@@ -0,0 +1,42 @@
+Notes on rsync profiling
+
+strlcpy is hot:
+
+                0.00    0.00       1/7735635     push_dir [68]
+                0.00    0.00       1/7735635     pop_dir [71]
+                0.00    0.00       1/7735635     send_file_list [15]
+                0.01    0.00   18857/7735635     send_files [4]
+                0.04    0.00  129260/7735635     send_file_entry [18]
+                0.04    0.00  129260/7735635     make_file [20]
+                0.04    0.00  141666/7735635     send_directory <cycle 1> [36]
+                2.29    0.00 7316589/7735635     f_name [13]
+[14]    11.7    2.42    0.00 7735635         strlcpy [14]
+
+
+Here's the top few functions:
+
+ 46.23      9.57     9.57 13160929     0.00     0.00  mdfour64
+ 14.78     12.63     3.06 13160929     0.00     0.00  copy64
+ 11.69     15.05     2.42  7735635     0.00     0.00  strlcpy
+ 10.05     17.13     2.08    41438     0.05     0.38  sum_update
+  4.11     17.98     0.85 13159996     0.00     0.00  mdfour_update
+  1.50     18.29     0.31                             file_compare
+  1.45     18.59     0.30   129261     0.00     0.01  send_file_entry
+  1.23     18.84     0.26  2557585     0.00     0.00  f_name
+  1.11     19.07     0.23  1483750     0.00     0.00  u_strcmp
+  1.11     19.30     0.23   118129     0.00     0.00  writefd_unbuffered
+  0.92     19.50     0.19  1085011     0.00     0.00  writefd
+  0.43     19.59     0.09   156987     0.00     0.00  read_timeout
+  0.43     19.68     0.09   129261     0.00     0.00  clean_fname
+  0.39     19.75     0.08    32887     0.00     0.38  matched
+  0.34     19.82     0.07        1    70.00 16293.92  send_files
+  0.29     19.89     0.06   129260     0.00     0.00  make_file
+  0.29     19.95     0.06    75430     0.00     0.00  read_unbuffered
+
+
+
+mdfour could perhaps be made faster:
+
+/* NOTE: This code makes no attempt to be fast!  */
+
+There might be an optimized version somewhere that we can borrow.

doc/rsync.sgml

@@ -0,0 +1,351 @@
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
+<book id="rsync">
+  <bookinfo>
+    <title>rsync</title>
+    <copyright>
+      <year>1996 -- 2002</year>
+      <holder>Martin Pool</holder>
+      <holder>Andrew Tridgell</holder>
+    </copyright>
+    <author>
+      <firstname>Martin</firstname>
+      <surname>Pool</surname>
+    </author>
+  </bookinfo>
+
+  <chapter>
+    <title>Introduction</title>
+
+    <para>rsync is a flexible program for efficiently copying files or
+      directory trees.
+
+    <para>rsync has many options to select which files will be copied
+      and how they are to be transferred.  It may be used as an
+      alternative to ftp, http, scp or rcp.
+
+    <para>The rsync remote-update protocol allows rsync to transfer just
+      the differences between two sets of files across the network link,
+      using an efficient checksum-search algorithm described in the
+      technical report that accompanies this package.</para>
+
+    <para>Some of the additional features of rsync are:</para>
+
+    <itemizedlist>
+      
+      <listitem>
+	<para>support for copying links, devices, owners, groups and
+	  permissions
+	</para>
+      </listitem>
+      
+      <listitem>
+	<para>
+	  exclude and exclude-from options similar to GNU tar
+	</para>
+      </listitem>
+
+      <listitem>
+	<para>
+	  a CVS exclude mode for ignoring the same files that CVS would ignore
+      </listitem>
+
+      <listitem>
+	<para>
+	  can use any transparent remote shell, including rsh or ssh
+      </listitem>
+
+      <listitem>
+	<para>
+	  does not require root privileges
+      </listitem>
+
+      <listitem>
+	<para>
+	  pipelining of file transfers to minimize latency costs
+      </listitem>
+		
+      <listitem>
+	<para>
+	  support for anonymous or authenticated rsync servers (ideal for
+	  mirroring)
+	</para>
+      </listitem>
+    </itemizedlist>
+  </chapter>
+
+
+
+  <chapter>
+    <title>Using rsync</title>
+    <section>
+      <title>
+	Introductory example
+      </title>
+      
+      <para>
+	Probably the most common case of rsync usage is to copy files
+	to or from a remote machine using
+	<application>ssh</application> as a network transport.  In
+	this situation rsync is a good alternative to
+	<application>scp</application>.
+      </para>
+
+      <para>
+	The most commonly used arguments for rsync are
+      </para>
+
+      <variablelist>
+	<varlistentry>
+	  <term><option>-v</option></term>
+	  <listitem>
+	    <para>Be verbose.  Primarily, display the name of each file as it is copied.</para>
+	  </listitem>
+	</varlistentry>
+
+
+	<varlistentry>
+	  <term><option>-a</option></term>
+	  <listitem>
+	    <para>
+	      Reproduce the structure and attributes of the origin files as exactly
+	      as possible: this includes copying subdirectories, symlinks, special
+	      files, ownership and permissions.  (@xref{Attributes to
+	      copy}.)
+	    </para>
+	  </listitem>
+	</varlistentry>
+      </variablelist>
+
+
+	
+      <para><option>-v </option>
+      
+      <para><option>-z</option>
+	Compress network traffic, using a modified version of the
+	@command{zlib} library.</para>
+      
+      <para><option>-P</option>
+	Display a progress indicator while files are transferred.  This should
+	normally be omitted if rsync is not run on a terminal.
+      </para>
+    </section>
+
+
+
+
+    <section>
+      <title>Local and remote</title>
+      
+      <para>There are six different ways of using rsync. They
+      are:</para>
+
+      
+
+      <!-- one of (CALLOUTLIST GLOSSLIST ITEMIZEDLIST ORDEREDLIST SEGMENTEDLIST SIMPLELIST VARIABLELIST CAUTION IMPORTANT NOTE TIP WARNING LITERALLAYOUT PROGRAMLISTING PROGRAMLISTINGCO SCREEN SCREENCO SCREENSHOT SYNOPSIS CMDSYNOPSIS FUNCSYNOPSIS CLASSSYNOPSIS FIELDSYNOPSIS CONSTRUCTORSYNOPSIS DESTRUCTORSYNOPSIS METHODSYNOPSIS FORMALPARA PARA SIMPARA ADDRESS BLOCKQUOTE GRAPHIC GRAPHICCO MEDIAOBJECT MEDIAOBJECTCO INFORMALEQUATION INFORMALEXAMPLE INFORMALFIGURE INFORMALTABLE EQUATION EXAMPLE FIGURE TABLE MSGSET PROCEDURE SIDEBAR QANDASET ANCHOR BRIDGEHEAD REMARK HIGHLIGHTS ABSTRACT AUTHORBLURB EPIGRAPH INDEXTERM REFENTRY SECTION) -->
+      <orderedlist>
+	<listitem>
+	  <para>
+	    for copying local files. This is invoked when neither
+	    source nor destination path contains a @code{:} separator
+
+	<listitem>
+	  <para>
+	    for copying from the local machine to a remote machine using
+	    a remote shell program as the transport (such as rsh or
+	    ssh). This is invoked when the destination path contains a
+	    single @code{:} separator.
+
+	<listitem>
+	  <para>
+	    for copying from a remote machine to the local machine
+	    using a remote shell program. This is invoked when the source
+	    contains a @code{:} separator.
+
+	<listitem>
+	  <para>
+	    for copying from a remote rsync server to the local
+	    machine. This is invoked when the source path contains a @code{::}
+	    separator or a @code{rsync://} URL.
+
+	<listitem>
+	  <para>
+	    for copying from the local machine to a remote rsync
+	    server. This is invoked when the destination path contains a @code{::}
+	    separator.
+
+	<listitem>
+	  <para>
+	    for listing files on a remote machine. This is done the
+	    same way as rsync transfers except that you leave off the
+	    local destination.  
+
+	</listitem>
+      </orderedlist>
+	  <para>
+Note that in all cases (other than listing) at least one of the source
+and destination paths must be local.
+
+	  <para>
+Any one invocation of rsync makes a copy in a single direction.  rsync
+currently has no equivalent of @command{ftp}'s interactive mode.
+
+@cindex @sc{nfs}
+@cindex network filesystems
+@cindex remote filesystems
+
+	  <para>
+rsync's network protocol is generally faster at copying files than
+network filesystems such as @sc{nfs} or @sc{cifs}.  It is better to
+run rsync on the file server either as a daemon or over ssh than
+running rsync giving the network directory.
+      </para>
+    </section>
+  </chapter>
+
+
+
+  <chapter>
+    <title>Frequently asked questions</title>
+
+    
+    <!-- one of (CALLOUTLIST GLOSSLIST ITEMIZEDLIST ORDEREDLIST SEGMENTEDLIST SIMPLELIST VARIABLELIST CAUTION IMPORTANT NOTE TIP WARNING LITERALLAYOUT PROGRAMLISTING PROGRAMLISTINGCO SCREEN SCREENCO SCREENSHOT SYNOPSIS CMDSYNOPSIS FUNCSYNOPSIS CLASSSYNOPSIS FIELDSYNOPSIS CONSTRUCTORSYNOPSIS DESTRUCTORSYNOPSIS METHODSYNOPSIS FORMALPARA PARA SIMPARA ADDRESS BLOCKQUOTE GRAPHIC GRAPHICCO MEDIAOBJECT MEDIAOBJECTCO INFORMALEQUATION INFORMALEXAMPLE INFORMALFIGURE INFORMALTABLE EQUATION EXAMPLE FIGURE TABLE MSGSET PROCEDURE SIDEBAR QANDASET ANCHOR BRIDGEHEAD REMARK HIGHLIGHTS ABSTRACT AUTHORBLURB EPIGRAPH INDEXTERM SECTION SIMPLESECT REFENTRY SECT1) -->
+    <qandaset>
+      <!-- one of (QANDADIV QANDAENTRY) -->
+
+      <qandaentry>
+	<question>
+	  <!-- one of (CALLOUTLIST GLOSSLIST ITEMIZEDLIST ORDEREDLIST
+	  SEGMENTEDLIST SIMPLELIST VARIABLELIST CAUTION IMPORTANT NOTE
+	  TIP WARNING LITERALLAYOUT PROGRAMLISTING PROGRAMLISTINGCO
+	  SCREEN SCREENCO SCREENSHOT SYNOPSIS CMDSYNOPSIS FUNCSYNOPSIS
+	  CLASSSYNOPSIS FIELDSYNOPSIS CONSTRUCTORSYNOPSIS
+	  DESTRUCTORSYNOPSIS METHODSYNOPSIS FORMALPARA PARA SIMPARA
+	  ADDRESS BLOCKQUOTE GRAPHIC GRAPHICCO MEDIAOBJECT
+	  MEDIAOBJECTCO INFORMALEQUATION INFORMALEXAMPLE
+	  INFORMALFIGURE INFORMALTABLE EQUATION EXAMPLE FIGURE TABLE
+	  PROCEDURE ANCHOR BRIDGEHEAD REMARK HIGHLIGHTS INDEXTERM) -->
+	  <para>Are there mailing lists for rsync?
+	</question>
+
+	<answer>
+	  <para>Yes, and you can subscribe and unsubscribe through a
+	  web interface at
+	    <ulink
+	      url="http://lists.samba.org/">http://lists.samba.org/</ulink>
+	  </para>
+
+	  <para>
+	    If you are having trouble with the mailing list, please
+	    send mail to the administrator
+	    
+	    <email>rsync-admin@lists.samba.org</email>
+
+	    not to the list itself.
+	  </para>
+
+	  <para>
+	    The mailing list archives are searchable.  Use 
+	    <ulink url="http://google.com/">Google</ulink> and prepend
+	    the search with <userinput>site:lists.samba.org
+	    rsync</userinput>, plus relevant keywords.
+	  </para>
+	</answer>
+      </qandaentry>
+
+
+      <qandaentry>
+	<question>
+	  <para>
+	    Why is rsync so much bigger when I build it with
+	    <command>gcc</command>?
+	  </para>
+	</question>
+	<answer>
+	  <para>
+	    On gcc, rsync builds by default with debug symbols
+	    included.  If you strip both executables, they should end
+	    up about the same size.  (Use <command>make
+	    install-strip</command>.)
+	  </para>
+	</answer>
+      </qandaentry>
+
+      
+      <qandaentry>
+	<question>
+	  <para>Is rsync useful for a single large file like an ISO image?</para>
+	</question>
+	<answer>
+	  <para>
+	    Yes, but note the following:
+
+	  <para>
+   Background: A common use of rsync is to update a file (or set of files) in one location from a more
+   correct or up-to-date copy in another location, taking advantage of portions of the files that are
+   identical to speed up the process. (Note that rsync will transfer a file in its entirety if no copy
+   exists at the destination.)
+
+	  <para>
+   (This discussion is written in terms of updating a local copy of a file from a correct file in a
+   remote location, although rsync can work in either direction.)
+
+	  <para>
+   The file to be updated (the local file) must be in a destination directory that has enough space for
+   two copies of the file. (In addition, keep an extra copy of the file to be updated in a different
+   location for safety -- see the discussion (below) about rsync's behavior when the rsync process is
+   interrupted before completion.)
+
+	  <para>
+   The local file must have the same name as the remote file being sync'd to (I think?). If you are
+   trying to upgrade an iso from, for example, beta1 to beta2, rename the local file to the same name
+   as the beta2 file. *(This is a useful thing to do -- only the changed portions will be
+   transmitted.)*
+
+	  <para>
+   The extra copy of the local file kept in a different location is because of rsync's behavior if
+   interrupted before completion:
+
+	  <para>
+   * If you specify the --partial option and rsync is interrupted, rsync will save the partially
+   rsync'd file and throw away the original local copy. (The partially rsync'd file is correct but
+   truncated.) If rsync is restarted, it will not have a local copy of the file to check for duplicate
+   blocks beyond the section of the file that has already been rsync'd, thus the remainder of the rsync
+   process will be a "pure transfer" of the file rather than taking advantage of the rsync algorithm.
+
+	  <para>
+   * If you don't specify the --partial option and rsync is interrupted, rsync will throw away the
+   partially rsync'd file, and, when rsync is restarted starts the rsync process over from the
+   beginning.
+
+	  <para>
+   Which of these is most desirable depends on the degree of commonality between the local and remote
+   copies of the file *and how much progress was made before the interruption*.
+
+	  <para>
+   The ideal approach after an interruption would be to create a new file by taking the original file
+   and deleting a portion equal in size to the portion already rsync'd and then appending *the
+   remaining* portion to the portion of the file that has already been rsync'd. (There has been some
+   discussion about creating an option to do this automatically.)
+
+   The --compare-dest option is useful when transferring multiple files, but is of no benefit in
+   transferring a single file. (AFAIK)
+
+   *Other potentially useful information can be found at:
+   -[3]http://twiki.org/cgi-bin/view/Wikilearn/RsyncingALargeFile
+
+   This answer, formatted with "real" bullets, can be found at:
+   -[4]http://twiki.org/cgi-bin/view/Wikilearn/RsyncingALargeFileFAQ*
+
+	  </para>
+	</answer>
+      </qandaentry>
+    </qandaset>
+  </chapter>
+
+
+  <appendix>
+    <title>Other Resources</title>
+    
+    <para><ulink url="http://www.ccp14.ac.uk/ccp14admin/rsync/"></ulink></para>
+  </appendix>
+</book>

exclude.c

@@ -4,7 +4,7 @@
  * Copyright (C) 1996-2001 Andrew Tridgell <tridge@samba.org>
  * Copyright (C) 1996 Paul Mackerras
  * Copyright (C) 2002 Martin Pool
- * Copyright (C) 2003-2024 Wayne Davison
+ * Copyright (C) 2003-2022 Wayne Davison
  *
  * 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

fileio.c

@@ -3,7 +3,7 @@
  *
  * Copyright (C) 1998 Andrew Tridgell
  * Copyright (C) 2002 Martin Pool
- * Copyright (C) 2004-2023 Wayne Davison
+ * Copyright (C) 2004-2020 Wayne Davison
  *
  * 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
@@ -40,34 +40,30 @@ OFF_T preallocated_len = 0;
 static OFF_T sparse_seek = 0;
 static OFF_T sparse_past_write = 0;
 
-int sparse_end(int f, OFF_T size, int updating_basis_or_equiv)
+int sparse_end(int f, OFF_T size)
 {
-	int ret = 0;
+	int ret;
+
+	sparse_past_write = 0;
+
+	if (!sparse_seek)
+		return 0;
 
-	if (updating_basis_or_equiv) {
-		if (sparse_seek && do_punch_hole(f, sparse_past_write, sparse_seek) < 0)
-			ret = -1;
-#ifdef HAVE_FTRUNCATE /* A compilation formality -- in-place requires ftruncate() */
-		else /* Just in case the original file was longer */
-			ret = do_ftruncate(f, size);
-#endif
-	} else if (sparse_seek) {
 #ifdef HAVE_FTRUNCATE
-		ret = do_ftruncate(f, size);
+	ret = do_ftruncate(f, size);
 #else
-		if (do_lseek(f, sparse_seek-1, SEEK_CUR) != size-1)
-			ret = -1;
-		else {
-			do {
-				ret = write(f, "", 1);
-			} while (ret < 0 && errno == EINTR);
+	if (do_lseek(f, sparse_seek-1, SEEK_CUR) != size-1)
+		ret = -1;
+	else {
+		do {
+			ret = write(f, "", 1);
+		} while (ret < 0 && errno == EINTR);
 
-			ret = ret <= 0 ? -1 : 0;
-		}
-#endif
+		ret = ret <= 0 ? -1 : 0;
 	}
+#endif
 
-	sparse_past_write = sparse_seek = 0;
+	sparse_seek = 0;
 
 	return ret;
 }

flist.c

@@ -4,7 +4,7 @@
  * Copyright (C) 1996 Andrew Tridgell
  * Copyright (C) 1996 Paul Mackerras
  * Copyright (C) 2001, 2002 Martin Pool <mbp@samba.org>
- * Copyright (C) 2002-2023 Wayne Davison
+ * Copyright (C) 2002-2022 Wayne Davison
  *
  * 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
@@ -132,18 +132,6 @@ static int64 tmp_dev = -1, tmp_ino;
 #endif
 static char tmp_sum[MAX_DIGEST_LEN];
 
-#ifdef ST_MTIME_NSEC
-/* Return st_mtim nsec if it is in the wire-valid range, else 0. */
-static inline uint32 wire_mtime_nsec_from_stat(const STRUCT_STAT *stp)
-{
-	unsigned long nsec = (unsigned long)stp->ST_MTIME_NSEC;
-
-	if (nsec > MAX_WIRE_NSEC)
-		return 0;
-	return (uint32)nsec;
-}
-#endif
-
 static char empty_sum[MAX_DIGEST_LEN];
 static int flist_count_offset; /* for --delete --progress */
 static int show_filelist_progress;
@@ -877,18 +865,13 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x
 		mode = from_wire_mode(read_int(f));
 		/* Reject modes whose type bits are not one of the standard
 		 * file types; otherwise garbage mode values propagate through
-		 * the file-type checks below unpredictably.  mode 0 is the one
-		 * legitimate exception: --delete-missing-args (missing_args==2)
-		 * sends a missing arg as a mode-0 entry (IS_MISSING_FILE), the
-		 * generator's delete signal (#910). */
-		if (mode != 0 || missing_args != 2) {
-		    if (!S_ISREG(mode) && !S_ISDIR(mode) && !S_ISLNK(mode)
-		     && !S_ISCHR(mode) && !S_ISBLK(mode)
-		     && !S_ISFIFO(mode) && !S_ISSOCK(mode)) {
+		 * the file-type checks below unpredictably. */
+		if (!S_ISREG(mode) && !S_ISDIR(mode) && !S_ISLNK(mode)
+		 && !S_ISCHR(mode) && !S_ISBLK(mode)
+		 && !S_ISFIFO(mode) && !S_ISSOCK(mode)) {
 			rprintf(FERROR, "invalid file mode 0%o for %s [%s]\n",
 				(unsigned)mode, lastname, who_am_i());
 			exit_cleanup(RERR_PROTOCOL);
-		    }
 		}
 	}
 	if (atimes_ndx && !S_ISDIR(mode) && !(xflags & XMIT_SAME_ATIME)) {
@@ -1267,7 +1250,7 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
 	int extra_len = file_extra_cnt * EXTRA_LEN;
 	const char *basename;
 	alloc_pool_t *pool;
-	STRUCT_STAT st = {0};
+	STRUCT_STAT st;
 	char *bp;
 
 	if (strlcpy(thisname, fname, sizeof thisname) >= sizeof thisname) {
@@ -1429,12 +1412,8 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
 	}
 
 #ifdef ST_MTIME_NSEC
-	{
-		uint32 nsec = wire_mtime_nsec_from_stat(&st);
-
-		if (nsec && protocol_version >= 31)
-			extra_len += EXTRA_LEN;
-	}
+	if (st.ST_MTIME_NSEC && protocol_version >= 31)
+		extra_len += EXTRA_LEN;
 #endif
 #if SIZEOF_CAPITAL_OFF_T >= 8
 	if (st.st_size > 0xFFFFFFFFu && S_ISREG(st.st_mode))
@@ -1489,13 +1468,9 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
 	file->flags = flags;
 	file->modtime = st.st_mtime;
 #ifdef ST_MTIME_NSEC
-	{
-		uint32 nsec = wire_mtime_nsec_from_stat(&st);
-
-		if (nsec && protocol_version >= 31) {
-			file->flags |= FLAG_MOD_NSEC;
-			F_MOD_NSEC(file) = nsec;
-		}
+	if (st.ST_MTIME_NSEC && protocol_version >= 31) {
+		file->flags |= FLAG_MOD_NSEC;
+		F_MOD_NSEC(file) = st.ST_MTIME_NSEC;
 	}
 #endif
 	file->len32 = (uint32)st.st_size;
@@ -2095,9 +2070,10 @@ static void send1extra(int f, struct file_struct *file, struct file_list *flist)
 		}
 
 		if (name_type != NORMAL_NAME) {
-			STRUCT_STAT st = {0};
-
-			if (name_type != MISSING_NAME && link_stat(fbuf, &st, 1) != 0) {
+			STRUCT_STAT st;
+			if (name_type == MISSING_NAME)
+				memset(&st, 0, sizeof st);
+			else if (link_stat(fbuf, &st, 1) != 0) {
 				interpret_stat_error(fbuf, True);
 				continue;
 			}
@@ -2229,7 +2205,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 	static const char *lastdir;
 	static int lastdir_len = -1;
 	int len, dirlen;
-	STRUCT_STAT st = {0};
+	STRUCT_STAT st;
 	char *p, *dir;
 	struct file_list *flist;
 	struct timeval start_tv, end_tv;
@@ -2402,7 +2378,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 		}
 
 		dirlen = dir ? strlen(dir) : 0;
-		if (dirlen != lastdir_len || (dirlen && memcmp(lastdir, dir, dirlen) != 0)) {
+		if (dirlen != lastdir_len || memcmp(lastdir, dir, dirlen) != 0) {
 			if (!change_pathname(NULL, dir, -dirlen))
 				goto bad_path;
 			lastdir = pathname;
@@ -2707,7 +2683,7 @@ struct file_list *recv_file_list(int f, int dir_ndx)
 		} else if (S_ISLNK(file->mode))
 			stats.num_symlinks++;
 		else if (IS_DEVICE(file->mode))
-			stats.num_devices++;
+			stats.num_symlinks++;
 		else
 			stats.num_specials++;
 
@@ -3202,8 +3178,8 @@ static void output_flist(struct file_list *flist)
 		} else
 			*uidbuf = '\0';
 		if (gid_ndx) {
-			static const char parens[] = "(\0)\0\0\0";
-			const char *pp = parens + (file->flags & FLAG_SKIP_GROUP ? 0 : 3);
+			static char parens[] = "(\0)\0\0\0";
+			char *pp = parens + (file->flags & FLAG_SKIP_GROUP ? 0 : 3);
 			snprintf(gidbuf, sizeof gidbuf, " gid=%s%u%s",
 				 pp, F_GROUP(file), pp + 2);
 		} else

generator.c

@@ -4,7 +4,7 @@
  * Copyright (C) 1996-2000 Andrew Tridgell
  * Copyright (C) 1996 Paul Mackerras
  * Copyright (C) 2002 Martin Pool <mbp@samba.org>
- * Copyright (C) 2003-2023 Wayne Davison
+ * Copyright (C) 2003-2022 Wayne Davison
  *
  * 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
@@ -66,7 +66,6 @@ extern int inplace;
 extern int append_mode;
 extern int make_backups;
 extern int csum_length;
-extern int xfer_sum_len;
 extern int ignore_times;
 extern int size_only;
 extern OFF_T max_size;
@@ -698,11 +697,6 @@ static void sum_sizes_sqroot(struct sum_struct *sum, int64 len)
 {
 	int32 blength;
 	int s2length;
-	/* The strong sum can be no longer than the negotiated checksum digest:
-	 * a short checksum (e.g. xxh64 = 8 bytes, when xxh128/xxh3 are absent)
-	 * makes xfer_sum_len < SUM_LENGTH, and the sender rejects an s2length
-	 * larger than xfer_sum_len (io.c). */
-	int max_s2length = MIN(SUM_LENGTH, xfer_sum_len);
 	int64 l;
 
 	if (len < 0) {
@@ -737,7 +731,7 @@ static void sum_sizes_sqroot(struct sum_struct *sum, int64 len)
 	if (protocol_version < 27) {
 		s2length = csum_length;
 	} else if (csum_length == SUM_LENGTH) {
-		s2length = max_s2length;
+		s2length = SUM_LENGTH;
 	} else {
 		int32 c;
 		int b = BLOCKSUM_BIAS;
@@ -746,7 +740,7 @@ static void sum_sizes_sqroot(struct sum_struct *sum, int64 len)
 		/* add a bit, subtract rollsum, round up. */
 		s2length = (b + 1 - 32 + 7) / 8; /* --optimize in compiler-- */
 		s2length = MAX(s2length, csum_length);
-		s2length = MIN(s2length, max_s2length);
+		s2length = MIN(s2length, SUM_LENGTH);
 	}
 
 	sum->flength	= len;
@@ -795,7 +789,7 @@ static int generate_and_send_sums(int fd, OFF_T len, int f_out, int f_copy)
 	for (i = 0; i < sum.count; i++) {
 		int32 n1 = (int32)MIN(len, (OFF_T)sum.blength);
 		char *map = map_ptr(mapbuf, offset, n1);
-		char sum2[MAX_DIGEST_LEN];
+		char sum2[SUM_LENGTH];
 		uint32 sum1;
 
 		len -= n1;
@@ -1718,8 +1712,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 		goto cleanup;
 	}
 
-	if (update_only > 0 && statret == 0 && stype == ftype
-	 && file->modtime - sx.st.st_mtime < modify_window) {
+	if (update_only > 0 && statret == 0 && file->modtime - sx.st.st_mtime < modify_window) {
 		if (INFO_GTE(SKIP, 1))
 			rprintf(FINFO, "%s is newer\n", fname);
 #ifdef SUPPORT_HARD_LINKS
@@ -2391,7 +2384,7 @@ void generate_files(int f_out, const char *local_name)
 		write_ndx(f_out, NDX_DONE);
 
 	if (protocol_version >= 31 && EARLY_DELETE_DONE_MSG()) {
-		if (delete_mode || force_delete || read_batch)
+		if ((INFO_GTE(STATS, 2) && (delete_mode || force_delete)) || read_batch)
 			write_del_stats(f_out);
 		if (EARLY_DELAY_DONE_MSG()) /* Can't send this before delay */
 			write_ndx(f_out, NDX_DONE);
@@ -2436,7 +2429,7 @@ void generate_files(int f_out, const char *local_name)
 
 	if (protocol_version >= 31) {
 		if (!EARLY_DELETE_DONE_MSG()) {
-			if (delete_mode || force_delete || read_batch)
+			if (INFO_GTE(STATS, 2) || read_batch)
 				write_del_stats(f_out);
 			write_ndx(f_out, NDX_DONE);
 		}

hashtable.c

@@ -351,7 +351,7 @@ void *hashtable_find(struct hashtable *tbl, int64 key, void *data_when_new)
 */
 
 #define NON_ZERO_32(x) ((x) ? (x) : (uint32_t)1)
-#define NON_ZERO_64(x, y) ((x) || (y) ? (y) | (uint64_t)(x) << 32 | (y) : (int64)1)
+#define NON_ZERO_64(x, y) ((x) || (y) ? (y) | (int64)(x) << 32 | (y) : (int64)1)
 
 uint32_t hashlittle(const void *key, size_t length)
 {

io.c

@@ -117,7 +117,7 @@ static int active_filecnt = 0;
 static OFF_T active_bytecnt = 0;
 static int first_message = 1;
 
-static const char int_byte_extra[64] = {
+static char int_byte_extra[64] = {
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* (00 - 3F)/4 */
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* (40 - 7F)/4 */
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* (80 - BF)/4 */
@@ -1292,21 +1292,8 @@ int read_line(int fd, char *buf, size_t bufsiz, int flags)
 	return s - buf;
 }
 
-/* Reverse safe_arg()'s backslash escaping of a daemon option arg, the way a
- * remote shell un-escapes args for the ssh transport.  In place; \X -> X. */
-static void unbackslash_arg(char *s)
-{
-	char *f = s, *t = s;
-	while (*f) {
-		if (*f == '\\' && f[1])
-			f++;
-		*t++ = *f++;
-	}
-	*t = '\0';
-}
-
 void read_args(int f_in, char *mod_name, char *buf, size_t bufsiz, int rl_nulls,
-	       int unescape, char ***argv_p, int *argc_p, char **request_p)
+	       char ***argv_p, int *argc_p, char **request_p)
 {
 	int maxargs = MAX_ARGS;
 	int dot_pos = 0, argc = 0, request_len = 0;
@@ -1348,11 +1335,6 @@ void read_args(int f_in, char *mod_name, char *buf, size_t bufsiz, int rl_nulls,
 				glob_expand(buf, &argv, &argc, &maxargs);
 		} else {
 			p = strdup(buf);
-			/* An option arg the client escaped with safe_arg() (no
-			 * remote shell un-escapes it for a daemon).  File args
-			 * after the dot are handled by glob_expand() below. */
-			if (unescape)
-				unbackslash_arg(p);
 			argv[argc++] = p;
 			if (*p == '.' && p[1] == '\0')
 				dot_pos = argc;

latest-year.h

@@ -1 +1 @@
-#define LATEST_YEAR "2026"
+#define LATEST_YEAR "2022"

lib/md5.c

@@ -197,7 +197,7 @@ void md5_update(md_context *ctx, const uchar *input, uint32 length)
 		memcpy(ctx->buffer + left, input, length);
 }
 
-static const uchar md5_padding[CSUM_CHUNK] = { 0x80 };
+static uchar md5_padding[CSUM_CHUNK] = { 0x80 };
 
 void md5_result(md_context *ctx, uchar digest[MD5_DIGEST_LEN])
 {

lib/mdfour.c

@@ -89,8 +89,8 @@ static void copy64(uint32 *M, const uchar *in)
 	int i;
 
 	for (i = 0; i < MD4_DIGEST_LEN; i++) {
-		M[i] = ((uint32)in[i*4+3] << 24) | ((uint32)in[i*4+2] << 16)
-		     | ((uint32)in[i*4+1] << 8)  | ((uint32)in[i*4+0] << 0);
+		M[i] = (in[i*4+3] << 24) | (in[i*4+2] << 16)
+		     | (in[i*4+1] << 8)  | (in[i*4+0] << 0);
 	}
 }
 

lib/pool_alloc.c

@@ -42,7 +42,6 @@ struct align_test {
 /* Temporarily cast a void* var into a char* var when adding an offset (to
  * keep some compilers from complaining about the pointer arithmetic). */
 #define PTR_ADD(b,o)	( (void*) ((char*)(b) + (o)) )
-#define PTR_SUB(b,o)	( (void*) ((char*)(b) - (o)) )
 
 alloc_pool_t
 pool_create(size_t size, size_t quantum, void (*bomb)(const char*, const char*, int), int flags)
@@ -101,7 +100,7 @@ pool_destroy(alloc_pool_t p)
 	for (cur = pool->extents; cur; cur = next) {
 		next = cur->next;
 		if (pool->flags & POOL_PREPEND)
-			free(PTR_SUB(cur->start, sizeof (struct pool_extent)));
+			free(PTR_ADD(cur->start, -sizeof (struct pool_extent)));
 		else {
 			free(cur->start);
 			free(cur);
@@ -236,7 +235,7 @@ pool_free(alloc_pool_t p, size_t len, void *addr)
 		if (cur->free + cur->bound >= pool->size) {
 			prev->next = cur->next;
 			if (pool->flags & POOL_PREPEND)
-				free(PTR_SUB(cur->start, sizeof (struct pool_extent)));
+				free(PTR_ADD(cur->start, -sizeof (struct pool_extent)));
 			else {
 				free(cur->start);
 				free(cur);
@@ -293,7 +292,7 @@ pool_free_old(alloc_pool_t p, void *addr)
 	while ((cur = next) != NULL) {
 		next = cur->next;
 		if (pool->flags & POOL_PREPEND)
-			free(PTR_SUB(cur->start, sizeof (struct pool_extent)));
+			free(PTR_ADD(cur->start, -sizeof (struct pool_extent)));
 		else {
 			free(cur->start);
 			free(cur);

lib/sysxattrs.c

@@ -126,18 +126,9 @@ ssize_t sys_llistxattr(const char *path, char *list, size_t size)
 	unsigned char keylen;
 	ssize_t off, len = extattr_list_link(path, EXTATTR_NAMESPACE_USER, list, size);
 
-	if (len <= 0 || size == 0)
+	if (len <= 0 || (size_t)len > size)
 		return len;
 
-	if ((size_t)len >= size) {
-		/* FreeBSD extattr_list_xx() returns 'size' as 'len' in case there are                                                              
-                   more data available, truncating the output, we solve this by signalling                                                          
-                   ERANGE in case len == size so that the code in xattrs.c will retry with                                                          
-                   a bigger buffer */
-		errno = ERANGE;
-		return -1;
-	}
-
 	/* FreeBSD puts a single-byte length before each string, with no '\0'
 	 * terminator.  We need to change this into a series of null-terminted
 	 * strings.  Since the size is the same, we can simply transform the
@@ -145,7 +136,7 @@ ssize_t sys_llistxattr(const char *path, char *list, size_t size)
 	for (off = 0; off < len; off += keylen + 1) {
 		keylen = ((unsigned char*)list)[off];
 		if (off + keylen >= len) {
-			/* Should be impossible, but bugs happen! */
+			/* Should be impossible, but kernel bugs happen! */
 			errno = EINVAL;
 			return -1;
 		}

loadparm.c

@@ -65,7 +65,7 @@ typedef enum {
 
 struct enum_list {
 	int value;
-	const char *name;
+	char *name;
 };
 
 struct parm_struct {
@@ -73,7 +73,7 @@ struct parm_struct {
 	parm_type type;
 	parm_class class;
 	void *ptr;
-	const struct enum_list *enum_list;
+	struct enum_list *enum_list;
 	unsigned flags;
 };
 
@@ -95,7 +95,7 @@ static item_list section_list = EMPTY_ITEM_LIST;
 static int iSectionIndex = -1;
 static BOOL bInGlobalSection = True;
 
-static const struct enum_list enum_syslog_facility[] = {
+static struct enum_list enum_syslog_facility[] = {
 #ifdef LOG_AUTH
 	{ LOG_AUTH, "auth" },
 #endif

log.c

@@ -22,7 +22,6 @@
 #include "rsync.h"
 #include "itypes.h"
 #include "inums.h"
-#include "rounding.h"	/* EXTRA_ROUNDING, so log_delete() aligns its file_struct */
 
 extern int dry_run;
 extern int am_daemon;

main.c

@@ -66,7 +66,7 @@ extern int protect_args;
 extern int relative_paths;
 extern int sanitize_paths;
 extern int curr_dir_depth;
-extern unsigned int curr_dir_len;
+extern int curr_dir_len;
 extern int module_id;
 extern int rsync_port;
 extern int whole_file;
@@ -89,8 +89,6 @@ extern int backup_dir_len;
 extern int basis_dir_cnt;
 extern int default_af_hint;
 extern int stdout_format_has_i;
-extern int trust_sender_filter;
-extern int trust_sender_args;
 extern struct stats stats;
 extern char *stdout_format;
 extern char *logfile_format;
@@ -386,7 +384,7 @@ static void handle_stats(int f)
 
 static void output_itemized_counts(const char *prefix, int *counts)
 {
-	static char *const labels[] = { "reg", "dir", "link", "dev", "special" };
+	static char *labels[] = { "reg", "dir", "link", "dev", "special" };
 	char buf[1024], *pre = " (";
 	int j, len = 0;
 	int total = counts[0];
@@ -832,16 +830,7 @@ static char *get_local_name(struct file_list *flist, char *dest_path)
 		dest_path = "/";
 
 	*cp = '\0';
-	if (dry_run && mkpath_dest_arg && do_stat(dest_path, &st) < 0) {
-		/* --mkpath would have created this parent dir, but a dry run did
-		 * not, so don't chdir into it; flag the destination as not yet
-		 * present (as the dir-creation path above does) so the generator
-		 * doesn't try to compare against the missing tree (#880).  Only
-		 * the missing-parent case is touched, so an ordinary file-to-file
-		 * dry run still itemizes against an existing destination. */
-		dry_run++;
-		change_dir(dest_path, CD_SKIP_CHDIR);
-	} else if (!change_dir(dest_path, CD_NORMAL)) {
+	if (!change_dir(dest_path, CD_NORMAL)) {
 		rsyserr(FERROR, errno, "change_dir#3 %s failed",
 			full_fname(dest_path));
 		exit_cleanup(RERR_FILESELECT);
@@ -1401,6 +1390,15 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
 	return MAX(exit_code, exit_code2);
 }
 
+static void dup_argv(char *argv[])
+{
+	int i;
+
+	for (i = 0; argv[i]; i++)
+		argv[i] = strdup(argv[i]);
+}
+
+
 /* Start a client for either type of remote connection.  Work out
  * whether the arguments request a remote shell or rsyncd connection,
  * and call the appropriate connection function, then run_client.
@@ -1416,6 +1414,10 @@ static int start_client(int argc, char *argv[])
 	int ret;
 	pid_t pid;
 
+	/* Don't clobber argv[] so that ps(1) can still show the right
+	 * command line. */
+	dup_argv(argv);
+
 	if (!read_batch) { /* for read_batch, NO source is specified */
 		char *path = check_for_hostspec(argv[0], &shell_machine, &rsync_port);
 		if (path) { /* source is remote */
@@ -1491,10 +1493,8 @@ static int start_client(int argc, char *argv[])
 	}
 
 	/* A local transfer doesn't unbackslash anything, so leave the args alone. */
-	if (local_server) {
+	if (local_server)
 		old_style_args = 2;
-		trust_sender_args = trust_sender_filter = 1;
-	}
 
 	if (!rsync_port && remote_argc && !**remote_argv) /* Turn an empty arg into a dot dir. */
 		*remote_argv = ".";
@@ -1627,11 +1627,6 @@ static void sigusr2_handler(UNUSED(int val))
 	if (!am_server)
 		output_summary();
 	close_all();
-#ifdef GCOV_COVERAGE
-	/* The receiver child is killed here via SIGUSR2 and exits with _exit(),
-	 * bypassing the gcov atexit flush; without this it writes no .gcda. */
-	{ extern void __gcov_dump(void); __gcov_dump(); }
-#endif
 	if (got_xfer_error)
 		_exit(RERR_PARTIAL);
 	_exit(0);
@@ -1770,9 +1765,7 @@ int main(int argc,char *argv[])
 	our_gid = MY_GID();
 	am_root = our_uid == ROOT_UID;
 
-	// DISPLAY should not be emptied unconditionally
-	if (!getenv("SSH_ASKPASS"))
-		unset_env_var("DISPLAY");
+	unset_env_var("DISPLAY");
 
 #if defined USE_OPENSSL && defined SET_OPENSSL_CONF
 #define TO_STR2(x) #x
@@ -1854,7 +1847,7 @@ int main(int argc,char *argv[])
 	if (am_server && protect_args) {
 		char buf[MAXPATHLEN];
 		protect_args = 2;
-		read_args(STDIN_FILENO, NULL, buf, sizeof buf, 1, 0, &argv, &argc, NULL);
+		read_args(STDIN_FILENO, NULL, buf, sizeof buf, 1, &argv, &argc, NULL);
 		if (!parse_arguments(&argc, (const char ***) &argv)) {
 			option_error();
 			exit_cleanup(RERR_SYNTAX);

match.c

@@ -3,7 +3,7 @@
  *
  * Copyright (C) 1996 Andrew Tridgell
  * Copyright (C) 1996 Paul Mackerras
- * Copyright (C) 2003-2023 Wayne Davison
+ * Copyright (C) 2003-2022 Wayne Davison
  *
  * 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
@@ -142,7 +142,7 @@ static void hash_search(int f,struct sum_struct *s,
 {
 	OFF_T offset, aligned_offset, end;
 	int32 k, want_i, aligned_i, backup;
-	char sum2[MAX_DIGEST_LEN];
+	char sum2[SUM_LENGTH];
 	uint32 s1, s2, sum;
 	int more;
 	schar *map;

maybe-make-man

@@ -8,14 +8,13 @@ fi
 inname="$1"
 srcdir=`dirname "$0"`
 flagfile="$srcdir/.md2man-works"
-force_flagfile="$srcdir/.md2man-force"
 
 if [ ! -f "$flagfile" ]; then
     # We test our smallest manpage just to see if the python setup works.
     if "$srcdir/md-convert" --test "$srcdir/rsync-ssl.1.md" >/dev/null 2>&1; then
 	touch $flagfile
     else
-	outname=`basename "$inname" .md`
+	outname=`echo "$inname" | sed 's/\.md$//'`
 	if [ -f "$outname" ]; then
 	    exit 0
 	elif [ -f "$srcdir/$outname" ]; then
@@ -33,10 +32,4 @@ if [ ! -f "$flagfile" ]; then
     fi
 fi
 
-if [ -f "$force_flagfile" ]; then
-    opt='--force-link-text'
-else
-    opt=''
-fi
-
-"$srcdir/md-convert" $opt "$srcdir/$inname"
+"$srcdir/md-convert" "$srcdir/$inname"

md-convert

@@ -120,7 +120,6 @@ TZ_RE = re.compile(r'^#define\s+MAINTAINER_TZ_OFFSET\s+(-?\d+(\.\d+)?)', re.M)
 VAR_REF_RE = re.compile(r'\$\{(\w+)\}')
 VERSION_RE = re.compile(r' (\d[.\d]+)[, ]')
 BIN_CHARS_RE = re.compile(r'[\1-\7]+')
-LONG_OPT_DASH_RE = re.compile(r'(--\w[-\w]+)')
 SPACE_DOUBLE_DASH_RE = re.compile(r'\s--(\s)')
 NON_SPACE_SINGLE_DASH_RE = re.compile(r'(^|\W)-')
 WHITESPACE_RE = re.compile(r'\s')
@@ -248,9 +247,6 @@ def find_man_substitutions():
 
     env_subs['date'] = time.strftime('%d %b %Y', time.gmtime(mtime + tz_offset)).lstrip('0')
 
-    if 'SOURCE_DATE_EPOCH' in os.environ:
-        env_subs['date'] = time.strftime('%d %b %Y', time.gmtime(int(os.environ.get('SOURCE_DATE_EPOCH', time.time()))))
-
 
 def html_via_commonmark(txt):
     return commonmark.HtmlRenderer().render(commonmark.Parser().parse(txt))
@@ -280,10 +276,7 @@ class TransformHtml(HTMLParser):
                 bad_hashtags = set(),
                 latest_targets = [ ],
                 opt_prefix = 'opt',
-                a_href = None,
-                a_href_external = False,
                 a_txt_start = None,
-                after_a_tag = False,
                 target_suf = '',
                 )
 
@@ -322,13 +315,6 @@ class TransformHtml(HTMLParser):
         for bad in st.referenced_hashtags - st.created_hashtags:
             warn('Unknown hashtag link in', self.fn + ':', '#' + bad)
 
-    def handle_UE(self):
-        st = self.state
-        if st.txt.startswith(('.', ',', '!', '?', ';', ':')):
-            st.man_out[-1] = ".UE " + st.txt[0] + "\n"
-            st.txt = st.txt[1:]
-        st.after_a_tag = False
-
     def handle_starttag(self, tag, attrs_list):
         st = self.state
         if args.debug:
@@ -401,20 +387,13 @@ class TransformHtml(HTMLParser):
             for var, val in attrs_list:
                 if var == 'href':
                     if val.startswith(('https://', 'http://', 'mailto:', 'ftp:')):
-                        if st.after_a_tag:
-                            self.handle_UE()
-                        st.man_out.append(manify(st.txt.strip()) + "\n")
-                        st.man_out.append(".UR " + val + "\n")
-                        st.txt = ''
-                        st.a_href = val
-                        st.a_href_external = True
+                        pass # nothing to check
                     elif '#' in val:
                         pg, tgt = val.split('#', 1)
                         if pg and pg not in VALID_PAGES or '#' in tgt:
                             st.bad_hashtags.add(val)
                         elif tgt in ('', 'opt', 'dopt'):
                             st.a_href = val
-                            st.a_href_external = False
                         elif pg == '':
                             st.referenced_hashtags.add(tgt)
                             if tgt in st.latest_targets:
@@ -430,8 +409,6 @@ class TransformHtml(HTMLParser):
         st = self.state
         if args.debug:
             self.output_debug('END', (tag,))
-        if st.after_a_tag:
-            self.handle_UE()
         if tag in CONSUMES_TXT or st.dt_from == tag:
             txt = st.txt.strip()
             st.txt = ''
@@ -496,15 +473,7 @@ class TransformHtml(HTMLParser):
         elif tag == 'hr':
             return
         elif tag == 'a':
-            if st.a_href_external:
-                st.txt = st.txt.strip()
-                if args.force_link_text or st.a_href != st.txt:
-                    st.man_out.append(manify(st.txt) + "\n")
-                st.man_out.append(".UE\n") # This might get replaced with a punctuation version in handle_UE()
-                st.after_a_tag = True
-                st.a_href_external = False
-                st.txt = ''
-            elif st.a_href:
+            if st.a_href:
                 atxt = st.txt[st.a_txt_start:]
                 find = 'href="' + st.a_href + '"'
                 for j in range(len(st.html_out)-1, 0, -1):
@@ -544,7 +513,6 @@ class TransformHtml(HTMLParser):
         if st.in_pre:
             html = htmlify(txt)
         else:
-            txt = LONG_OPT_DASH_RE.sub(lambda x: x.group(1).replace('-', NBR_DASH[0]), txt)
             txt = SPACE_DOUBLE_DASH_RE.sub(NBR_SPACE[0] + r'--\1', txt).replace('--', NBR_DASH[0]*2)
             txt = NON_SPACE_SINGLE_DASH_RE.sub(r'\1' + NBR_DASH[0], txt)
             html = htmlify(txt)
@@ -644,7 +612,6 @@ if __name__ == '__main__':
     parser = argparse.ArgumentParser(description="Convert markdown into html and (optionally) nroff. Each input filename must have a .md suffix, which is changed to .html for the output filename. If the input filename ends with .num.md (e.g. foo.1.md) then a nroff file is also output with the input filename's .md suffix removed (e.g. foo.1).", add_help=False)
     parser.add_argument('--test', action='store_true', help="Just test the parsing without outputting any files.")
     parser.add_argument('--dest', metavar='DIR', help="Create files in DIR instead of the current directory.")
-    parser.add_argument('--force-link-text', action='store_true', help="Don't remove the link text if it matches the link href. Useful when nroff doesn't understand .UR and .UE.")
     parser.add_argument('--debug', '-D', action='count', default=0, help='Output copious info on the html parsing. Repeat for even more.')
     parser.add_argument("--help", "-h", action="help", help="Output this help message and exit.")
     parser.add_argument("mdfiles", metavar='FILE.md', nargs='+', help="One or more .md files to convert.")

old_versions/README.md

@@ -1,87 +0,0 @@
-# Old rsync version archive
-
-Static rsync binaries built from historical release tags. Two uses:
-
-1. **Cross-version behaviour checks** — confirming whether a behaviour a user
-   reported on an old release is version-specific or option-driven.
-2. **The version-mixing test suite** — `runtests.py --rsync-bin2=...` runs the
-   current code against one of these as the daemon / remote-shell peer; CI
-   (`.github/workflows/ubuntu-version-mix.yml`) does this for every binary
-   here against the per-version manifests in `testsuite/expect/`.
-
-Binaries are **statically linked** so they run regardless of the host's
-shared libraries, and named `rsync_<version>`:
-
-| Binary         | Version | Protocol | Notes                                   |
-|----------------|---------|----------|-----------------------------------------|
-| `rsync_2.6.0`  | 2.6.0   | 27       | 2004; needs autoconf regen (see below)  |
-| `rsync_3.0.0`  | 3.0.0   | 30       | 2008                                    |
-| `rsync_3.1.0`  | 3.1.0   | 31       | 2013                                    |
-| `rsync_3.1.3`  | 3.1.3   | 31       | Ubuntu 18.04 / Debian buster era (2018) |
-| `rsync_3.2.0`  | 3.2.0   | 31       | 2020 (zstd/lz4/xxhash negotiation added)|
-| `rsync_3.2.7`  | 3.2.7   | 31       | 2022                                    |
-| `rsync_3.3.0`  | 3.3.0   | 31       | 2024                                    |
-| `rsync_3.4.0`  | 3.4.0   | 32       | 2025                                    |
-| `rsync_3.4.1`  | 3.4.1   | 32       | 2025                                    |
-
-These are every `x.y.0` release from 2.6.0 (2004) onward plus a few point
-releases. 2.6.0 is the practical floor: older tags need progressively more
-porting to build on a current toolchain.
-
-All built `--disable-openssl` and with `_FORTIFY_SOURCE` disabled (see below);
-xxhash/zstd/lz4 are compiled in where the version supports them.
-
-## Adding a version
-
-```bash
-./build_static.sh 3.2.7            # uses git tag v3.2.7
-./build_static.sh 3.0.9 v3.0.9     # explicit tag if naming differs
-```
-
-The script checks out the tag into a throwaway `git worktree`, applies the
-minimal patches needed to compile old sources on a modern toolchain, links
-statically, verifies the result is static and reports the requested version,
-then installs `rsync_<version>` here and removes the worktree.
-
-Override the source repo with `RSYNC_REPO=/path/to/rsync ./build_static.sh ...`
-(defaults to `../rsync.4`).
-
-## Why the patches?
-
-Modern GCC (>= 14, C23 default) and glibc reject things old rsync relied on.
-`build_static.sh` handles these, each guarded so it's a no-op when not needed:
-
-1. **K&R `lseek64()` redeclaration** in `syscall.c` clashes with glibc's real
-   prototype — removed.
-2. **`gettimeofday()`** — glibc only has the 2-arg form; configure misdetects
-   the 1-arg form, so `HAVE_GETTIMEOFDAY_TZ` is forced on in `config.h`.
-3. **C23 `()` == `(void)`** breaks K&R prototypes called with arguments
-   (`qsort` comparator, `pool->bomb`, etc.) — built with `-std=gnu11`.
-4. Assorted modern `-Werror` promotions (incompatible pointer types, implicit
-   declarations) downgraded to warnings; bundled zlib/popt used to keep the
-   static link self-contained.
-
-5. **OpenSSL (3.2+)** is disabled with `--disable-openssl`: linking
-   `libcrypto.a` statically drags in jitterentropy (`jent_*`) and zlib's
-   `uncompress` (OpenSSL's COMP module), which don't resolve here. OpenSSL only
-   provided optional MD4/MD5, which rsync implements natively, so checksum
-   behaviour is unaffected.
-
-6. **`_FORTIFY_SOURCE` disabled** (`-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0`):
-   modern Ubuntu defaults it to `=3`, whose stricter object-size checks turn
-   latent (historically benign) over-reads in OLD rsync into hard
-   `*** buffer overflow detected ***` aborts when the binary runs as a
-   server/daemon — which made e.g. 3.1.3 and 3.2.7 unusable as peers. Disabling
-   it makes the archival binaries behave as the released versions did.
-
-7. **Pre-3.0 tags (e.g. 2.6.0)** ship `configure.in`, not a generated
-   `configure`. The script runs `autoheader`/`autoconf` to generate it, after
-   neutralizing the `AC_CHECK_FUNCS(fn,,AC_LIBOBJ(lib/...))` fallbacks for
-   `inet_ntop`/`inet_pton`/`getaddrinfo`/`getnameinfo` — modern autoconf emits
-   broken shell for those never-taken branches (the funcs exist in glibc). It
-   also generates `proto.h` (no make rule in that era) and stubs the vendored
-   `lib/addrinfo.h` the tag dropped (modern glibc supplies `struct addrinfo`).
-   All guarded so they no-op on 3.x.
-
-Newer versions may need fewer or different tweaks; if a build fails, the
-script prints the first compiler errors from its log.

old_versions/build_static.sh

@@ -1,128 +0,0 @@
-#!/bin/bash
-# Build a static rsync binary from a historical git tag, for cross-version
-# behaviour testing. Produces ./rsync_<version> in this directory.
-#
-# Usage:   ./build_static.sh <version> [git-tag]
-# Example: ./build_static.sh 3.1.3          # uses tag v3.1.3
-#          ./build_static.sh 3.2.7 v3.2.7
-#
-# Old rsync releases don't compile cleanly on a modern toolchain (GCC >= 14
-# defaults to C23, where an empty () prototype means (void); glibc dropped the
-# 1-arg gettimeofday; lseek64 K&R redeclarations clash). This script applies
-# the minimal, best-effort workarounds and links statically so the result is
-# self-contained and reproducible regardless of the host's shared libraries.
-#
-# Each workaround is guarded so it's a no-op on versions that don't need it.
-set -euo pipefail
-
-VERSION="${1:?usage: build_static.sh <version> [git-tag]}"
-TAG="${2:-v$VERSION}"
-
-ARCHIVE_DIR="$(cd "$(dirname "$0")" && pwd)"
-REPO="${RSYNC_REPO:-/home/tridge/project/rsync/rsync.4}"   # any rsync worktree
-WORKTREE="$(mktemp -d /tmp/rsync-build-XXXXXX)"
-OUT="$ARCHIVE_DIR/rsync_$VERSION"
-
-# C standard restores K&R () semantics; permissive flags downgrade the pile of
-# modern -Werror promotions (incompatible pointers, implicit decls) to warnings.
-# _FORTIFY_SOURCE is forced OFF: modern Ubuntu defaults it to =3, whose stricter
-# object-size checks turn latent (historically benign) over-reads in OLD rsync
-# into hard "*** buffer overflow detected ***" aborts when the binary acts as a
-# server/daemon. Disabling it makes these archival binaries behave the way the
-# released versions did, which is the whole point of the archive.
-CFLAGS_OLD="-I. -I./zlib -O2 -g -std=gnu11 -fcommon -DHAVE_CONFIG_H -Wno-error \
--U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0 \
--Wno-incompatible-pointer-types -Wno-implicit-function-declaration -Wno-int-conversion"
-
-cleanup() {
-    cd "$REPO"
-    git worktree remove --force "$WORKTREE" 2>/dev/null || true
-    git worktree prune 2>/dev/null || true
-}
-trap cleanup EXIT
-
-echo ">>> checking out $TAG into $WORKTREE"
-# prefer an exact tag to avoid ambiguity with similarly-named branches
-REF="$TAG"
-if git -C "$REPO" rev-parse -q --verify "refs/tags/$TAG" >/dev/null; then
-    REF="refs/tags/$TAG"
-fi
-git -C "$REPO" worktree add --detach "$WORKTREE" "$REF"
-cd "$WORKTREE"
-
-# --- workaround 1: K&R lseek64 redeclaration clashes with glibc's prototype ---
-if grep -q 'off64_t lseek64();' syscall.c 2>/dev/null; then
-    echo ">>> patching syscall.c lseek64 redeclaration"
-    perl -0pi -e 's/#ifdef HAVE_LSEEK64\n#if !SIZEOF_OFF64_T\n\tOFF_T lseek64\(\);\n#else\n\toff64_t lseek64\(\);\n#endif\n\treturn lseek64/#ifdef HAVE_LSEEK64\n\treturn lseek64/' syscall.c
-fi
-
-# --- workaround 0: pre-3.0 tags ship configure.in, not a generated configure.
-# Generate it. Modern autoconf emits broken shell for their
-# AC_CHECK_FUNCS(fn,,AC_LIBOBJ(lib/...)) fallbacks -- but those branches are
-# dead on a modern host (glibc has inet_ntop/inet_pton/getaddrinfo/getnameinfo),
-# so neutralize the AC_LIBOBJ replacements before regenerating.
-OLD_TREE=0
-if [ ! -f ./configure ] && { [ -f configure.in ] || [ -f configure.ac ]; }; then
-    OLD_TREE=1
-    acsrc=configure.ac; [ -f configure.in ] && acsrc=configure.in
-    echo ">>> generating configure for an old tag (autoheader/autoconf)"
-    sed -i 's#AC_LIBOBJ(lib/[a-zA-Z_]*)#:#g' "$acsrc"
-    autoheader 2>/dev/null || true
-    autoconf 2>/dev/null || { echo "autoconf failed"; exit 1; }
-fi
-
-CONF_ARGS=(--disable-md2man --with-included-zlib=yes --with-included-popt=yes)
-# OpenSSL (3.2+) only adds optional MD4/MD5 that rsync already implements, but
-# linking libcrypto.a statically drags in jitterentropy + zlib's uncompress,
-# which aren't resolvable here. Drop it when the flag exists.
-if ./configure --help 2>/dev/null | grep -q -- '--disable-openssl'; then
-    echo ">>> disabling openssl for self-contained static link"
-    CONF_ARGS+=(--disable-openssl)
-fi
-
-echo ">>> configure (bundled zlib + popt, static-friendly)"
-./configure "${CONF_ARGS[@]}" \
-    >"$WORKTREE/conf.log" 2>&1 || { tail -20 "$WORKTREE/conf.log"; exit 1; }
-
-# --- workaround 2: modern glibc only has the 2-arg gettimeofday ---------------
-if grep -q '/\* #undef HAVE_GETTIMEOFDAY_TZ \*/' config.h; then
-    echo ">>> forcing HAVE_GETTIMEOFDAY_TZ (configure misdetects it)"
-    sed -i 's|/\* #undef HAVE_GETTIMEOFDAY_TZ \*/|#define HAVE_GETTIMEOFDAY_TZ 1|' config.h
-fi
-
-# --- workaround 4 (old trees only): generate proto.h if the tree has no make
-# rule for it, and stub a vendored lib/addrinfo.h that the git tag dropped
-# (modern glibc supplies struct addrinfo / sockaddr_storage, so empty is right).
-if [ "$OLD_TREE" = 1 ]; then
-    if [ ! -f proto.h ] && [ -f mkproto.awk ]; then
-        echo ">>> generating proto.h"
-        cat ./*.c ./lib/compat.c 2>/dev/null | awk -f ./mkproto.awk > proto.h
-    fi
-    if grep -q 'include "lib/addrinfo.h"' rsync.h 2>/dev/null && [ ! -f lib/addrinfo.h ]; then
-        echo ">>> stubbing lib/addrinfo.h"
-        echo '/* emptied: modern glibc provides struct addrinfo */' > lib/addrinfo.h
-    fi
-fi
-
-echo ">>> building (static)"
-make -j"$(nproc)" CFLAGS="$CFLAGS_OLD" LDFLAGS="-static" \
-    >"$WORKTREE/make.log" 2>&1 || { grep -E 'error:|\*\*\*' "$WORKTREE/make.log" | head; exit 1; }
-
-# verify it's actually static before we keep it
-if ldd ./rsync 2>&1 | grep -qv 'not a dynamic executable'; then
-    echo "ERROR: binary is not statically linked:" >&2
-    ldd ./rsync >&2
-    exit 1
-fi
-
-GOT="$(./rsync --version | head -1 | awk '{print $3}')"
-if [ "$GOT" != "$VERSION" ]; then
-    echo "ERROR: built version '$GOT' != requested '$VERSION'" >&2
-    exit 1
-fi
-
-cp ./rsync "$OUT"
-strip "$OUT"
-echo ">>> installed $OUT"
-"$OUT" --version | head -1
-file "$OUT"

options.c

@@ -3,7 +3,7 @@
  *
  * Copyright (C) 1998-2001 Andrew Tridgell <tridge@samba.org>
  * Copyright (C) 2000, 2001, 2002 Martin Pool <mbp@samba.org>
- * Copyright (C) 2002-2023 Wayne Davison
+ * Copyright (C) 2002-2022 Wayne Davison
  *
  * 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
@@ -86,7 +86,6 @@ int sparse_files = 0;
 int preallocate_files = 0;
 int do_compression = 0;
 int do_compression_level = CLVL_NOT_SPECIFIED;
-int do_compression_threads = 0; /*n = 0 use rsync thread, n >= 1 spawn n threads for compression */
 int am_root = 0; /* 0 = normal, 1 = root, 2 = --super, -1 = --fake-super */
 int am_server = 0;
 int am_sender = 0;
@@ -210,7 +209,6 @@ int remote_option_cnt = 0;
 const char **remote_options = NULL;
 const char *checksum_choice = NULL;
 const char *compress_choice = NULL;
-static const char *empty_argv[1];
 
 int quiet = 0;
 int output_motd = 1;
@@ -235,7 +233,7 @@ char *iconv_opt =
 
 struct chmod_mode_struct *chmod_modes = NULL;
 
-static const char *const debug_verbosity[] = {
+static const char *debug_verbosity[] = {
 	/*0*/ NULL,
 	/*1*/ NULL,
 	/*2*/ "BIND,CMD,CONNECT,DEL,DELTASUM,DUP,FILTER,FLIST,ICONV",
@@ -246,7 +244,7 @@ static const char *const debug_verbosity[] = {
 
 #define MAX_VERBOSITY ((int)(sizeof debug_verbosity / sizeof debug_verbosity[0]) - 1)
 
-static const char *const info_verbosity[1+MAX_VERBOSITY] = {
+static const char *info_verbosity[1+MAX_VERBOSITY] = {
 	/*0*/ "NONREG",
 	/*1*/ "COPY,DEL,FLIST,MISC,NAME,STATS,SYMSAFE",
 	/*2*/ "BACKUP,MISC2,MOUNT,NAME2,REMOVE,SKIP",
@@ -484,7 +482,7 @@ static void parse_output_words(struct output_struct *words, short *levels, const
 static void output_item_help(struct output_struct *words)
 {
 	short *levels = words == info_words ? info_levels : debug_levels;
-	const char *const*verbosity = words == info_words ? info_verbosity : debug_verbosity;
+	const char **verbosity = words == info_words ? info_verbosity : debug_verbosity;
 	char buf[128], *opt, *fmt = "%-10s %s\n";
 	int j;
 
@@ -766,8 +764,6 @@ static struct poptOption long_options[] = {
   {"skip-compress",    0,  POPT_ARG_STRING, &skip_compress, 0, 0, 0 },
   {"compress-level",   0,  POPT_ARG_INT,    &do_compression_level, 0, 0, 0 },
   {"zl",               0,  POPT_ARG_INT,    &do_compression_level, 0, 0, 0 },
-  {"compress-threads", 0,  POPT_ARG_INT,    &do_compression_threads, 0, 0, 0 },
-  {"zt",               0,  POPT_ARG_INT,    &do_compression_threads, 0, 0, 0 },
   {0,                 'P', POPT_ARG_NONE,   0, 'P', 0, 0 },
   {"progress",         0,  POPT_ARG_VAL,    &do_progress, 1, 0, 0 },
   {"no-progress",      0,  POPT_ARG_VAL,    &do_progress, 0, 0, 0 },
@@ -856,7 +852,7 @@ static struct poptOption long_options[] = {
   {0,0,0,0, 0, 0, 0}
 };
 
-static const struct poptOption long_daemon_options[] = {
+static struct poptOption long_daemon_options[] = {
   /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
   {"address",          0,  POPT_ARG_STRING, &bind_address, 0, 0, 0 },
   {"bwlimit",          0,  POPT_ARG_INT,    &daemon_bwlimit, 0, 0, 0 },
@@ -1360,7 +1356,7 @@ char *alt_dest_opt(int type)
  **/
 int parse_arguments(int *argc_p, const char ***argv_p)
 {
-	poptContext pc;
+	static poptContext pc;
 	const char *arg, **argv = *argv_p;
 	int argc = *argc_p;
 	int opt, want_dest_type;
@@ -1380,6 +1376,10 @@ int parse_arguments(int *argc_p, const char ***argv_p)
 
 	/* TODO: Call poptReadDefaultConfig; handle errors. */
 
+	/* The context leaks in case of an error, but if there's a
+	 * problem we always exit anyhow. */
+	if (pc)
+		poptFreeContext(pc);
 	pc = poptGetContext(RSYNC_NAME, argc, argv, long_options, 0);
 	if (pc == NULL) {
 		strlcpy(err_buf, "poptGetContext returned NULL\n", sizeof err_buf);
@@ -1426,7 +1426,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
 				strlcpy(err_buf,
 					"Attempt to hack rsync thwarted!\n",
 					sizeof err_buf);
-				goto cleanup;
+				return 0;
 			}
 #ifdef ICONV_OPTION
 			iconv_opt = NULL;
@@ -1472,7 +1472,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
 			if (tmpdir && strlen(tmpdir) >= MAXPATHLEN - 10) {
 				snprintf(err_buf, sizeof err_buf,
 					 "the --temp-dir path is WAY too long.\n");
-				goto cleanup;
+				return 0;
 			}
 
 			if (!daemon_opt) {
@@ -1482,16 +1482,8 @@ int parse_arguments(int *argc_p, const char ***argv_p)
 				exit_cleanup(RERR_SYNTAX);
 			}
 
-			argv = poptGetArgs(pc);
-			argc = count_args(argv);
-			if (!argc) {
-				*argv_p = empty_argv;
-				*argc_p = 0;
-			} else if (poptDupArgv(argc, argv, argc_p, argv_p) != 0)
-				out_of_memory("parse_arguments");
-			argv = *argv_p;
-			poptFreeContext(pc);
-
+			*argv_p = argv = poptGetArgs(pc);
+			*argc_p = argc = count_args(argv);
 			am_starting_up = 0;
 			daemon_opt = 0;
 			am_daemon = 1;
@@ -1546,7 +1538,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
 		case 'a':
 			if (refused_archive_part) {
 				create_refuse_error(refused_archive_part);
-				goto cleanup;
+				return 0;
 			}
 			if (!recurse) /* preserve recurse == 2 */
 				recurse = 1;
@@ -1616,7 +1608,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
 		case 'P':
 			if (refused_partial || refused_progress) {
 				create_refuse_error(refused_partial ? refused_partial : refused_progress);
-				goto cleanup;
+				return 0;
 			}
 			do_progress = 1;
 			keep_partial = 1;
@@ -1651,7 +1643,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
 			if (*arg != '-') {
 				snprintf(err_buf, sizeof err_buf,
 					"Remote option must start with a dash: %s\n", arg);
-				goto cleanup;
+				return 0;
 			}
 			if (remote_option_cnt+2 >= remote_option_alloc) {
 				remote_option_alloc += 16;
@@ -1693,27 +1685,27 @@ int parse_arguments(int *argc_p, const char ***argv_p)
 			ssize_t size;
 			arg = poptGetOptArg(pc);
 			if ((size = parse_size_arg(arg, 'b', "block-size", 0, max_blength, False)) < 0)
-				goto cleanup;
+				return 0;
 			block_size = (int32)size;
 			break;
 		}
 
 		case OPT_MAX_SIZE:
 			if ((max_size = parse_size_arg(max_size_arg, 'b', "max-size", 0, -1, False)) < 0)
-				goto cleanup;
+				return 0;
 			max_size_arg = strdup(do_big_num(max_size, 0, NULL));
 			break;
 
 		case OPT_MIN_SIZE:
 			if ((min_size = parse_size_arg(min_size_arg, 'b', "min-size", 0, -1, False)) < 0)
-				goto cleanup;
+				return 0;
 			min_size_arg = strdup(do_big_num(min_size, 0, NULL));
 			break;
 
 		case OPT_BWLIMIT: {
 			ssize_t size = parse_size_arg(bwlimit_arg, 'K', "bwlimit", 512, -1, True);
 			if (size < 0)
-				goto cleanup;
+				return 0;
 			bwlimit_arg = strdup(do_big_num(size, 0, NULL));
 			bwlimit = (size + 512) / 1024;
 			break;
@@ -1742,7 +1734,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
 				snprintf(err_buf, sizeof err_buf,
 					"ERROR: the %s option conflicts with the %s option\n",
 					alt_dest_opt(want_dest_type), alt_dest_opt(0));
-				goto cleanup;
+				return 0;
 			}
 			alt_dest_type = want_dest_type;
 
@@ -1750,7 +1742,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
 				snprintf(err_buf, sizeof err_buf,
 					"ERROR: at most %d %s args may be specified\n",
 					MAX_BASIS_DIRS, alt_dest_opt(0));
-				goto cleanup;
+				return 0;
 			}
 			/* We defer sanitizing this arg until we know what
 			 * our destination directory is going to be. */
@@ -1763,7 +1755,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
 				snprintf(err_buf, sizeof err_buf,
 					"Invalid argument passed to --chmod (%s)\n",
 					arg);
-				goto cleanup;
+				return 0;
 			}
 			break;
 
@@ -1782,11 +1774,11 @@ int parse_arguments(int *argc_p, const char ***argv_p)
 				if (usermap_via_chown) {
 					snprintf(err_buf, sizeof err_buf,
 						"--usermap conflicts with prior --chown.\n");
-					goto cleanup;
+					return 0;
 				}
 				snprintf(err_buf, sizeof err_buf,
 					"You can only specify --usermap once.\n");
-				goto cleanup;
+				return 0;
 			}
 			usermap = (char *)poptGetOptArg(pc);
 			usermap_via_chown = False;
@@ -1798,11 +1790,11 @@ int parse_arguments(int *argc_p, const char ***argv_p)
 				if (groupmap_via_chown) {
 					snprintf(err_buf, sizeof err_buf,
 						"--groupmap conflicts with prior --chown.\n");
-					goto cleanup;
+					return 0;
 				}
 				snprintf(err_buf, sizeof err_buf,
 					"You can only specify --groupmap once.\n");
-				goto cleanup;
+				return 0;
 			}
 			groupmap = (char *)poptGetOptArg(pc);
 			groupmap_via_chown = False;
@@ -1821,11 +1813,11 @@ int parse_arguments(int *argc_p, const char ***argv_p)
 					if (!usermap_via_chown) {
 						snprintf(err_buf, sizeof err_buf,
 							"--chown conflicts with prior --usermap.\n");
-						goto cleanup;
+						return 0;
 					}
 					snprintf(err_buf, sizeof err_buf,
 						"You can only specify a user-affecting --chown once.\n");
-					goto cleanup;
+					return 0;
 				}
 				if (asprintf(&usermap, "*:%.*s", len, chown) < 0)
 					out_of_memory("parse_arguments");
@@ -1837,11 +1829,11 @@ int parse_arguments(int *argc_p, const char ***argv_p)
 					if (!groupmap_via_chown) {
 						snprintf(err_buf, sizeof err_buf,
 							"--chown conflicts with prior --groupmap.\n");
-						goto cleanup;
+						return 0;
 					}
 					snprintf(err_buf, sizeof err_buf,
 						"You can only specify a group-affecting --chown once.\n");
-					goto cleanup;
+					return 0;
 				}
 				if (asprintf(&groupmap, "*:%s", arg) < 0)
 					out_of_memory("parse_arguments");
@@ -1869,7 +1861,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
 			snprintf(err_buf,sizeof(err_buf),
 				 "ACLs are not supported on this %s\n",
 				 am_server ? "server" : "client");
-			goto cleanup;
+			return 0;
 #endif
 
 		case 'X':
@@ -1880,7 +1872,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
 			snprintf(err_buf,sizeof(err_buf),
 				 "extended attributes are not supported on this %s\n",
 				 am_server ? "server" : "client");
-			goto cleanup;
+			return 0;
 #endif
 
 		case OPT_STOP_AFTER: {
@@ -1889,7 +1881,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
 			stop_at_utime = time(NULL);
 			if ((val = atol(arg) * 60) <= 0 || LONG_MAX - val < stop_at_utime || (long)(time_t)val != val) {
 				snprintf(err_buf, sizeof err_buf, "invalid --stop-after value: %s\n", arg);
-				goto cleanup;
+				return 0;
 			}
 			stop_at_utime += val;
 			break;
@@ -1900,11 +1892,11 @@ int parse_arguments(int *argc_p, const char ***argv_p)
 			arg = poptGetOptArg(pc);
 			if ((stop_at_utime = parse_time(arg)) == (time_t)-1) {
 				snprintf(err_buf, sizeof err_buf, "invalid --stop-at format: %s\n", arg);
-				goto cleanup;
+				return 0;
 			}
 			if (stop_at_utime <= time(NULL)) {
 				snprintf(err_buf, sizeof err_buf, "--stop-at time is not in the future: %s\n", arg);
-				goto cleanup;
+				return 0;
 			}
 			break;
 #endif
@@ -1922,7 +1914,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
 			else {
 				snprintf(err_buf, sizeof err_buf,
 					"--stderr mode \"%s\" is not one of errors, all, or client\n", arg);
-				goto cleanup;
+				return 0;
 			}
 			saw_stderr_opt = 1;
 			break;
@@ -1933,13 +1925,13 @@ int parse_arguments(int *argc_p, const char ***argv_p)
 			 * turned this option off. */
 			if (opt >= OPT_REFUSED_BASE) {
 				create_refuse_error(opt);
-				goto cleanup;
+				return 0;
 			}
 			snprintf(err_buf, sizeof err_buf, "%s%s: %s\n",
 				 am_server ? "on remote machine: " : "",
 				 poptBadOption(pc, POPT_BADOPTION_NOALIAS),
 				 poptStrerror(opt));
-			goto cleanup;
+			return 0;
 		}
 	}
 
@@ -1959,11 +1951,9 @@ int parse_arguments(int *argc_p, const char ***argv_p)
 	if (max_alloc_arg) {
 		ssize_t size = parse_size_arg(max_alloc_arg, 'B', "max-alloc", 1024*1024, -1, True);
 		if (size < 0)
-			goto cleanup;
+			return 0;
 		max_alloc = size;
 	}
-	if (!max_alloc)
-		max_alloc = SIZE_MAX;
 
 	if (old_style_args < 0) {
 		if (!am_server && protect_args <= 0 && (arg = getenv("RSYNC_OLD_ARGS")) != NULL && *arg) {
@@ -1975,7 +1965,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
 		if (protect_args > 0) {
 			snprintf(err_buf, sizeof err_buf,
 				 "--secluded-args conflicts with --old-args.\n");
-			goto cleanup;
+			return 0;
 		}
 		protect_args = 0;
 	}
@@ -2020,10 +2010,8 @@ int parse_arguments(int *argc_p, const char ***argv_p)
 			do_compression = CPRES_AUTO;
 		if (do_compression && refused_compress) {
 			create_refuse_error(refused_compress);
-			goto cleanup;
+			return 0;
 		}
-		if (do_compression_threads < 0)
-			do_compression_threads = 0;
 	}
 
 #ifdef HAVE_SETVBUF
@@ -2047,7 +2035,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
 		default:
 			snprintf(err_buf, sizeof err_buf,
 				"Invalid --outbuf setting -- specify N, L, or B.\n");
-			goto cleanup;
+			return 0;
 		}
 		setvbuf(stdout, (char *)NULL, mode, 0);
 	}
@@ -2075,7 +2063,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
 	}
 	if (refused_no_iconv && !iconv_opt) {
 		create_refuse_error(refused_no_iconv);
-		goto cleanup;
+		return 0;
 	}
 #endif
 
@@ -2086,30 +2074,18 @@ int parse_arguments(int *argc_p, const char ***argv_p)
 	if (orig_protect_args == 2 && am_server)
 		protect_args = orig_protect_args;
 
-	if (protect_args == 1 && am_server) {
-		poptFreeContext(pc);
+	if (protect_args == 1 && am_server)
 		return 1;
-	}
 
-	/* Because popt 1.19 has started to free the returned args data, we now
-	 * make a copy of the array and then do an immediate cleanup. */
-	argv = poptGetArgs(pc);
-	argc = count_args(argv);
-	if (!argc) {
-		*argv_p = empty_argv;
-		*argc_p = 0;
-	} else if (poptDupArgv(argc, argv, argc_p, argv_p) != 0)
-		out_of_memory("parse_arguments");
-	argv = *argv_p;
-	poptFreeContext(pc);
-	pc = NULL;
+	*argv_p = argv = poptGetArgs(pc);
+	*argc_p = argc = count_args(argv);
 
 #ifndef SUPPORT_LINKS
 	if (preserve_links && !am_sender) {
 		snprintf(err_buf, sizeof err_buf,
 			 "symlinks are not supported on this %s\n",
 			 am_server ? "server" : "client");
-		goto cleanup;
+		return 0;
 	}
 #endif
 
@@ -2118,7 +2094,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
 		snprintf(err_buf, sizeof err_buf,
 			 "hard links are not supported on this %s\n",
 			 am_server ? "server" : "client");
-		goto cleanup;
+		return 0;
 	}
 #endif
 
@@ -2126,20 +2102,20 @@ int parse_arguments(int *argc_p, const char ***argv_p)
 	if (am_root < 0 && preserve_xattrs > 1) {
 		snprintf(err_buf, sizeof err_buf,
 			 "--fake-super conflicts with -XX\n");
-		goto cleanup;
+		return 0;
 	}
 #else
 	if (am_root < 0) {
 		snprintf(err_buf, sizeof err_buf,
 			 "--fake-super requires an rsync with extended attributes enabled\n");
-		goto cleanup;
+		return 0;
 	}
 #endif
 
 	if (write_batch && read_batch) {
 		snprintf(err_buf, sizeof err_buf,
 			"--write-batch and --read-batch can not be used together\n");
-		goto cleanup;
+		return 0;
 	}
 	if (write_batch > 0 || read_batch) {
 		if (am_server) {
@@ -2158,25 +2134,25 @@ int parse_arguments(int *argc_p, const char ***argv_p)
 	if (read_batch && files_from) {
 		snprintf(err_buf, sizeof err_buf,
 			"--read-batch cannot be used with --files-from\n");
-		goto cleanup;
+		return 0;
 	}
 	if (read_batch && remove_source_files) {
 		snprintf(err_buf, sizeof err_buf,
 			"--read-batch cannot be used with --remove-%s-files\n",
 			remove_source_files == 1 ? "source" : "sent");
-		goto cleanup;
+		return 0;
 	}
 	if (batch_name && strlen(batch_name) > MAX_BATCH_NAME_LEN) {
 		snprintf(err_buf, sizeof err_buf,
 			"the batch-file name must be %d characters or less.\n",
 			MAX_BATCH_NAME_LEN);
-		goto cleanup;
+		return 0;
 	}
 
 	if (tmpdir && strlen(tmpdir) >= MAXPATHLEN - 10) {
 		snprintf(err_buf, sizeof err_buf,
 			 "the --temp-dir path is WAY too long.\n");
-		goto cleanup;
+		return 0;
 	}
 
 	if (max_delete < 0 && max_delete != INT_MIN) {
@@ -2210,7 +2186,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
 	if (delete_before + !!delete_during + delete_after > 1) {
 		snprintf(err_buf, sizeof err_buf,
 			"You may not combine multiple --delete-WHEN options.\n");
-		goto cleanup;
+		return 0;
 	}
 	if (delete_before || delete_during || delete_after)
 		delete_mode = 1;
@@ -2221,7 +2197,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
 				delete_during = 1;
 			else {
 				create_refuse_error(refused_delete_before);
-				goto cleanup;
+				return 0;
 			}
 		} else if (refused_delete_during)
 			delete_before = 1;
@@ -2230,14 +2206,14 @@ int parse_arguments(int *argc_p, const char ***argv_p)
 	if (!xfer_dirs && delete_mode) {
 		snprintf(err_buf, sizeof err_buf,
 			"--delete does not work without --recursive (-r) or --dirs (-d).\n");
-		goto cleanup;
+		return 0;
 	}
 
 	if (missing_args == 3) /* simplify if both options were specified */
 		missing_args = 2;
 	if (refused_delete && (delete_mode || missing_args == 2)) {
 		create_refuse_error(refused_delete);
-		goto cleanup;
+		return 0;
 	}
 
 	if (remove_source_files) {
@@ -2246,7 +2222,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
 		 * options. */
 		if (refused_delete && am_sender) {
 			create_refuse_error(refused_delete);
-			goto cleanup;
+			return 0;
 		}
 		need_messages_from_generator = 1;
 	}
@@ -2300,7 +2276,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
 		snprintf(err_buf, sizeof err_buf,
 			"--suffix cannot contain slashes: %s\n",
 			backup_suffix);
-		goto cleanup;
+		return 0;
 	}
 	if (backup_dir) {
 		size_t len;
@@ -2313,7 +2289,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
 		if (len > sizeof backup_dir_buf - 128) {
 			snprintf(err_buf, sizeof err_buf,
 				"the --backup-dir path is WAY too long.\n");
-			goto cleanup;
+			return 0;
 		}
 		backup_dir_len = (int)len;
 		if (!backup_dir_len) {
@@ -2332,7 +2308,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
 			"--suffix cannot be empty %s\n", backup_dir_len < 0
 			? "when --backup-dir is the same as the dest dir"
 			: "without a --backup-dir");
-		goto cleanup;
+		return 0;
 	} else if (make_backups && delete_mode && !delete_excluded && !am_server) {
 		snprintf(backup_dir_buf, sizeof backup_dir_buf,
 			"P *%s", backup_suffix);
@@ -2360,7 +2336,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
 	if (do_progress && !am_server) {
 		if (!log_before_transfer && INFO_EQ(NAME, 0))
 			parse_output_words(info_words, info_levels, "name", DEFAULT_PRIORITY);
-		parse_output_words(info_words, info_levels, "FLIST2,PROGRESS", DEFAULT_PRIORITY);
+		parse_output_words(info_words, info_levels, "flist2,progress", DEFAULT_PRIORITY);
 	}
 
 	if (dry_run)
@@ -2401,11 +2377,11 @@ int parse_arguments(int *argc_p, const char ***argv_p)
 		if (whole_file > 0) {
 			snprintf(err_buf, sizeof err_buf,
 				 "--append cannot be used with --whole-file\n");
-			goto cleanup;
+			return 0;
 		}
 		if (refused_inplace) {
 			create_refuse_error(refused_inplace);
-			goto cleanup;
+			return 0;
 		}
 		inplace = 1;
 	}
@@ -2413,7 +2389,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
 	if (write_devices) {
 		if (refused_inplace) {
 			create_refuse_error(refused_inplace);
-			goto cleanup;
+			return 0;
 		}
 		inplace = 1;
 	}
@@ -2428,13 +2404,13 @@ int parse_arguments(int *argc_p, const char ***argv_p)
 				 "--%s cannot be used with --%s\n",
 				 append_mode ? "append" : "inplace",
 				 delay_updates ? "delay-updates" : "partial-dir");
-			goto cleanup;
+			return 0;
 		}
 		/* --inplace implies --partial for refusal purposes, but we
 		 * clear the keep_partial flag for internal logic purposes. */
 		if (refused_partial) {
 			create_refuse_error(refused_partial);
-			goto cleanup;
+			return 0;
 		}
 		keep_partial = 0;
 #else
@@ -2442,7 +2418,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
 			 "--%s is not supported on this %s\n",
 			 append_mode ? "append" : "inplace",
 			 am_server ? "server" : "client");
-		goto cleanup;
+		return 0;
 #endif
 	} else {
 		if (keep_partial && !partial_dir && !am_server) {
@@ -2456,7 +2432,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
 				partial_dir = NULL;
 			if (!partial_dir && refused_partial) {
 				create_refuse_error(refused_partial);
-				goto cleanup;
+				return 0;
 			}
 			keep_partial = 1;
 		}
@@ -2477,14 +2453,14 @@ int parse_arguments(int *argc_p, const char ***argv_p)
 			if (am_server) {
 				snprintf(err_buf, sizeof err_buf,
 					"The --files-from sent to the server cannot specify a host.\n");
-				goto cleanup;
+				return 0;
 			}
 			files_from = p;
 			filesfrom_host = h;
 			if (strcmp(files_from, "-") == 0) {
 				snprintf(err_buf, sizeof err_buf,
 					"Invalid --files-from remote filename\n");
-				goto cleanup;
+				return 0;
 			}
 		} else {
 			if (sanitize_paths)
@@ -2503,7 +2479,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
 				snprintf(err_buf, sizeof err_buf,
 					"failed to open files-from file %s: %s\n",
 					files_from, strerror(errno));
-				goto cleanup;
+				return 0;
 			}
 		}
 	}
@@ -2520,9 +2496,6 @@ int parse_arguments(int *argc_p, const char ***argv_p)
   options_rejected:
 	snprintf(err_buf, sizeof err_buf,
 		"Your options have been rejected by the server.\n");
-  cleanup:
-	if (pc)
-		poptFreeContext(pc);
 	return 0;
 }
 
@@ -2538,7 +2511,7 @@ static char SPLIT_ARG_WHEN_OLD[1];
  **/
 char *safe_arg(const char *opt, const char *arg)
 {
-#define SHELL_CHARS "!#$&;|<>(){}\"'` \t\\"
+#define SHELL_CHARS "!#$&;|<>(){}\"' \t\\"
 #define WILD_CHARS  "*?[]" /* We don't allow remote brace expansion */
 	BOOL is_filename_arg = !opt;
 	char *escapes = is_filename_arg ? SHELL_CHARS : WILD_CHARS SHELL_CHARS;
@@ -2550,7 +2523,7 @@ char *safe_arg(const char *opt, const char *arg)
 	char *ret;
 	if (!protect_args && old_style_args < 2 && (!old_style_args || (!is_filename_arg && opt != SPLIT_ARG_WHEN_OLD))) {
 		const char *f;
-		if (*arg == '~' && is_filename_arg && !am_sender && !trust_sender_args
+		if (!trust_sender_args && *arg == '~'
 		 && ((relative_paths && !strstr(arg, "/./"))
 		  || !strchr(arg, '/'))) {
 			extras++;
@@ -2581,7 +2554,7 @@ char *safe_arg(const char *opt, const char *arg)
 		if (escape_leading_tilde)
 			*t++ = '\\';
 		while (*f) {
-			if (*f == '\\') {
+                        if (*f == '\\') {
 				if (!is_filename_arg || !strchr(WILD_CHARS, f[1]))
 					*t++ = '\\';
 			} else if (strchr(escapes, *f))

packaging/auto-Makefile

@@ -1,4 +1,4 @@
-TARGETS := all install install-ssl-daemon install-all install-strip uninstall uninstall-ssl-daemon uninstall-all conf gen reconfigure restatus \
+TARGETS := all install install-ssl-daemon install-all install-strip conf gen gensend reconfigure restatus \
 	proto man clean cleantests distclean test check check29 check30 installcheck splint \
 	doxygen doxygen-upload finddead rrsync
 

packaging/branch-from-patch

@@ -0,0 +1,174 @@
+#!/usr/bin/env -S python3 -B
+
+# This script turns one or more diff files in the patches dir (which is
+# expected to be a checkout of the rsync-patches git repo) into a branch
+# in the main rsync git checkout. This allows the applied patch to be
+# merged with the latest rsync changes and tested.  To update the diff
+# with the resulting changes, see the patch-update script.
+
+import os, sys, re, argparse, glob
+
+sys.path = ['packaging'] + sys.path
+
+from pkglib import *
+
+def main():
+    global created, info, local_branch
+
+    cur_branch, args.base_branch = check_git_state(args.base_branch, not args.skip_check, args.patches_dir)
+
+    local_branch = get_patch_branches(args.base_branch)
+
+    if args.delete_local_branches:
+        for name in sorted(local_branch):
+            branch = f"patch/{args.base_branch}/{name}"
+            cmd_chk(['git', 'branch', '-D', branch])
+        local_branch = set()
+
+    if args.add_missing:
+        for fn in sorted(glob.glob(f"{args.patches_dir}/*.diff")):
+            name = re.sub(r'\.diff$', '', re.sub(r'.+/', '', fn))
+            if name not in local_branch and fn not in args.patch_files:
+                args.patch_files.append(fn)
+
+    if not args.patch_files:
+        return
+
+    for fn in args.patch_files:
+        if not fn.endswith('.diff'):
+            die(f"Filename is not a .diff file: {fn}")
+        if not os.path.isfile(fn):
+            die(f"File not found: {fn}")
+
+    scanned = set()
+    info = { }
+
+    patch_list = [ ]
+    for fn in args.patch_files:
+        m = re.match(r'^(?P<dir>.*?)(?P<name>[^/]+)\.diff$', fn)
+        patch = argparse.Namespace(**m.groupdict())
+        if patch.name in scanned:
+            continue
+        patch.fn = fn
+
+        lines = [ ]
+        commit_hash = None
+        with open(patch.fn, 'r', encoding='utf-8') as fh:
+            for line in fh:
+                m = re.match(r'^based-on: (\S+)', line)
+                if m:
+                    commit_hash = m[1]
+                    break
+                if (re.match(r'^index .*\.\..* \d', line)
+                 or re.match(r'^diff --git ', line)
+                 or re.match(r'^--- (old|a)/', line)):
+                    break
+                lines.append(re.sub(r'\s*\Z', "\n", line, 1))
+        info_txt = ''.join(lines).strip() + "\n"
+        lines = None
+
+        parent = args.base_branch
+        patches = re.findall(r'patch -p1 <%s/(\S+)\.diff' % args.patches_dir, info_txt)
+        if patches:
+            last = patches.pop()
+            if last != patch.name:
+                warn(f"No identity patch line in {patch.fn}")
+                patches.append(last)
+            if patches:
+                parent = patches.pop()
+                if parent not in scanned:
+                    diff_fn = patch.dir + parent + '.diff'
+                    if not os.path.isfile(diff_fn):
+                        die(f"Failed to find parent of {patch.fn}: {parent}")
+                    # Add parent to args.patch_files so that we will look for the
+                    # parent's parent.  Any duplicates will be ignored.
+                    args.patch_files.append(diff_fn)
+        else:
+            warn(f"No patch lines found in {patch.fn}")
+
+        info[patch.name] = [ parent, info_txt, commit_hash ]
+
+        patch_list.append(patch)
+
+    created = set()
+    for patch in patch_list:
+        create_branch(patch)
+
+    cmd_chk(['git', 'checkout', args.base_branch])
+
+
+def create_branch(patch):
+    if patch.name in created:
+        return
+    created.add(patch.name)
+
+    parent, info_txt, commit_hash = info[patch.name]
+    parent = argparse.Namespace(dir=patch.dir, name=parent, fn=patch.dir + parent + '.diff')
+
+    if parent.name == args.base_branch:
+        parent_branch = commit_hash if commit_hash else args.base_branch
+    else:
+        create_branch(parent)
+        parent_branch = '/'.join(['patch', args.base_branch, parent.name])
+
+    branch = '/'.join(['patch', args.base_branch, patch.name])
+    print("\n" + '=' * 64)
+    print(f"Processing {branch} ({parent_branch})")
+
+    if patch.name in local_branch:
+        cmd_chk(['git', 'branch', '-D', branch])
+
+    cmd_chk(['git', 'checkout', '-b', branch, parent_branch])
+
+    info_fn = 'PATCH.' + patch.name
+    with open(info_fn, 'w', encoding='utf-8') as fh:
+        fh.write(info_txt)
+    cmd_chk(['git', 'add', info_fn])
+
+    with open(patch.fn, 'r', encoding='utf-8') as fh:
+        patch_txt = fh.read()
+
+    cmd_run('patch -p1'.split(), input=patch_txt)
+
+    for fn in glob.glob('*.orig') + glob.glob('*/*.orig'):
+        os.unlink(fn)
+
+    pos = 0
+    new_file_re = re.compile(r'\nnew file mode (?P<mode>\d+)\s+--- /dev/null\s+\+\+\+ b/(?P<fn>.+)')
+    while True:
+        m = new_file_re.search(patch_txt, pos)
+        if not m:
+            break
+        os.chmod(m['fn'], int(m['mode'], 8))
+        cmd_chk(['git', 'add', m['fn']])
+        pos = m.end()
+
+    while True:
+        cmd_chk('git status'.split())
+        ans = input('Press Enter to commit, Ctrl-C to abort, or type a wild-name to add a new file: ')
+        if ans == '':
+            break
+        cmd_chk("git add " + ans, shell=True)
+
+    while True:
+        s = cmd_run(['git', 'commit', '-a', '-m', f"Creating branch from {patch.name}.diff."])
+        if not s.returncode:
+            break
+        s = cmd_run(['/bin/zsh'])
+        if s.returncode:
+            die('Aborting due to shell error code')
+
+
+if __name__ == '__main__':
+    parser = argparse.ArgumentParser(description="Create a git patch branch from an rsync patch file.", add_help=False)
+    parser.add_argument('--branch', '-b', dest='base_branch', metavar='BASE_BRANCH', default='master', help="The branch the patch is based on. Default: master.")
+    parser.add_argument('--add-missing', '-a', action='store_true', help="Add a branch for every patches/*.diff that doesn't have a branch.")
+    parser.add_argument('--skip-check', action='store_true', help="Skip the check that ensures starting with a clean branch.")
+    parser.add_argument('--delete', dest='delete_local_branches', action='store_true', help="Delete all the local patch/BASE/* branches, not just the ones that are being recreated.")
+    parser.add_argument('--patches-dir', '-p', metavar='DIR', default='patches', help="Override the location of the rsync-patches dir. Default: patches.")
+    parser.add_argument('patch_files', metavar='patches/DIFF_FILE', nargs='*', help="Specify what patch diff files to process. Default: all of them.")
+    parser.add_argument("--help", "-h", action="help", help="Output this help message and exit.")
+    args = parser.parse_args()
+    main()
+
+# vim: sw=4 et ft=python

packaging/ftp.filt

@@ -1,2 +0,0 @@
-- /generated-files/
-- /binaries/

packaging/lsb/rsync.spec

@@ -1,6 +1,6 @@
 Summary: A fast, versatile, remote (and local) file-copying tool
 Name: rsync
-Version: 3.4.3
+Version: 3.2.7
 %define fullversion %{version}
 Release: 1
 %define srcdir src
@@ -79,5 +79,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir /etc/rsync-ssl/certs
 
 %changelog
-* Wed May 20 2026 Rsync Project <rsync.project@gmail.com>
-Released 3.4.3.
+* Thu Oct 20 2022 Wayne Davison <wayne@opencoder.net>
+Released 3.2.7.
+
+* Fri Mar 21 2008 Wayne Davison <wayne@opencoder.net>
+Added installation of /etc/xinetd.d/rsync file and some commented-out
+lines that demonstrate how to use the rsync-patches tar file.

packaging/patch-update

@@ -0,0 +1,244 @@
+#!/usr/bin/env -S python3 -B
+
+# This script is used to turn one or more of the "patch/BASE/*" branches
+# into one or more diffs in the "patches" directory.  Pass the option
+# --gen if you want generated files in the diffs.  Pass the name of
+# one or more diffs if you want to just update a subset of all the
+# diffs.
+
+import os, sys, re, argparse, time, shutil
+
+sys.path = ['packaging'] + sys.path
+
+from pkglib import *
+
+MAKE_GEN_CMDS = [
+        './prepare-source'.split(),
+        'cd build && if test -f config.status ; then ./config.status ; else ../configure ; fi',
+        'make -C build gen'.split(),
+        ]
+TMP_DIR = "patches.gen"
+
+os.environ['GIT_MERGE_AUTOEDIT'] = 'no'
+
+def main():
+    global master_commit, parent_patch, description, completed, last_touch
+
+    if not os.path.isdir(args.patches_dir):
+        die(f'No "{args.patches_dir}" directory was found.')
+    if not os.path.isdir('.git'):
+        die('No ".git" directory present in the current dir.')
+
+    starting_branch, args.base_branch = check_git_state(args.base_branch, not args.skip_check, args.patches_dir)
+
+    master_commit = latest_git_hash(args.base_branch)
+
+    if cmd_txt_chk(['packaging/prep-auto-dir']).out == '':
+        die('You must setup an auto-build-save dir to use this script.')
+
+    if args.gen:
+        if os.path.lexists(TMP_DIR):
+            die(f'"{TMP_DIR}" must not exist in the current directory.')
+        gen_files = get_gen_files()
+        os.mkdir(TMP_DIR, 0o700)
+        for cmd in MAKE_GEN_CMDS:
+            cmd_chk(cmd)
+        cmd_chk(['rsync', '-a', *gen_files, f'{TMP_DIR}/master/'])
+
+    last_touch = int(time.time())
+
+    # Start by finding all patches so that we can load all possible parents.
+    patches = sorted(list(get_patch_branches(args.base_branch)))
+
+    parent_patch = { }
+    description = { }
+
+    for patch in patches:
+        branch = f"patch/{args.base_branch}/{patch}"
+        desc = ''
+        proc = cmd_pipe(['git', 'diff', '-U1000', f"{args.base_branch}...{branch}", '--', f"PATCH.{patch}"])
+        in_diff = False
+        for line in proc.stdout:
+            if in_diff:
+                if not re.match(r'^[ +]', line):
+                    continue
+                line = line[1:]
+                m = re.search(r'patch -p1 <patches/(\S+)\.diff', line)
+                if m and m[1] != patch:
+                    parpat = parent_patch[patch] = m[1]
+                    if not parpat in patches:
+                        die(f"Parent of {patch} is not a local branch: {parpat}")
+                desc += line
+            elif re.match(r'^@@ ', line):
+                in_diff = True
+        description[patch] = desc
+        proc.communicate()
+
+    if args.patch_files: # Limit the list of patches to actually process
+        valid_patches = patches
+        patches = [ ]
+        for fn in args.patch_files:
+            name = re.sub(r'\.diff$', '', re.sub(r'.+/', '', fn))
+            if name not in valid_patches:
+                die(f"Local branch not available for patch: {name}")
+            patches.append(name)
+
+    completed = set()
+
+    for patch in patches:
+        if patch in completed:
+            continue
+        if not update_patch(patch):
+            break
+
+    if args.gen:
+        shutil.rmtree(TMP_DIR)
+
+    while last_touch >= int(time.time()):
+        time.sleep(1)
+    cmd_chk(['git', 'checkout', starting_branch])
+    cmd_chk(['packaging/prep-auto-dir'], discard='output')
+
+
+def update_patch(patch):
+    global last_touch
+
+    completed.add(patch) # Mark it as completed early to short-circuit any (bogus) dependency loops.
+
+    parent = parent_patch.get(patch, None)
+    if parent:
+        if parent not in completed:
+            if not update_patch(parent):
+                return 0
+        based_on = parent = f"patch/{args.base_branch}/{parent}"
+    else:
+        parent = args.base_branch
+        based_on = master_commit
+
+    print(f"======== {patch} ========")
+
+    while args.gen and last_touch >= int(time.time()):
+        time.sleep(1)
+
+    branch = f"patch/{args.base_branch}/{patch}"
+    s = cmd_run(['git', 'checkout', branch])
+    if s.returncode != 0:
+        return 0
+
+    s = cmd_run(['git', 'merge', based_on])
+    ok = s.returncode == 0
+    skip_shell = False
+    if not ok or args.cmd or args.make or args.shell:
+        cmd_chk(['packaging/prep-auto-dir'], discard='output')
+    if not ok:
+        print(f'"git merge {based_on}" incomplete -- please fix.')
+        if not run_a_shell(parent, patch):
+            return 0
+        if not args.make and not args.cmd:
+            skip_shell = True
+    if args.make:
+        if cmd_run(['packaging/smart-make']).returncode != 0:
+            if not run_a_shell(parent, patch):
+                return 0
+            if not args.cmd:
+                skip_shell = True
+    if args.cmd:
+        if cmd_run(args.cmd).returncode != 0:
+            if not run_a_shell(parent, patch):
+                return 0
+            skip_shell = True
+    if args.shell and not skip_shell:
+        if not run_a_shell(parent, patch):
+            return 0
+
+    with open(f"{args.patches_dir}/{patch}.diff", 'w', encoding='utf-8') as fh:
+        fh.write(description[patch])
+        fh.write(f"\nbased-on: {based_on}\n")
+
+        if args.gen:
+            gen_files = get_gen_files()
+            for cmd in MAKE_GEN_CMDS:
+                cmd_chk(cmd)
+            cmd_chk(['rsync', '-a', *gen_files, f"{TMP_DIR}/{patch}/"])
+        else:
+            gen_files = [ ]
+        last_touch = int(time.time())
+
+        proc = cmd_pipe(['git', 'diff', based_on])
+        skipping = False
+        for line in proc.stdout:
+            if skipping:
+                if not re.match(r'^diff --git a/', line):
+                    continue
+                skipping = False
+            elif re.match(r'^diff --git a/PATCH', line):
+                skipping = True
+                continue
+            if not re.match(r'^index ', line):
+                fh.write(line)
+        proc.communicate()
+
+        if args.gen:
+            e_tmp_dir = re.escape(TMP_DIR)
+            diff_re  = re.compile(r'^(diff -Nurp) %s/[^/]+/(.*?) %s/[^/]+/(.*)' % (e_tmp_dir, e_tmp_dir))
+            minus_re = re.compile(r'^\-\-\- %s/[^/]+/([^\t]+)\t.*' % e_tmp_dir)
+            plus_re  = re.compile(r'^\+\+\+ %s/[^/]+/([^\t]+)\t.*' % e_tmp_dir)
+
+            if parent == args.base_branch:
+                parent_dir = 'master'
+            else:
+                m = re.search(r'([^/]+)$', parent)
+                parent_dir = m[1]
+
+            proc = cmd_pipe(['diff', '-Nurp', f"{TMP_DIR}/{parent_dir}", f"{TMP_DIR}/{patch}"])
+            for line in proc.stdout:
+                line = diff_re.sub(r'\1 a/\2 b/\3', line)
+                line = minus_re.sub(r'--- a/\1', line)
+                line =  plus_re.sub(r'+++ b/\1', line)
+                fh.write(line)
+            proc.communicate()
+
+    return 1
+
+
+def run_a_shell(parent, patch):
+    m = re.search(r'([^/]+)$', parent)
+    parent_dir = m[1]
+    os.environ['PS1'] = f"[{parent_dir}] {patch}: "
+
+    while True:
+        s = cmd_run([os.environ.get('SHELL', '/bin/sh')])
+        if s.returncode != 0:
+            ans = input("Abort? [n/y] ")
+            if re.match(r'^y', ans, flags=re.I):
+                return False
+            continue
+        cur_branch, is_clean, status_txt = check_git_status(0)
+        if is_clean:
+            break
+        print(status_txt, end='')
+
+    cmd_run('rm -f build/*.o build/*/*.o')
+
+    return True
+
+
+if __name__ == '__main__':
+    parser = argparse.ArgumentParser(description="Turn a git branch back into a diff files in the patches dir.", add_help=False)
+    parser.add_argument('--branch', '-b', dest='base_branch', metavar='BASE_BRANCH', default='master', help="The branch the patch is based on. Default: master.")
+    parser.add_argument('--skip-check', action='store_true', help="Skip the check that ensures starting with a clean branch.")
+    parser.add_argument('--make', '-m', action='store_true', help="Run the smart-make script in every patch branch.")
+    parser.add_argument('--cmd', '-c', help="Run a command in every patch branch.")
+    parser.add_argument('--shell', '-s', action='store_true', help="Launch a shell for every patch/BASE/* branch updated, not just when a conflict occurs.")
+    parser.add_argument('--gen', metavar='DIR', nargs='?', const='', help='Include generated files. Optional DIR value overrides the default of using the "patches" dir.')
+    parser.add_argument('--patches-dir', '-p', metavar='DIR', default='patches', help="Override the location of the rsync-patches dir. Default: patches.")
+    parser.add_argument('patch_files', metavar='patches/DIFF_FILE', nargs='*', help="Specify what patch diff files to process. Default: all of them.")
+    parser.add_argument("--help", "-h", action="help", help="Output this help message and exit.")
+    args = parser.parse_args()
+    if args.gen == '':
+        args.gen = args.patches_dir
+    elif args.gen is not None:
+        args.patches_dir = args.gen
+    main()
+
+# vim: sw=4 et ft=python

packaging/pkglib.py

@@ -170,6 +170,17 @@ def get_patch_branches(base_branch):
     return branches
 
 
+def mandate_gensend_hook():
+    hook = '.git/hooks/pre-push'
+    if not os.path.exists(hook):
+        print('Creating hook file:', hook)
+        cmd_chk(['./rsync', '-a', 'packaging/pre-push', hook])
+    else:
+        ct = cmd_txt(['grep', 'make gensend', hook], discard='output')
+        if ct.rc:
+            die('Please add a "make gensend" into your', hook, 'script.')
+
+
 # Snag the GENFILES values out of the Makefile file and return them as a list.
 def get_gen_files(want_dir_plus_list=False):
     cont_re = re.compile(r'\\\n')

packaging/pre-push

@@ -0,0 +1,16 @@
+#!/bin/bash -e
+
+cat >/dev/null # Just discard stdin data
+
+if [[ -f /proc/$PPID/cmdline ]]; then
+    while read -d $'\0' arg ; do
+	if [[ "$arg" == '--tags' ]] ; then
+	    exit 0
+	fi
+    done </proc/$PPID/cmdline
+fi
+
+branch=`git rev-parse --abbrev-ref HEAD`
+if [[ "$branch" = master && "$*" == *github* ]]; then
+    make gensend
+fi

packaging/release-rsync

@@ -0,0 +1,399 @@
+#!/usr/bin/env -S python3 -B
+
+# This script expects the directory ~/samba-rsync-ftp to exist and to be a
+# copy of the /home/ftp/pub/rsync dir on samba.org.  When the script is done,
+# the git repository in the current directory will be updated, and the local
+# ~/samba-rsync-ftp dir will be ready to be rsynced to samba.org.
+
+import os, sys, re, argparse, glob, shutil, signal
+from datetime import datetime
+from getpass import getpass
+
+sys.path = ['packaging'] + sys.path
+
+from pkglib import *
+
+os.environ['LESS'] = 'mqeiXR'; # Make sure that -F is turned off and -R is turned on.
+dest = os.environ['HOME'] + '/samba-rsync-ftp'
+ORIGINAL_PATH = os.environ['PATH']
+
+def main():
+    if not os.path.isfile('packaging/release-rsync'):
+        die('You must run this script from the top of your rsync checkout.')
+
+    now = datetime.now()
+    cl_today = now.strftime('* %a %b %d %Y')
+    year = now.strftime('%Y')
+    ztoday = now.strftime('%d %b %Y')
+    today = ztoday.lstrip('0')
+
+    mandate_gensend_hook()
+
+    curdir = os.getcwd()
+
+    signal.signal(signal.SIGINT, signal_handler)
+
+    if cmd_txt_chk(['packaging/prep-auto-dir']).out == '':
+        die('You must setup an auto-build-save dir to use this script.');
+
+    auto_dir, gen_files = get_gen_files(True)
+    gen_pathnames = [ os.path.join(auto_dir, fn) for fn in gen_files ]
+
+    dash_line = '=' * 74
+
+    print(f"""\
+{dash_line}
+== This will release a new version of rsync onto an unsuspecting world. ==
+{dash_line}
+""")
+
+    with open('build/rsync.1') as fh:
+        for line in fh:
+            if line.startswith(r'.\" prefix='):
+                doc_prefix = line.split('=')[1].strip()
+                if doc_prefix != '/usr':
+                    warn(f"*** The documentation was built with prefix {doc_prefix} instead of /usr ***")
+                    die("*** Read the md2man script for a way to override this. ***")
+                break
+            if line.startswith('.P'):
+                die("Failed to find the prefix comment at the start of the rsync.1 manpage.")
+
+    if not os.path.isdir(dest):
+        die(dest, "dest does not exist")
+    if not os.path.isdir('.git'):
+        die("There is no .git dir in the current directory.")
+    if os.path.lexists('a'):
+        die('"a" must not exist in the current directory.')
+    if os.path.lexists('b'):
+        die('"b" must not exist in the current directory.')
+    if os.path.lexists('patches.gen'):
+        die('"patches.gen" must not exist in the current directory.')
+
+    check_git_state(args.master_branch, True, 'patches')
+
+    curversion = get_rsync_version()
+
+    # All version values are strings!
+    lastversion, last_protocol_version, pdate = get_NEWS_version_info()
+    protocol_version, subprotocol_version = get_protocol_versions()
+
+    version = curversion
+    m = re.search(r'pre(\d+)', version)
+    if m:
+        version = re.sub(r'pre\d+', 'pre' + str(int(m[1]) + 1), version)
+    else:
+        version = version.replace('dev', 'pre1')
+
+    ans = input(f"Please enter the version number of this release: [{version}] ")
+    if ans == '.':
+        version = re.sub(r'pre\d+', '', version)
+    elif ans != '':
+        version = ans
+    if not re.match(r'^[\d.]+(pre\d+)?$', version):
+        die(f'Invalid version: "{version}"')
+
+    v_ver = 'v' + version
+    rsync_ver = 'rsync-' + version
+
+    if os.path.lexists(rsync_ver):
+        die(f'"{rsync_ver}" must not exist in the current directory.')
+
+    out = cmd_txt_chk(['git', 'tag', '-l', v_ver]).out
+    if out != '':
+        print(f"Tag {v_ver} already exists.")
+        ans = input("\nDelete tag or quit? [Q/del] ")
+        if not re.match(r'^del', ans, flags=re.I):
+            die("Aborted")
+        cmd_chk(['git', 'tag', '-d', v_ver])
+        if os.path.isdir('patches/.git'):
+            cmd_chk(f"cd patches && git tag -d '{v_ver}'")
+
+    version = re.sub(r'[-.]*pre[-.]*', 'pre', version)
+    if 'pre' in version and not curversion.endswith('dev'):
+        lastversion = curversion
+
+    ans = input(f"Enter the previous version to produce a patch against: [{lastversion}] ")
+    if ans != '':
+        lastversion = ans
+    lastversion = re.sub(r'[-.]*pre[-.]*', 'pre', lastversion)
+
+    rsync_lastver = 'rsync-' + lastversion
+    if os.path.lexists(rsync_lastver):
+        die(f'"{rsync_lastver}" must not exist in the current directory.')
+
+    m = re.search(r'(pre\d+)', version)
+    pre = m[1] if m else ''
+
+    release = '0.1' if pre else '1'
+    ans = input(f"Please enter the RPM release number of this release: [{release}] ")
+    if ans != '':
+        release = ans
+    if pre:
+        release += '.' + pre
+
+    finalversion = re.sub(r'pre\d+', '', version)
+    proto_changed = protocol_version != last_protocol_version
+    if proto_changed:
+        if finalversion in pdate:
+            proto_change_date = pdate[finalversion]
+        else:
+            while True:
+                ans = input("On what date did the protocol change to {protocol_version} get checked in? (dd Mmm yyyy) ")
+                if re.match(r'^\d\d \w\w\w \d\d\d\d$', ans):
+                    break
+            proto_change_date = ans
+    else:
+        proto_change_date = ' ' * 11
+
+    if 'pre' in lastversion:
+        if not pre:
+            die("You should not diff a release version against a pre-release version.")
+        srcdir = srcdiffdir = lastsrcdir = 'src-previews'
+        skipping = ' ** SKIPPING **'
+    elif pre:
+        srcdir = srcdiffdir = 'src-previews'
+        lastsrcdir = 'src'
+        skipping = ' ** SKIPPING **'
+    else:
+        srcdir = lastsrcdir = 'src'
+        srcdiffdir = 'src-diffs'
+        skipping = ''
+
+    print(f"""
+{dash_line}
+version is "{version}"
+lastversion is "{lastversion}"
+dest is "{dest}"
+curdir is "{curdir}"
+srcdir is "{srcdir}"
+srcdiffdir is "{srcdiffdir}"
+lastsrcdir is "{lastsrcdir}"
+release is "{release}"
+
+About to:
+    - tweak SUBPROTOCOL_VERSION in rsync.h, if needed
+    - tweak the version in version.h and the spec files
+    - tweak NEWS.md to ensure header values are correct
+    - generate configure.sh, config.h.in, and proto.h
+    - page through the differences
+""")
+    ans = input("<Press Enter to continue> ")
+
+    specvars = {
+        'Version:': finalversion,
+        'Release:': release,
+        '%define fullversion': f'%{{version}}{pre}',
+        'Released': version + '.',
+        '%define srcdir': srcdir,
+        }
+
+    tweak_files = 'version.h rsync.h NEWS.md'.split()
+    tweak_files += glob.glob('packaging/*.spec')
+    tweak_files += glob.glob('packaging/*/*.spec')
+
+    for fn in tweak_files:
+        with open(fn, 'r', encoding='utf-8') as fh:
+            old_txt = txt = fh.read()
+        if fn == 'version.h':
+            x_re = re.compile(r'^(#define RSYNC_VERSION).*', re.M)
+            msg = f"Unable to update RSYNC_VERSION in {fn}"
+            txt = replace_or_die(x_re, r'\1 "%s"' % version, txt, msg)
+        elif '.spec' in fn:
+            for var, val in specvars.items():
+                x_re = re.compile(r'^%s .*' % re.escape(var), re.M)
+                txt = replace_or_die(x_re, var + ' ' + val, txt, f"Unable to update {var} in {fn}")
+            x_re = re.compile(r'^\* \w\w\w \w\w\w \d\d \d\d\d\d (.*)', re.M)
+            txt = replace_or_die(x_re, r'%s \1' % cl_today, txt, f"Unable to update ChangeLog header in {fn}")
+        elif fn == 'rsync.h':
+            x_re = re.compile('(#define\s+SUBPROTOCOL_VERSION)\s+(\d+)')
+            repl = lambda m: m[1] + ' ' + ('0' if not pre or not proto_changed else '1' if m[2] == '0' else m[2])
+            txt = replace_or_die(x_re, repl, txt, f"Unable to find SUBPROTOCOL_VERSION define in {fn}")
+        elif fn == 'NEWS.md':
+            efv = re.escape(finalversion)
+            x_re = re.compile(r'^# NEWS for rsync %s \(UNRELEASED\)\s+## Changes in this version:\n' % efv
+                    + r'(\n### PROTOCOL NUMBER:\s+- The protocol number was changed to \d+\.\n)?')
+            rel_day = 'UNRELEASED' if pre else today
+            repl = (f'# NEWS for rsync {finalversion} ({rel_day})\n\n'
+                + '## Changes in this version:\n')
+            if proto_changed:
+                repl += f'\n### PROTOCOL NUMBER:\n\n - The protocol number was changed to {protocol_version}.\n'
+            good_top = re.sub(r'\(.*?\)', '(UNRELEASED)', repl, 1)
+            msg = f"The top lines of {fn} are not in the right format.  It should be:\n" + good_top
+            txt = replace_or_die(x_re, repl, txt, msg)
+            x_re = re.compile(r'^(\| )(\S{2} \S{3} \d{4})(\s+\|\s+%s\s+\| ).{11}(\s+\| )\S{2}(\s+\|+)$' % efv, re.M)
+            repl = lambda m: m[1] + (m[2] if pre else ztoday) + m[3] + proto_change_date + m[4] + protocol_version + m[5]
+            txt = replace_or_die(x_re, repl, txt, f'Unable to find "| ?? ??? {year} | {finalversion} | ... |" line in {fn}')
+        else:
+            die(f"Unrecognized file in tweak_files: {fn}")
+
+        if txt != old_txt:
+            print(f"Updating {fn}")
+            with open(fn, 'w', encoding='utf-8') as fh:
+                fh.write(txt)
+
+    cmd_chk(['packaging/year-tweak'])
+
+    print(dash_line)
+    cmd_run("git diff".split())
+
+    srctar_name = f"{rsync_ver}.tar.gz"
+    pattar_name = f"rsync-patches-{version}.tar.gz"
+    diff_name = f"{rsync_lastver}-{version}.diffs.gz"
+    srctar_file = os.path.join(dest, srcdir, srctar_name)
+    pattar_file = os.path.join(dest, srcdir, pattar_name)
+    diff_file = os.path.join(dest, srcdiffdir, diff_name)
+    lasttar_file = os.path.join(dest, lastsrcdir, rsync_lastver + '.tar.gz')
+
+    print(f"""\
+{dash_line}
+
+About to:
+    - git commit all changes
+    - run a full build, ensuring that the manpages & configure.sh are up-to-date
+    - merge the {args.master_branch} branch into the patch/{args.master_branch}/* branches
+    - update the files in the "patches" dir and OPTIONALLY (if you type 'y') to
+      run patch-update with the --make option (which opens a shell on error)
+""")
+    ans = input("<Press Enter OR 'y' to continue> ")
+
+    s = cmd_run(['git', 'commit', '-a', '-m', f'Preparing for release of {version} [buildall]'])
+    if s.returncode:
+        die('Aborting')
+
+    cmd_chk('touch configure.ac && packaging/smart-make && make gen')
+
+    print('Creating any missing patch branches.')
+    s = cmd_run(f'packaging/branch-from-patch --branch={args.master_branch} --add-missing')
+    if s.returncode:
+        die('Aborting')
+
+    print('Updating files in "patches" dir ...')
+    s = cmd_run(f'packaging/patch-update --branch={args.master_branch}')
+    if s.returncode:
+        die('Aborting')
+
+    if re.match(r'^y', ans, re.I):
+        print(f'\nRunning smart-make on all "patch/{args.master_branch}/*" branches ...')
+        cmd_run(f"packaging/patch-update --branch={args.master_branch} --skip-check --make")
+
+    if os.path.isdir('patches/.git'):
+        s = cmd_run(f"cd patches && git commit -a -m 'The patches for {version}.'")
+        if s.returncode:
+            die('Aborting')
+
+    print(f"""\
+{dash_line}
+
+About to:
+    - create signed tag for this release: {v_ver}
+    - create release diffs, "{diff_name}"
+    - create release tar, "{srctar_name}"
+    - generate {rsync_ver}/patches/* files
+    - create patches tar, "{pattar_name}"
+    - update top-level README.md, NEWS.md, TODO, and ChangeLog
+    - update top-level rsync*.html manpages
+    - gpg-sign the release files
+    - update hard-linked top-level release files{skipping}
+""")
+    ans = input("<Press Enter to continue> ")
+
+    # TODO: is there a better way to ensure that our passphrase is in the agent?
+    cmd_run("touch TeMp; gpg --sign TeMp; rm TeMp*")
+
+    out = cmd_txt(f"git tag -s -m 'Version {version}.' {v_ver}", capture='combined').out
+    print(out, end='')
+    if 'bad passphrase' in out or 'failed' in out:
+        die('Aborting')
+
+    if os.path.isdir('patches/.git'):
+        out = cmd_txt(f"cd patches && git tag -s -m 'Version {version}.' {v_ver}", capture='combined').out
+        print(out, end='')
+        if 'bad passphrase' in out or 'failed' in out:
+            die('Aborting')
+
+    os.environ['PATH'] = ORIGINAL_PATH
+
+    # Extract the generated files from the old tar.
+    tweaked_gen_files = [ os.path.join(rsync_lastver, fn) for fn in gen_files ]
+    cmd_run(['tar', 'xzf', lasttar_file, *tweaked_gen_files])
+    os.rename(rsync_lastver, 'a')
+
+    print(f"Creating {diff_file} ...")
+    cmd_chk(['rsync', '-a', *gen_pathnames, 'b/'])
+
+    sed_script = r's:^((---|\+\+\+) [ab]/[^\t]+)\t.*:\1:' # CAUTION: must not contain any single quotes!
+    cmd_chk(f"(git diff v{lastversion} {v_ver} -- ':!.github'; diff -upN a b | sed -r '{sed_script}') | gzip -9 >{diff_file}")
+    shutil.rmtree('a')
+    os.rename('b', rsync_ver)
+
+    print(f"Creating {srctar_file} ...")
+    cmd_chk(f"git archive --format=tar --prefix={rsync_ver}/ {v_ver} | tar xf -")
+    cmd_chk(f"support/git-set-file-times --quiet --prefix={rsync_ver}/")
+    cmd_chk(['fakeroot', 'tar', 'czf', srctar_file, '--exclude=.github', rsync_ver])
+    shutil.rmtree(rsync_ver)
+
+    print(f'Updating files in "{rsync_ver}/patches" dir ...')
+    os.mkdir(rsync_ver, 0o755)
+    os.mkdir(f"{rsync_ver}/patches", 0o755)
+    cmd_chk(f"packaging/patch-update --skip-check --branch={args.master_branch} --gen={rsync_ver}/patches".split())
+
+    print(f"Creating {pattar_file} ...")
+    cmd_chk(['fakeroot', 'tar', 'chzf', pattar_file, rsync_ver + '/patches'])
+    shutil.rmtree(rsync_ver)
+
+    print(f"Updating the other files in {dest} ...")
+    md_files = 'README.md NEWS.md INSTALL.md'.split()
+    html_files = [ fn for fn in gen_pathnames if fn.endswith('.html') ]
+    cmd_chk(['rsync', '-a', *md_files, *html_files, dest])
+    cmd_chk(["./md-convert", "--dest", dest, *md_files])
+
+    cmd_chk(f"git log --name-status | gzip -9 >{dest}/ChangeLog.gz")
+
+    for fn in (srctar_file, pattar_file, diff_file):
+        asc_fn = fn + '.asc'
+        if os.path.lexists(asc_fn):
+            os.unlink(asc_fn)
+        res = cmd_run(['gpg', '--batch', '-ba', fn])
+        if res.returncode != 0 and res.returncode != 2:
+            die("gpg signing failed")
+
+    if not pre:
+        for find in f'{dest}/rsync-*.gz {dest}/rsync-*.asc {dest}/src-previews/rsync-*diffs.gz*'.split():
+            for fn in glob.glob(find):
+                os.unlink(fn)
+        top_link = [
+                srctar_file, f"{srctar_file}.asc",
+                pattar_file, f"{pattar_file}.asc",
+                diff_file, f"{diff_file}.asc",
+                ]
+        for fn in top_link:
+            os.link(fn, re.sub(r'/src(-\w+)?/', '/', fn))
+
+    print(f"""\
+{dash_line}
+
+Local changes are done.  When you're satisfied, push the git repository
+and rsync the release files.  Remember to announce the release on *BOTH*
+rsync-announce@lists.samba.org and rsync@lists.samba.org (and the web)!
+""")
+
+
+def replace_or_die(regex, repl, txt, die_msg):
+    m = regex.search(txt)
+    if not m:
+        die(die_msg)
+    return regex.sub(repl, txt, 1)
+
+
+def signal_handler(sig, frame):
+    die("\nAborting due to SIGINT.")
+
+
+if __name__ == '__main__':
+    parser = argparse.ArgumentParser(description="Prepare a new release of rsync in the git repo & ftp dir.", add_help=False)
+    parser.add_argument('--branch', '-b', dest='master_branch', default='master', help="The branch to release. Default: master.")
+    parser.add_argument("--help", "-h", action="help", help="Output this help message and exit.")
+    args = parser.parse_args()
+    main()
+
+# vim: sw=4 et ft=python

packaging/release.py

@@ -1,707 +0,0 @@
-#!/usr/bin/env python3
-
-# Step-based release script for rsync.  Each step is a separate invocation
-# selected by a --step-N-XX option, so the maintainer drives the release
-# manually one piece at a time.
-#
-# All persistent state and working files live in ../release/ (a sibling of
-# the rsync git checkout):
-#
-#   ../release/rsync-ftp/       mirror of samba.org:/home/ftp/pub/rsync
-#   ../release/rsync-html/      release-time snapshot of the html site
-#   ../release/work/            scratch space for tarball / diff staging
-#   ../release/release-state.json   info shared between steps
-#
-# The rsync-patches archive is no longer maintained and has been dropped.
-#
-# Run "packaging/release.py --list" to see the step list.
-
-import os, sys, re, argparse, glob, shutil, json, signal, subprocess
-from datetime import datetime
-
-sys.path = ['packaging'] + sys.path
-
-from pkglib import (
-    warn, die, cmd_run, cmd_chk, cmd_txt, cmd_txt_chk, cmd_pipe,
-    check_git_state, get_rsync_version,
-    get_NEWS_version_info, get_protocol_versions,
-)
-
-# ---------- Paths ----------
-
-RELEASE_DIR = os.path.realpath('../release')
-FTP_DIR     = os.path.join(RELEASE_DIR, 'rsync-ftp')
-HTML_DIR    = os.path.join(RELEASE_DIR, 'rsync-html')
-WORK_DIR    = os.path.join(RELEASE_DIR, 'work')
-STATE_FILE  = os.path.join(RELEASE_DIR, 'release-state.json')
-
-# The rsync-web/ subdirectory in the rsync source tree is the source-of-truth
-# for the git-tracked html content.  step-1-fetch snapshots it into HTML_DIR
-# for the release flow, where it can be edited or augmented with server-side
-# content before step-11-push-html sends it to samba.org.
-HTML_SRC = os.path.realpath('rsync-web')
-
-FTP_REMOTE_PATH  = '/home/ftp/pub/rsync'
-HTML_REMOTE_PATH = '/home/httpd/html/rsync'
-
-# Files that ./configure + make produce and that the release tarball / diff
-# need to bundle alongside the git-tracked source.  Mirrors the GENFILES
-# definition in Makefile.in (with rrsync.1{,.html} since we always configure
-# --with-rrsync in --step-4-build).
-GEN_FILES = [
-    'configure.sh',
-    'aclocal.m4',
-    'config.h.in',
-    'rsync.1',     'rsync.1.html',
-    'rsync-ssl.1', 'rsync-ssl.1.html',
-    'rsyncd.conf.5', 'rsyncd.conf.5.html',
-    'rrsync.1',    'rrsync.1.html',
-]
-
-# ---------- Step registry ----------
-
-STEPS = [
-    ('step-1-fetch',       'mirror ../release/rsync-ftp from samba.org and snapshot ../release/rsync-html from rsync-web/'),
-    ('step-2-prepare',     'gather release info interactively and write release-state.json'),
-    ('step-3-tweak',       'update version.h, rsync.h, NEWS.md, and packaging/*.spec'),
-    ('step-4-build',       'run smart-make + make gen'),
-    ('step-5-commit',      'git commit -a (commit the prepared release changes)'),
-    ('step-6-tag',         'create the gpg-signed git tag'),
-    ('step-7-tarball',     'build the source tarball and diffs.gz against the previous release'),
-    ('step-8-update-ftp',  'refresh README/NEWS/INSTALL/html in the ftp dir, regen ChangeLog.gz, gpg-sign tarballs'),
-    ('step-9-toplinks',    'hard-link top-level release files (final releases only)'),
-    ('step-10-push-ftp',   'rsync ../release/rsync-ftp/ to samba.org'),
-    ('step-11-push-html',  'rsync ../release/rsync-html/ to samba.org (after any manual edits)'),
-    ('step-12-push-git',   'print the git push commands for you to run'),
-]
-STEP_FLAGS = [s[0] for s in STEPS]
-
-DASH_LINE = '=' * 74
-
-# ---------- State helpers ----------
-
-def load_state():
-    if not os.path.isfile(STATE_FILE):
-        die(f"{STATE_FILE} not found.  Run --step-2-prepare first.")
-    with open(STATE_FILE, 'r', encoding='utf-8') as fh:
-        return json.load(fh)
-
-
-def save_state(state):
-    os.makedirs(RELEASE_DIR, exist_ok=True)
-    with open(STATE_FILE, 'w', encoding='utf-8') as fh:
-        json.dump(state, fh, indent=2, sort_keys=True)
-        fh.write('\n')
-
-
-def require_samba_host():
-    host = os.environ.get('RSYNC_SAMBA_HOST', '')
-    if not host.endswith('.samba.org'):
-        die("Set RSYNC_SAMBA_HOST in your environment to the samba hostname (e.g. hr3.samba.org).")
-    return host
-
-
-def require_top_of_checkout():
-    if not os.path.isfile('packaging/release.py'):
-        die("Run this script from the top of your rsync checkout.")
-    if not os.path.exists('.git'):
-        die("There is no .git in the current directory (run from the top of a git checkout or worktree).")
-
-
-def replace_or_die(regex, repl, txt, die_msg):
-    m = regex.search(txt)
-    if not m:
-        die(die_msg)
-    return regex.sub(repl, txt, 1)
-
-
-def section(title):
-    print(f"\n{DASH_LINE}\n== {title}\n{DASH_LINE}")
-
-
-def confirm(prompt, default_no=True):
-    suffix = '[n] ' if default_no else '[y] '
-    ans = input(f"{prompt} {suffix}").strip().lower()
-    if default_no:
-        return ans.startswith('y')
-    return ans == '' or ans.startswith('y')
-
-
-# ---------- Step 1: fetch ftp + html ----------
-
-def step_1_fetch(args):
-    host = require_samba_host()
-    os.makedirs(RELEASE_DIR, exist_ok=True)
-    os.makedirs(WORK_DIR, exist_ok=True)
-
-    section(f"Fetching ftp dir into {FTP_DIR}")
-    if not os.path.isdir(FTP_DIR):
-        os.makedirs(FTP_DIR)
-    # packaging/ftp.filt is the authoritative copy of the .filt filter file
-    # that controls which subtrees rsync excludes from the FTP mirror.
-    # Seed FTP_DIR/.filt from it so the bundled version is what step-1's
-    # rsync uses here, and so step-10-push-ftp propagates it back to the
-    # server.  --exclude=/.filt below stops the server's copy from
-    # overwriting our bundled one on the way down.
-    filt = os.path.join(FTP_DIR, '.filt')
-    bundled_filt = os.path.realpath('packaging/ftp.filt')
-    if not os.path.isfile(bundled_filt):
-        die(f"{bundled_filt} not found; cannot seed .filt for the FTP pull.")
-    shutil.copyfile(bundled_filt, filt)
-    cmd_chk(['rsync', '-aivOHP', f'-f:_{filt}', '--exclude=/.filt',
-             f'{host}:{FTP_REMOTE_PATH}/', f'{FTP_DIR}/'])
-
-    section(f"Snapshotting html dir from {HTML_SRC} into {HTML_DIR}")
-    if not os.path.isdir(HTML_SRC):
-        die(f"{HTML_SRC} not found.  This should be the in-tree rsync-web/ "
-            f"subdirectory; something is wrong with your checkout.")
-    os.makedirs(HTML_DIR, exist_ok=True)
-    cmd_chk(['rsync', '-aiv', f'{HTML_SRC}/', f'{HTML_DIR}/'])
-
-    # Then mirror non-git html content from the server, skipping files that
-    # the html git already provides (driven by the 'filt' file in HTML_DIR).
-    filt = os.path.join(HTML_DIR, 'filt')
-    if os.path.exists(filt):
-        tmp_filt = os.path.join(HTML_DIR, 'tmp-filt')
-        cmd_chk(f"sed -n -e 's/[-P]/H/p' '{filt}' >'{tmp_filt}'")
-        cmd_chk(['rsync', '-aivOHP', f'-f._{tmp_filt}',
-                 f'{host}:{HTML_REMOTE_PATH}/', f'{HTML_DIR}/'])
-        os.unlink(tmp_filt)
-
-    print(f"\nFetch complete.  Local dirs are now in {RELEASE_DIR}.")
-
-
-# ---------- Step 2: prepare ----------
-
-def step_2_prepare(args):
-    require_top_of_checkout()
-    os.makedirs(RELEASE_DIR, exist_ok=True)
-
-    if not os.path.isdir(FTP_DIR):
-        die(f"{FTP_DIR} does not exist.  Run --step-1-fetch first.")
-
-    now = datetime.now().astimezone()
-    cl_today = now.strftime('* %a %b %d %Y')
-    year     = now.strftime('%Y')
-    ztoday   = now.strftime('%d %b %Y')
-    today    = ztoday.lstrip('0')
-    tz_now   = now.strftime('%z')
-    tz_num   = tz_now[0:1].replace('+', '') + str(float(tz_now[1:3]) + float(tz_now[3:]) / 60)
-
-    curversion = get_rsync_version()
-    lastversion, last_protocol_version, pdate = get_NEWS_version_info()
-    protocol_version, subprotocol_version    = get_protocol_versions()
-
-    # Default next version: bump preN, or move dev -> pre1.
-    version = curversion
-    m = re.search(r'pre(\d+)', version)
-    if m:
-        version = re.sub(r'pre\d+', 'pre' + str(int(m[1]) + 1), version)
-    else:
-        version = version.replace('dev', 'pre1')
-
-    print(f"\nCurrent version (version.h): {curversion}")
-    print(f"Last released version (NEWS.md): {lastversion}")
-    print(f"Current protocol version: {protocol_version}  (last released: {last_protocol_version})")
-
-    ans = input(f"\nVersion to release [{version}, '.' to drop the preN suffix]: ").strip()
-    if ans == '.':
-        version = re.sub(r'pre\d+', '', version)
-    elif ans:
-        version = ans
-    if not re.match(r'^[\d.]+(pre\d+)?$', version):
-        die(f'Invalid version: "{version}"')
-    version = re.sub(r'[-.]*pre[-.]*', 'pre', version)
-
-    if 'pre' in version and not curversion.endswith('dev'):
-        lastversion = curversion
-
-    ans = input(f"Previous version to diff against [{lastversion}]: ").strip()
-    if ans:
-        lastversion = ans
-    lastversion = re.sub(r'[-.]*pre[-.]*', 'pre', lastversion)
-
-    m = re.search(r'(pre\d+)', version)
-    pre = m[1] if m else ''
-    finalversion = re.sub(r'pre\d+', '', version)
-
-    release = '0.1' if pre else '1'
-    ans = input(f"RPM release number [{release}]: ").strip()
-    if ans:
-        release = ans
-    if pre:
-        release += '.' + pre
-
-    proto_changed = protocol_version != last_protocol_version
-    if proto_changed:
-        if finalversion in pdate:
-            proto_change_date = pdate[finalversion]
-        else:
-            while True:
-                ans = input(f"Date the protocol changed to {protocol_version} (dd Mmm yyyy): ").strip()
-                if re.match(r'^\d\d \w\w\w \d\d\d\d$', ans):
-                    break
-            proto_change_date = ans
-    else:
-        proto_change_date = ' ' * 11
-
-    if 'pre' in lastversion:
-        if not pre:
-            die("Refusing to diff a release version against a pre-release version.")
-        srcdir = srcdiffdir = lastsrcdir = 'src-previews'
-    elif pre:
-        srcdir = srcdiffdir = 'src-previews'
-        lastsrcdir = 'src'
-    else:
-        srcdir = lastsrcdir = 'src'
-        srcdiffdir = 'src-diffs'
-
-    state = {
-        'version':            version,
-        'lastversion':        lastversion,
-        'finalversion':       finalversion,
-        'pre':                pre,
-        'release':            release,
-        'protocol_version':   protocol_version,
-        'subprotocol_version': subprotocol_version,
-        'proto_changed':      proto_changed,
-        'proto_change_date':  proto_change_date,
-        'srcdir':             srcdir,
-        'srcdiffdir':         srcdiffdir,
-        'lastsrcdir':         lastsrcdir,
-        'today':              today,
-        'ztoday':             ztoday,
-        'cl_today':           cl_today,
-        'year':               year,
-        'tz_num':             tz_num,
-        'master_branch':      args.master_branch,
-    }
-    save_state(state)
-
-    section("Release info")
-    for k in ('version', 'lastversion', 'release', 'srcdir', 'srcdiffdir', 'lastsrcdir',
-              'protocol_version', 'proto_changed', 'proto_change_date'):
-        print(f"  {k}: {state[k]}")
-    print(f"\nWrote {STATE_FILE}.  Re-run --step-2-prepare to change anything.")
-
-
-# ---------- Step 3: tweak version files ----------
-
-def step_3_tweak(args):
-    require_top_of_checkout()
-    state = load_state()
-
-    version          = state['version']
-    finalversion     = state['finalversion']
-    pre              = state['pre']
-    release          = state['release']
-    today            = state['today']
-    ztoday           = state['ztoday']
-    cl_today         = state['cl_today']
-    year             = state['year']
-    tz_num           = state['tz_num']
-    proto_changed    = state['proto_changed']
-    proto_change_date = state['proto_change_date']
-    protocol_version  = state['protocol_version']
-    srcdir           = state['srcdir']
-
-    specvars = {
-        'Version:':           finalversion,
-        'Release:':           release,
-        '%define fullversion': f'%{{version}}{pre}',
-        'Released':           version + '.',
-        '%define srcdir':     srcdir,
-    }
-
-    tweak_files = ['version.h', 'rsync.h', 'NEWS.md']
-    tweak_files += glob.glob('packaging/*.spec')
-    tweak_files += glob.glob('packaging/*/*.spec')
-
-    for fn in tweak_files:
-        with open(fn, 'r', encoding='utf-8') as fh:
-            old_txt = txt = fh.read()
-        if fn == 'version.h':
-            x_re = re.compile(r'^(#define RSYNC_VERSION).*', re.M)
-            txt = replace_or_die(x_re, r'\1 "%s"' % version, txt,
-                                 f"Unable to update RSYNC_VERSION in {fn}")
-            x_re = re.compile(r'^(#define MAINTAINER_TZ_OFFSET).*', re.M)
-            txt = replace_or_die(x_re, r'\1 ' + tz_num, txt,
-                                 f"Unable to update MAINTAINER_TZ_OFFSET in {fn}")
-        elif fn == 'rsync.h':
-            x_re = re.compile(r'(#define\s+SUBPROTOCOL_VERSION)\s+(\d+)')
-            repl = lambda m: m[1] + ' ' + (
-                '0' if not pre or not proto_changed
-                else '1' if m[2] == '0'
-                else m[2])
-            txt = replace_or_die(x_re, repl, txt,
-                                 f"Unable to find SUBPROTOCOL_VERSION in {fn}")
-        elif fn == 'NEWS.md':
-            efv = re.escape(finalversion)
-            x_re = re.compile(
-                r'^# NEWS for rsync %s \(UNRELEASED\)\s+## Changes in this version:\n' % efv
-                + r'(\n### PROTOCOL NUMBER:\s+- The protocol number was changed to \d+\.\n)?')
-            rel_day = 'UNRELEASED' if pre else today
-            repl = (f'# NEWS for rsync {finalversion} ({rel_day})\n\n'
-                    + '## Changes in this version:\n')
-            if proto_changed:
-                repl += f'\n### PROTOCOL NUMBER:\n\n - The protocol number was changed to {protocol_version}.\n'
-            good_top = re.sub(r'\(.*?\)', '(UNRELEASED)', repl, 1)
-            msg = (f"The top of {fn} is not in the right format.  It should be:\n" + good_top)
-            txt = replace_or_die(x_re, repl, txt, msg)
-            x_re = re.compile(
-                r'^(\| )(\S{2} \S{3} \d{4})(\s+\|\s+%s\s+\| ).{11}(\s+\| )\S{2}(\s+\|+)$' % efv,
-                re.M)
-            repl = lambda m: (m[1] + (m[2] if pre else ztoday) + m[3]
-                              + proto_change_date + m[4] + protocol_version + m[5])
-            txt = replace_or_die(x_re, repl, txt,
-                                 f'Unable to find "| ?? ??? {year} | {finalversion} | ... |" line in {fn}')
-        elif '.spec' in fn:
-            for var, val in specvars.items():
-                x_re = re.compile(r'^%s .*' % re.escape(var), re.M)
-                txt = replace_or_die(x_re, var + ' ' + val, txt,
-                                     f"Unable to update {var} in {fn}")
-            x_re = re.compile(r'^\* \w\w\w \w\w\w \d\d \d\d\d\d (.*)', re.M)
-            txt = replace_or_die(x_re, r'%s \1' % cl_today, txt,
-                                 f"Unable to update ChangeLog header in {fn}")
-        else:
-            die(f"Unrecognized file in tweak_files: {fn}")
-
-        if txt != old_txt:
-            print(f"Updating {fn}")
-            with open(fn, 'w', encoding='utf-8') as fh:
-                fh.write(txt)
-
-    cmd_chk(['packaging/year-tweak'])
-
-    section("git diff after tweaks")
-    cmd_run(['git', '--no-pager', 'diff'])
-
-
-# ---------- Step 4: build ----------
-
-def step_4_build(args):
-    require_top_of_checkout()
-    load_state()  # just to ensure we've prepared
-
-    section("Running prepare-source + configure --prefix=/usr --with-rrsync + make + make gen")
-    # Always re-prepare so configure.sh is current; we run configure ourselves
-    # with the release-required flags rather than relying on the cached
-    # config.status (which may have been produced with different options).
-    if os.path.isfile('.fetch'):
-        cmd_chk(['./prepare-source', 'fetch'])
-    else:
-        cmd_chk(['./prepare-source'])
-
-    cmd_chk(['./configure', '--prefix=/usr', '--with-rrsync'])
-    cmd_chk(['make'])
-    cmd_chk(['make', 'gen'])
-
-
-# ---------- Step 5: commit ----------
-
-def step_5_commit(args):
-    require_top_of_checkout()
-    state = load_state()
-    version = state['version']
-
-    section("git status")
-    cmd_run(['git', 'status'])
-    if not confirm("Commit all current changes with the release message?"):
-        die("Aborted.")
-    cmd_chk(['git', 'commit', '-a', '-m', f'Preparing for release of {version} [buildall]'])
-
-
-# ---------- Step 6: tag ----------
-
-def step_6_tag(args):
-    require_top_of_checkout()
-    state = load_state()
-    version = state['version']
-    v_ver = 'v' + version
-
-    out = cmd_txt_chk(['git', 'tag', '-l', v_ver]).out
-    if out.strip():
-        if not confirm(f"Tag {v_ver} already exists.  Delete and recreate?"):
-            die("Aborted.")
-        cmd_chk(['git', 'tag', '-d', v_ver])
-
-    # Prime the gpg agent so the actual tag signing won't prompt.
-    section("Priming gpg agent")
-    cmd_run("touch TeMp; gpg --sign TeMp; rm -f TeMp TeMp.gpg")
-
-    section(f"Creating signed tag {v_ver}")
-    out = cmd_txt(['git', 'tag', '-s', '-m', f'Version {version}.', v_ver],
-                  capture='combined').out
-    print(out, end='')
-    if 'bad passphrase' in out.lower() or 'failed' in out.lower():
-        die("Tag creation failed.")
-
-
-# ---------- Step 7: tarball + diff ----------
-
-def step_7_tarball(args):
-    require_top_of_checkout()
-    state = load_state()
-
-    version      = state['version']
-    lastversion  = state['lastversion']
-    pre          = state['pre']
-    srcdir       = state['srcdir']
-    srcdiffdir   = state['srcdiffdir']
-    lastsrcdir   = state['lastsrcdir']
-
-    rsync_ver     = 'rsync-' + version
-    rsync_lastver = 'rsync-' + lastversion
-    v_ver         = 'v' + version
-
-    srctar_name = f"{rsync_ver}.tar.gz"
-    diff_name   = f"{rsync_lastver}-{version}.diffs.gz"
-
-    srctar_file = os.path.join(FTP_DIR, srcdir, srctar_name)
-    diff_file   = os.path.join(FTP_DIR, srcdiffdir, diff_name)
-    lasttar_file = os.path.join(FTP_DIR, lastsrcdir, rsync_lastver + '.tar.gz')
-
-    for d in (os.path.dirname(srctar_file), os.path.dirname(diff_file)):
-        os.makedirs(d, exist_ok=True)
-    if not os.path.isfile(lasttar_file):
-        die(f"Previous tarball not found: {lasttar_file}")
-
-    # Stage in ../release/work to keep the source checkout clean.
-    if os.path.isdir(WORK_DIR):
-        shutil.rmtree(WORK_DIR)
-    os.makedirs(WORK_DIR)
-
-    a_dir = os.path.join(WORK_DIR, 'a')
-    b_dir = os.path.join(WORK_DIR, 'b')
-
-    # Extract gen files from the previous tarball into work/a/.
-    tweaked_gen_files = [os.path.join(rsync_lastver, fn) for fn in GEN_FILES]
-    cmd_chk(['tar', '-C', WORK_DIR, '-xzf', lasttar_file, *tweaked_gen_files])
-    os.rename(os.path.join(WORK_DIR, rsync_lastver), a_dir)
-
-    # Copy current gen files (built in the top-level checkout) into work/b/.
-    os.makedirs(b_dir)
-    cmd_chk(['rsync', '-a', *GEN_FILES, b_dir + '/'])
-
-    section(f"Creating {diff_file}")
-    sed_script = r's:^((---|\+\+\+) [ab]/[^\t]+)\t.*:\1:'  # no single quotes!
-    cmd_chk(
-        f"(git diff v{lastversion} {v_ver} -- ':!.github'; "
-        f"diff -upN {a_dir} {b_dir} | sed -r '{sed_script}') | gzip -9 >{diff_file}")
-
-    section(f"Creating {srctar_file}")
-    # Reuse work/b/ (which already holds the fresh gen files) as the release
-    # staging dir, then let "git archive" overlay the git-tracked source files
-    # on top.  That way the tarball ends up with both gen files and source.
-    rsync_ver_dir = os.path.join(WORK_DIR, rsync_ver)
-    shutil.rmtree(a_dir)
-    os.rename(b_dir, rsync_ver_dir)
-    cmd_chk(f"git archive --format=tar --prefix={rsync_ver}/ {v_ver} | "
-            f"tar -C {WORK_DIR} -xf -")
-    cmd_chk(f"support/git-set-file-times --quiet --prefix={rsync_ver_dir}/")
-    cmd_chk(['fakeroot', 'tar', '-C', WORK_DIR, '-czf', srctar_file,
-             '--exclude=.github', rsync_ver])
-
-    # Leave staging in place; --step-8-update-ftp does its own thing.
-    print(f"\nCreated:\n  {srctar_file}\n  {diff_file}")
-
-
-# ---------- Step 8: update ftp ----------
-
-def step_8_update_ftp(args):
-    require_top_of_checkout()
-    state = load_state()
-
-    version     = state['version']
-    lastversion = state['lastversion']
-    srcdir      = state['srcdir']
-    srcdiffdir  = state['srcdiffdir']
-
-    rsync_ver     = 'rsync-' + version
-    rsync_lastver = 'rsync-' + lastversion
-    srctar_file   = os.path.join(FTP_DIR, srcdir, f"{rsync_ver}.tar.gz")
-    diff_file     = os.path.join(FTP_DIR, srcdiffdir,
-                                 f"{rsync_lastver}-{version}.diffs.gz")
-
-    section(f"Refreshing top-of-tree files in {FTP_DIR}")
-    md_files = ['README.md', 'NEWS.md', 'INSTALL.md']
-    html_files = [fn for fn in GEN_FILES if fn.endswith('.html')]
-    cmd_chk(['rsync', '-a', *md_files, *html_files, FTP_DIR + '/'])
-    cmd_chk(['./md-convert', '--dest', FTP_DIR, *md_files])
-
-    section(f"Regenerating {FTP_DIR}/ChangeLog.gz")
-    cmd_chk(f"git log --name-status | gzip -9 >{FTP_DIR}/ChangeLog.gz")
-
-    # Prime gpg agent and then sign the tar + diff.
-    section("Priming gpg agent")
-    cmd_run("touch TeMp; gpg --sign TeMp; rm -f TeMp TeMp.gpg")
-
-    for fn in (srctar_file, diff_file):
-        if not os.path.isfile(fn):
-            die(f"Missing file to sign: {fn}.  Did --step-7-tarball run successfully?")
-        asc_fn = fn + '.asc'
-        if os.path.lexists(asc_fn):
-            os.unlink(asc_fn)
-        section(f"GPG-signing {fn}")
-        res = cmd_run(['gpg', '--batch', '-ba', fn])
-        if res.returncode not in (0, 2):
-            die("gpg signing failed.")
-
-
-# ---------- Step 9: top-level hard links ----------
-
-def step_9_toplinks(args):
-    require_top_of_checkout()
-    state = load_state()
-
-    pre = state['pre']
-    if pre:
-        print("Skipping: pre-releases do not get top-level hard links.")
-        return
-
-    version     = state['version']
-    lastversion = state['lastversion']
-    srcdir      = state['srcdir']
-    srcdiffdir  = state['srcdiffdir']
-
-    rsync_ver     = 'rsync-' + version
-    rsync_lastver = 'rsync-' + lastversion
-    srctar_file = os.path.join(FTP_DIR, srcdir, f"{rsync_ver}.tar.gz")
-    diff_file   = os.path.join(FTP_DIR, srcdiffdir,
-                               f"{rsync_lastver}-{version}.diffs.gz")
-
-    section("Removing stale top-level rsync-* files")
-    for find in [f'{FTP_DIR}/rsync-*.gz',
-                 f'{FTP_DIR}/rsync-*.asc',
-                 f'{FTP_DIR}/src-previews/rsync-*diffs.gz*']:
-        for fn in glob.glob(find):
-            os.unlink(fn)
-
-    top_link = [
-        srctar_file, srctar_file + '.asc',
-        diff_file,   diff_file + '.asc',
-    ]
-    for fn in top_link:
-        target = re.sub(r'/src(-\w+)?/', '/', fn)
-        if os.path.lexists(target):
-            os.unlink(target)
-        os.link(fn, target)
-        print(f"  linked {target}")
-
-
-# ---------- Step 10: push ftp ----------
-
-def step_10_push_ftp(args):
-    host = require_samba_host()
-    if not os.path.isdir(FTP_DIR):
-        die(f"{FTP_DIR} does not exist.  Run --step-1-fetch first.")
-    section(f"rsync ftp dir to {host}")
-    rsync_with_confirm(['-aivOHP', '--chown=:rsync', '--del',
-                        f'-f._{os.path.join(FTP_DIR, ".filt")}',
-                        f'{FTP_DIR}/', f'{host}:{FTP_REMOTE_PATH}/'])
-
-
-# ---------- Step 11: push html ----------
-
-def step_11_push_html(args):
-    host = require_samba_host()
-    if not os.path.isdir(HTML_DIR):
-        die(f"{HTML_DIR} does not exist.  Run --step-1-fetch first.")
-    section(f"rsync html dir to {host}")
-    filt = os.path.join(HTML_DIR, 'filt')
-    rsync_with_confirm(['-aivOHP', '--chown=:rsync', '--del',
-                        f'-f._{filt}',
-                        f'{HTML_DIR}/', f'{host}:{HTML_REMOTE_PATH}/'])
-
-
-# ---------- Step 12: print push-git instructions ----------
-
-def step_12_push_git(args):
-    state = load_state()
-    version = state['version']
-    master_branch = state['master_branch']
-    v_ver = 'v' + version
-
-    print(f"""\
-{DASH_LINE}
-Run these from the rsync-git checkout (this script does not push for you):
-
-    git push origin {master_branch}
-    git push origin {v_ver}
-
-If you have a 'samba' remote configured (git.samba.org:/data/git/rsync.git):
-
-    git push samba {master_branch}
-    git push samba {v_ver}
-
-Then upload the tarball + .asc to the GitHub release for {v_ver},
-and announce on rsync-announce@, rsync@, and Discord.
-
-NOTE! Also update the PPAs if needed
-""")
-
-
-# ---------- shared rsync-with-confirm ----------
-
-def rsync_with_confirm(rsync_args):
-    """Run an rsync command in dry-run mode, then ask before running for real."""
-    cmd_run(['rsync', '--dry-run', *rsync_args])
-    if confirm("Run without --dry-run?"):
-        cmd_run(['rsync', *rsync_args])
-
-
-# ---------- dispatch ----------
-
-STEP_FUNCS = {
-    'step-1-fetch':       step_1_fetch,
-    'step-2-prepare':     step_2_prepare,
-    'step-3-tweak':       step_3_tweak,
-    'step-4-build':       step_4_build,
-    'step-5-commit':      step_5_commit,
-    'step-6-tag':         step_6_tag,
-    'step-7-tarball':     step_7_tarball,
-    'step-8-update-ftp':  step_8_update_ftp,
-    'step-9-toplinks':    step_9_toplinks,
-    'step-10-push-ftp':   step_10_push_ftp,
-    'step-11-push-html':  step_11_push_html,
-    'step-12-push-git':   step_12_push_git,
-}
-
-
-def signal_handler(sig, frame):
-    die("\nAborting due to SIGINT.")
-
-
-def main():
-    parser = argparse.ArgumentParser(
-        description="Step-based release script for rsync.",
-        formatter_class=argparse.RawDescriptionHelpFormatter,
-        epilog="Run --list to see the steps.  Each invocation runs exactly one --step-* option.")
-    parser.add_argument('--branch', '-b', dest='master_branch', default='master',
-                        help="The branch to release (default: master).")
-    parser.add_argument('--list', action='store_true',
-                        help="List all release steps and exit.")
-    grp = parser.add_mutually_exclusive_group()
-    for flag, descr in STEPS:
-        grp.add_argument('--' + flag, dest='step', action='store_const',
-                         const=flag, help=descr)
-    args = parser.parse_args()
-
-    if args.list:
-        print("Release steps:")
-        for flag, descr in STEPS:
-            print(f"  --{flag:18s} {descr}")
-        return
-
-    if not args.step:
-        parser.error("pick one --step-N-XX option (or --list to see them).")
-
-    signal.signal(signal.SIGINT, signal_handler)
-    os.environ['LESS'] = 'mqeiXR'
-    STEP_FUNCS[args.step](args)
-
-
-if __name__ == '__main__':
-    main()
-
-# vim: sw=4 et ft=python

packaging/var-checker

@@ -6,10 +6,9 @@
 
 import os, sys, re, argparse, glob
 
-VARS_RE = re.compile(r'^(?!(?:extern|enum)\s)([a-zA-Z][^ \n\t:]*\s+.*);', re.M)
+VARS_RE = re.compile(r'^(?!(?:extern|enum)\s)([a-zA-Z]\S*\s+.*);', re.M)
 EXTERNS_RE = re.compile(r'^extern\s+(.*);', re.M)
 
-types = { }
 sizes = { }
 
 def main():
@@ -69,44 +68,19 @@ def parse_vars(fn, lines):
     for line in lines:
         line = re.sub(r'\s*\{.*\}', '', line)
         line = re.sub(r'\s*\(.*\)', '', line)
-        line = re.sub(r'\s*=\s*[^,]*', '', line)
-        m = re.search(r'^(?:(?:static|extern)\s+)?(?P<type>[^\[,]+?)(?P<vars>\w+([\[,].+)?)$', line)
-        if not m:
-            print(f"Bogus match? ({line})")
-            continue
-        items = m['vars']
-        main_type = m['type'].strip()
-        mt_len = len(main_type)
-        main_type = main_type.rstrip('*')
-        first_stars = '*' * (mt_len - len(main_type))
-        if first_stars:
-            main_type = main_type.rstrip()
-            items = first_stars + items
-        for item in re.split(r'\s*,\s*', items):
-            m = re.search(r'(?P<stars>\*+\s*)?(?P<var>\w+)(?P<sz>\[.*?\])?$', item)
+        for item in re.split(r'\s*,\s*', line):
+            item = re.sub(r'\s*=.*', '', item)
+            m = re.search(r'(?P<var>\w+)(?P<sz>\[.*?\])?$', item)
             if not m:
                 print(f"Bogus match? ({item})")
                 continue
-            typ = main_type
-            if m['stars']:
-                typ = typ + m['stars'].strip()
-            chk = [
-                    'type', typ, types,
-                    'size', m['sz'], sizes,
-                    ]
-            while chk:
-                label = chk.pop(0)
-                new = chk.pop(0)
-                lst = chk.pop(0)
-                if label == 'type':
-                    new = ' '.join(new.split()).replace(' *', '*')
-                if m['var'] in lst:
-                    old = lst[m['var']]
-                    if new != old:
+            if m['sz']:
+                if m['var'] in sizes:
+                    if sizes[m['var']] != m['sz']:
                         var = m['var']
-                        print(fn, f'has inconsistent {label} for "{var}":', new, 'vs', old)
+                        print(fn, f'has inconsistent size for "{var}":', m['sz'], 'vs', sizes[var])
                 else:
-                    lst[m['var']] = new
+                    sizes[m['var']] = m['sz']
             ret.append(m['var'])
     return ret
 

packaging/year-tweak

@@ -7,6 +7,9 @@
 import sys, os, re, argparse, subprocess
 from datetime import datetime
 
+MAINTAINER_NAME = 'Wayne Davison'
+MAINTAINER_SUF = ' ' + MAINTAINER_NAME + "\n"
+
 def main():
     latest_year = '2000'
 
@@ -19,6 +22,10 @@ def main():
         m = argparse.Namespace(**m.groupdict())
         if m.year > latest_year:
             latest_year = m.year
+        if m.fn.startswith('zlib/') or m.fn.startswith('popt/'):
+            continue
+        if re.search(r'\.(c|h|sh|test)$', m.fn):
+            maybe_edit_copyright_year(m.fn, m.year)
     proc.communicate()
 
     fn = 'latest-year.h'
@@ -32,8 +39,55 @@ def main():
             fh.write(txt)
 
 
+def maybe_edit_copyright_year(fn, year):
+    opening_lines = [ ]
+    copyright_line = None
+
+    with open(fn, 'r', encoding='utf-8') as fh:
+        for lineno, line in enumerate(fh):
+            opening_lines.append(line)
+            if lineno > 3 and not re.search(r'\S', line):
+                break
+            m = re.match(r'^(?P<pre>.*Copyright\s+\S+\s+)(?P<year>\d\d\d\d(?:-\d\d\d\d)?(,\s+\d\d\d\d)*)(?P<suf>.+)', line)
+            if not m:
+                continue
+            copyright_line = argparse.Namespace(**m.groupdict())
+            copyright_line.lineno = len(opening_lines)
+            copyright_line.is_maintainer_line = MAINTAINER_NAME in copyright_line.suf
+            copyright_line.txt = line
+            if copyright_line.is_maintainer_line:
+                break
+
+        if not copyright_line:
+            return
+
+        if copyright_line.is_maintainer_line:
+            cyears = copyright_line.year.split('-')
+            if year == cyears[0]:
+                cyears = [ year ]
+            else:
+                cyears = [ cyears[0], year ]
+            txt = copyright_line.pre + '-'.join(cyears) + MAINTAINER_SUF
+            if txt == copyright_line.txt:
+                return
+            opening_lines[copyright_line.lineno - 1] = txt
+        else:
+            if fn.startswith('lib/') or fn.startswith('testsuite/'):
+                return
+            txt = copyright_line.pre + year + MAINTAINER_SUF
+            opening_lines[copyright_line.lineno - 1] += txt
+
+        remaining_txt = fh.read()
+
+    print(f"Updating {fn} with year {year}")
+
+    with open(fn, 'w', encoding='utf-8') as fh:
+        fh.write(''.join(opening_lines))
+        fh.write(remaining_txt)
+
+
 if __name__ == '__main__':
-    parser = argparse.ArgumentParser(description="Grab the year of the last mod for our c & h files and make sure the LATEST_YEAR value is accurate.")
+    parser = argparse.ArgumentParser(description="Grab the year of last mod for our c & h files and make sure the Copyright comment is up-to-date.")
     args = parser.parse_args()
     main()
 

popt/findme.c

@@ -0,0 +1,55 @@
+/** \ingroup popt
+ * \file popt/findme.c
+ */
+
+/* (C) 1998-2002 Red Hat, Inc. -- Licensing details are in the COPYING
+   file accompanying popt source distributions, available from 
+   ftp://ftp.rpm.org/pub/rpm/dist. */
+
+#include "system.h"
+#include "findme.h"
+
+const char * findProgramPath(const char * argv0)
+{
+    char * path = getenv("PATH");
+    char * pathbuf;
+    char * start, * chptr;
+    char * buf;
+    size_t bufsize;
+
+    if (argv0 == NULL) return NULL;	/* XXX can't happen */
+    /* If there is a / in the argv[0], it has to be an absolute path */
+    if (strchr(argv0, '/'))
+	return xstrdup(argv0);
+
+    if (path == NULL) return NULL;
+
+    bufsize = strlen(path) + 1;
+    start = pathbuf = alloca(bufsize);
+    if (pathbuf == NULL) return NULL;	/* XXX can't happen */
+    strlcpy(pathbuf, path, bufsize);
+    bufsize += sizeof "/" - 1 + strlen(argv0);
+    buf = malloc(bufsize);
+    if (buf == NULL) return NULL;	/* XXX can't happen */
+
+    chptr = NULL;
+    /*@-branchstate@*/
+    do {
+	if ((chptr = strchr(start, ':')))
+	    *chptr = '\0';
+	snprintf(buf, bufsize, "%s/%s", start, argv0);
+
+	if (!access(buf, X_OK))
+	    return buf;
+
+	if (chptr) 
+	    start = chptr + 1;
+	else
+	    start = NULL;
+    } while (start && *start);
+    /*@=branchstate@*/
+
+    free(buf);
+
+    return NULL;
+}

popt/findme.h

@@ -0,0 +1,20 @@
+/** \ingroup popt
+ * \file popt/findme.h
+ */
+
+/* (C) 1998-2000 Red Hat, Inc. -- Licensing details are in the COPYING
+   file accompanying popt source distributions, available from 
+   ftp://ftp.rpm.org/pub/rpm/dist. */
+
+#ifndef H_FINDME
+#define H_FINDME
+
+/**
+ * Return absolute path to executable by searching PATH.
+ * @param argv0		name of executable
+ * @return		(malloc'd) absolute path to executable (or NULL)
+ */
+/*@null@*/ const char * findProgramPath(/*@null@*/ const char * argv0)
+	/*@*/;
+
+#endif

popt/lookup3.c

@@ -1,959 +0,0 @@
-/* -------------------------------------------------------------------- */
-/*
- * lookup3.c, by Bob Jenkins, May 2006, Public Domain.
- * 
- * These are functions for producing 32-bit hashes for hash table lookup.
- * jlu32w(), jlu32l(), jlu32lpair(), jlu32b(), _JLU3_MIX(), and _JLU3_FINAL() 
- * are externally useful functions.  Routines to test the hash are included 
- * if SELF_TEST is defined.  You can use this free for any purpose.  It's in
- * the public domain.  It has no warranty.
- * 
- * You probably want to use jlu32l().  jlu32l() and jlu32b()
- * hash byte arrays.  jlu32l() is is faster than jlu32b() on
- * little-endian machines.  Intel and AMD are little-endian machines.
- * On second thought, you probably want jlu32lpair(), which is identical to
- * jlu32l() except it returns two 32-bit hashes for the price of one.  
- * You could implement jlu32bpair() if you wanted but I haven't bothered here.
- * 
- * If you want to find a hash of, say, exactly 7 integers, do
- *   a = i1;  b = i2;  c = i3;
- *   _JLU3_MIX(a,b,c);
- *   a += i4; b += i5; c += i6;
- *   _JLU3_MIX(a,b,c);
- *   a += i7;
- *   _JLU3_FINAL(a,b,c);
- * then use c as the hash value.  If you have a variable size array of
- * 4-byte integers to hash, use jlu32w().  If you have a byte array (like
- * a character string), use jlu32l().  If you have several byte arrays, or
- * a mix of things, see the comments above jlu32l().  
- * 
- * Why is this so big?  I read 12 bytes at a time into 3 4-byte integers, 
- * then mix those integers.  This is fast (you can do a lot more thorough
- * mixing with 12*3 instructions on 3 integers than you can with 3 instructions
- * on 1 byte), but shoehorning those bytes into integers efficiently is messy.
-*/
-/* -------------------------------------------------------------------- */
-
-#include <stdint.h>
-
-#if defined(_JLU3_SELFTEST)
-# define _JLU3_jlu32w		1
-# define _JLU3_jlu32l		1
-# define _JLU3_jlu32lpair	1
-# define _JLU3_jlu32b		1
-#endif
-
-static const union _dbswap {
-    const uint32_t ui;
-    const unsigned char uc[4];
-} endian = { .ui = 0x11223344 };
-# define HASH_LITTLE_ENDIAN	(endian.uc[0] == (unsigned char) 0x44)
-# define HASH_BIG_ENDIAN	(endian.uc[0] == (unsigned char) 0x11)
-
-#ifndef ROTL32
-# define ROTL32(x, s) (((x) << (s)) | ((x) >> (32 - (s))))
-#endif
-
-/* NOTE: The _size parameter should be in bytes. */
-#define	_JLU3_INIT(_h, _size)	(0xdeadbeef + ((uint32_t)(_size)) + (_h))
-
-/* -------------------------------------------------------------------- */
-/*
- * _JLU3_MIX -- mix 3 32-bit values reversibly.
- * 
- * This is reversible, so any information in (a,b,c) before _JLU3_MIX() is
- * still in (a,b,c) after _JLU3_MIX().
- * 
- * If four pairs of (a,b,c) inputs are run through _JLU3_MIX(), or through
- * _JLU3_MIX() in reverse, there are at least 32 bits of the output that
- * are sometimes the same for one pair and different for another pair.
- * This was tested for:
- * * pairs that differed by one bit, by two bits, in any combination
- *   of top bits of (a,b,c), or in any combination of bottom bits of
- *   (a,b,c).
- * * "differ" is defined as +, -, ^, or ~^.  For + and -, I transformed
- *   the output delta to a Gray code (a^(a>>1)) so a string of 1's (as
- *   is commonly produced by subtraction) look like a single 1-bit
- *   difference.
- * * the base values were pseudorandom, all zero but one bit set, or 
- *   all zero plus a counter that starts at zero.
- * 
- * Some k values for my "a-=c; a^=ROTL32(c,k); c+=b;" arrangement that
- * satisfy this are
- *     4  6  8 16 19  4
- *     9 15  3 18 27 15
- *    14  9  3  7 17  3
- * Well, "9 15 3 18 27 15" didn't quite get 32 bits diffing
- * for "differ" defined as + with a one-bit base and a two-bit delta.  I
- * used http://burtleburtle.net/bob/hash/avalanche.html to choose 
- * the operations, constants, and arrangements of the variables.
- * 
- * This does not achieve avalanche.  There are input bits of (a,b,c)
- * that fail to affect some output bits of (a,b,c), especially of a.  The
- * most thoroughly mixed value is c, but it doesn't really even achieve
- * avalanche in c.
- * 
- * This allows some parallelism.  Read-after-writes are good at doubling
- * the number of bits affected, so the goal of mixing pulls in the opposite
- * direction as the goal of parallelism.  I did what I could.  Rotates
- * seem to cost as much as shifts on every machine I could lay my hands
- * on, and rotates are much kinder to the top and bottom bits, so I used
- * rotates.
- */
-/* -------------------------------------------------------------------- */
-#define _JLU3_MIX(a,b,c) \
-{ \
-  a -= c;  a ^= ROTL32(c, 4);  c += b; \
-  b -= a;  b ^= ROTL32(a, 6);  a += c; \
-  c -= b;  c ^= ROTL32(b, 8);  b += a; \
-  a -= c;  a ^= ROTL32(c,16);  c += b; \
-  b -= a;  b ^= ROTL32(a,19);  a += c; \
-  c -= b;  c ^= ROTL32(b, 4);  b += a; \
-}
-
-/* -------------------------------------------------------------------- */
-/**
- * _JLU3_FINAL -- final mixing of 3 32-bit values (a,b,c) into c
- * 
- * Pairs of (a,b,c) values differing in only a few bits will usually
- * produce values of c that look totally different.  This was tested for
- * * pairs that differed by one bit, by two bits, in any combination
- *   of top bits of (a,b,c), or in any combination of bottom bits of
- *   (a,b,c).
- * * "differ" is defined as +, -, ^, or ~^.  For + and -, I transformed
- *   the output delta to a Gray code (a^(a>>1)) so a string of 1's (as
- *   is commonly produced by subtraction) look like a single 1-bit
- *   difference.
- * * the base values were pseudorandom, all zero but one bit set, or 
- *   all zero plus a counter that starts at zero.
- * 
- * These constants passed:
- *  14 11 25 16 4 14 24
- *  12 14 25 16 4 14 24
- * and these came close:
- *   4  8 15 26 3 22 24
- *  10  8 15 26 3 22 24
- *  11  8 15 26 3 22 24
- */
-/* -------------------------------------------------------------------- */
-#define _JLU3_FINAL(a,b,c) \
-{ \
-  c ^= b; c -= ROTL32(b,14); \
-  a ^= c; a -= ROTL32(c,11); \
-  b ^= a; b -= ROTL32(a,25); \
-  c ^= b; c -= ROTL32(b,16); \
-  a ^= c; a -= ROTL32(c,4);  \
-  b ^= a; b -= ROTL32(a,14); \
-  c ^= b; c -= ROTL32(b,24); \
-}
-
-#if defined(_JLU3_jlu32w)
-uint32_t jlu32w(uint32_t h, const uint32_t *k, size_t size);
-/* -------------------------------------------------------------------- */
-/**
- *  This works on all machines.  To be useful, it requires
- *  -- that the key be an array of uint32_t's, and
- *  -- that the size be the number of uint32_t's in the key
- * 
- *  The function jlu32w() is identical to jlu32l() on little-endian
- *  machines, and identical to jlu32b() on big-endian machines,
- *  except that the size has to be measured in uint32_ts rather than in
- *  bytes.  jlu32l() is more complicated than jlu32w() only because
- *  jlu32l() has to dance around fitting the key bytes into registers.
- *
- * @param h		the previous hash, or an arbitrary value
- * @param *k		the key, an array of uint32_t values
- * @param size		the size of the key, in uint32_ts
- * @return		the lookup3 hash
- */
-/* -------------------------------------------------------------------- */
-uint32_t jlu32w(uint32_t h, const uint32_t *k, size_t size)
-{
-    uint32_t a = _JLU3_INIT(h, (size * sizeof(*k)));
-    uint32_t b = a;
-    uint32_t c = a;
-
-    if (k == NULL)
-	goto exit;
-
-    /*----------------------------------------------- handle most of the key */
-    while (size > 3) {
-	a += k[0];
-	b += k[1];
-	c += k[2];
-	_JLU3_MIX(a,b,c);
-	size -= 3;
-	k += 3;
-    }
-
-    /*----------------------------------------- handle the last 3 uint32_t's */
-    switch (size) {
-    case 3 : c+=k[2];
-    case 2 : b+=k[1];
-    case 1 : a+=k[0];
-	_JLU3_FINAL(a,b,c);
-	/* fallthrough */
-    case 0:
-	break;
-    }
-    /*---------------------------------------------------- report the result */
-exit:
-    return c;
-}
-#endif	/* defined(_JLU3_jlu32w) */
-
-#if defined(_JLU3_jlu32l)
-uint32_t jlu32l(uint32_t h, const void *key, size_t size);
-/* -------------------------------------------------------------------- */
-/*
- * jlu32l() -- hash a variable-length key into a 32-bit value
- *   h       : can be any 4-byte value
- *   k       : the key (the unaligned variable-length array of bytes)
- *   size    : the size of the key, counting by bytes
- * Returns a 32-bit value.  Every bit of the key affects every bit of
- * the return value.  Two keys differing by one or two bits will have
- * totally different hash values.
- * 
- * The best hash table sizes are powers of 2.  There is no need to do
- * mod a prime (mod is sooo slow!).  If you need less than 32 bits,
- * use a bitmask.  For example, if you need only 10 bits, do
- *   h = (h & hashmask(10));
- * In which case, the hash table should have hashsize(10) elements.
- * 
- * If you are hashing n strings (uint8_t **)k, do it like this:
- *   for (i=0, h=0; i<n; ++i) h = jlu32l(h, k[i], len[i]);
- * 
- * By Bob Jenkins, 2006.  bob_jenkins@burtleburtle.net.  You may use this
- * code any way you wish, private, educational, or commercial.  It's free.
- * 
- * Use for hash table lookup, or anything where one collision in 2^^32 is
- * acceptable.  Do NOT use for cryptographic purposes.
- *
- * @param h		the previous hash, or an arbitrary value
- * @param *k		the key, an array of uint8_t values
- * @param size		the size of the key
- * @return		the lookup3 hash
- */
-/* -------------------------------------------------------------------- */
-uint32_t jlu32l(uint32_t h, const void *key, size_t size)
-{
-    union { const void *ptr; size_t i; } u;
-    uint32_t a = _JLU3_INIT(h, size);
-    uint32_t b = a;
-    uint32_t c = a;
-
-    if (key == NULL)
-	goto exit;
-
-    u.ptr = key;
-    if (HASH_LITTLE_ENDIAN && ((u.i & 0x3) == 0)) {
-	const uint32_t *k = (const uint32_t *)key;	/* read 32-bit chunks */
-#ifdef	VALGRIND
-	const uint8_t  *k8;
-#endif
-
-    /*------ all but last block: aligned reads and affect 32 bits of (a,b,c) */
-	while (size > 12) {
-	    a += k[0];
-	    b += k[1];
-	    c += k[2];
-	    _JLU3_MIX(a,b,c);
-	    size -= 12;
-	    k += 3;
-	}
-
-	/*------------------------- handle the last (probably partial) block */
-	/* 
-	 * "k[2]&0xffffff" actually reads beyond the end of the string, but
-	 * then masks off the part it's not allowed to read.  Because the
-	 * string is aligned, the masked-off tail is in the same word as the
-	 * rest of the string.  Every machine with memory protection I've seen
-	 * does it on word boundaries, so is OK with this.  But VALGRIND will
-	 * still catch it and complain.  The masking trick does make the hash
-	 * noticeably faster for short strings (like English words).
-	 */
-#ifndef VALGRIND
-
-	switch (size) {
-	case 12:	c += k[2]; b+=k[1]; a+=k[0]; break;
-	case 11:	c += k[2]&0xffffff; b+=k[1]; a+=k[0]; break;
-	case 10:	c += k[2]&0xffff; b+=k[1]; a+=k[0]; break;
-	case  9:	c += k[2]&0xff; b+=k[1]; a+=k[0]; break;
-	case  8:	b += k[1]; a+=k[0]; break;
-	case  7:	b += k[1]&0xffffff; a+=k[0]; break;
-	case  6:	b += k[1]&0xffff; a+=k[0]; break;
-	case  5:	b += k[1]&0xff; a+=k[0]; break;
-	case  4:	a += k[0]; break;
-	case  3:	a += k[0]&0xffffff; break;
-	case  2:	a += k[0]&0xffff; break;
-	case  1:	a += k[0]&0xff; break;
-	case  0:	goto exit;
-	}
-
-#else /* make valgrind happy */
-
-	k8 = (const uint8_t *)k;
-	switch (size) {
-	case 12:	c += k[2]; b+=k[1]; a+=k[0]	break;
-	case 11:	c += ((uint32_t)k8[10])<<16;	/* fallthrough */
-	case 10:	c += ((uint32_t)k8[9])<<8;	/* fallthrough */
-	case  9:	c += k8[8];			/* fallthrough */
-	case  8:	b += k[1]; a+=k[0];		break;
-	case  7:	b += ((uint32_t)k8[6])<<16;	/* fallthrough */
-	case  6:	b += ((uint32_t)k8[5])<<8;	/* fallthrough */
-	case  5:	b += k8[4];			/* fallthrough */
-	case  4:	a += k[0];			break;
-	case  3:	a += ((uint32_t)k8[2])<<16;	/* fallthrough */
-	case  2:	a += ((uint32_t)k8[1])<<8;	/* fallthrough */
-	case  1:	a += k8[0];			break;
-	case  0:	goto exit;
-	}
-
-#endif /* !valgrind */
-
-    } else if (HASH_LITTLE_ENDIAN && ((u.i & 0x1) == 0)) {
-	const uint16_t *k = (const uint16_t *)key;	/* read 16-bit chunks */
-	const uint8_t  *k8;
-
-	/*----------- all but last block: aligned reads and different mixing */
-	while (size > 12) {
-	    a += k[0] + (((uint32_t)k[1])<<16);
-	    b += k[2] + (((uint32_t)k[3])<<16);
-	    c += k[4] + (((uint32_t)k[5])<<16);
-	    _JLU3_MIX(a,b,c);
-	    size -= 12;
-	    k += 6;
-	}
-
-	/*------------------------- handle the last (probably partial) block */
-	k8 = (const uint8_t *)k;
-	switch (size) {
-	case 12:
-	    c += k[4]+(((uint32_t)k[5])<<16);
-	    b += k[2]+(((uint32_t)k[3])<<16);
-	    a += k[0]+(((uint32_t)k[1])<<16);
-	    break;
-	case 11:
-	    c += ((uint32_t)k8[10])<<16;
-	    /* fallthrough */
-	case 10:
-	    c += (uint32_t)k[4];
-	    b += k[2]+(((uint32_t)k[3])<<16);
-	    a += k[0]+(((uint32_t)k[1])<<16);
-	    break;
-	case  9:
-	    c += (uint32_t)k8[8];
-	    /* fallthrough */
-	case  8:
-	    b += k[2]+(((uint32_t)k[3])<<16);
-	    a += k[0]+(((uint32_t)k[1])<<16);
-	    break;
-	case  7:
-	    b += ((uint32_t)k8[6])<<16;
-	    /* fallthrough */
-	case  6:
-	    b += (uint32_t)k[2];
-	    a += k[0]+(((uint32_t)k[1])<<16);
-	    break;
-	case  5:
-	    b += (uint32_t)k8[4];
-	    /* fallthrough */
-	case  4:
-	    a += k[0]+(((uint32_t)k[1])<<16);
-	    break;
-	case  3:
-	    a += ((uint32_t)k8[2])<<16;
-	    /* fallthrough */
-	case  2:
-	    a += (uint32_t)k[0];
-	    break;
-	case  1:
-	    a += (uint32_t)k8[0];
-	    break;
-	case  0:
-	    goto exit;
-	}
-
-    } else {		/* need to read the key one byte at a time */
-	const uint8_t *k = (const uint8_t *)key;
-
-	/*----------- all but the last block: affect some 32 bits of (a,b,c) */
-	while (size > 12) {
-	    a += (uint32_t)k[0];
-	    a += ((uint32_t)k[1])<<8;
-	    a += ((uint32_t)k[2])<<16;
-	    a += ((uint32_t)k[3])<<24;
-	    b += (uint32_t)k[4];
-	    b += ((uint32_t)k[5])<<8;
-	    b += ((uint32_t)k[6])<<16;
-	    b += ((uint32_t)k[7])<<24;
-	    c += (uint32_t)k[8];
-	    c += ((uint32_t)k[9])<<8;
-	    c += ((uint32_t)k[10])<<16;
-	    c += ((uint32_t)k[11])<<24;
-	    _JLU3_MIX(a,b,c);
-	    size -= 12;
-	    k += 12;
-	}
-
-	/*---------------------------- last block: affect all 32 bits of (c) */
-	switch (size) {
-	case 12:	c += ((uint32_t)k[11])<<24;	/* fallthrough */
-	case 11:	c += ((uint32_t)k[10])<<16;	/* fallthrough */
-	case 10:	c += ((uint32_t)k[9])<<8;	/* fallthrough */
-	case  9:	c += (uint32_t)k[8];		/* fallthrough */
-	case  8:	b += ((uint32_t)k[7])<<24;	/* fallthrough */
-	case  7:	b += ((uint32_t)k[6])<<16;	/* fallthrough */
-	case  6:	b += ((uint32_t)k[5])<<8;	/* fallthrough */
-	case  5:	b += (uint32_t)k[4];		/* fallthrough */
-	case  4:	a += ((uint32_t)k[3])<<24;	/* fallthrough */
-	case  3:	a += ((uint32_t)k[2])<<16;	/* fallthrough */
-	case  2:	a += ((uint32_t)k[1])<<8;	/* fallthrough */
-	case  1:	a += (uint32_t)k[0];
-	    break;
-	case  0:
-	    goto exit;
-	}
-    }
-
-    _JLU3_FINAL(a,b,c);
-
-exit:
-    return c;
-}
-#endif	/* defined(_JLU3_jlu32l) */
-
-#if defined(_JLU3_jlu32lpair)
-/**
- * jlu32lpair: return 2 32-bit hash values.
- *
- * This is identical to jlu32l(), except it returns two 32-bit hash
- * values instead of just one.  This is good enough for hash table
- * lookup with 2^^64 buckets, or if you want a second hash if you're not
- * happy with the first, or if you want a probably-unique 64-bit ID for
- * the key.  *pc is better mixed than *pb, so use *pc first.  If you want
- * a 64-bit value do something like "*pc + (((uint64_t)*pb)<<32)".
- *
- * @param h		the previous hash, or an arbitrary value
- * @param *key		the key, an array of uint8_t values
- * @param size		the size of the key in bytes
- * @retval *pc,		IN: primary initval, OUT: primary hash
- * *retval *pb		IN: secondary initval, OUT: secondary hash
- */
-void jlu32lpair(const void *key, size_t size, uint32_t *pc, uint32_t *pb)
-{
-    union { const void *ptr; size_t i; } u;
-    uint32_t a = _JLU3_INIT(*pc, size);
-    uint32_t b = a;
-    uint32_t c = a;
-
-    if (key == NULL)
-	goto exit;
-
-    c += *pb;	/* Add the secondary hash. */
-
-    u.ptr = key;
-    if (HASH_LITTLE_ENDIAN && ((u.i & 0x3) == 0)) {
-	const uint32_t *k = (const uint32_t *)key;	/* read 32-bit chunks */
-#ifdef	VALGRIND
-	const uint8_t  *k8;
-#endif
-
-	/*-- all but last block: aligned reads and affect 32 bits of (a,b,c) */
-	while (size > (size_t)12) {
-	    a += k[0];
-	    b += k[1];
-	    c += k[2];
-	    _JLU3_MIX(a,b,c);
-	    size -= 12;
-	    k += 3;
-	}
-	/*------------------------- handle the last (probably partial) block */
-	/* 
-	 * "k[2]&0xffffff" actually reads beyond the end of the string, but
-	 * then masks off the part it's not allowed to read.  Because the
-	 * string is aligned, the masked-off tail is in the same word as the
-	 * rest of the string.  Every machine with memory protection I've seen
-	 * does it on word boundaries, so is OK with this.  But VALGRIND will
-	 * still catch it and complain.  The masking trick does make the hash
-	 * noticeably faster for short strings (like English words).
-	 */
-#ifndef VALGRIND
-
-	switch (size) {
-	case 12:	c += k[2]; b+=k[1]; a+=k[0]; break;
-	case 11:	c += k[2]&0xffffff; b+=k[1]; a+=k[0]; break;
-	case 10:	c += k[2]&0xffff; b+=k[1]; a+=k[0]; break;
-	case  9:	c += k[2]&0xff; b+=k[1]; a+=k[0]; break;
-	case  8:	b += k[1]; a+=k[0]; break;
-	case  7:	b += k[1]&0xffffff; a+=k[0]; break;
-	case  6:	b += k[1]&0xffff; a+=k[0]; break;
-	case  5:	b += k[1]&0xff; a+=k[0]; break;
-	case  4:	a += k[0]; break;
-	case  3:	a += k[0]&0xffffff; break;
-	case  2:	a += k[0]&0xffff; break;
-	case  1:	a += k[0]&0xff; break;
-	case  0:	goto exit;
-	}
-
-#else /* make valgrind happy */
-
-	k8 = (const uint8_t *)k;
-	switch (size) {
-	case 12:	c += k[2]; b+=k[1]; a+=k[0];	break;
-	case 11:	c += ((uint32_t)k8[10])<<16;	/* fallthrough */
-	case 10:	c += ((uint32_t)k8[9])<<8;	/* fallthrough */
-	case  9:	c += k8[8];			/* fallthrough */
-	case  8:	b += k[1]; a+=k[0];		break;
-	case  7:	b += ((uint32_t)k8[6])<<16;	/* fallthrough */
-	case  6:	b += ((uint32_t)k8[5])<<8;	/* fallthrough */
-	case  5:	b += k8[4];			/* fallthrough */
-	case  4:	a += k[0];			break;
-	case  3:	a += ((uint32_t)k8[2])<<16;	/* fallthrough */
-	case  2:	a += ((uint32_t)k8[1])<<8;	/* fallthrough */
-	case  1:	a += k8[0];			break;
-	case  0:	goto exit;
-	}
-
-#endif /* !valgrind */
-
-    } else if (HASH_LITTLE_ENDIAN && ((u.i & 0x1) == 0)) {
-	const uint16_t *k = (const uint16_t *)key;	/* read 16-bit chunks */
-	const uint8_t  *k8;
-
-	/*----------- all but last block: aligned reads and different mixing */
-	while (size > (size_t)12) {
-	    a += k[0] + (((uint32_t)k[1])<<16);
-	    b += k[2] + (((uint32_t)k[3])<<16);
-	    c += k[4] + (((uint32_t)k[5])<<16);
-	    _JLU3_MIX(a,b,c);
-	    size -= 12;
-	    k += 6;
-	}
-
-	/*------------------------- handle the last (probably partial) block */
-	k8 = (const uint8_t *)k;
-	switch (size) {
-	case 12:
-	    c += k[4]+(((uint32_t)k[5])<<16);
-	    b += k[2]+(((uint32_t)k[3])<<16);
-	    a += k[0]+(((uint32_t)k[1])<<16);
-	    break;
-	case 11:
-	    c += ((uint32_t)k8[10])<<16;
-	    /* fallthrough */
-	case 10:
-	    c += k[4];
-	    b += k[2]+(((uint32_t)k[3])<<16);
-	    a += k[0]+(((uint32_t)k[1])<<16);
-	    break;
-	case  9:
-	    c += k8[8];
-	    /* fallthrough */
-	case  8:
-	    b += k[2]+(((uint32_t)k[3])<<16);
-	    a += k[0]+(((uint32_t)k[1])<<16);
-	    break;
-	case  7:
-	    b += ((uint32_t)k8[6])<<16;
-	    /* fallthrough */
-	case  6:
-	    b += k[2];
-	    a += k[0]+(((uint32_t)k[1])<<16);
-	    break;
-	case  5:
-	    b += k8[4];
-	    /* fallthrough */
-	case  4:
-	    a += k[0]+(((uint32_t)k[1])<<16);
-	    break;
-	case  3:
-	    a += ((uint32_t)k8[2])<<16;
-	    /* fallthrough */
-	case  2:
-	    a += k[0];
-	    break;
-	case  1:
-	    a += k8[0];
-	    break;
-	case  0:
-	    goto exit;
-	}
-
-    } else {		/* need to read the key one byte at a time */
-	const uint8_t *k = (const uint8_t *)key;
-
-	/*----------- all but the last block: affect some 32 bits of (a,b,c) */
-	while (size > (size_t)12) {
-	    a += k[0];
-	    a += ((uint32_t)k[1])<<8;
-	    a += ((uint32_t)k[2])<<16;
-	    a += ((uint32_t)k[3])<<24;
-	    b += k[4];
-	    b += ((uint32_t)k[5])<<8;
-	    b += ((uint32_t)k[6])<<16;
-	    b += ((uint32_t)k[7])<<24;
-	    c += k[8];
-	    c += ((uint32_t)k[9])<<8;
-	    c += ((uint32_t)k[10])<<16;
-	    c += ((uint32_t)k[11])<<24;
-	    _JLU3_MIX(a,b,c);
-	    size -= 12;
-	    k += 12;
-	}
-
-	/*---------------------------- last block: affect all 32 bits of (c) */
-	switch (size) {
-	case 12:	c += ((uint32_t)k[11])<<24;	/* fallthrough */
-	case 11:	c += ((uint32_t)k[10])<<16;	/* fallthrough */
-	case 10:	c += ((uint32_t)k[9])<<8;	/* fallthrough */
-	case  9:	c += k[8];			/* fallthrough */
-	case  8:	b += ((uint32_t)k[7])<<24;	/* fallthrough */
-	case  7:	b += ((uint32_t)k[6])<<16;	/* fallthrough */
-	case  6:	b += ((uint32_t)k[5])<<8;	/* fallthrough */
-	case  5:	b += k[4];			/* fallthrough */
-	case  4:	a += ((uint32_t)k[3])<<24;	/* fallthrough */
-	case  3:	a += ((uint32_t)k[2])<<16;	/* fallthrough */
-	case  2:	a += ((uint32_t)k[1])<<8;	/* fallthrough */
-	case  1:	a += k[0];
-	    break;
-	case  0:
-	    goto exit;
-	}
-    }
-
-    _JLU3_FINAL(a,b,c);
-
-exit:
-    *pc = c;
-    *pb = b;
-    return;
-}
-#endif	/* defined(_JLU3_jlu32lpair) */
-
-#if defined(_JLU3_jlu32b)
-uint32_t jlu32b(uint32_t h, const void *key, size_t size);
-/*
- * jlu32b():
- * This is the same as jlu32w() on big-endian machines.  It is different
- * from jlu32l() on all machines.  jlu32b() takes advantage of
- * big-endian byte ordering. 
- *
- * @param h		the previous hash, or an arbitrary value
- * @param *k		the key, an array of uint8_t values
- * @param size		the size of the key
- * @return		the lookup3 hash
- */
-uint32_t jlu32b(uint32_t h, const void *key, size_t size)
-{
-    union { const void *ptr; size_t i; } u;
-    uint32_t a = _JLU3_INIT(h, size);
-    uint32_t b = a;
-    uint32_t c = a;
-
-    if (key == NULL)
-	return h;
-
-    u.ptr = key;
-    if (HASH_BIG_ENDIAN && ((u.i & 0x3) == 0)) {
-	const uint32_t *k = (const uint32_t *)key;	/* read 32-bit chunks */
-#ifdef	VALGRIND
-	const uint8_t  *k8;
-#endif
-
-	/*-- all but last block: aligned reads and affect 32 bits of (a,b,c) */
-	while (size > 12) {
-	    a += k[0];
-	    b += k[1];
-	    c += k[2];
-	    _JLU3_MIX(a,b,c);
-	    size -= 12;
-	    k += 3;
-	}
-
-	/*------------------------- handle the last (probably partial) block */
-	/* 
-	 * "k[2]<<8" actually reads beyond the end of the string, but
-	 * then shifts out the part it's not allowed to read.  Because the
-	 * string is aligned, the illegal read is in the same word as the
-	 * rest of the string.  Every machine with memory protection I've seen
-	 * does it on word boundaries, so is OK with this.  But VALGRIND will
-	 * still catch it and complain.  The masking trick does make the hash
-	 * noticeably faster for short strings (like English words).
-	 */
-#ifndef VALGRIND
-
-	switch (size) {
-	case 12:	c += k[2]; b+=k[1]; a+=k[0]; break;
-	case 11:	c += k[2]&0xffffff00; b+=k[1]; a+=k[0]; break;
-	case 10:	c += k[2]&0xffff0000; b+=k[1]; a+=k[0]; break;
-	case  9:	c += k[2]&0xff000000; b+=k[1]; a+=k[0]; break;
-	case  8:	b += k[1]; a+=k[0]; break;
-	case  7:	b += k[1]&0xffffff00; a+=k[0]; break;
-	case  6:	b += k[1]&0xffff0000; a+=k[0]; break;
-	case  5:	b += k[1]&0xff000000; a+=k[0]; break;
-	case  4:	a += k[0]; break;
-	case  3:	a += k[0]&0xffffff00; break;
-	case  2:	a += k[0]&0xffff0000; break;
-	case  1:	a += k[0]&0xff000000; break;
-	case  0:	goto exit;
-    }
-
-#else  /* make valgrind happy */
-
-	k8 = (const uint8_t *)k;
-	switch (size) {	/* all the case statements fall through */
-	case 12:	c += k[2]; b+=k[1]; a+=k[0];	break;
-	case 11:	c += ((uint32_t)k8[10])<<8;	/* fallthrough */
-	case 10:	c += ((uint32_t)k8[9])<<16;	/* fallthrough */
-	case  9:	c += ((uint32_t)k8[8])<<24;	/* fallthrough */
-	case  8:	b += k[1]; a+=k[0];		break;
-	case  7:	b += ((uint32_t)k8[6])<<8;	/* fallthrough */
-	case  6:	b += ((uint32_t)k8[5])<<16;	/* fallthrough */
-	case  5:	b += ((uint32_t)k8[4])<<24;	/* fallthrough */
-	case  4:	a += k[0];			break;
-	case  3:	a += ((uint32_t)k8[2])<<8;	/* fallthrough */
-	case  2:	a += ((uint32_t)k8[1])<<16;	/* fallthrough */
-	case  1:	a += ((uint32_t)k8[0])<<24;	break;
-	case  0:	goto exit;
-    }
-
-#endif /* !VALGRIND */
-
-    } else {                        /* need to read the key one byte at a time */
-	const uint8_t *k = (const uint8_t *)key;
-
-	/*----------- all but the last block: affect some 32 bits of (a,b,c) */
-	while (size > 12) {
-	    a += ((uint32_t)k[0])<<24;
-	    a += ((uint32_t)k[1])<<16;
-	    a += ((uint32_t)k[2])<<8;
-	    a += ((uint32_t)k[3]);
-	    b += ((uint32_t)k[4])<<24;
-	    b += ((uint32_t)k[5])<<16;
-	    b += ((uint32_t)k[6])<<8;
-	    b += ((uint32_t)k[7]);
-	    c += ((uint32_t)k[8])<<24;
-	    c += ((uint32_t)k[9])<<16;
-	    c += ((uint32_t)k[10])<<8;
-	    c += ((uint32_t)k[11]);
-	    _JLU3_MIX(a,b,c);
-	    size -= 12;
-	    k += 12;
-	}
-
-	/*---------------------------- last block: affect all 32 bits of (c) */
-	switch (size) {	/* all the case statements fall through */
-	case 12:	c += k[11];			/* fallthrough */
-	case 11:	c += ((uint32_t)k[10])<<8;	/* fallthrough */
-	case 10:	c += ((uint32_t)k[9])<<16;	/* fallthrough */
-	case  9:	c += ((uint32_t)k[8])<<24;	/* fallthrough */
-	case  8:	b += k[7];			/* fallthrough */
-	case  7:	b += ((uint32_t)k[6])<<8;	/* fallthrough */
-	case  6:	b += ((uint32_t)k[5])<<16;	/* fallthrough */
-	case  5:	b += ((uint32_t)k[4])<<24;	/* fallthrough */
-	case  4:	a += k[3];			/* fallthrough */
-	case  3:	a += ((uint32_t)k[2])<<8;	/* fallthrough */
-	case  2:	a += ((uint32_t)k[1])<<16;	/* fallthrough */
-	case  1:	a += ((uint32_t)k[0])<<24;	/* fallthrough */
-	    break;
-	case  0:
-	    goto exit;
-	}
-    }
-
-    _JLU3_FINAL(a,b,c);
-
-exit:
-    return c;
-}
-#endif	/* defined(_JLU3_jlu32b) */
-
-#if defined(_JLU3_SELFTEST)
-
-/* used for timings */
-static void driver1(void)
-{
-    uint8_t buf[256];
-    uint32_t i;
-    uint32_t h=0;
-    time_t a,z;
-
-    time(&a);
-    for (i=0; i<256; ++i) buf[i] = 'x';
-    for (i=0; i<1; ++i) {
-	h = jlu32l(h, &buf[0], sizeof(buf[0]));
-    }
-    time(&z);
-    if (z-a > 0) printf("time %d %.8x\n", (int)(z-a), h);
-}
-
-/* check that every input bit changes every output bit half the time */
-#define HASHSTATE 1
-#define HASHLEN   1
-#define MAXPAIR 60
-#define MAXLEN  70
-static void driver2(void)
-{
-    uint8_t qa[MAXLEN+1], qb[MAXLEN+2], *a = &qa[0], *b = &qb[1];
-    uint32_t c[HASHSTATE], d[HASHSTATE], i=0, j=0, k, l, m=0, z;
-    uint32_t e[HASHSTATE],f[HASHSTATE],g[HASHSTATE],h[HASHSTATE];
-    uint32_t x[HASHSTATE],y[HASHSTATE];
-    uint32_t hlen;
-
-    printf("No more than %d trials should ever be needed \n",MAXPAIR/2);
-    for (hlen=0; hlen < MAXLEN; ++hlen) {
-	z=0;
-	for (i=0; i<hlen; ++i) {	/*-------------- for each input byte, */
-	    for (j=0; j<8; ++j) {	/*--------------- for each input bit, */
-		for (m=1; m<8; ++m) {	/*---- for several possible initvals, */
-		    for (l=0; l<HASHSTATE; ++l)
-			e[l]=f[l]=g[l]=h[l]=x[l]=y[l]=~((uint32_t)0);
-
-		    /* check that every output bit is affected by that input bit */
-		    for (k=0; k<MAXPAIR; k+=2) { 
-			uint32_t finished=1;
-			/* keys have one bit different */
-			for (l=0; l<hlen+1; ++l) {a[l] = b[l] = (uint8_t)0;}
-			/* have a and b be two keys differing in only one bit */
-			a[i] ^= (k<<j);
-			a[i] ^= (k>>(8-j));
-			c[0] = jlu32l(m, a, hlen);
-			b[i] ^= ((k+1)<<j);
-			b[i] ^= ((k+1)>>(8-j));
-			d[0] = jlu32l(m, b, hlen);
-			/* check every bit is 1, 0, set, and not set at least once */
-			for (l=0; l<HASHSTATE; ++l) {
-			    e[l] &= (c[l]^d[l]);
-			    f[l] &= ~(c[l]^d[l]);
-			    g[l] &= c[l];
-			    h[l] &= ~c[l];
-			    x[l] &= d[l];
-			    y[l] &= ~d[l];
-			    if (e[l]|f[l]|g[l]|h[l]|x[l]|y[l]) finished=0;
-			}
-			if (finished) break;
-		    }
-		    if (k>z) z=k;
-		    if (k == MAXPAIR) {
-			printf("Some bit didn't change: ");
-			printf("%.8x %.8x %.8x %.8x %.8x %.8x  ",
-				e[0],f[0],g[0],h[0],x[0],y[0]);
-			printf("i %u j %u m %u len %u\n", i, j, m, hlen);
-		    }
-		    if (z == MAXPAIR) goto done;
-		}
-	    }
-	}
-   done:
-	if (z < MAXPAIR) {
-	    printf("Mix success  %2u bytes  %2u initvals  ",i,m);
-	    printf("required  %u  trials\n", z/2);
-	}
-    }
-    printf("\n");
-}
-
-/* Check for reading beyond the end of the buffer and alignment problems */
-static void driver3(void)
-{
-    uint8_t buf[MAXLEN+20], *b;
-    uint32_t len;
-    uint8_t q[] = "This is the time for all good men to come to the aid of their country...";
-    uint32_t h;
-    uint8_t qq[] = "xThis is the time for all good men to come to the aid of their country...";
-    uint32_t i;
-    uint8_t qqq[] = "xxThis is the time for all good men to come to the aid of their country...";
-    uint32_t j;
-    uint8_t qqqq[] = "xxxThis is the time for all good men to come to the aid of their country...";
-    uint32_t ref,x,y;
-    uint8_t *p;
-    uint32_t m = 13;
-
-    printf("Endianness.  These lines should all be the same (for values filled in):\n");
-    printf("%.8x                            %.8x                            %.8x\n",
-	jlu32w(m, (const uint32_t *)q, (sizeof(q)-1)/4),
-	jlu32w(m, (const uint32_t *)q, (sizeof(q)-5)/4),
-	jlu32w(m, (const uint32_t *)q, (sizeof(q)-9)/4));
-    p = q;
-    printf("%.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x\n",
-	jlu32l(m, p, sizeof(q)-1), jlu32l(m, p, sizeof(q)-2),
-	jlu32l(m, p, sizeof(q)-3), jlu32l(m, p, sizeof(q)-4),
-	jlu32l(m, p, sizeof(q)-5), jlu32l(m, p, sizeof(q)-6),
-	jlu32l(m, p, sizeof(q)-7), jlu32l(m, p, sizeof(q)-8),
-	jlu32l(m, p, sizeof(q)-9), jlu32l(m, p, sizeof(q)-10),
-	jlu32l(m, p, sizeof(q)-11), jlu32l(m, p, sizeof(q)-12));
-    p = &qq[1];
-    printf("%.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x\n",
-	jlu32l(m, p, sizeof(q)-1), jlu32l(m, p, sizeof(q)-2),
-	jlu32l(m, p, sizeof(q)-3), jlu32l(m, p, sizeof(q)-4),
-	jlu32l(m, p, sizeof(q)-5), jlu32l(m, p, sizeof(q)-6),
-	jlu32l(m, p, sizeof(q)-7), jlu32l(m, p, sizeof(q)-8),
-	jlu32l(m, p, sizeof(q)-9), jlu32l(m, p, sizeof(q)-10),
-	jlu32l(m, p, sizeof(q)-11), jlu32l(m, p, sizeof(q)-12));
-    p = &qqq[2];
-    printf("%.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x\n",
-	jlu32l(m, p, sizeof(q)-1), jlu32l(m, p, sizeof(q)-2),
-	jlu32l(m, p, sizeof(q)-3), jlu32l(m, p, sizeof(q)-4),
-	jlu32l(m, p, sizeof(q)-5), jlu32l(m, p, sizeof(q)-6),
-	jlu32l(m, p, sizeof(q)-7), jlu32l(m, p, sizeof(q)-8),
-	jlu32l(m, p, sizeof(q)-9), jlu32l(m, p, sizeof(q)-10),
-	jlu32l(m, p, sizeof(q)-11), jlu32l(m, p, sizeof(q)-12));
-    p = &qqqq[3];
-    printf("%.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x\n",
-	jlu32l(m, p, sizeof(q)-1), jlu32l(m, p, sizeof(q)-2),
-	jlu32l(m, p, sizeof(q)-3), jlu32l(m, p, sizeof(q)-4),
-	jlu32l(m, p, sizeof(q)-5), jlu32l(m, p, sizeof(q)-6),
-	jlu32l(m, p, sizeof(q)-7), jlu32l(m, p, sizeof(q)-8),
-	jlu32l(m, p, sizeof(q)-9), jlu32l(m, p, sizeof(q)-10),
-	jlu32l(m, p, sizeof(q)-11), jlu32l(m, p, sizeof(q)-12));
-    printf("\n");
-    for (h=0, b=buf+1; h<8; ++h, ++b) {
-	for (i=0; i<MAXLEN; ++i) {
-	    len = i;
-	    for (j=0; j<i; ++j)
-		*(b+j)=0;
-
-	    /* these should all be equal */
-	    m = 1;
-	    ref = jlu32l(m, b, len);
-	    *(b+i)=(uint8_t)~0;
-	    *(b-1)=(uint8_t)~0;
-	    x = jlu32l(m, b, len);
-	    y = jlu32l(m, b, len);
-	    if ((ref != x) || (ref != y)) 
-		printf("alignment error: %.8x %.8x %.8x %u %u\n",ref,x,y, h, i);
-	}
-    }
-}
-
-/* check for problems with nulls */
-static void driver4(void)
-{
-    uint8_t buf[1];
-    uint32_t h;
-    uint32_t i;
-    uint32_t state[HASHSTATE];
-
-    buf[0] = ~0;
-    for (i=0; i<HASHSTATE; ++i)
-	state[i] = 1;
-    printf("These should all be different\n");
-    h = 0;
-    for (i=0; i<8; ++i) {
-	h = jlu32l(h, buf, 0);
-	printf("%2ld  0-byte strings, hash is  %.8x\n", (long)i, h);
-    }
-}
-
-
-int main(int argc, char ** argv)
-{
-    driver1();	/* test that the key is hashed: used for timings */
-    driver2();	/* test that whole key is hashed thoroughly */
-    driver3();	/* test that nothing but the key is hashed */
-    driver4();	/* test hashing multiple buffers (all buffers are null) */
-    return 1;
-}
-
-#endif  /* _JLU3_SELFTEST */

popt/popt.h

@@ -1,4 +1,5 @@
-/** @file
+/** \file popt/popt.h
+ * \ingroup popt
  */
 
 /* (C) 1998-2000 Red Hat, Inc. -- Licensing details are in the COPYING
@@ -12,49 +13,45 @@
 
 #define POPT_OPTION_DEPTH	10
 
-/**
+/** \ingroup popt
  * \name Arg type identifiers
  */
-#define POPT_ARG_NONE		 0U	/*!< no arg */
-#define POPT_ARG_STRING		 1U	/*!< arg will be saved as string */
-#define POPT_ARG_INT		 2U	/*!< arg ==> int */
-#define POPT_ARG_LONG		 3U	/*!< arg ==> long */
-#define POPT_ARG_INCLUDE_TABLE	 4U	/*!< arg points to table */
-#define POPT_ARG_CALLBACK	 5U	/*!< table-wide callback... must be
+/*@{*/
+#define POPT_ARG_NONE		0	/*!< no arg */
+#define POPT_ARG_STRING		1	/*!< arg will be saved as string */
+#define POPT_ARG_INT		2	/*!< arg will be converted to int */
+#define POPT_ARG_LONG		3	/*!< arg will be converted to long */
+#define POPT_ARG_INCLUDE_TABLE	4	/*!< arg points to table */
+#define POPT_ARG_CALLBACK	5	/*!< table-wide callback... must be
 					   set first in table; arg points 
 					   to callback, descrip points to 
 					   callback data to pass */
-#define POPT_ARG_INTL_DOMAIN     6U	/*!< set the translation domain
+#define POPT_ARG_INTL_DOMAIN    6       /*!< set the translation domain
 					   for this table and any
 					   included tables; arg points
 					   to the domain string */
-#define POPT_ARG_VAL		 7U	/*!< arg should take value val */
-#define	POPT_ARG_FLOAT		 8U	/*!< arg ==> float */
-#define	POPT_ARG_DOUBLE		 9U	/*!< arg ==> double */
-#define	POPT_ARG_LONGLONG	 10U	/*!< arg ==> long long */
+#define POPT_ARG_VAL		7	/*!< arg should take value val */
+#define	POPT_ARG_FLOAT		8	/*!< arg will be converted to float */
+#define	POPT_ARG_DOUBLE		9	/*!< arg will be converted to double */
 
-#define POPT_ARG_MAINCALL	(16U+11U)	/*!< EXPERIMENTAL: return (*arg) (argc, argv) */
-#define	POPT_ARG_ARGV		12U	/*!< dupe'd arg appended to realloc'd argv array. */
-#define	POPT_ARG_SHORT		13U	/*!< arg ==> short */
-#define	POPT_ARG_BITSET		(16U+14U)	/*!< arg ==> bit set */
+#define POPT_ARG_MASK		0x0000FFFF
+/*@}*/
 
-#define POPT_ARG_MASK		0x000000FFU
-#define POPT_GROUP_MASK		0x0000FF00U
-
-/**
+/** \ingroup popt
  * \name Arg modifiers
  */
-#define POPT_ARGFLAG_ONEDASH	0x80000000U  /*!< allow -longoption */
-#define POPT_ARGFLAG_DOC_HIDDEN 0x40000000U  /*!< don't show in help/usage */
-#define POPT_ARGFLAG_STRIP	0x20000000U  /*!< strip this arg from argv(only applies to long args) */
-#define	POPT_ARGFLAG_OPTIONAL	0x10000000U  /*!< arg may be missing */
+/*@{*/
+#define POPT_ARGFLAG_ONEDASH	0x80000000  /*!< allow -longoption */
+#define POPT_ARGFLAG_DOC_HIDDEN 0x40000000  /*!< don't show in help/usage */
+#define POPT_ARGFLAG_STRIP	0x20000000  /*!< strip this arg from argv(only applies to long args) */
+#define	POPT_ARGFLAG_OPTIONAL	0x10000000  /*!< arg may be missing */
 
-#define	POPT_ARGFLAG_OR		0x08000000U  /*!< arg will be or'ed */
-#define	POPT_ARGFLAG_NOR	0x09000000U  /*!< arg will be nor'ed */
-#define	POPT_ARGFLAG_AND	0x04000000U  /*!< arg will be and'ed */
-#define	POPT_ARGFLAG_NAND	0x05000000U  /*!< arg will be nand'ed */
-#define	POPT_ARGFLAG_XOR	0x02000000U  /*!< arg will be xor'ed */
-#define	POPT_ARGFLAG_NOT	0x01000000U  /*!< arg will be negated */
+#define	POPT_ARGFLAG_OR		0x08000000  /*!< arg will be or'ed */
+#define	POPT_ARGFLAG_NOR	0x09000000  /*!< arg will be nor'ed */
+#define	POPT_ARGFLAG_AND	0x04000000  /*!< arg will be and'ed */
+#define	POPT_ARGFLAG_NAND	0x05000000  /*!< arg will be nand'ed */
+#define	POPT_ARGFLAG_XOR	0x02000000  /*!< arg will be xor'ed */
+#define	POPT_ARGFLAG_NOT	0x01000000  /*!< arg will be negated */
 #define POPT_ARGFLAG_LOGICALOPS \
         (POPT_ARGFLAG_OR|POPT_ARGFLAG_AND|POPT_ARGFLAG_XOR)
 
@@ -63,126 +60,158 @@
 #define	POPT_BIT_CLR	(POPT_ARG_VAL|POPT_ARGFLAG_NAND)
 					/*!< clear arg bit(s) */
 
-#define	POPT_ARGFLAG_SHOW_DEFAULT 0x00800000U /*!< show default value in --help */
-#define	POPT_ARGFLAG_RANDOM	0x00400000U  /*!< random value in [1,arg] */
-#define	POPT_ARGFLAG_TOGGLE	0x00200000U  /*!< permit --[no]opt prefix toggle */
+#define	POPT_ARGFLAG_SHOW_DEFAULT 0x00800000 /*!< show default value in --help */
 
-/**
+/*@}*/
+
+/** \ingroup popt
  * \name Callback modifiers
  */
-#define POPT_CBFLAG_PRE		0x80000000U  /*!< call the callback before parse */
-#define POPT_CBFLAG_POST	0x40000000U  /*!< call the callback after parse */
-#define POPT_CBFLAG_INC_DATA	0x20000000U  /*!< use data from the include line,
+/*@{*/
+#define POPT_CBFLAG_PRE		0x80000000  /*!< call the callback before parse */
+#define POPT_CBFLAG_POST	0x40000000  /*!< call the callback after parse */
+#define POPT_CBFLAG_INC_DATA	0x20000000  /*!< use data from the include line,
 					       not the subtable */
-#define POPT_CBFLAG_SKIPOPTION	0x10000000U  /*!< don't callback with option */
-#define POPT_CBFLAG_CONTINUE	0x08000000U  /*!< continue callbacks with option */
+#define POPT_CBFLAG_SKIPOPTION	0x10000000  /*!< don't callback with option */
+#define POPT_CBFLAG_CONTINUE	0x08000000  /*!< continue callbacks with option */
+/*@}*/
 
-/**
+/** \ingroup popt
  * \name Error return values
  */
+/*@{*/
 #define POPT_ERROR_NOARG	-10	/*!< missing argument */
 #define POPT_ERROR_BADOPT	-11	/*!< unknown option */
 #define POPT_ERROR_UNWANTEDARG	-12	/*!< option does not take an argument */
 #define POPT_ERROR_OPTSTOODEEP	-13	/*!< aliases nested too deeply */
-#define POPT_ERROR_BADQUOTE	-15	/*!< error in parameter quoting */
+#define POPT_ERROR_BADQUOTE	-15	/*!< error in paramter quoting */
 #define POPT_ERROR_ERRNO	-16	/*!< errno set, use strerror(errno) */
 #define POPT_ERROR_BADNUMBER	-17	/*!< invalid numeric value */
 #define POPT_ERROR_OVERFLOW	-18	/*!< number too large or too small */
 #define	POPT_ERROR_BADOPERATION	-19	/*!< mutually exclusive logical operations requested */
 #define	POPT_ERROR_NULLARG	-20	/*!< opt->arg should not be NULL */
 #define	POPT_ERROR_MALLOC	-21	/*!< memory allocation failed */
-#define	POPT_ERROR_BADCONFIG	-22	/*!< config file failed sanity test */
+/*@}*/
 
-/**
+/** \ingroup popt
  * \name poptBadOption() flags
  */
-#define POPT_BADOPTION_NOALIAS  (1U << 0)  /*!< don't go into an alias */
+/*@{*/
+#define POPT_BADOPTION_NOALIAS  (1 << 0)  /*!< don't go into an alias */
+/*@}*/
 
-/**
+/** \ingroup popt
  * \name poptGetContext() flags
  */
-#define POPT_CONTEXT_NO_EXEC	(1U << 0)  /*!< ignore exec expansions */
-#define POPT_CONTEXT_KEEP_FIRST	(1U << 1)  /*!< pay attention to argv[0] */
-#define POPT_CONTEXT_POSIXMEHARDER (1U << 2) /*!< options can't follow args */
-#define POPT_CONTEXT_ARG_OPTS	(1U << 4) /*!< return args as options with value 0 */
+/*@{*/
+#define POPT_CONTEXT_NO_EXEC	(1 << 0)  /*!< ignore exec expansions */
+#define POPT_CONTEXT_KEEP_FIRST	(1 << 1)  /*!< pay attention to argv[0] */
+#define POPT_CONTEXT_POSIXMEHARDER (1 << 2) /*!< options can't follow args */
+#define POPT_CONTEXT_ARG_OPTS	(1 << 4) /*!< return args as options with value 0 */
+/*@}*/
 
-/**
+/** \ingroup popt
  */
 struct poptOption {
+/*@observer@*/ /*@null@*/
     const char * longName;	/*!< may be NULL */
-    char shortName;		/*!< may be '\0' */
-    unsigned int argInfo;	/*!< type of argument expected after the option */
+    char shortName;		/*!< may be NUL */
+    int argInfo;
+/*@shared@*/ /*@null@*/
     void * arg;			/*!< depends on argInfo */
-    int val;			/*!< 0 means don't return, just update arg */
+    int val;			/*!< 0 means don't return, just update flag */
+/*@observer@*/ /*@null@*/
     const char * descrip;	/*!< description for autohelp -- may be NULL */
-    const char * argDescrip;	/*!< argument description for autohelp -- may be NULL */
+/*@observer@*/ /*@null@*/
+    const char * argDescrip;	/*!< argument description for autohelp */
 };
 
-/**
+/** \ingroup popt
  * A popt alias argument for poptAddAlias().
  */
 struct poptAlias {
+/*@owned@*/ /*@null@*/
     const char * longName;	/*!< may be NULL */
     char shortName;		/*!< may be NUL */
     int argc;
+/*@owned@*/
     const char ** argv;		/*!< must be free()able */
 };
 
-/**
+/** \ingroup popt
  * A popt alias or exec argument for poptAddItem().
  */
+/*@-exporttype@*/
 typedef struct poptItem_s {
     struct poptOption option;	/*!< alias/exec name(s) and description. */
     int argc;			/*!< (alias) no. of args. */
+/*@owned@*/
     const char ** argv;		/*!< (alias) args, must be free()able. */
 } * poptItem;
+/*@=exporttype@*/
 
-/**
+/** \ingroup popt
  * \name Auto-generated help/usage
  */
+/*@{*/
 
 /**
  * Empty table marker to enable displaying popt alias/exec options.
  */
+/*@-exportvar@*/
+/*@unchecked@*/ /*@observer@*/
 extern struct poptOption poptAliasOptions[];
+/*@=exportvar@*/
 #define POPT_AUTOALIAS { NULL, '\0', POPT_ARG_INCLUDE_TABLE, poptAliasOptions, \
 			0, "Options implemented via popt alias/exec:", NULL },
 
 /**
  * Auto help table options.
  */
+/*@-exportvar@*/
+/*@unchecked@*/ /*@observer@*/
 extern struct poptOption poptHelpOptions[];
+/*@=exportvar@*/
 
+/*@-exportvar@*/
+/*@unchecked@*/ /*@observer@*/
 extern struct poptOption * poptHelpOptionsI18N;
+/*@=exportvar@*/
 
 #define POPT_AUTOHELP { NULL, '\0', POPT_ARG_INCLUDE_TABLE, poptHelpOptions, \
 			0, "Help options:", NULL },
 
-#define POPT_TABLEEND { NULL, '\0', 0, NULL, 0, NULL, NULL }
+#define POPT_TABLEEND { NULL, '\0', 0, 0, 0, NULL, NULL }
+/*@}*/
 
-/**
+/** \ingroup popt
  */
-typedef struct poptContext_s * poptContext;
+/*@-exporttype@*/
+typedef /*@abstract@*/ struct poptContext_s * poptContext;
+/*@=exporttype@*/
 
-/**
+/** \ingroup popt
  */
 #ifndef __cplusplus
+/*@-exporttype -typeuse@*/
 typedef struct poptOption * poptOption;
+/*@=exporttype =typeuse@*/
 #endif
 
-/**
- */
+/*@-exportconst@*/
 enum poptCallbackReason {
     POPT_CALLBACK_REASON_PRE	= 0, 
     POPT_CALLBACK_REASON_POST	= 1,
     POPT_CALLBACK_REASON_OPTION = 2
 };
+/*@=exportconst@*/
 
 #ifdef __cplusplus
 extern "C" {
 #endif
+/*@-type@*/
 
-/**
+/** \ingroup popt
  * Table callback prototype.
  * @param con		context
  * @param reason	reason for callback
@@ -192,18 +221,13 @@ extern "C" {
  */
 typedef void (*poptCallbackType) (poptContext con, 
 		enum poptCallbackReason reason,
-		const struct poptOption * opt,
-		const char * arg,
-		const void * data);
+		/*@null@*/ const struct poptOption * opt,
+		/*@null@*/ const char * arg,
+		/*@null@*/ const void * data)
+	/*@globals internalState @*/
+	/*@modifies internalState @*/;
 
-/**
- * Destroy context.
- * @param con		context
- * @return		NULL always
- */
-poptContext poptFreeContext( poptContext con);
-
-/**
+/** \ingroup popt
  * Initialize popt context.
  * @param name		context name (usually argv[0] program name)
  * @param argc		no. of arguments
@@ -212,90 +236,97 @@ poptContext poptFreeContext( poptContext con);
  * @param flags		or'd POPT_CONTEXT_* bits
  * @return		initialized popt context
  */
+/*@only@*/ /*@null@*/
 poptContext poptGetContext(
-		const char * name,
-		int argc, const char ** argv,
-		const struct poptOption * options,
-		unsigned int flags);
+		/*@dependent@*/ /*@keep@*/ const char * name,
+		int argc, /*@dependent@*/ /*@keep@*/ const char ** argv,
+		/*@dependent@*/ /*@keep@*/ const struct poptOption * options,
+		int flags)
+	/*@*/;
 
-/**
- * Destroy context (alternative implementation).
- * @param con		context
- * @return		NULL always
- */
-poptContext poptFini( poptContext con);
-
-/**
- * Initialize popt context (alternative implementation).
- * This routine does poptGetContext() and then poptReadConfigFiles().
- * @param argc		no. of arguments
- * @param argv		argument array
- * @param options	address of popt option table
- * @param configPaths	colon separated file path(s) to read.
- * @return		initialized popt context (NULL on error).
- */
-poptContext poptInit(int argc, const char ** argv,
-		const struct poptOption * options,
-		const char * configPaths);
-
-/**
+/** \ingroup popt
  * Reinitialize popt context.
  * @param con		context
  */
-void poptResetContext(poptContext con);
+/*@unused@*/
+void poptResetContext(/*@null@*/poptContext con)
+	/*@modifies con @*/;
 
-/**
+/** \ingroup popt
  * Return value of next option found.
  * @param con		context
  * @return		next option val, -1 on last item, POPT_ERROR_* on error
  */
-int poptGetNextOpt(poptContext con);
+int poptGetNextOpt(/*@null@*/poptContext con)
+	/*@globals fileSystem, internalState @*/
+	/*@modifies con, fileSystem, internalState @*/;
 
-/**
+/** \ingroup popt
  * Return next option argument (if any).
  * @param con		context
  * @return		option argument, NULL if no argument is available
  */
-char * poptGetOptArg(poptContext con);
+/*@observer@*/ /*@null@*/ /*@unused@*/
+const char * poptGetOptArg(/*@null@*/poptContext con)
+	/*@modifies con @*/;
 
-/**
+/** \ingroup popt
  * Return next argument.
  * @param con		context
  * @return		next argument, NULL if no argument is available
  */
-const char * poptGetArg(poptContext con);
+/*@observer@*/ /*@null@*/ /*@unused@*/
+const char * poptGetArg(/*@null@*/poptContext con)
+	/*@modifies con @*/;
 
-/**
+/** \ingroup popt
  * Peek at current argument.
  * @param con		context
  * @return		current argument, NULL if no argument is available
  */
-const char * poptPeekArg(poptContext con);
+/*@observer@*/ /*@null@*/ /*@unused@*/
+const char * poptPeekArg(/*@null@*/poptContext con)
+	/*@*/;
 
-/**
+/** \ingroup popt
  * Return remaining arguments.
  * @param con		context
  * @return		argument array, NULL terminated
  */
-const char ** poptGetArgs(poptContext con);
+/*@observer@*/ /*@null@*/
+const char ** poptGetArgs(/*@null@*/poptContext con)
+	/*@modifies con @*/;
 
-/**
+/** \ingroup popt
  * Return the option which caused the most recent error.
  * @param con		context
  * @param flags
  * @return		offending option
  */
-const char * poptBadOption(poptContext con, unsigned int flags);
+/*@observer@*/
+const char * poptBadOption(/*@null@*/poptContext con, int flags)
+	/*@*/;
 
-/**
+/** \ingroup popt
+ * Destroy context.
+ * @param con		context
+ * @return		NULL always
+ */
+/*@null@*/
+poptContext poptFreeContext( /*@only@*/ /*@null@*/ poptContext con)
+	/*@modifies con @*/;
+
+/** \ingroup popt
  * Add arguments to context.
  * @param con		context
  * @param argv		argument array, NULL terminated
  * @return		0 on success, POPT_ERROR_OPTSTOODEEP on failure
  */
-int poptStuffArgs(poptContext con, const char ** argv);
+/*@unused@*/
+int poptStuffArgs(poptContext con, /*@keep@*/ const char ** argv)
+	/*@modifies con @*/;
 
-/**
+/** \ingroup popt
  * Add alias to context.
  * @todo Pass alias by reference, not value.
  * @deprecated Use poptAddItem instead.
@@ -304,64 +335,44 @@ int poptStuffArgs(poptContext con, const char ** argv);
  * @param flags		(unused)
  * @return		0 on success
  */
-int poptAddAlias(poptContext con, struct poptAlias alias, int flags);
+/*@unused@*/
+int poptAddAlias(poptContext con, struct poptAlias alias, int flags)
+	/*@modifies con @*/;
 
-/**
+/** \ingroup popt
  * Add alias/exec item to context.
  * @param con		context
  * @param newItem	alias/exec item to add
  * @param flags		0 for alias, 1 for exec
  * @return		0 on success
  */
-int poptAddItem(poptContext con, poptItem newItem, int flags);
+int poptAddItem(poptContext con, poptItem newItem, int flags)
+	/*@modifies con @*/;
 
-/**
- * Test path/file for config file sanity (regular file, permissions etc)
- * @param fn		file name
- * @return		1 on OK, 0 on NOTOK.
- */
-int poptSaneFile(const char * fn);
-
-/**
- * Read a file into a buffer.
- * @param fn		file name
- * @retval *bp		buffer (malloc'd) (or NULL)
- * @retval *nbp		no. of bytes in buffer (including final NUL) (or NULL)
- * @param flags		1 to trim escaped newlines
- * return		0 on success
- */
-int poptReadFile(const char * fn, char ** bp,
-		size_t * nbp, int flags);
-#define	POPT_READFILE_TRIMNEWLINES	1
-
-/**
+/** \ingroup popt
  * Read configuration file.
  * @param con		context
  * @param fn		file name to read
  * @return		0 on success, POPT_ERROR_ERRNO on failure
  */
-int poptReadConfigFile(poptContext con, const char * fn);
+int poptReadConfigFile(poptContext con, const char * fn)
+	/*@globals errno, fileSystem, internalState @*/
+	/*@modifies con->execs, con->numExecs,
+		errno, fileSystem, internalState @*/;
 
-/**
- * Read configuration file(s).
- * Colon separated files to read, looping over poptReadConfigFile().
- * Note that an '@' character preceding a path in the list will
- * also perform additional sanity checks on the file before reading.
- * @param con		context
- * @param paths		colon separated file name(s) to read
- * @return		0 on success, POPT_ERROR_BADCONFIG on failure
- */
-int poptReadConfigFiles(poptContext con, const char * paths);
-
-/**
+/** \ingroup popt
  * Read default configuration from /etc/popt and $HOME/.popt.
  * @param con		context
  * @param useEnv	(unused)
  * @return		0 on success, POPT_ERROR_ERRNO on failure
  */
-int poptReadDefaultConfig(poptContext con, int useEnv);
+/*@unused@*/
+int poptReadDefaultConfig(poptContext con, /*@unused@*/ int useEnv)
+	/*@globals fileSystem, internalState @*/
+	/*@modifies con->execs, con->numExecs,
+		fileSystem, internalState @*/;
 
-/**
+/** \ingroup popt
  * Duplicate an argument array.
  * @note: The argument array is malloc'd as a single area, so only argv must
  * be free'd.
@@ -372,11 +383,12 @@ int poptReadDefaultConfig(poptContext con, int useEnv);
  * @retval argvPtr	address of returned argument array
  * @return		0 on success, POPT_ERROR_NOARG on failure
  */
-int poptDupArgv(int argc, const char **argv,
-		int * argcPtr,
-		const char *** argvPtr);
+int poptDupArgv(int argc, /*@null@*/ const char **argv,
+		/*@null@*/ /*@out@*/ int * argcPtr,
+		/*@null@*/ /*@out@*/ const char *** argvPtr)
+	/*@modifies *argcPtr, *argvPtr @*/;
 
-/**
+/** \ingroup popt
  * Parse a string into an argument array.
  * The parse allows ', ", and \ quoting, but ' is treated the same as " and
  * both may include \ quotes.
@@ -388,9 +400,10 @@ int poptDupArgv(int argc, const char **argv,
  * @retval argvPtr	address of returned argument array
  */
 int poptParseArgvString(const char * s,
-		int * argcPtr, const char *** argvPtr);
+		/*@out@*/ int * argcPtr, /*@out@*/ const char *** argvPtr)
+	/*@modifies *argcPtr, *argvPtr @*/;
 
-/**
+/** \ingroup popt
  * Parses an input configuration file and returns an string that is a 
  * command line.  For use with popt.  You must free the return value when done.
  *
@@ -405,8 +418,8 @@ bla=bla
 
 this_is   =   fdsafdas
      bad_line=        
-  really bad line
-  really bad line  = again
+  reall bad line  
+  reall bad line  = again
 5555=   55555   
   test = with lots of spaces
 \endverbatim
@@ -436,82 +449,83 @@ this_is   =   fdsafdas
  * @return		0 on success
  * @see			poptParseArgvString
  */
-int poptConfigFileToString(FILE *fp, char ** argstrp, int flags);
+/*@-fcnuse@*/
+int poptConfigFileToString(FILE *fp, /*@out@*/ char ** argstrp, int flags)
+	/*@globals fileSystem @*/
+	/*@modifies *fp, *argstrp, fileSystem @*/;
+/*@=fcnuse@*/
 
-/**
+/** \ingroup popt
  * Return formatted error string for popt failure.
  * @param error		popt error
  * @return		error string
  */
-const char * poptStrerror(const int error);
+/*@observer@*/
+const char * poptStrerror(const int error)
+	/*@*/;
 
-/**
+/** \ingroup popt
  * Limit search for executables.
  * @param con		context
  * @param path		single path to search for executables
  * @param allowAbsolute	absolute paths only?
  */
-void poptSetExecPath(poptContext con, const char * path, int allowAbsolute);
+/*@unused@*/
+void poptSetExecPath(poptContext con, const char * path, int allowAbsolute)
+	/*@modifies con @*/;
 
-/**
+/** \ingroup popt
  * Print detailed description of options.
  * @param con		context
- * @param fp		output file handle
+ * @param fp		ouput file handle
  * @param flags		(unused)
  */
-void poptPrintHelp(poptContext con, FILE * fp, int flags);
+void poptPrintHelp(poptContext con, FILE * fp, /*@unused@*/ int flags)
+	/*@globals fileSystem @*/
+	/*@modifies *fp, fileSystem @*/;
 
-/**
+/** \ingroup popt
  * Print terse description of options.
  * @param con		context
- * @param fp		output file handle
+ * @param fp		ouput file handle
  * @param flags		(unused)
  */
-void poptPrintUsage(poptContext con, FILE * fp, int flags);
+void poptPrintUsage(poptContext con, FILE * fp, /*@unused@*/ int flags)
+	/*@globals fileSystem @*/
+	/*@modifies *fp, fileSystem @*/;
 
-/**
+/** \ingroup popt
  * Provide text to replace default "[OPTION...]" in help/usage output.
  * @param con		context
  * @param text		replacement text
  */
-void poptSetOtherOptionHelp(poptContext con, const char * text);
+/*@-fcnuse@*/
+void poptSetOtherOptionHelp(poptContext con, const char * text)
+	/*@modifies con @*/;
+/*@=fcnuse@*/
 
-/**
+/** \ingroup popt
  * Return argv[0] from context.
  * @param con		context
  * @return		argv[0]
  */
-const char * poptGetInvocationName(poptContext con);
+/*@-fcnuse@*/
+/*@observer@*/
+const char * poptGetInvocationName(poptContext con)
+	/*@*/;
+/*@=fcnuse@*/
 
-/**
+/** \ingroup popt
  * Shuffle argv pointers to remove stripped args, returns new argc.
  * @param con		context
  * @param argc		no. of args
  * @param argv		arg vector
  * @return		new argc
  */
-int poptStrippedArgv(poptContext con, int argc, char ** argv);
-
-/**
- * Add a string to an argv array.
- * @retval *argvp	argv array
- * @param argInfo	(unused)
- * @param val		string arg to add (using strdup)
- * @return		0 on success, POPT_ERROR_NULLARG/POPT_ERROR_BADOPERATION
- */
-int poptSaveString(const char *** argvp, unsigned int argInfo,
-		const char * val);
-
-/**
- * Save a long long, performing logical operation with value.
- * @warning Alignment check may be too strict on certain platorms.
- * @param arg		integer pointer, aligned on int boundary.
- * @param argInfo	logical operation (see POPT_ARGFLAG_*)
- * @param aLongLong	value to use
- * @return		0 on success, POPT_ERROR_NULLARG/POPT_ERROR_BADOPERATION
- */
-int poptSaveLongLong(long long * arg, unsigned int argInfo,
-		long long aLongLong);
+/*@-fcnuse@*/
+int poptStrippedArgv(poptContext con, int argc, char ** argv)
+	/*@modifies *argv @*/;
+/*@=fcnuse@*/
 
 /**
  * Save a long, performing logical operation with value.
@@ -521,17 +535,12 @@ int poptSaveLongLong(long long * arg, unsigned int argInfo,
  * @param aLong		value to use
  * @return		0 on success, POPT_ERROR_NULLARG/POPT_ERROR_BADOPERATION
  */
-int poptSaveLong(long * arg, unsigned int argInfo, long aLong);
-
-/**
- * Save a short integer, performing logical operation with value.
- * @warning Alignment check may be too strict on certain platorms.
- * @param arg		short pointer, aligned on short boundary.
- * @param argInfo	logical operation (see POPT_ARGFLAG_*)
- * @param aLong		value to use
- * @return		0 on success, POPT_ERROR_NULLARG/POPT_ERROR_BADOPERATION
- */
-int poptSaveShort(short * arg, unsigned int argInfo, long aLong);
+/*@-incondefs@*/
+/*@unused@*/
+int poptSaveLong(/*@null@*/ long * arg, int argInfo, long aLong)
+	/*@modifies *arg @*/
+	/*@requires maxSet(arg) >= 0 /\ maxRead(arg) == 0 @*/;
+/*@=incondefs@*/
 
 /**
  * Save an integer, performing logical operation with value.
@@ -541,40 +550,14 @@ int poptSaveShort(short * arg, unsigned int argInfo, long aLong);
  * @param aLong		value to use
  * @return		0 on success, POPT_ERROR_NULLARG/POPT_ERROR_BADOPERATION
  */
-int poptSaveInt(int * arg, unsigned int argInfo, long aLong);
-
-/* The bit set typedef. */
-typedef struct poptBits_s {
-    unsigned int bits[1];
-} * poptBits;
-
-#define _POPT_BITS_N    1024U	/*!< estimated population */
-#define _POPT_BITS_M    ((3U * _POPT_BITS_N) / 2U)
-#define _POPT_BITS_K    16U	/*!< no. of linear hash combinations */
-
-extern unsigned int _poptBitsN;
-extern  unsigned int _poptBitsM;
-extern  unsigned int _poptBitsK;
-
-int poptBitsAdd(poptBits bits, const char * s);
-int poptBitsChk(poptBits bits, const char * s);
-int poptBitsClr(poptBits bits);
-int poptBitsDel(poptBits bits, const char * s);
-int poptBitsIntersect(poptBits * ap, const poptBits b);
-int poptBitsUnion(poptBits * ap, const poptBits b);
-int poptBitsArgs(poptContext con, poptBits * ap);
-
-/**
- * Save a string into a bit set (experimental).
- * @retval *bits	bit set (lazily malloc'd if NULL)
- * @param argInfo	logical operation (see POPT_ARGFLAG_*)
- * @param s		string to add to bit set
- * @return		0 on success, POPT_ERROR_NULLARG/POPT_ERROR_BADOPERATION
- */
-int poptSaveBits(poptBits * bitsp, unsigned int argInfo,
-		const char * s);
-
+/*@-incondefs@*/
+/*@unused@*/
+int poptSaveInt(/*@null@*/ int * arg, int argInfo, long aLong)
+	/*@modifies *arg @*/
+	/*@requires maxSet(arg) >= 0 /\ maxRead(arg) == 0 @*/;
+/*@=incondefs@*/
 
+/*@=type@*/
 #ifdef  __cplusplus
 }
 #endif

popt/poptconfig.c

@@ -1,5 +1,5 @@
 /** \ingroup popt
- * @file
+ * \file popt/poptconfig.c
  */
 
 /* (C) 1998-2002 Red Hat, Inc. -- Licensing details are in the COPYING
@@ -8,300 +8,54 @@
 
 #include "system.h"
 #include "poptint.h"
-#include <sys/stat.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <errno.h>
+/*@access poptContext @*/
 
-#if defined(HAVE_FNMATCH_H)
-#include <fnmatch.h>
-
-#endif
-
-#if defined(HAVE_GLOB_H)
-#include <glob.h>
-
-#if !defined(HAVE_GLOB_PATTERN_P)
-/* Return nonzero if PATTERN contains any metacharacters.
-   Metacharacters can be quoted with backslashes if QUOTE is nonzero.  */
-static int
-glob_pattern_p (const char * pattern, int quote)
+/*@-compmempass@*/	/* FIX: item->option.longName kept, not dependent. */
+static void configLine(poptContext con, char * line)
+	/*@modifies con @*/
 {
-    const char * p;
-    int open = 0;
-
-    for (p = pattern; *p != '\0'; ++p)
-    switch (*p) {
-    case '?':
-    case '*':
-	return 1;
-	break;
-    case '\\':
-	if (quote && p[1] != '\0')
-	  ++p;
-	break;
-    case '[':
-	open = 1;
-	break;
-    case ']':
-	if (open)
-	  return 1;
-	break;
-    }
-    return 0;
-}
-#endif	/* !defined(__GLIBC__) */
-
-static int poptGlobFlags = 0;
-
-static int poptGlob_error(UNUSED(const char * epath),
-		UNUSED(int eerrno))
-{
-    return 1;
-}
-#endif	/* HAVE_GLOB_H */
-
-/**
- * Return path(s) from a glob pattern.
- * @param con		context
- * @param pattern	glob pattern
- * @retval *acp		no. of paths
- * @retval *avp		array of paths
- * @return		0 on success
- */
-static int poptGlob(UNUSED(poptContext con), const char * pattern,
-		int * acp, const char *** avp)
-{
-    const char * pat = pattern;
-    int rc = 0;		/* assume success */
-
-#if defined(HAVE_GLOB_H)
-    if (glob_pattern_p(pat, 0)) {
-	glob_t _g, *pglob = &_g;
-
-	if (!(rc = glob(pat, poptGlobFlags, poptGlob_error, pglob))) {
-	    if (acp) {
-		*acp = (int) pglob->gl_pathc;
-		pglob->gl_pathc = 0;
-	    }
-	    if (avp) {
-		*avp = (const char **) pglob->gl_pathv;
-		pglob->gl_pathv = NULL;
-	    }
-	    globfree(pglob);
-	} else if (rc == GLOB_NOMATCH) {
-	    *avp = NULL;
-	    *acp = 0;
-	    rc = 0;
-	} else
-	    rc = POPT_ERROR_ERRNO;
-    } else
-#endif	/* HAVE_GLOB_H */
-    {
-	if (acp)
-	    *acp = 1;
-	if (avp && (*avp = calloc((size_t)(1 + 1), sizeof (**avp))) != NULL)
-	    (*avp)[0] = xstrdup(pat);
-    }
-
-    return rc;
-}
-
-
-int poptSaneFile(const char * fn)
-{
-    struct stat sb;
-
-    if (fn == NULL || strstr(fn, ".rpmnew") || strstr(fn, ".rpmsave"))
-	return 0;
-    if (stat(fn, &sb) == -1)
-	return 0;
-    if (!S_ISREG(sb.st_mode))
-	return 0;
-    if (sb.st_mode & (S_IXUSR|S_IXGRP|S_IXOTH))
-	return 0;
-    return 1;
-}
-
-int poptReadFile(const char * fn, char ** bp, size_t * nbp, int flags)
-{
-    int fdno;
-    char * b = NULL;
-    off_t nb = 0;
-    char * s, * t, * se;
-    int rc = POPT_ERROR_ERRNO;	/* assume failure */
-
-    fdno = open(fn, O_RDONLY);
-    if (fdno < 0)
-	goto exit;
-
-    if ((nb = lseek(fdno, 0, SEEK_END)) == (off_t)-1
-     || (uintmax_t)nb >= SIZE_MAX
-     || lseek(fdno, 0, SEEK_SET) == (off_t)-1
-     || (b = calloc(sizeof(*b), (size_t)nb + 1)) == NULL
-     || read(fdno, (char *)b, (size_t)nb) != (ssize_t)nb)
-    {
-	int oerrno = errno;
-	(void) close(fdno);
-	if (nb != (off_t)-1 && (uintmax_t)nb >= SIZE_MAX)
-	    errno = -EOVERFLOW;
-	else
-	    errno = oerrno;
-	goto exit;
-    }
-    if (close(fdno) == -1)
-	goto exit;
-    if (b == NULL) {
-	rc = POPT_ERROR_MALLOC;
-	goto exit;
-    }
-    rc = 0;
-
-   /* Trim out escaped newlines. */
-    if (flags & POPT_READFILE_TRIMNEWLINES)
-    {
-	for (t = b, s = b, se = b + nb; *s && s < se; s++) {
-	    switch (*s) {
-	    case '\\':
-		if (s[1] == '\n') {
-		    s++;
-		    continue;
-		}
-		/* fallthrough */
-	    default:
-		*t++ = *s;
-		break;
-	    }
-	}
-	*t++ = '\0';
-	nb = (off_t)(t - b);
-    }
-
-exit:
-    if (rc != 0) {
-	if (b)
-	    free(b);
-	b = NULL;
-	nb = 0;
-    }
-    if (bp)
-	*bp = b;
-    else if (b)
-	free(b);
-    if (nbp)
-	*nbp = (size_t)nb;
-    return rc;
-}
-
-/**
- * Check for application match.
- * @param con		context
- * @param s		config application name
- * return		0 if config application matches
- */
-static int configAppMatch(poptContext con, const char * s)
-{
-    int rc = 1;
-
-    if (con->appName == NULL)	/* XXX can't happen. */
-	return rc;
-
-#if defined(HAVE_GLOB_H) && defined(HAVE_FNMATCH_H)
-    if (glob_pattern_p(s, 1)) {
-	static int flags = FNM_PATHNAME | FNM_PERIOD;
-#ifdef FNM_EXTMATCH
-	flags |= FNM_EXTMATCH;
-#endif
-	rc = fnmatch(s, con->appName, flags);
-    } else
-#endif
-	rc = strcmp(s, con->appName);
-    return rc;
-}
-
-static int poptConfigLine(poptContext con, char * line)
-{
-    char *b = NULL;
-    size_t nb = 0;
-    char * se = line;
-    const char * appName;
+    size_t nameLength;
     const char * entryType;
     const char * opt;
-    struct poptItem_s item_buf;
-    poptItem item = &item_buf;
+    poptItem item = (poptItem) alloca(sizeof(*item));
     int i, j;
-    int rc = POPT_ERROR_BADCONFIG;
 
     if (con->appName == NULL)
-	goto exit;
+	return;
+    nameLength = strlen(con->appName);
     
+/*@-boundswrite@*/
     memset(item, 0, sizeof(*item));
 
-    appName = se;
-    while (*se != '\0' && !_isspaceptr(se)) se++;
-    if (*se == '\0')
-	goto exit;
-    else
-	*se++ = '\0';
+    if (strncmp(line, con->appName, nameLength)) return;
 
-    if (configAppMatch(con, appName)) goto exit;
+    line += nameLength;
+    if (*line == '\0' || !isSpace(line)) return;
 
-    while (*se != '\0' && _isspaceptr(se)) se++;
-    entryType = se;
-    while (*se != '\0' && !_isspaceptr(se)) se++;
-    if (*se != '\0') *se++ = '\0';
+    while (*line != '\0' && isSpace(line)) line++;
+    entryType = line;
+    while (*line == '\0' || !isSpace(line)) line++;
+    *line++ = '\0';
 
-    while (*se != '\0' && _isspaceptr(se)) se++;
-    if (*se == '\0') goto exit;
-    opt = se;
-    while (*se != '\0' && !_isspaceptr(se)) se++;
-    if (opt[0] == '-' && *se == '\0') goto exit;
-    if (*se != '\0') *se++ = '\0';
+    while (*line != '\0' && isSpace(line)) line++;
+    if (*line == '\0') return;
+    opt = line;
+    while (*line == '\0' || !isSpace(line)) line++;
+    *line++ = '\0';
 
-    while (*se != '\0' && _isspaceptr(se)) se++;
-    if (opt[0] == '-' && *se == '\0') goto exit;
+    while (*line != '\0' && isSpace(line)) line++;
+    if (*line == '\0') return;
 
+    /*@-temptrans@*/ /* FIX: line alias is saved */
     if (opt[0] == '-' && opt[1] == '-')
 	item->option.longName = opt + 2;
     else if (opt[0] == '-' && opt[2] == '\0')
 	item->option.shortName = opt[1];
-    else {
-	const char * fn = opt;
+    /*@=temptrans@*/
 
-	/* XXX handle globs and directories in fn? */
-	if ((rc = poptReadFile(fn, &b, &nb, POPT_READFILE_TRIMNEWLINES)) != 0)
-	    goto exit;
-	if (b == NULL || nb == 0)
-	    goto exit;
-
-	/* Append remaining text to the interpolated file option text. */
-	if (*se != '\0') {
-	    size_t nse = strlen(se) + 1;
-	    if ((b = realloc(b, (nb + nse))) == NULL)	/* XXX can't happen */
-		goto exit;
-	    (void) stpcpy( stpcpy(&b[nb-1], " "), se);
-	    nb += nse;
-	}
-	se = b;
-
-	/* Use the basename of the path as the long option name. */
-	{   const char * longName = strrchr(fn, '/');
-	    if (longName != NULL)
-		longName++;
-	    else
-		longName = fn;
-	    if (longName == NULL)	/* XXX can't happen. */
-		goto exit;
-	    /* Single character basenames are treated as short options. */
-	    if (longName[1] != '\0')
-		item->option.longName = longName;
-	    else
-		item->option.shortName = longName[0];
-	}
-    }
-
-    if (poptParseArgvString(se, &item->argc, &item->argv)) goto exit;
+    if (poptParseArgvString(line, &item->argc, &item->argv)) return;
 
+    /*@-modobserver@*/
     item->option.argInfo = POPT_ARGFLAG_DOC_HIDDEN;
     for (i = 0, j = 0; i < item->argc; i++, j++) {
 	const char * f;
@@ -327,183 +81,103 @@ static int poptConfigLine(poptContext con, char * line)
 	item->argv[j] = NULL;
 	item->argc = j;
     }
+    /*@=modobserver@*/
+/*@=boundswrite@*/
 	
+    /*@-nullstate@*/ /* FIX: item->argv[] may be NULL */
     if (!strcmp(entryType, "alias"))
-	rc = poptAddItem(con, item, 0);
+	(void) poptAddItem(con, item, 0);
     else if (!strcmp(entryType, "exec"))
-	rc = poptAddItem(con, item, 1);
-exit:
-    rc = 0;	/* XXX for now, always return success */
-    if (b)
-	free(b);
-    return rc;
+	(void) poptAddItem(con, item, 1);
+    /*@=nullstate@*/
 }
+/*@=compmempass@*/
 
 int poptReadConfigFile(poptContext con, const char * fn)
 {
-    char * b = NULL, *be;
-    size_t nb = 0;
-    const char *se;
-    char *t = NULL, *te;
+    const char * file, * chptr, * end;
+    char * buf;
+/*@dependent@*/ char * dst;
+    int fd, rc;
+    off_t fileLength;
+
+    fd = open(fn, O_RDONLY);
+    if (fd < 0)
+	return (errno == ENOENT ? 0 : POPT_ERROR_ERRNO);
+
+    fileLength = lseek(fd, 0, SEEK_END);
+    if (fileLength == -1 || lseek(fd, 0, 0) == -1) {
+	rc = errno;
+	(void) close(fd);
+	errno = rc;
+	return POPT_ERROR_ERRNO;
+    }
+
+    file = alloca(fileLength + 1);
+    if (read(fd, (char *)file, fileLength) != fileLength) {
+	rc = errno;
+	(void) close(fd);
+	errno = rc;
+	return POPT_ERROR_ERRNO;
+    }
+    if (close(fd) == -1)
+	return POPT_ERROR_ERRNO;
+
+/*@-boundswrite@*/
+    dst = buf = alloca(fileLength + 1);
+
+    chptr = file;
+    end = (file + fileLength);
+    /*@-infloops@*/	/* LCL: can't detect chptr++ */
+    while (chptr < end) {
+	switch (*chptr) {
+	  case '\n':
+	    *dst = '\0';
+	    dst = buf;
+	    while (*dst && isSpace(dst)) dst++;
+	    if (*dst && *dst != '#')
+		configLine(con, dst);
+	    chptr++;
+	    /*@switchbreak@*/ break;
+	  case '\\':
+	    *dst++ = *chptr++;
+	    if (chptr < end) {
+		if (*chptr == '\n') 
+		    dst--, chptr++;	
+		    /* \ at the end of a line does not insert a \n */
+		else
+		    *dst++ = *chptr++;
+	    }
+	    /*@switchbreak@*/ break;
+	  default:
+	    *dst++ = *chptr++;
+	    /*@switchbreak@*/ break;
+	}
+    }
+    /*@=infloops@*/
+/*@=boundswrite@*/
+
+    return 0;
+}
+
+int poptReadDefaultConfig(poptContext con, /*@unused@*/ UNUSED(int useEnv))
+{
+    char * fn, * home;
     int rc;
 
-    if ((rc = poptReadFile(fn, &b, &nb, POPT_READFILE_TRIMNEWLINES)) != 0)
-	return (errno == ENOENT ? 0 : rc);
-    if (b == NULL || nb == 0) {
-	rc = POPT_ERROR_BADCONFIG;
-	goto exit;
-    }
+    if (con->appName == NULL) return 0;
 
-    if ((t = malloc(nb + 1)) == NULL)
-	goto exit;
-    te = t;
-
-    be = (b + nb);
-    for (se = b; se < be; se++) {
-	switch (*se) {
-	  case '\n':
-	    *te = '\0';
-	    te = t;
-	    while (*te && _isspaceptr(te)) te++;
-	    if (*te && *te != '#')
-		if ((rc = poptConfigLine(con, te)) != 0)
-		    goto exit;
-	    break;
-	  case '\\':
-	    *te = *se++;
-	    /* \ at the end of a line does not insert a \n */
-	    if (se < be && *se != '\n') {
-		te++;
-		*te++ = *se;
-	    }
-	    break;
-	  default:
-	    *te++ = *se;
-	    break;
-	}
-    }
-    rc = 0;
-
-exit:
-    free(t);
-    if (b)
-	free(b);
-    return rc;
-}
-
-int poptReadConfigFiles(poptContext con, const char * paths)
-{
-    char * buf = (paths ? xstrdup(paths) : NULL);
-    const char * p;
-    char * pe;
-    int rc = 0;		/* assume success */
-
-    for (p = buf; p != NULL && *p != '\0'; p = pe) {
-	const char ** av = NULL;
-	int ac = 0;
-	int i;
-	int xx;
-
-	/* locate start of next path element */
-	pe = strchr(p, ':');
-	if (pe != NULL && *pe == ':')
-	    *pe++ = '\0';
-	else
-	    pe = (char *) (p + strlen(p));
-
-	xx = poptGlob(con, p, &ac, &av);
-
-	/* work-off each resulting file from the path element */
-	for (i = 0; i < ac; i++) {
-	    const char * fn = av[i];
-	    if (!poptSaneFile(fn))
-		continue;
-	    xx = poptReadConfigFile(con, fn);
-	    if (xx && rc == 0)
-		rc = xx;
-	    free((void *)av[i]);
-	    av[i] = NULL;
-	}
-	free(av);
-	av = NULL;
-    }
-
-    if (buf)
-	free(buf);
-
-    return rc;
-}
-
-int poptReadDefaultConfig(poptContext con, UNUSED(int useEnv))
-{
-    char * home;
-    struct stat sb;
-    int rc = 0;		/* assume success */
-
-    if (con->appName == NULL) goto exit;
-
-    rc = poptReadConfigFile(con, POPT_SYSCONFDIR "/popt");
-    if (rc) goto exit;
-
-#if defined(HAVE_GLOB_H)
-    if (!stat(POPT_SYSCONFDIR "/popt.d", &sb) && S_ISDIR(sb.st_mode)) {
-	const char ** av = NULL;
-	int ac = 0;
-	int i;
-
-	if ((rc = poptGlob(con, POPT_SYSCONFDIR "/popt.d/*", &ac, &av)) == 0) {
-	    for (i = 0; rc == 0 && i < ac; i++) {
-		const char * fn = av[i];
-		if (!poptSaneFile(fn))
-		    continue;
-		rc = poptReadConfigFile(con, fn);
-		free((void *)av[i]);
-		av[i] = NULL;
-	    }
-	    free(av);
-	    av = NULL;
-	}
-    }
-    if (rc) goto exit;
-#endif
+    rc = poptReadConfigFile(con, "/etc/popt");
+    if (rc) return rc;
 
     if ((home = getenv("HOME"))) {
-	char * fn = malloc(strlen(home) + 20);
-	if (fn != NULL) {
-	    (void) stpcpy(stpcpy(fn, home), "/.popt");
-	    rc = poptReadConfigFile(con, fn);
-	    free(fn);
-	} else
-	    rc = POPT_ERROR_ERRNO;
-	if (rc) goto exit;
+	size_t bufsize = strlen(home) + 20;
+	fn = alloca(bufsize);
+	if (fn == NULL) return 0;
+	snprintf(fn, bufsize, "%s/.popt", home);
+	rc = poptReadConfigFile(con, fn);
+	if (rc) return rc;
     }
 
-exit:
-    return rc;
-}
-
-poptContext
-poptFini(poptContext con)
-{
-    return poptFreeContext(con);
-}
-
-poptContext
-poptInit(int argc, const char ** argv,
-		const struct poptOption * options, const char * configPaths)
-{
-    poptContext con = NULL;
-    const char * argv0;
-
-    if (argv == NULL || argv[0] == NULL || options == NULL)
-	return con;
-
-    if ((argv0 = strrchr(argv[0], '/')) != NULL) argv0++;
-    else argv0 = argv[0];
-   
-    con = poptGetContext(argv0, argc, (const char **)argv, options, 0);
-    if (con != NULL&& poptReadConfigFiles(con, configPaths))
-	con = poptFini(con);
-
-    return con;
+    return 0;
 }

popt/poptint.c

@@ -1,194 +0,0 @@
-#include "system.h"
-#include <stdarg.h>
-#include <errno.h>
-#ifdef HAVE_LANGINFO_H
-#include <langinfo.h>
-#endif
-#include "poptint.h"
-
-/* Any pair of 32 bit hashes can be used. lookup3.c generates pairs, will do. */
-#define _JLU3_jlu32lpair        1
-#define	jlu32lpair	poptJlu32lpair
-#include "lookup3.c"
-
-const char *
-POPT_prev_char (const char *str)
-{
-    const char *p = str;
-
-    while (1) {
-	p--;
-	if (((unsigned)*p & 0xc0) != (unsigned)0x80)
-	    return p;
-    }
-}
-
-const char *
-POPT_next_char (const char *str)
-{
-    const char *p = str;
-
-    while (*p != '\0') {
-	p++;
-	if (((unsigned)*p & 0xc0) != (unsigned)0x80)
-	    break;
-    }
-    return p;
-}
-
-#if !defined(POPT_fprintf)	/* XXX lose all the goop ... */
-
-#if defined(ENABLE_NLS) && defined(HAVE_LIBINTL_H) && defined(HAVE_DCGETTEXT)
-/*
- * Rebind a "UTF-8" codeset for popt's internal use.
- */
-char *
-POPT_dgettext(const char * dom, const char * str)
-{
-    char * codeset = NULL;
-    char * retval = NULL;
-
-    if (!dom) 
-	dom = textdomain(NULL);
-    codeset = bind_textdomain_codeset(dom, NULL);
-    bind_textdomain_codeset(dom, "UTF-8");
-    retval = dgettext(dom, str);
-    bind_textdomain_codeset(dom, codeset);
-
-    return retval;
-}
-#endif
-
-#ifdef HAVE_ICONV
-/**
- * Return malloc'd string converted from UTF-8 to current locale.
- * @param istr		input string (UTF-8 encoding assumed)
- * @return		localized string
- */
-static char *
-strdup_locale_from_utf8 (char * istr)
-{
-    char * codeset = NULL;
-    char * ostr = NULL;
-    iconv_t cd;
-
-    if (istr == NULL)
-	return NULL;
-
-#ifdef HAVE_LANGINFO_H
-    codeset = nl_langinfo ((nl_item)CODESET);
-#endif
-
-    if (codeset != NULL && strcmp(codeset, "UTF-8") != 0
-     && (cd = iconv_open(codeset, "UTF-8")) != (iconv_t)-1)
-    {
-	char * shift_pin = NULL;
-	size_t db = strlen(istr);
-	char * dstr = malloc((db + 1) * sizeof(*dstr));
-	char * dstr_tmp;
-	char * pin = istr;
-	char * pout = dstr;
-	size_t ib = db;
-	size_t ob = db;
-	size_t err;
-
-	if (dstr == NULL) {
-	    (void) iconv_close(cd);
-	    return NULL;
-	}
-	err = iconv(cd, NULL, NULL, NULL, NULL);
-	while (1) {
-	    *pout = '\0';
-	    err = iconv(cd, &pin, &ib, &pout, &ob);
-	    if (err != (size_t)-1) {
-		if (shift_pin == NULL) {
-		    shift_pin = pin;
-		    pin = NULL;
-		    ib = 0;
-		    continue;
-		}
-	    } else
-	    switch (errno) {
-	    case E2BIG:
-	    {	size_t used = (size_t)(pout - dstr);
-		db *= 2;
-		dstr_tmp = realloc(dstr, (db + 1) * sizeof(*dstr));
-		if (dstr_tmp == NULL) {
-		    free(dstr);
-		    (void) iconv_close(cd);
-		    return NULL;
-		}
-		dstr = dstr_tmp;
-		pout = dstr + used;
-		ob = db - used;
-		continue;
-	    }   break;
-	    case EINVAL:
-	    case EILSEQ:
-	    default:
-		break;
-	    }
-	    break;
-	}
-	(void) iconv_close(cd);
-	*pout = '\0';
-	ostr = xstrdup(dstr);
-	free(dstr);
-    } else
-	ostr = xstrdup(istr);
-
-    return ostr;
-}
-#endif
-
-int
-POPT_fprintf (FILE * stream, const char * format, ...)
-{
-    char * b = NULL, * ob = NULL;
-    int rc;
-    va_list ap;
-
-#if defined(HAVE_VASPRINTF)
-    va_start(ap, format);
-    if ((rc = vasprintf(&b, format, ap)) < 0)
-	b = NULL;
-    va_end(ap);
-#else
-    size_t nb = (size_t)1;
-
-    /* HACK: add +1 to the realloc no. of bytes "just in case". */
-    /* XXX Likely unneeded, the issues wrto vsnprintf(3) return b0rkage have
-     * to do with whether the final '\0' is counted (or not). The code
-     * below already adds +1 for the (possibly already counted) trailing NUL.
-     */
-    while ((b = realloc(b, nb+1)) != NULL) {
-	va_start(ap, format);
-	rc = vsnprintf(b, nb, format, ap);
-	va_end(ap);
-	if (rc > -1) {	/* glibc 2.1 */
-	    if ((size_t)rc < nb)
-		break;
-	    nb = (size_t)(rc + 1);	/* precise buffer length known */
-	} else 		/* glibc 2.0 */
-	    nb += (nb < (size_t)100 ? (size_t)100 : nb);
-	ob = b;
-    }
-#endif
-
-    rc = 0;
-    if (b != NULL) {
-#ifdef HAVE_ICONV
-	ob = strdup_locale_from_utf8(b);
-	if (ob != NULL) {
-	    rc = fprintf(stream, "%s", ob);
-	    free(ob);
-	} else
-#endif
-	    rc = fprintf(stream, "%s", b);
-	free (b);
-    }
-
-    return rc;
-}
-
-#endif	/* !defined(POPT_fprintf) */

popt/poptint.h

@@ -1,5 +1,5 @@
 /** \ingroup popt
- * @file
+ * \file popt/poptint.h
  */
 
 /* (C) 1998-2000 Red Hat, Inc. -- Licensing details are in the COPYING
@@ -9,145 +9,108 @@
 #ifndef H_POPTINT
 #define H_POPTINT
 
-#include <stdint.h>
-
 /**
  * Wrapper to free(3), hides const compilation noise, permit NULL, return NULL.
  * @param p		memory to free
  * @retval		NULL always
  */
-static inline void *
-_free(const void * p)
+/*@unused@*/ static inline /*@null@*/ void *
+_free(/*@only@*/ /*@null@*/ const void * p)
+	/*@modifies p @*/
 {
     if (p != NULL)	free((void *)p);
     return NULL;
 }
 
+static inline int
+isSpace(const char *ptr)
+{
+    return isspace(*(unsigned char *)ptr);
+}
+
 /* Bit mask macros. */
+/*@-exporttype -redef @*/
 typedef	unsigned int __pbm_bits;
+/*@=exporttype =redef @*/
 #define	__PBM_NBITS		(8 * sizeof (__pbm_bits))
 #define	__PBM_IX(d)		((d) / __PBM_NBITS)
 #define __PBM_MASK(d)		((__pbm_bits) 1 << (((unsigned)(d)) % __PBM_NBITS))
+/*@-exporttype -redef @*/
 typedef struct {
     __pbm_bits bits[1];
 } pbm_set;
+/*@=exporttype =redef @*/
 #define	__PBM_BITS(set)	((set)->bits)
 
-#define	PBM_ALLOC(d)	calloc(__PBM_IX (d) + 1, sizeof(pbm_set))
+#define	PBM_ALLOC(d)	calloc(__PBM_IX (d) + 1, sizeof(__pbm_bits))
 #define	PBM_FREE(s)	_free(s);
 #define PBM_SET(d, s)   (__PBM_BITS (s)[__PBM_IX (d)] |= __PBM_MASK (d))
 #define PBM_CLR(d, s)   (__PBM_BITS (s)[__PBM_IX (d)] &= ~__PBM_MASK (d))
 #define PBM_ISSET(d, s) ((__PBM_BITS (s)[__PBM_IX (d)] & __PBM_MASK (d)) != 0)
 
-extern void poptJlu32lpair(const void *key, size_t size,
-                uint32_t *pc, uint32_t *pb);
-
-/** \ingroup popt
- * Typedef's for string and array of strings.
- */
-typedef const char * poptString;
-typedef poptString * poptArgv;
-
-/** \ingroup popt
- * A union to simplify opt->arg access without casting.
- */
-typedef union poptArg_u {
-    void * ptr;
-    int * intp;
-    short * shortp;
-    long * longp;
-    long long * longlongp;
-    float * floatp;
-    double * doublep;
-    const char ** argv;
-    poptCallbackType cb;
-    poptOption opt;
-} poptArg;
-
-extern unsigned int _poptArgMask;
-extern unsigned int _poptGroupMask;
-
-#define	poptArgType(_opt)	((_opt)->argInfo & _poptArgMask)
-#define	poptGroup(_opt)		((_opt)->argInfo & _poptGroupMask)
-
-#define	F_ISSET(_opt, _FLAG)	((_opt)->argInfo & POPT_ARGFLAG_##_FLAG)
-#define	LF_ISSET(_FLAG)		(argInfo & POPT_ARGFLAG_##_FLAG)
-#define	CBF_ISSET(_opt, _FLAG)	((_opt)->argInfo & POPT_CBFLAG_##_FLAG)
-
-/* XXX sick hack to preserve pretense of a popt-1.x ABI. */
-#define	poptSubstituteHelpI18N(opt) \
-  { if ((opt) == poptHelpOptions) (opt) = poptHelpOptionsI18N; }
-
 struct optionStackEntry {
     int argc;
-    poptArgv argv;
+/*@only@*/ /*@null@*/
+    const char ** argv;
+/*@only@*/ /*@null@*/
     pbm_set * argb;
     int next;
-    char * nextArg;
+/*@only@*/ /*@null@*/
+    const char * nextArg;
+/*@observer@*/ /*@null@*/
     const char * nextCharArg;
+/*@dependent@*/ /*@null@*/
     poptItem currAlias;
     int stuffed;
 };
 
 struct poptContext_s {
     struct optionStackEntry optionStack[POPT_OPTION_DEPTH];
+/*@dependent@*/
     struct optionStackEntry * os;
-    poptArgv leftovers;
+/*@owned@*/ /*@null@*/
+    const char ** leftovers;
     int numLeftovers;
-    int allocLeftovers;
     int nextLeftover;
+/*@keep@*/
     const struct poptOption * options;
     int restLeftover;
+/*@only@*/ /*@null@*/
     const char * appName;
+/*@only@*/ /*@null@*/
     poptItem aliases;
     int numAliases;
-    unsigned int flags;
+    int flags;
+/*@owned@*/ /*@null@*/
     poptItem execs;
     int numExecs;
-    char * execFail;
-    poptArgv finalArgv;
+/*@only@*/ /*@null@*/
+    const char ** finalArgv;
     int finalArgvCount;
     int finalArgvAlloced;
-    int (*maincall) (int argc, const char **argv);
+/*@dependent@*/ /*@null@*/
     poptItem doExec;
+/*@only@*/
     const char * execPath;
     int execAbsolute;
+/*@only@*/ /*@relnull@*/
     const char * otherHelp;
+/*@null@*/
     pbm_set * arg_strip;
 };
 
-#if defined(POPT_fprintf)
-#define	POPT_dgettext	dgettext
-#else
-#ifdef HAVE_ICONV
-#include <iconv.h>
-#endif
-
-#if defined(HAVE_DCGETTEXT)
-char *POPT_dgettext(const char * dom, const char * str);
-#endif
-
-FORMAT(printf, 2, 3)
-int   POPT_fprintf (FILE* stream, const char *format, ...);
-#endif	/* !defined(POPT_fprintf) */
-
-const char *POPT_prev_char (const char *str);
-const char *POPT_next_char (const char *str);
-
-#endif
-
-#if defined(ENABLE_NLS) && defined(HAVE_LIBINTL_H)
+#ifdef HAVE_LIBINTL_H
 #include <libintl.h>
 #endif
 
-#if defined(ENABLE_NLS) && defined(HAVE_GETTEXT)
+#if defined(HAVE_GETTEXT) && !defined(__LCLINT__)
 #define _(foo) gettext(foo)
 #else
 #define _(foo) foo
 #endif
 
-#if defined(ENABLE_NLS) && defined(HAVE_LIBINTL_H) && defined(HAVE_DCGETTEXT)
-#define D_(dom, str) POPT_dgettext(dom, str)
+#if defined(HAVE_DCGETTEXT) && !defined(__LCLINT__)
+#define D_(dom, str) dgettext(dom, str)
 #define POPT_(foo) D_("popt", foo)
 #else
 #define D_(dom, str) str
@@ -156,3 +119,4 @@ const char *POPT_next_char (const char *str);
 
 #define N_(foo) foo
 
+#endif

popt/poptparse.c

@@ -1,5 +1,5 @@
 /** \ingroup popt
- * @file
+ * \file popt/poptparse.c
  */
 
 /* (C) 1998-2002 Red Hat, Inc. -- Licensing details are in the COPYING
@@ -8,8 +8,11 @@
 
 #include "system.h"
 
+#include "poptint.h"
+
 #define POPT_ARGV_ARRAY_GROW_DELTA 5
 
+/*@-boundswrite@*/
 int poptDupArgv(int argc, const char **argv,
 		int * argcPtr, const char *** argvPtr)
 {
@@ -31,13 +34,19 @@ int poptDupArgv(int argc, const char **argv,
 	return POPT_ERROR_MALLOC;
     argv2 = (void *) dst;
     dst += (argc + 1) * sizeof(*argv);
-    *dst = '\0';
 
-    for (i = 0; i < argc; i++) {
-	argv2[i] = dst;
-	dst = stpcpy(dst, argv[i]);
-	dst++;	/* trailing NUL */
+    /*@-branchstate@*/
+    {
+	char * const end_buf = (char *)argv2 + nb;
+	for (i = 0; i < argc; i++) {
+	    argv2[i] = dst;
+	    /* nb is the TOTAL buffer size, not the remaining bytes; use the
+	     * remaining bytes from dst to end_buf so glibc 2.39+ fortified
+	     * strlcpy doesn't trip __bos() and abort. */
+	    dst += strlcpy(dst, argv[i], end_buf - dst) + 1;
+	}
     }
+    /*@=branchstate@*/
     argv2[argc] = NULL;
 
     if (argvPtr) {
@@ -50,25 +59,21 @@ int poptDupArgv(int argc, const char **argv,
 	*argcPtr = argc;
     return 0;
 }
+/*@=boundswrite@*/
 
+/*@-bounds@*/
 int poptParseArgvString(const char * s, int * argcPtr, const char *** argvPtr)
 {
     const char * src;
     char quote = '\0';
     int argvAlloced = POPT_ARGV_ARRAY_GROW_DELTA;
     const char ** argv = malloc(sizeof(*argv) * argvAlloced);
-    const char ** argv_tmp;
     int argc = 0;
-    size_t buflen = strlen(s) + 1;
-    char * buf, * bufOrig = NULL;
+    int buflen = strlen(s) + 1;
+    char * buf = memset(alloca(buflen), 0, buflen);
     int rc = POPT_ERROR_MALLOC;
 
     if (argv == NULL) return rc;
-    buf = bufOrig = calloc((size_t)1, buflen);
-    if (buf == NULL) {
-	free(argv);
-	return rc;
-    }
     argv[argc] = buf;
 
     for (src = s; *src != '\0'; src++) {
@@ -84,14 +89,13 @@ int poptParseArgvString(const char * s, int * argcPtr, const char *** argvPtr)
 		if (*src != quote) *buf++ = '\\';
 	    }
 	    *buf++ = *src;
-	} else if (_isspaceptr(src)) {
+	} else if (isSpace(src)) {
 	    if (*argv[argc] != '\0') {
 		buf++, argc++;
 		if (argc == argvAlloced) {
 		    argvAlloced += POPT_ARGV_ARRAY_GROW_DELTA;
-		    argv_tmp = realloc(argv, sizeof(*argv) * argvAlloced);
-		    if (argv_tmp == NULL) goto exit;
-		    argv = argv_tmp;
+		    argv = realloc(argv, sizeof(*argv) * argvAlloced);
+		    if (argv == NULL) goto exit;
 		}
 		argv[argc] = buf;
 	    }
@@ -99,17 +103,17 @@ int poptParseArgvString(const char * s, int * argcPtr, const char *** argvPtr)
 	  case '"':
 	  case '\'':
 	    quote = *src;
-	    break;
+	    /*@switchbreak@*/ break;
 	  case '\\':
 	    src++;
 	    if (!*src) {
 		rc = POPT_ERROR_BADQUOTE;
 		goto exit;
 	    }
-	    /* fallthrough */
+	    /*@fallthrough@*/
 	  default:
 	    *buf++ = *src;
-	    break;
+	    /*@switchbreak@*/ break;
 	}
     }
 
@@ -120,30 +124,29 @@ int poptParseArgvString(const char * s, int * argcPtr, const char *** argvPtr)
     rc = poptDupArgv(argc, argv, argcPtr, argvPtr);
 
 exit:
-    if (bufOrig) free(bufOrig);
     if (argv) free(argv);
     return rc;
 }
+/*@=bounds@*/
 
 /* still in the dev stage.
- * return values, perhaps 1== file error
+ * return values, perhaps 1== file erro
  * 2== line to long
  * 3== umm.... more?
  */
-int poptConfigFileToString(FILE *fp, char ** argstrp,
-		UNUSED(int flags))
+int poptConfigFileToString(FILE *fp, char ** argstrp, /*@unused@*/ UNUSED(int flags))
 {
     char line[999];
     char * argstr;
-    char * argstr_tmp;
     char * p;
     char * q;
     char * x;
-    size_t t;
-    size_t argvlen = 0;
+    int t;
+    int argvlen = 0;
     size_t maxlinelen = sizeof(line);
     size_t linelen;
-    size_t maxargvlen = (size_t)480;
+    int maxargvlen = 480;
+    int linenum = 0;
 
     *argstrp = NULL;
 
@@ -158,10 +161,11 @@ int poptConfigFileToString(FILE *fp, char ** argstrp,
     if (argstr == NULL) return POPT_ERROR_MALLOC;
 
     while (fgets(line, (int)maxlinelen, fp) != NULL) {
+	linenum++;
 	p = line;
 
 	/* loop until first non-space char or EOL */
-	while( *p != '\0' && _isspaceptr(p) )
+	while( *p != '\0' && isSpace(p) )
 	    p++;
 
 	linelen = strlen(p);
@@ -175,29 +179,25 @@ int poptConfigFileToString(FILE *fp, char ** argstrp,
 
 	q = p;
 
-	while (*q != '\0' && (!_isspaceptr(q)) && *q != '=')
+	while (*q != '\0' && (!isSpace(q)) && *q != '=')
 	    q++;
 
-	if (_isspaceptr(q)) {
+	if (isSpace(q)) {
 	    /* a space after the name, find next non space */
 	    *q++='\0';
-	    while( *q != '\0' && _isspaceptr(q) ) q++;
+	    while( *q != '\0' && isSpace(q) ) q++;
 	}
 	if (*q == '\0') {
 	    /* single command line option (ie, no name=val, just name) */
 	    q[-1] = '\0';		/* kill off newline from fgets() call */
-	    argvlen += (t = (size_t)(q - p)) + (sizeof(" --")-1);
+	    argvlen += (t = q - p) + (sizeof(" --")-1);
 	    if (argvlen >= maxargvlen) {
 		maxargvlen = (t > maxargvlen) ? t*2 : maxargvlen*2;
-		argstr_tmp = realloc(argstr, maxargvlen);
-		if (argstr_tmp == NULL) {
-		    free(argstr);
-		    return POPT_ERROR_MALLOC;
-		}
-		argstr = argstr_tmp;
+		argstr = realloc(argstr, maxargvlen);
+		if (argstr == NULL) return POPT_ERROR_MALLOC;
 	    }
-	    strcat(argstr, " --");
-	    strcat(argstr, p);
+	    strlcat(argstr, " --", maxargvlen);
+	    strlcat(argstr, p, maxargvlen);
 	    continue;
 	}
 	if (*q != '=')
@@ -207,33 +207,29 @@ int poptConfigFileToString(FILE *fp, char ** argstrp,
 	*q++ = '\0';
 
 	/* find next non-space letter of value */
-	while (*q != '\0' && _isspaceptr(q))
+	while (*q != '\0' && isSpace(q))
 	    q++;
 	if (*q == '\0')
 	    continue;	/* XXX silently ignore missing value */
 
 	/* now, loop and strip all ending whitespace */
 	x = p + linelen;
-	while (_isspaceptr(--x))
-	    *x = '\0';	/* null out last char if space (including fgets() NL) */
+	while (isSpace(--x))
+	    *x = 0;	/* null out last char if space (including fgets() NL) */
 
 	/* rest of line accept */
-	t = (size_t)(x - p);
+	t = x - p;
 	argvlen += t + (sizeof("' --='")-1);
 	if (argvlen >= maxargvlen) {
 	    maxargvlen = (t > maxargvlen) ? t*2 : maxargvlen*2;
-	    argstr_tmp = realloc(argstr, maxargvlen);
-	    if (argstr_tmp == NULL) {
-		free(argstr);
-		return POPT_ERROR_MALLOC;
-	    }
-	    argstr = argstr_tmp;
+	    argstr = realloc(argstr, maxargvlen);
+	    if (argstr == NULL) return POPT_ERROR_MALLOC;
 	}
-	strcat(argstr, " --");
-	strcat(argstr, p);
-	strcat(argstr, "=\"");
-	strcat(argstr, q);
-	strcat(argstr, "\"");
+	strlcat(argstr, " --", maxargvlen);
+	strlcat(argstr, p, maxargvlen);
+	strlcat(argstr, "=\"", maxargvlen);
+	strlcat(argstr, q, maxargvlen);
+	strlcat(argstr, "\"", maxargvlen);
     }
 
     *argstrp = argstr;

popt/system.h

@@ -1,70 +1,134 @@
-/**
- * @file
- */
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
+#if defined (__GLIBC__) && defined(__LCLINT__)
+/*@-declundef@*/
+/*@unchecked@*/
+extern __const __int32_t *__ctype_tolower;
+/*@unchecked@*/
+extern __const __int32_t *__ctype_toupper;
+/*@=declundef@*/
+#endif
+
+#ifdef __TANDEM
+# include <floss.h(floss_execvp,floss_read)>
+#endif
+
 #include <ctype.h>
 
-/* XXX isspace(3) has i18n encoding signedness issues on Solaris. */
-#define	_isspaceptr(_chp)	isspace((int)(*(unsigned const char *)(_chp)))
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
 
-#ifdef HAVE_MCHECK_H
+#if HAVE_MCHECK_H 
 #include <mcheck.h>
 #endif
 
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-void * xmalloc (size_t size);
-
-void * xcalloc (size_t nmemb, size_t size);
-
-void * xrealloc (void * ptr, size_t size);
-
-char * xstrdup (const char *str);
-
-#if !defined(HAVE_STPCPY)
-/* Copy SRC to DEST, returning the address of the terminating '\0' in DEST.  */
-static inline char * stpcpy (char *dest, const char * src) {
-    register char *d = dest;
-    register const char *s = src;
-
-    do
-	*d++ = *s;
-    while (*s++ != '\0');
-    return d - 1;
-}
+#include <stdio.h>
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef STDC_HEADERS
+# include <stdlib.h>
+# include <stddef.h>
+#else
+# ifdef HAVE_STDLIB_H
+#  include <stdlib.h>
+# endif
+#endif
+#ifdef HAVE_STRING_H
+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
+#  include <memory.h>
+# endif
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
 #endif
 
-/* Memory allocation via macro defs to get meaningful locations from mtrace() */
-#if defined(HAVE_MCHECK_H) && defined(__GNUC__)
-#define	vmefail()	(fprintf(stderr, "virtual memory exhausted.\n"), exit(EXIT_FAILURE), NULL)
-#define	xmalloc(_size) 		(malloc(_size) ? : vmefail())
-#define	xcalloc(_nmemb, _size)	(calloc((_nmemb), (_size)) ? : vmefail())
-#define	xrealloc(_ptr, _size)	(realloc((_ptr), (_size)) ? : vmefail())
-#define xstrdup(_str)   (strcpy((malloc(strlen(_str)+1) ? : vmefail()), (_str)))
-#else
-#define	xmalloc(_size) 		malloc(_size)
-#define	xcalloc(_nmemb, _size)	calloc((_nmemb), (_size))
-#define	xrealloc(_ptr, _size)	realloc((_ptr), (_size))
-#define	xstrdup(_str)	strdup(_str)
-#endif  /* defined(HAVE_MCHECK_H) && defined(__GNUC__) */
+#ifndef __GNUC__
+#define __attribute__(x) 
+#endif
 
-#if defined(HAVE_SECURE_GETENV)
-#define getenv(_s)	secure_getenv(_s)
-#elif defined(HAVE___SECURE_GETENV)
+#ifdef __NeXT
+/* access macros are not declared in non posix mode in unistd.h -
+ don't try to use posix on NeXTstep 3.3 ! */
+#include <libc.h>
+#endif
+
+#if defined(__LCLINT__)
+/*@-declundef -incondefs @*/ /* LCL: missing annotation */
+/*@only@*/ /*@out@*/
+void * alloca (size_t __size)
+	/*@ensures MaxSet(result) == (__size - 1) @*/
+	/*@*/;
+/*@=declundef =incondefs @*/
+#endif
+
+/* AIX requires this to be the first thing in the file.  */ 
+#ifndef __GNUC__
+# if HAVE_ALLOCA_H
+#  include <alloca.h>
+# else
+#  ifdef _AIX
+#pragma alloca
+#  else
+#   ifdef HAVE_ALLOCA
+#    ifndef alloca /* predefined by HP cc +Olibcalls */
+char *alloca(size_t size);
+#    endif
+#   else
+#    ifdef alloca
+#     undef alloca
+#    endif
+#    define alloca(sz) malloc(sz) /* Kludge this for now */
+#   endif
+#  endif
+# endif
+#elif !defined(alloca)
+#define alloca __builtin_alloca
+#endif
+
+#ifndef HAVE_STRLCPY
+size_t strlcpy(char *d, const char *s, size_t bufsize);
+#endif
+
+#ifndef HAVE_STRLCAT
+size_t strlcat(char *d, const char *s, size_t bufsize);
+#endif
+
+#if HAVE_MCHECK_H && defined(__GNUC__)
+static inline char *
+xstrdup(const char *s)
+{
+    size_t memsize = strlen(s) + 1;
+    char *ptr = malloc(memsize);
+    if (!ptr) {
+	fprintf(stderr, "virtual memory exhausted.\n");
+	exit(EXIT_FAILURE);
+    }
+    strlcpy(ptr, s, memsize);
+    return ptr;
+}
+#else
+#define	xstrdup(_str)	strdup(_str)
+#endif  /* HAVE_MCHECK_H && defined(__GNUC__) */
+
+#if HAVE___SECURE_GETENV && !defined(__LCLINT__)
 #define	getenv(_s)	__secure_getenv(_s)
 #endif
 
-#if !defined(__GNUC__) && !defined(__attribute__)
-#define __attribute__(x) 
+#if !defined HAVE_SNPRINTF || !defined HAVE_C99_VSNPRINTF
+#define snprintf rsync_snprintf
+int snprintf(char *str,size_t count,const char *fmt,...);
 #endif
+
 #define UNUSED(x) x __attribute__((__unused__))
-#define FORMAT(a, b, c) __attribute__((__format__ (a, b, c)))
-#define NORETURN __attribute__((__noreturn__))
+
+#define PACKAGE "rsync"
 
 #include "popt.h"

receiver.c

@@ -3,7 +3,7 @@
  *
  * Copyright (C) 1996-2000 Andrew Tridgell
  * Copyright (C) 1996 Paul Mackerras
- * Copyright (C) 2003-2023 Wayne Davison
+ * Copyright (C) 2003-2022 Wayne Davison
  *
  * 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
@@ -83,65 +83,6 @@ static int updating_basis_or_equiv;
 #define MAX_UNIQUE_NUMBER 999999
 #define MAX_UNIQUE_LOOP 100
 
-/* Open a basis/output path that may legitimately be an operator-trusted
- * ABSOLUTE path -- e.g. an absolute --partial-dir ("a directory reserved for
- * partial-dir work") or --backup-dir. secure_relative_open() deliberately
- * rejects an absolute relpath, so feeding it the whole absolute partialptr
- * (with a NULL basedir) returns EINVAL: the basis fd is then -1, no basis is
- * mapped, and receive_data() omits every matched block from the whole-file
- * verification checksum -> a spurious "failed verification" that strands the
- * (correct) data in the partial-dir forever.
- *
- * The operator's directory is trusted; only the leaf basename is peer-supplied.
- * So when basedir is NULL and relpath is absolute, split it into its directory
- * (trusted) and leaf and confine just the leaf -- exactly how secure_relative_
- * open already trusts an absolute basedir while O_NOFOLLOW-confining the leaf.
- * Anything else is a straight pass-through that preserves the strict contract. */
-static int secure_basis_open(const char *basedir, const char *relpath, int flags, mode_t mode)
-{
-	extern int am_daemon, am_chrooted;
-
-	/* The confined resolver is only needed for the sanitizing daemon
-	 * (am_daemon && !am_chrooted, i.e. use_secure_symlinks).  Local /
-	 * remote-shell mode has no module boundary, and "use chroot = yes" makes
-	 * the kernel root the boundary, so there an alt-dest basis like
-	 * --link-dest=../01 must resolve against the cwd as a bare open did before
-	 * the hardening (confining it would reject the legitimate sibling "..",
-	 * #915). */
-	if (!am_daemon || am_chrooted) {
-		if (basedir) {
-			char fullpath[MAXPATHLEN];
-			if (pathjoin(fullpath, sizeof fullpath, basedir, relpath) >= sizeof fullpath) {
-				errno = ENAMETOOLONG;
-				return -1;
-			}
-			return do_open(fullpath, flags, mode);
-		}
-		return do_open(relpath, flags, mode);
-	}
-
-	if (!basedir && relpath && *relpath == '/') {
-		const char *slash = strrchr(relpath, '/');
-		const char *leaf = slash + 1;
-		char dirbuf[MAXPATHLEN];
-		const char *dir;
-		if (slash == relpath)
-			dir = "/";
-		else {
-			size_t dlen = slash - relpath;
-			if (dlen >= sizeof dirbuf) {
-				errno = ENAMETOOLONG;
-				return -1;
-			}
-			memcpy(dirbuf, relpath, dlen);
-			dirbuf[dlen] = '\0';
-			dir = dirbuf;
-		}
-		return secure_relative_open(dir, leaf, flags, mode);
-	}
-	return secure_relative_open(basedir, relpath, flags, mode);
-}
-
 /* get_tmpname() - create a tmp filename for a given filename
  *
  * If a tmpdir is defined, use that as the directory to put it in.  Otherwise,
@@ -423,34 +364,6 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
 
 		stats.matched_data += len;
 
-		/* A block match with no mapped basis is a protocol inconsistency
-		 * ONLY when we are actually producing output (fd != -1): the
-		 * generator told the sender a basis existed but the receiver could
-		 * not open it, so honoring the match would silently omit these
-		 * bytes from the verification checksum (a spurious failure) or
-		 * leave a hole in the output. Fail cleanly in that case.
-		 *
-		 * On the DISCARD path (fd == -1, fname == NULL) there is no output
-		 * and no verification: discard_receive_data() deliberately drains a
-		 * delta the receiver never intends to write (basis fstat failed,
-		 * basis is a directory, output open failed, batch skip, ...). The
-		 * sender does not know the data is being discarded and streams an
-		 * ordinary delta, so a match token here is NORMAL protocol, not
-		 * malformed. Absorb it benignly (advance the offset and continue),
-		 * as the pre-existing "if (mapbuf)" guards did before this check was
-		 * added in 31fbb17d -- erroring would wrongly break legitimate
-		 * transfers, and full_fname(fname) with fname==NULL would
-		 * dereference NULL (a receiver crash on a normal transfer). */
-		if (!mapbuf) {
-			if (fd != -1) {
-				rprintf(FERROR, "got a block match with no basis file for %s [%s]\n",
-					full_fname(fname), who_am_i());
-				exit_cleanup(RERR_PROTOCOL);
-			}
-			offset += len;
-			continue;
-		}
-
 		if (DEBUG_GTE(DELTASUM, 3)) {
 			rprintf(FINFO,
 				"chunk[%d] of size %ld at %s offset=%s%s\n",
@@ -480,7 +393,7 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
 
 	if (fd != -1 && offset > 0) {
 		if (sparse_files > 0) {
-			if (sparse_end(fd, offset, updating_basis_or_equiv) != 0)
+			if (sparse_end(fd, offset) != 0)
 				goto report_write_error;
 		} else if (flush_write_file(fd) < 0) {
 		    report_write_error:
@@ -880,9 +793,8 @@ int recv_files(int f_in, int f_out, char *local_name)
 				fnamecmp = fname;
 		}
 
-		/* open the file (secure_basis_open tolerates an operator-trusted
-		 * absolute fnamecmp, e.g. an absolute --partial-dir basis) */
-		fd1 = secure_basis_open(basedir, fnamecmp, O_RDONLY, 0);
+		/* open the file */
+		fd1 = secure_relative_open(basedir, fnamecmp, O_RDONLY, 0);
 
 		if (fd1 == -1 && protocol_version < 29) {
 			if (fnamecmp != fname) {
@@ -896,7 +808,7 @@ int recv_files(int f_in, int f_out, char *local_name)
 				basedir = basis_dir[0];
 				fnamecmp = fname;
 				fnamecmp_type = FNAMECMP_BASIS_DIR_LOW;
-				fd1 = secure_basis_open(basedir, fnamecmp, O_RDONLY, 0);
+				fd1 = secure_relative_open(basedir, fnamecmp, O_RDONLY, 0);
 			}
 		}
 
@@ -972,47 +884,18 @@ int recv_files(int f_in, int f_out, char *local_name)
 			 * attacker could switch a directory to a symlink between
 			 * path validation and file open. */
 			if (use_secure_symlinks)
-				fd2 = secure_basis_open(NULL, fnametmp, O_WRONLY|O_CREAT, 0600);
+				fd2 = secure_relative_open(NULL, fnametmp, O_WRONLY|O_CREAT, 0600);
 			else
 				fd2 = do_open(fnametmp, O_WRONLY|O_CREAT, 0600);
 #ifdef linux
 			if (fd2 == -1 && errno == EACCES) {
 				/* Maybe the error was due to protected_regular setting? */
 				if (use_secure_symlinks)
-					fd2 = secure_relative_open(NULL, fnametmp, O_WRONLY, 0600);
+					fd2 = secure_relative_open(NULL, fname, O_WRONLY, 0600);
 				else
-					fd2 = do_open(fnametmp, O_WRONLY, 0600);
+					fd2 = do_open(fname, O_WRONLY, 0600);
 			}
 #endif
-			if (fd2 == -1 && errno == EACCES) {
-				/* A read-only existing file: make it writable, then retry
-				 * (its mode is restored after the transfer).  On a
-				 * non-chroot daemon fchmod() a no-follow fd rather than
-				 * chmod the path, so a symlink raced into fnametmp can't
-				 * redirect the chmod (do_chmod_at follows the final link). */
-				int errno_save = errno, chmod_ok;
-				if (use_secure_symlinks) {
-#ifdef O_NOFOLLOW
-					int cfd = secure_relative_open(NULL, fnametmp, O_RDONLY|O_NOFOLLOW, 0);
-					chmod_ok = cfd != -1 && fchmod(cfd, 0600) == 0;
-					if (cfd != -1)
-						close(cfd);
-#else
-					/* Without O_NOFOLLOW the resolver's oldest fallback would
-					 * follow a raced symlink, so fail closed rather than
-					 * chmod through it. */
-					chmod_ok = 0;
-#endif
-				} else
-					chmod_ok = do_chmod_at(fnametmp, 0600) == 0;
-				if (chmod_ok) {
-					if (use_secure_symlinks)
-						fd2 = secure_relative_open(NULL, fnametmp, O_WRONLY, 0600);
-					else
-						fd2 = do_open(fnametmp, O_WRONLY, 0600);
-				} else
-					errno = errno_save;
-			}
 			if (fd2 == -1) {
 				rsyserr(FERROR_XFER, errno, "open %s failed",
 					full_fname(fnametmp));

rsync-web/.gitignore

@@ -1,11 +0,0 @@
-/.xvpics
-/doxygen/
-/tech_report/IMG_PARAMS.dir
-/tech_report/IMG_PARAMS.pag
-/upload
-/netware
-/pre-change
-/index.html-*
-/rsync-and-debian/rsync-and-debian.html
-/rsync-and-debian/rsync-and-debian.ps
-/badge.svg

rsync-web/COPYING.html

@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. &lt;<a href="https://fsf.org/">https://fsf.org/</a>&gt;
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-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
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-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 pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-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.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-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.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-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.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-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.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-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.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  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.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-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 convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU 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 specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  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.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO 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.
-
-  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
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-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
-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.
-
-    &lt;one line to give the program's name and a brief idea of what it does.&gt;
-    Copyright (C) &lt;year&gt;  &lt;name of author&gt;
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see &lt;<a href="https://www.gnu.org/licenses/">https://www.gnu.org/licenses/</a>&gt;.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    &lt;program&gt;  Copyright (C) &lt;year&gt;  &lt;name of author&gt;
-    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, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-&lt;<a href="https://www.gnu.org/licenses/">https://www.gnu.org/licenses/</a>&gt;.
-
-  The GNU 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.  But first, please read
-&lt;<a href="https://www.gnu.org/philosophy/why-not-lgpl.html">https://www.gnu.org/philosophy/why-not-lgpl.html</a>&gt;.

rsync-web/COPYING2.html

@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     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
-freedom to share and change it.  By contrast, the GNU General Public
-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
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  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
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  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
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-<hr>
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-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
-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
-source code as you receive it, in any medium, provided that you
-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
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    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.)
-<hr>
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-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
-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
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    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
-making modifications to it.  For an executable work, complete source
-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
-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.
-<hr>
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-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
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-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
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-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
-be a consequence of the rest of this License.
-<hr>
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-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
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this 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
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-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
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO 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
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE 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.
-
-		     END OF TERMS AND CONDITIONS
-<hr>
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-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
-the "copyright" line and a pointer to where the full notice is found.
-
-    &lt;one line to give the program's name and a brief idea of what it does.&gt;
-    Copyright (C) &lt;year&gt;  &lt;name of author&gt;
-
-    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
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  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
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year  name of author
-    Gnomovision 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
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  &lt;signature of Ty Coon&gt;, 1 April 1989
-  Ty Coon, President of Vice
-
-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 Library General
-Public License instead of this License.

rsync-web/FAQ.html

@@ -1,284 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
-<HTML>
-<HEAD>
-<TITLE>rsync FAQ</TITLE>
-</HEAD>
-<!--#include virtual="header.html" -->
-
-<H2 align="center">Frequently Asked Questions</H2>
-
-<table><tr valign=top><td><ul>
-<li><a href="#1">the transfer fails to finish</a><br>
-<li><a href="#2">rsync recopies the same files</a><br>
-<li><a href="#3">is your shell clean</a><br>
-<li><a href="#4">memory usage</a><br>
-<li><a href="#5">out of memory</a><br>
-<li><a href="#6">rsync through a firewall</a><br>
-<li><a href="#7">rsync and cron</a><br>
-</ul></td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td><ul>
-<li><a href="#8">rsync: Command not found</a><br>
-<li><a href="#9">spaces in filenames</a><br>
-<li><a href="#10">ignore "vanished files" warning</a><br>
-<li><a href="#11">read-only file system</a><br>
-<li><a href="#12">multiplexing overflow 101:7104843</a><br>
-<li><a href="#13">inflate (token) returned -5</a><br>
-</ul></td></tr></table>
-
-<hr>
-<h3><a name=1>the transfer fails to finish</a></h3>
-
-<p>If you get an error like one of these:
-
-<pre>rsync: error writing 4 unbuffered bytes - exiting: Broken pipe
-rsync error: error in rsync protocol data stream (code 12) at io.c(463)
-</pre>
-
-<p>or
-
-<pre>rsync: connection unexpectedly closed (24 bytes read so far)
-rsync error: error in rsync protocol data stream (code 12) at io.c(342)
-</pre>
-
-<p>please read the <a href="issues.html">issues and debugging page</a>
-for details on how you can try to figure out what is going wrong.
-
-<hr>
-<h3><a name=2>rsync recopies the same files</a></h3>
-
-<p>Some people occasionally report that rsync copies too many files when
-they expect it to copy only a few. In most cases the explanation is
-that you forgot to include the --times (-t) option in the original copy,
-so rsync is forced to (efficiently) transfer every file that differs in
-its modified time to discover what data (if any) has changed.
-
-<p>Another common cause involves sending files to an Microsoft filesystem:
-if the file's modified time is an odd value but the receiving filesystem
-can only store even values, then rsync will re-transfer too many files.
-You can avoid this by specifying the --modify-window=1 option.
-
-<p>Yet another periodic case can happen when daylight-savings time
-changes if your OS+filesystem saves file times in local time instead of
-UTC.  For a full explanation of this and some suggestions on how to
-avoid them problem, see <a href="daylight-savings.html">this document</a>.
-
-<p>Something else that can trip up rsync is a filesystem changeing the
-filename behind the scenes.  This can happen when a filesystem changes
-an all-uppercase name into lowercase, or when it decomposes UTF-8 behind
-your back.
-
-<blockquote>
-
-<p>An example of the latter can occur with HFS+ on Mac OS X:  if you
-copy a directory with a file that has a UTF-8 character sequence in it,
-say a 2-byte umlaut-u (\0303\0274), the file will get that character
-stored by the filesystem using 3 bytes (\0165\0314\0210), and rsync will
-not know that these differing filenames are the same file (it will, in
-fact, remove a prior copy of the file if --delete is enabled, and then
-recreate it).
-
-<p>You can avoid a charset problem by passing an appropriate --iconv
-option to rsync that tells it what character-set the source files are,
-and what character-set the destination files get stored in.  For
-instance, the above Mac OS X problem would be dealt with by using
---iconv=UTF-8,UTF8-MAC (UTF8-MAC is a pseudo-charset recognized by Mac
-OS X iconv in which all characters are decomposed).
-
-</blockquote>
-
-<p>If you think that rsync is copying too many files, look at the
-itemized output (-i) to see why rsync is doing the update (e.g. the 't'
-flag indicates that the time differs, or all pluses indicates that rsync
-thinks the file doesn't exist).  You can also look at the stats produced
-with -v and see if rsync is really sending all the data.  See also the
---checksum (-c) option for one way to avoid the extra copying of files
-that don't have synchronized modified times (but keep in mind that the
--c option eats lots of disk I/O, and can be rather slow).
-
-<hr>
-<h3><a name=3>is your shell clean</a></h3>
-
-<p>The "is your shell clean" message and the "protocol mismatch" message
-are usually caused by having some sort of program in your .cshrc, .profile,
-.bashrc or equivalent file that writes a message every time you connect
-using a remote-shell program (such as ssh or rsh).  Data written in this
-way corrupts the rsync data stream. rsync detects this at startup and
-produces those error messages.  However, if you are using rsync-daemon
-syntax (host::path or rsync://) without using a remote-shell program (no
---rsh or -e option), there is not remote-shell program involved, and the
-problem is probably caused by an error on the daemon side (so check the
-daemon logs).
-
-<p>A good way to test if your remote-shell connection is clean is to try
-something like this (use ssh or rsh, as appropriate):
-
-<blockquote><pre>ssh remotesystem /bin/true &gt; test.dat</pre></blockquote>
-
-<p>That should create a file called test.dat with nothing in it. If
-test.dat is not of zero length then your shell is not clean.  Look at the
-contents of test.dat to see what was sent. Look at all the startup files on
-remotesystem to try and find the problem.
-
-<hr>
-<h3><a name=4>memory usage</a></h3>
-
-<p>Rsync versions before 3.0.0 always build the entire list of files to be
-transferred at the beginning and hold it in memory for the entire run.  Rsync
-needs about 100 bytes to store all the relevant information for one file,
-so (for example) a run with 800,000 files would consume about 80M of
-memory.  -H and --delete increase the memory usage further.
-
-<p>Version 3.0.0 slightly reduced the memory used per file by not storing fields
-not needed for a particular file.  It also introduced an incremental recursion
-mode that builds the file list in chunks and holds each chunk in memory only as
-long as it is needed.  This mode dramatically reduces memory usage, but it
-only works provided that both sides are 3.0.0 or newer and certain options that
-rsync currently can't handle in this mode are not being used.
-
-<hr>
-<h3><a name=5>out of memory</a></h3>
-
-<p>The usual reason for "out of memory" when running rsync is that you are
-transferring a _very_ large number of files.  The size of the files doesn't
-matter, only the total number of files.  If memory is a problem, first try to
-use the incremental recursion mode: upgrade both sides to rsync 3.0.0 or
-newer and avoid options that disable incremental recursion (e.g., use
-<tt>--delete-delay</tt> instead of <tt>--delete-after</tt>).  If this is not
-possible, you can break the rsync run into smaller chunks operating on
-individual subdirectories using <tt>--relative</tt> and/or exclude rules.
-
-<hr>
-<h3><a name=6>rsync through a firewall</a></h3>
-
-<p>If you have a setup where there is no way to directly connect two
-systems for an rsync transfer, there are several ways to get a firewall
-system to act as an intermediary in the transfer.  You'll find full details
-on the <a href="firewall.html">firewall methods</a> page.
-
-<hr>
-<h3><a name=7>rsync and cron</a></h3>
-
-<p>On some systems (notably SunOS4) cron supplies what looks like a socket
-to rsync, so rsync thinks that stdin is a socket. This means that if you
-start rsync with the --daemon switch from a cron job you end up rsync
-thinking it has been started from inetd. The fix is simple&mdash;just
-redirect stdin from /dev/null in your cron job.
-
-<hr>
-<h3><a name=8>rsync: Command not found</a></h3>
-
-<p>This error is produced when the remote shell is unable to locate the rsync
-binary in your path. There are 3 possible solutions:
-
-<ol>
-
-<li>install rsync in a "standard" location that is in your remote path. 
-
-<li>modify your .cshrc, .bashrc etc on the remote system to include the path
-that rsync is in
-
-<li>use the --rsync-path option to explicitly specify the path on the
-remote system where rsync is installed
-
-</ol>
-
-<p>You may echo find the command:
-
-<blockquote><pre>ssh host 'echo $PATH'</pre></blockquote>
-
-<p>for determining what your remote path is.
-
-<hr>
-<h3><a name=9>spaces in filenames</a></h3>
-
-<p>Can rsync copy files with spaces in them?
-
-<p>Short answer: Yes, rsync can handle filenames with spaces.
-
-<p>Long answer: 
-
-<p>Rsync handles spaces just like any other unix command line application.
-Within the code spaces are treated just like any other character so a
-filename with a space is no different from a filename with any other
-character in it.
-
-<p>The problem of spaces is in the argv processing done to interpret the
-command line.  As with any other unix application you have to escape spaces
-in some way on the command line or they will be used to separate arguments. 
-
-<p>It is slightly trickier in rsync (and other remote-copy programs like
-scp) because rsync sends a command line to the remote system to launch the
-peer copy of rsync (this assumes that we're not talking about daemon mode,
-which is not affected by this problem because no remote shell is involved
-in the reception of the filenames).  The command line is interpreted by the
-remote shell and thus the spaces need to arrive on the remote system
-escaped so that the shell doesn't split such filenames into multiple
-arguments.
-
-<p>For example:
-
-<blockquote><pre>rsync -av host:'a long filename' /tmp/</pre></blockquote>
-
-<p>This is usually a request for rsync to copy 3 files from the remote
-system, "a", "long", and "filename" (the only exception to this is for a
-system running a shell that does not word-split arguments in its commands,
-and that is exceedingly rare).  If you wanted to request a single file with
-spaces, you need to get some kind of space-quoting characters to the remote
-shell that is running the remote rsync command.  The following commands
-should all work:
-
-<blockquote><pre>rsync -av host:'"a long filename"' /tmp/
-rsync -av host:'a\ long\ filename' /tmp/
-rsync -av host:a\\\ long\\\ filename /tmp/</pre></blockquote>
-
-<p>You might also like to use a '?' in place of a space as long as there
-are no other matching filenames than the one with spaces (since '?' matches
-any character):
-
-<blockquote><pre>rsync -av host:a?long?filename /tmp/</pre></blockquote>
-
-<p>As long as you know that the remote filenames on the command line
-are interpreted by the remote shell then it all works fine. 
-
-<hr>
-<h3><a name=10>ignore "vanished files" warning</a></h3>
-
-<p>Some folks would like to ignore the "vanished files" warning, which
-manifests as an exit-code 24.  The easiest way to do this is to create
-a shell script wrapper.  For instance, name this something like
-"rsync-no24":
-
-<blockquote><pre>#!/bin/sh
-rsync "$@"
-e=$?
-if test $e = 24; then
-    exit 0
-fi
-exit $e</pre></blockquote>
-
-<hr>
-<h3><a name=11>read-only file system</a></h3>
-
-<p>If you get "Read-only file system" as an error when sending to a rsync
-daemon then you probably forgot to set "read only = no" for that module.
-
-<hr>
-<h3><a name=12>multiplexing overflow 101:7104843</a></h3>
-
-<p>This mysterious error, or the similar "invalid message 101:7104843", can
-happen if one of the rsync processes is killed for some reason and a message
-beginning with the four characters "Kill" gets inserted into the protocol
-stream as a result.  To solve the problem, you'll need to figure out why rsync
-is being killed.
-
-<hr>
-<h3><a name=13>inflate (token) returned -5</a></h3>
-
-This error means that rsync failed to handle an expected error from the
-compression code for a file that happened to be transferred with a block size
-of 32816 bytes.  You can avoid this issue for the affected file by transferring
-it with a manually-set block size (e.g. --block-size=33000), or by upgrading
-the receiving side to rsync 3.0.7.
-
-<hr>
-
-<!--#include virtual="footer.html" -->

rsync-web/GPL.html

@@ -1,16 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
-<HTML>
-<HEAD>
-<TITLE>rsync's license</TITLE>
-</HEAD>
-<!--#include virtual="header.html" -->
-
-Beginning with 3.0.0, rsync is available under the <b>GNU General Public
-License version 3</b>. <i>(Older releases were available under the
-<a href="GPL2.html">GPL version 2</a>.)</i>
-
-<pre><small>
-<!--#include virtual="COPYING.html" -->
-</small></pre>
-
-<!--#include virtual="footer.html" -->

rsync-web/GPL2.html

@@ -1,15 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
-<HTML>
-<HEAD>
-<TITLE>rsync's license</TITLE>
-</HEAD>
-<!--#include virtual="header.html" -->
-
-Releases <b>prior</b> to 3.0.0 were released under the
-<b>GNU General Public License version 2</b>:
-
-<pre><small>
-<!--#include virtual="COPYING2.html" -->
-</small></pre>
-
-<!--#include virtual="footer.html" -->

rsync-web/backup.txt

@@ -1,36 +0,0 @@
-#!/bin/sh
-
-# This script does personal backups to a rsync backup server. You will end up
-# with a 7 day rotating incremental backup. The incrementals will go
-# into subdirectories named after the day of the week, and the current
-# full backup goes into a directory called "current"
-# tridge@linuxcare.com
-
-# directory to backup
-BDIR=/home/$USER
-
-# excludes file - this contains a wildcard pattern per line of files to exclude
-EXCLUDES=$HOME/cron/excludes
-
-# the name of the backup machine
-BSERVER=owl
-
-# your password on the backup server
-export RSYNC_PASSWORD=XXXXXX
-
-
-########################################################################
-
-BACKUPDIR=`date +%A`
-OPTS="--force --ignore-errors --delete-excluded --exclude-from=$EXCLUDES 
-      --delete --backup --backup-dir=/$BACKUPDIR -a"
-
-export PATH=$PATH:/bin:/usr/bin:/usr/local/bin
-
-# the following line clears the last weeks incremental directory
-[ -d $HOME/emptydir ] || mkdir $HOME/emptydir
-rsync --delete -a $HOME/emptydir/ $BSERVER::$USER/$BACKUPDIR/
-rmdir $HOME/emptydir
-
-# now the actual transfer
-rsync $OPTS $BDIR $BSERVER::$USER/current