Merge master to refresh format base

Add a "Filter wildcards" subsection listing the bracket wildcard forms
the matcher (src/htsfilters.c) implements: *, *[file]/*[name], *[path],
*[param], character sets and ranges, literal escapes, size rules, and
the *[] end anchor. It links to the full filters page for the rest.
Added as an h4 under the filters section so section numbering and the
page ToC are untouched.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Xavier Roche <roche@httrack.com>

.github/dependabot.yml

@@ -6,9 +6,3 @@ updates:
     directory: /src
     schedule:
       interval: weekly
-
-  # Keep the workflow action pins current (they only rot manually otherwise).
-  - package-ecosystem: github-actions
-    directory: /
-    schedule:
-      interval: weekly

.github/workflows/ci.yml

@@ -31,7 +31,7 @@ jobs:
     env:
       CC: ${{ matrix.cc }}
     steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
         with:
           submodules: recursive
 
@@ -75,7 +75,7 @@ jobs:
     name: build (no python3, Debian buildd)
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
         with:
           submodules: recursive
 
@@ -119,7 +119,7 @@ jobs:
     name: build (macOS arm64, clang)
     runs-on: macos-14
     steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
         with:
           submodules: recursive
 
@@ -166,7 +166,7 @@ jobs:
     name: webhttrack smoke (macOS arm64)
     runs-on: macos-14
     steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
         with:
           submodules: recursive
 
@@ -199,7 +199,7 @@ jobs:
     name: build (linux i386, gcc -m32)
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
         with:
           submodules: recursive
 
@@ -242,7 +242,7 @@ jobs:
     name: sanitize (ASan+UBSan, gcc)
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
         with:
           submodules: recursive
 
@@ -296,7 +296,7 @@ jobs:
     name: msan (MemorySanitizer, clang)
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
         with:
           submodules: recursive
 
@@ -344,7 +344,7 @@ jobs:
     name: fuzz (libFuzzer corpus replay, clang)
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
         with:
           submodules: recursive
 
@@ -383,7 +383,7 @@ jobs:
     name: build (no openssl, --disable-https)
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
         with:
           submodules: recursive
 
@@ -437,7 +437,7 @@ jobs:
             zlib1g-dev libssl-dev libbrotli-dev libzstd-dev \
             debhelper devscripts lintian fakeroot
 
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
         with:
           submodules: recursive
 
@@ -468,7 +468,7 @@ jobs:
     name: distcheck (release tarball)
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
         with:
           submodules: recursive
 
@@ -493,7 +493,7 @@ jobs:
     if: github.event_name == 'pull_request'
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
@@ -537,7 +537,7 @@ jobs:
         tests/*.test
         tools/mkdeb.sh
     steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
 
       - name: Install linters
         run: |
@@ -572,7 +572,7 @@ jobs:
     if: github.event_name == 'pull_request'
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
@@ -618,31 +618,3 @@ jobs:
               echo "Fix locally with: git clang-format --binary clang-format-19 $base"
               exit 1 ;;
           esac
-
-  man-page-sync:
-    name: man page / html in sync
-    if: github.event_name == 'pull_request'
-    runs-on: ubuntu-24.04
-    steps:
-      - uses: actions/checkout@v7
-        with:
-          fetch-depth: 0
-
-      # html/httrack.man.html is groff-rendered from man/httrack.1 and committed.
-      # Rendering needs the full groff html device, so CI can't regenerate it;
-      # instead require the two to move together: a PR that touches httrack.1
-      # must also touch the html, catching the "regenerated roff, forgot html".
-      - name: httrack.1 changes must include html/httrack.man.html
-        run: |
-          set -euo pipefail
-          git fetch --no-tags origin \
-            "+refs/heads/${{ github.base_ref }}:refs/remotes/origin/${{ github.base_ref }}"
-          base="origin/${{ github.base_ref }}"
-          changed="$(git diff --name-only "$base"...HEAD)"
-          has() { printf '%s\n' "$changed" | grep -qx "$1"; }
-          if has man/httrack.1 && ! has html/httrack.man.html; then
-            echo "::error::man/httrack.1 changed but html/httrack.man.html did not."
-            echo "Regenerate it with: make -C man regen-man-html (needs the full groff package)."
-            exit 1
-          fi
-          echo "man/html sync OK."

.github/workflows/codeql.yml

@@ -26,7 +26,7 @@ jobs:
       # Upload findings to the repo's code-scanning dashboard.
       security-events: write
     steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v6
         with:
           submodules: recursive
 

.github/workflows/windows-build.yml

@@ -23,13 +23,8 @@ jobs:
       matrix:
         platform: [x64, Win32]
         configuration: [Release]
-    # Redirect vcpkg's default `files` binary cache into the workspace so
-    # actions/cache can persist it. vcpkg builds openssl/brotli/zlib/zstd from
-    # source otherwise, several minutes every run.
-    env:
-      VCPKG_DEFAULT_BINARY_CACHE: ${{ github.workspace }}\vcpkg_cache
     steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v4
         with:
           submodules: recursive   # coucal lives in src/coucal
 
@@ -49,24 +44,6 @@ jobs:
         shell: pwsh
         run: vcpkg integrate install
 
-      # vcpkg errors if VCPKG_DEFAULT_BINARY_CACHE points at a missing dir, and
-      # actions/cache does not create it on a miss.
-      - name: Create the vcpkg binary cache directory
-        shell: pwsh
-        run: New-Item -ItemType Directory -Force -Path $env:VCPKG_DEFAULT_BINARY_CACHE | Out-Null
-
-      # x-gha is gone (vcpkg-tool #1662 dropped it after GitHub changed the cache
-      # API), so cache the binary archives directly. Keyed on the manifest, which
-      # carries the builtin-baseline, so a Dependabot bump busts it; restore-keys
-      # still seeds the unchanged ports' archives, so only the bumped one rebuilds.
-      - name: Cache vcpkg binary archives
-        uses: actions/cache@v6
-        with:
-          path: ${{ github.workspace }}\vcpkg_cache
-          key: vcpkg-${{ matrix.platform }}-${{ hashFiles('src/vcpkg.json') }}
-          restore-keys: |
-            vcpkg-${{ matrix.platform }}-
-
       # The runner image's vcpkg checkout is pinned to some commit; our manifest's
       # builtin-baseline is usually newer, so `git show <baseline>:versions/...`
       # fails until that commit is local. Fetch exactly the pinned baseline (read
@@ -225,16 +202,14 @@ jobs:
 
           # Every gate here exits 77, so an all-skipped suite would report green having
           # tested nothing: pin the skips, and floor the passes in case the glob empties.
-          # footer-overflow skips on Windows (needs a path past MAX_PATH); crange pending #581;
-          # webdav-mime needs a reapable background listener, which MSYS cannot give it.
-          expected_skips=" 01_engine-footer-overflow.test 48_local-crange-memresume.test 71_local-crange-repaircache.test 79_local-proxytrack-webdav-mime.test"
+          expected_skips=" 48_local-crange-memresume.test 71_local-crange-repaircache.test"  # pending #581
           [ "$pass" -ge 90 ] || { echo "::error::only $pass tests passed ($skip skipped)"; exit 1; }
           [ "$skipped" = "$expected_skips" ] || { echo "::error::unexpected skips:$skipped"; exit 1; }
           [ "$fail" -eq 0 ] || { echo "::error::failing:$failed"; exit 1; }
 
       - name: Upload the test logs
         if: always()
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v4
         with:
           name: engine-tests-${{ matrix.platform }}-${{ matrix.configuration }}
           path: tests/*.log
@@ -242,7 +217,7 @@ jobs:
 
       - name: Upload MSBuild logs
         if: always()
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v4
         with:
           name: msbuild-${{ matrix.platform }}-${{ matrix.configuration }}
           path: msbuild-*.log

configure.ac

@@ -1,6 +1,6 @@
 AC_PREREQ([2.71])
 
-AC_INIT([httrack], [3.49.14], [roche+packaging@httrack.com], [httrack], [http://www.httrack.com/])
+AC_INIT([httrack], [3.49.13], [roche+packaging@httrack.com], [httrack], [http://www.httrack.com/])
 AC_COPYRIGHT([
 HTTrack Website Copier, Offline Browser for Windows and Unix
 Copyright (C) 1998-2015 Xavier Roche and other contributors
@@ -29,12 +29,13 @@ AC_CONFIG_SRCDIR(src/httrack.c)
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS(config.h)
 AM_INIT_AUTOMAKE([subdir-objects])
-# 3:6:0: 3.49.14 grows two installed structs from the inside (htsoptstate sits mid-
-# httrackp, htsblk mid-lien_back), so the fields after them shift: httrackp.cookies_file
-# +8, lien_back.http11 +48. Soname deliberately stays .so.3: the shifted fields are
-# 3.49-era additions no external consumer reaches, and a libhttrack3 rename isn't worth it.
+# 3:5:0: 3.49.13 leaves every installed struct layout and the exported symbol set
+# untouched vs 3.49.12; the 2 GB (_stat64) and UTF-8 export widenings are _WIN32-only,
+# and INTsys widened on POSIX (#600) but sits in no installed struct. Stays soname
+# .so.3; bump revision. x32 alone changes layout (LLint was 4 bytes there, #524), and
+# is not a release architecture.
 # (3:0:0 was the htsblk mime-buffer widening, the ABI break that moved .so.2 -> .so.3.)
-VERSION_INFO="3:6:0"
+VERSION_INFO="3:5:0"
 AM_MAINTAINER_MODE
 AC_USE_SYSTEM_EXTENSIONS
 
@@ -66,11 +67,10 @@ AC_SUBST(LT_CV_OBJDIR,$lt_cv_objdir)
 AC_SUBST(VERSION_INFO)
 
 ### Default CFLAGS
-# No -Wdeclaration-after-statement: nothing sets -std=, so this builds as gnu17.
 DEFAULT_CFLAGS="-Wall -Wformat -Wformat-security \
 -Wmultichar -Wwrite-strings -Wcast-qual -Wcast-align \
 -Wstrict-prototypes -Wmissing-prototypes \
--Wmissing-declarations \
+-Wmissing-declarations -Wdeclaration-after-statement \
 -Wpointer-arith -Wsequence-point -Wnested-externs \
 -D_REENTRANT"
 AC_SUBST(DEFAULT_CFLAGS)
@@ -78,30 +78,27 @@ DEFAULT_LDFLAGS=""
 AC_SUBST(DEFAULT_LDFLAGS)
 
 ### Additional flags (if supported)
-# -Werror on probes: exit-status-only checks let clang's warn-on-unknown-flag through.
-AX_CHECK_COMPILE_FLAG([-Wparentheses], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -Wparentheses"], [], [-Werror])
-AX_CHECK_COMPILE_FLAG([-Winit-self], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -Winit-self"], [], [-Werror])
-AX_CHECK_COMPILE_FLAG([-Wunused-but-set-parameter], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -Wunused-but-set-parameter"], [], [-Werror])
-AX_CHECK_COMPILE_FLAG([-Waddress], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -Waddress"], [], [-Werror])
-AX_CHECK_COMPILE_FLAG([-Wuninitialized], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -Wuninitialized"], [], [-Werror])
-AX_CHECK_COMPILE_FLAG([-Wformat=2], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -Wformat=2"], [], [-Werror])
-# -Wformat-nonliteral needs -Wformat in the probe or gcc rejects it as ignored.
-AX_CHECK_COMPILE_FLAG([-Wformat-nonliteral], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -Wformat-nonliteral"], [], [-Werror -Wformat])
-AX_CHECK_COMPILE_FLAG([-Wmissing-parameter-type], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -Wmissing-parameter-type"], [], [-Werror])
-AX_CHECK_COMPILE_FLAG([-Wold-style-definition], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -Wold-style-definition"], [], [-Werror])
-AX_CHECK_COMPILE_FLAG([-Wignored-qualifiers], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -Wignored-qualifiers"], [], [-Werror])
+AX_CHECK_COMPILE_FLAG([-Wparentheses], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -Wparentheses"])
+AX_CHECK_COMPILE_FLAG([-Winit-self], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -Winit-self"])
+AX_CHECK_COMPILE_FLAG([-Wunused-but-set-parameter], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -Wunused-but-set-parameter"])
+AX_CHECK_COMPILE_FLAG([-Waddress], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -Waddress"])
+AX_CHECK_COMPILE_FLAG([-Wuninitialized], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -Wuninitialized"])
+AX_CHECK_COMPILE_FLAG([-Wformat=2], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -Wformat=2"])
+AX_CHECK_COMPILE_FLAG([-Wformat-nonliteral], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -Wformat-nonliteral"])
+AX_CHECK_COMPILE_FLAG([-Wmissing-parameter-type], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -Wmissing-parameter-type"])
+AX_CHECK_COMPILE_FLAG([-Wold-style-definition], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -Wold-style-definition"])
+AX_CHECK_COMPILE_FLAG([-Wignored-qualifiers], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -Wignored-qualifiers"])
 # Make htssafe.h's pointer-dest 'warning' attribute a hard error in our build
 # (migration is at zero; a new char* dest is a regression). gcc/clang each take
 # only their own spelling; downstream keeps the plain warning, not a build break.
-AX_CHECK_COMPILE_FLAG([-Werror=attribute-warning], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -Werror=attribute-warning"], [], [-Werror])
-AX_CHECK_COMPILE_FLAG([-Werror=user-defined-warnings], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -Werror=user-defined-warnings"], [], [-Werror])
-AX_CHECK_COMPILE_FLAG([-fstrict-aliasing -Wstrict-aliasing], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -fstrict-aliasing -Wstrict-aliasing"], [], [-Werror])
+AX_CHECK_COMPILE_FLAG([-Werror=attribute-warning], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -Werror=attribute-warning"])
+AX_CHECK_COMPILE_FLAG([-Werror=user-defined-warnings], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -Werror=user-defined-warnings"])
+AX_CHECK_COMPILE_FLAG([-fstrict-aliasing -Wstrict-aliasing], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -fstrict-aliasing -Wstrict-aliasing"])
 AX_CHECK_COMPILE_FLAG([-fstack-protector-strong], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -fstack-protector-strong"],
-	[AX_CHECK_COMPILE_FLAG([-fstack-protector], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -fstack-protector"], [], [-Werror])], [-Werror])
-AX_CHECK_COMPILE_FLAG([-fstack-clash-protection], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -fstack-clash-protection"], [], [-Werror])
-AX_CHECK_COMPILE_FLAG([-fcf-protection], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -fcf-protection"], [], [-Werror])
-# No --discard-all: it drops the local symbols naming every static function, so
-# a trace misattributes them to the nearest surviving global. Costs 0.6% size.
+	[AX_CHECK_COMPILE_FLAG([-fstack-protector], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -fstack-protector"])])
+AX_CHECK_COMPILE_FLAG([-fstack-clash-protection], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -fstack-clash-protection"])
+AX_CHECK_COMPILE_FLAG([-fcf-protection], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -fcf-protection"])
+AX_CHECK_LINK_FLAG([-Wl,--discard-all], [DEFAULT_LDFLAGS="$DEFAULT_LDFLAGS -Wl,--discard-all"])
 AX_CHECK_LINK_FLAG([-Wl,--no-undefined], [DEFAULT_LDFLAGS="$DEFAULT_LDFLAGS -Wl,--no-undefined"])
 AX_CHECK_LINK_FLAG([-Wl,-z,relro,-z,now], [DEFAULT_LDFLAGS="$DEFAULT_LDFLAGS -Wl,-z,relro,-z,now"])
 AX_CHECK_LINK_FLAG([-Wl,-z,noexecstack], [DEFAULT_LDFLAGS="$DEFAULT_LDFLAGS -Wl,-z,noexecstack"])
@@ -123,13 +120,13 @@ AC_SUBST([LIBC_FORCE_LINK])
 ### PIE
 CFLAGS_PIE=""
 LDFLAGS_PIE=""
-AX_CHECK_COMPILE_FLAG([-fpie], [CFLAGS_PIE="-fpie"], [], [-Werror])
+AX_CHECK_COMPILE_FLAG([-fpie -pie], [CFLAGS_PIE="-fpie -pie"])
 AX_CHECK_LINK_FLAG([-pie], [LDFLAGS_PIE="-pie"])
 AC_SUBST([CFLAGS_PIE])
 AC_SUBST([LDFLAGS_PIE])
 
-# Ties a crash trace from a stripped build back to its separate debug symbols.
-AX_CHECK_LINK_FLAG([-Wl,--build-id], [DEFAULT_LDFLAGS="$DEFAULT_LDFLAGS -Wl,--build-id"])
+## Export all symbols for backtraces
+AX_CHECK_COMPILE_FLAG([-rdynamic], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -rdynamic"])
 
 ### Check for -fvisibility=hidden support
 gl_VISIBILITY
@@ -173,7 +170,7 @@ AC_CHECK_TYPE(sa_family_t, [], [AC_DEFINE([sa_family_t], [uint16_t], [sa_family_
 AX_CHECK_ALIGNED_ACCESS_REQUIRED
 
 # check for various headers
-AC_CHECK_HEADERS([execinfo.h sys/ioctl.h])
+AC_CHECK_HEADERS([execinfo.h])
 
 ### zlib
 CHECK_ZLIB()

debian/changelog

@@ -1,11 +1,3 @@
-httrack (3.49.14-1) unstable; urgency=medium
-
-  * New upstream release: WARC/WACZ archive output, Windows long-path support,
-    named -%F footer fields, and encoding fixes for non-ASCII project paths;
-    full list in history.txt.
-
- -- Xavier Roche <xavier@debian.org>  Fri, 24 Jul 2026 08:01:43 +0200
-
 httrack (3.49.13-1) unstable; urgency=medium
 
   * New upstream release: SOCKS5 and CONNECT proxy support, brotli and zstd

greetings.txt

@@ -5,7 +5,7 @@ Xavier Roche (xroche at httrack.com)
   project leader
   core engine, Windows/Linux GUI
 Yann Philippot (yphilippot at lemel.fr)
-  past contributor (java binary .class parser)
+  for the java binary .class parser
 
 With the help of:
 Leto Kauler (molotov at tasmail.com)

history.txt

@@ -4,23 +4,6 @@ HTTrack Website Copier release history:
 
 This file lists all changes and fixes that have been made for HTTrack
 
-3.49-14
-+ New: WARC/1.1 archive output (--warc), with a sorted CDXJ index (--warc-cdx) and WACZ packaging (--wacz), also available from webhttrack (#668)
-+ New: -%F takes named footer fields such as {url}, {lastmodified}, {mime}, {charset} and {status} instead of a fixed layout (#667)
-+ New: a command-line guide organized by task ships with the offline documentation (#649)
-+ Fixed: on Windows, paths beyond MAX_PATH truncated files, and mirroring into a long or non-ASCII directory silently failed (#133)
-+ Fixed: the top index showed mojibake for non-ASCII project names and categories on Windows (#216)
-+ Fixed: webhttrack handed the engine the web form's charset rather than UTF-8, so a non-ASCII path mirrored into a mojibake directory (#629)
-+ Fixed: a non-ASCII single -O left the logs and the cache in a mangled twin directory on Windows (#630)
-+ Fixed: a path-ceiling truncation dropped the .delayed marker, losing the file (#623)
-+ Fixed: an oversized -%F footer aborted the crawl instead of being skipped (#669)
-+ Fixed: a rejected 206 resume could loop and lose the file rather than refetch it whole (#581)
-+ Fixed: default-port stripping was scheme-blind and dropped explicit ports from https and ftp URLs, and a :80 written with leading zeros mangled the host (#627, #638)
-+ Fixed: -K silently reset the -c socket count (#650)
-+ Fixed: signed-shift undefined behaviour in the zip-repair local-header read (#639)
-+ Changed: the offline documentation drops stale facts, gains an Android help page, and documents the filter wildcards and the real long option forms
-+ Changed: multiple internal hardening, test and CI improvements
-
 3.49-13
 + New: SOCKS5 proxy support, with scheme-aware -P URLs (socks5://, socks5h://, connect://) and plain HTTP tunneled through a CONNECT-only proxy (#563, #564)
 + New: decode brotli and zstd content codings, advertised over TLS only as browsers do (#556)

html/abuse.html

@@ -217,7 +217,7 @@ school or
 shows. They might do that because they are connected through expensive modem connection,
 or because they would like to consult pages while travelling, or archive sites that may be
 removed
-one day, make some data mining, compiling information ("if only I could find this
+one day, make some data mining, comiling information ("if only I could find this
 website I saw one day..&quot;). <br>
 There are many good reasons to mirror websites, and this helps many good people.<br>
 As a webmaster, you might be interested to use such tools, too: test broken links, move a
@@ -229,7 +229,7 @@ test the webserver response and performances, index it..<br>
 Anyway, bandwidth abuse can be a problem. If your site is regularly &quot;clobbered&quot;
 by evil downloaders, you have <br>
 various solutions. You have radical solutions, and intermediate solutions. I strongly
-recommend not to use<br>
+recomment not to use<br>
 radical solutions, because of the previous remarks (good people often mirror websites).<br>
 <br>
 In general, for all solutions,<br>
@@ -244,7 +244,7 @@ or, to be extreme: if you unplug the wire, there will be no bandwidth abuse<br>
 Good: Will work with good people. Many good people just don't KNOW that they can slow down
 a network.<br>
 Bad: Will **only** work with good people<br>
-How to do: Obvious - place a note, a warning, an article, a draw, a poem or whatever you
+How to do: Obvious - place a note, a warning, an article, a draw, a poeme or whatever you
 want<br>
 <br>
 </li><li>Use &quot;robots.txt&quot; file<br>
@@ -266,7 +266,7 @@ Good: Efficient<br>
 Bad: Multiple users behind proxies will be slow down, not really easy to setup<br>
 How to do: Depends on webserver. Might be done with low-level IP rules (QoS)<br>
 <br>
-</li><li>Prioritize small files, against large files<br>
+</li><li>Priorize small files, against large files<br>
 Good: Efficient if large files are the cause of abuse<br>
 Bad: Not always efficient<br>
 How to do: Depends on the webserver<br>
@@ -283,7 +283,7 @@ How to do: Use routine QoS (fair queuing), or webserver options<br>
 <br>
 </li><li>Use technical tricks (like javascript) to hide URLs<br>
 Good: Efficient<br>
-Bad: The most efficient tricks will also cause your website to be heavy, and not
+Bad: The most efficient tricks will also cause your website to he heavy, and not
 user-friendly (and therefore less attractive, even for surfing users). Remember: clients
 or visitors might want to consult offline your website. Advanced users will also be still
 able to note the URLs and catch them. Will not work on non-javascript browsers. It will
@@ -335,7 +335,7 @@ Example: Use things like
 </li><li>Use technical tricks to temporarily ban IPs<br>
 Good: Efficient<br>
 Bad: Radical (your site will only be available online for all users), not easy to setup<br>
-How to do: Create fake links with &quot;killing&quot; targets<br>
+How to to: Create fake links with &quot;killing&quot; targets<br>
 Example: Use things like &lt;a href=&quot;killme.cgi&quot;&gt;&lt;nothing&gt;&lt;/a&gt;
 (again an example in php:)<br>
 <tt>
@@ -417,7 +417,7 @@ Example:<br>
 </li><li>Another one is to create images of emails<br>
 Good: Efficient, does not require javascript<br>
 Bad: There is still the problem of the link (mailto:), images are bigger than text, and it can cause problems for blind people (a good solution is use an ALT attribute with the email written like "smith at mycompany dot com")<br>
-How to do: Not so obvious if you do not want to create images by yourself<br>
+How to do: Not so obvious of you do not want to create images by yourself<br>
 Example: (php, Unix)<br>
 
 <tt>
@@ -491,7 +491,7 @@ echo <br>
 </li><li>You can also create temporary email aliases, each week, for all users<br>
 Good: Efficient, and you can give your real email in your reply-to address<br>
 Bad: Temporary emails<br>
-How to do: Not so hard to do<br>
+How to do: Not so hard todo<br>
 Example: (script &amp; php, Unix)<br>
 
 <tt>

html/cmddoc.html

@@ -0,0 +1,157 @@
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+	<meta name="description" content="HTTrack is an easy-to-use website mirror utility. It allows you to download a World Wide website from the Internet to a local directory,building recursively all structures, getting html, images, and other files from the server to your computer. Links are rebuiltrelatively so that you can freely browse to the local site (works with any browser). You can mirror several sites together so that you can jump from one toanother. You can, also, update an existing mirror site, or resume an interrupted download. The robot is fully configurable, with an integrated help" />
+	<meta name="keywords" content="httrack, HTTRACK, HTTrack, winhttrack, WINHTTRACK, WinHTTrack, offline browser, web mirror utility, aspirateur web, surf offline, web capture, www mirror utility, browse offline, local  site builder, website mirroring, aspirateur www, internet grabber, capture de site web, internet tool, hors connexion, unix, dos, windows 95, windows 98, solaris, ibm580, AIX 4.0, HTS, HTGet, web aspirator, web aspirateur, libre, GPL, GNU, free software" />
+	<title>HTTrack Website Copier - Offline Browser</title>
+
+	<style type="text/css">
+	<!--
+
+body {
+	margin: 0;  padding: 0;  margin-bottom: 15px;  margin-top: 8px;
+	background: #77b;
+}
+body, td {
+	font: 14px "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;
+	}
+
+#subTitle {
+	background: #000;  color: #fff;  padding: 4px;  font-weight: bold; 
+	}
+
+#siteNavigation a, #siteNavigation .current {
+	font-weight: bold;  color: #448;
+	}
+#siteNavigation a:link    { text-decoration: none; }
+#siteNavigation a:visited { text-decoration: none; }
+
+#siteNavigation .current { background-color: #ccd; }
+
+#siteNavigation a:hover   { text-decoration: none;  background-color: #fff;  color: #000; }
+#siteNavigation a:active  { text-decoration: none;  background-color: #ccc; }
+
+
+a:link    { text-decoration: underline;  color: #00f; }
+a:visited { text-decoration: underline;  color: #000; }
+a:hover   { text-decoration: underline;  color: #c00; }
+a:active  { text-decoration: underline; }
+
+#pageContent {
+	clear: both;
+	border-bottom: 6px solid #000;
+	padding: 10px;  padding-top: 20px;
+	line-height: 1.65em;
+	background-image: url(images/bg_rings.gif);
+	background-repeat: no-repeat;
+	background-position: top right;
+	}
+
+#pageContent, #siteNavigation {
+	background-color: #ccd;
+	}
+
+
+.imgLeft  { float: left;   margin-right: 10px;  margin-bottom: 10px; }
+.imgRight { float: right;  margin-left: 10px;   margin-bottom: 10px; }
+
+hr { height: 1px;  color: #000;  background-color: #000;  margin-bottom: 15px; }
+
+h1 { margin: 0;  font-weight: bold;  font-size: 2em; }
+h2 { margin: 0;  font-weight: bold;  font-size: 1.6em; }
+h3 { margin: 0;  font-weight: bold;  font-size: 1.3em; }
+h4 { margin: 0;  font-weight: bold;  font-size: 1.18em; }
+
+.blak { background-color: #000; }
+.hide { display: none; }
+.tableWidth { min-width: 400px; }
+
+.tblRegular       { border-collapse: collapse; }
+.tblRegular td    { padding: 6px;  background-image: url(fade.gif);  border: 2px solid #99c; }
+.tblHeaderColor, .tblHeaderColor td { background: #99c; }
+.tblNoBorder td   { border: 0; }
+
+
+// -->
+</style>
+
+</head>
+
+<table width="76%" border="0" align="center" cellspacing="0" cellpadding="0" class="tableWidth">
+	<tr>
+	<td><img src="images/header_title_4.gif" width="400" height="34" alt="HTTrack Website Copier" title="" border="0" id="title" /></td>
+	</tr>
+</table>
+<table width="76%" border="0" align="center" cellspacing="0" cellpadding="3" class="tableWidth">
+	<tr>
+	<td id="subTitle">Open Source offline browser</td>
+	</tr>
+</table>
+<table width="76%" border="0" align="center" cellspacing="0" cellpadding="0" class="tableWidth">
+<tr class="blak">
+<td>
+	<table width="100%" border="0" align="center" cellspacing="1" cellpadding="0">
+	<tr>
+	<td colspan="6"> 
+		<table width="100%" border="0" align="center" cellspacing="0" cellpadding="10">
+		<tr> 
+		<td id="pageContent"> 
+<!-- ==================== End prologue ==================== -->
+
+<h2 align="center"><em>Command-Line Documentation</em></h2>
+
+<br>
+
+The command-line version
+
+<ul>
+  <li><a href="cmdguide.html">Command-line Guide</a></li>
+  <br>A task-oriented guide: how to do the common things, and the defaults that surprise newcomers<br><br>
+  <li><a href="options.html">Command line Options</a></li>
+  <br>List of all powerful command line options<br><br>
+  <li>How to use httrack command-line version:</li>
+  <ul>
+    <li>Open a shell window</li>
+      <br>
+      <br>
+    <li>Type in <tt>httrack</tt> (or the complete path to the httrack executable)</li>
+      <br><small><tt>httrack</tt></small>
+      <br>
+      <br>
+    <li>Add the URLs, separated by a blank space</li>
+      <br><small><tt>httrack www.example.com/foo/</tt></small>
+      <br>
+      <br>
+    <li>If you need, add some options (see the <a href="options.html">option list</a>)</li>
+      <br><small><tt>httrack www.example.com/foo/ -O "/webs" -N4 -P proxy.myhost.com:3128</tt></small>
+      <br>
+      <br>
+    <li>Launch the command line, and wait until the mirror is finishing</li>
+      <br><small>You can (especially on the Unix release) press ^C to stop the mirror or put httrack in background</small>
+      <br>
+      <br>
+  </ul>
+</ul>
+
+<!-- ==================== Start epilogue ==================== -->
+		</td>
+		</tr>
+		</table>
+	</td>
+	</tr>
+	</table>
+</td>
+</tr>
+</table>
+
+<table width="76%" border="0" align="center" valign="bottom" cellspacing="0" cellpadding="0">
+	<tr>
+	<td id="footer"><small>&copy; 1998-2026 Xavier Roche & other contributors - Web Design: Leto Kauler.</small></td>
+	</tr>
+</table>
+
+</body>
+
+</html>
+

html/cmdguide.html

@@ -323,18 +323,10 @@ options control what HTTrack says about itself.</p>
   <tr><td><tt>--user-agent (-F)</tt></td><td>The <tt>User-Agent</tt>. Set a browser string to get past crawler blocks; <tt>--user-agent ""</tt> sends none.</td></tr>
   <tr><td><tt>--referer (-%R), --from (-%E), --language (-%l), --accept (-%a)</tt></td><td>Referer, From, Accept-Language and Accept headers.</td></tr>
   <tr><td><tt>--headers (-%X)</tt></td><td>Add raw header lines to every request.</td></tr>
-  <tr><td><tt>--footer (-%F)</tt></td><td>A footer written into saved pages (on disk, not a network header). See <b>Footer fields</b> below.</td></tr>
+  <tr><td><tt>--footer (-%F)</tt></td><td>A footer written into saved pages (on disk, not a network header).</td></tr>
   <tr><td><tt>--cookies (-b), --cookies-file (-%K)</tt></td><td>Accept cookies, and preload a Netscape <tt>cookies.txt</tt>.</td></tr>
 </table>
 
-<p><b>Footer fields.</b> A footer with no <tt>%s</tt> may reference named fields:
-<tt>{addr}</tt>, <tt>{path}</tt>, <tt>{url}</tt>, <tt>{date}</tt> (mirror time),
-<tt>{lastmodified}</tt> (the page's Last-Modified), <tt>{version}</tt>,
-<tt>{mime}</tt>, <tt>{charset}</tt>, <tt>{status}</tt> and <tt>{size}</tt>; write
-<tt>{{</tt> or <tt>}}</tt> for a literal brace. A footer that contains <tt>%s</tt>
-keeps the older positional form (host, path, date in that order). Example:
-<tt>-%F "&lt;!-- Mirrored from {url} on {date} --&gt;"</tt>.</p>
-
 <p><b>Login.</b> For HTTP Basic auth, put the credentials in the URL:
 <tt>http://user:pass@host/</tt>. An <tt>@</tt> inside the username must be written
 <tt>%40</tt>. Only Basic is supported, not Digest.</p>
@@ -429,16 +421,14 @@ host and stops the crawl; start from the final URL, or add
 rule wins.</small></p>
 
 <h4>Download the PDFs on a site</h4>
-<p><tt>httrack https://example.com/ "-*" "+https://example.com/*.html" "+https://example.com/*[path]/" "+https://example.com/*.pdf" --path mydir</tt><br>
-<small>HTTrack finds PDFs by parsing the site's HTML, so a plain
-<tt>"-*" "+example.com/*.pdf"</tt> is wrong: it prunes the pages that carry the
-links and keeps only PDFs reachable from the front page. Instead admit the HTML as
-scaffolding (<tt>*.html</tt> and <tt>*[path]/</tt> for directory-index pages at any
-depth, e.g. <tt>docs/</tt> or <tt>a/b/deep/</tt>; <tt>*[file]/</tt> would stop at one
-level), keep the PDFs, and let <tt>-*</tt> drop everything else (images,
-archives, off-site assets). PDFs on another host (a CDN or docs subdomain) are not
-included by default; allow that host too, e.g. <tt>"+docs.example.com/*.pdf"</tt>,
-or widen to <tt>"+*.pdf"</tt> for PDFs anywhere.</small></p>
+<p><tt>httrack https://example.com/ --path mydir</tt><br>
+<small>There is no PDF-only crawl. HTTrack discovers PDF links by parsing the
+site's HTML pages, so a <tt>"-*" "+example.com/*.pdf"</tt> filter blocks the very
+pages that carry the links and grabs only the PDFs linked from the front page. Let
+it crawl the site: the HTML pages come along as the scaffolding, and every reachable
+PDF is saved with them. If some PDFs live on another host (a CDN or a docs
+subdomain), allow that host too, for example
+<tt>"+docs.example.com/*.pdf"</tt>.</small></p>
 
 <h4>Keep page requisites, including off-host images</h4>
 <p><tt>httrack https://example.com/blog/ --near --path mydir</tt><br>
@@ -473,15 +463,6 @@ then:</small><br>
 lifts the built-in caps; use it only against infrastructure you are allowed to
 load.</small></p>
 
-<h4>Save a WARC archive of the crawl</h4>
-<p><tt>httrack https://example.com/ --warc --path mydir</tt><br>
-<small>Writes a standard WARC/1.1 file (<tt>httrack-&lt;timestamp&gt;.warc.gz</tt>) in
-the project folder alongside the browsable mirror, not instead of it. Set the name
-with <tt>--warc-file NAME</tt> and split a large crawl with <tt>--warc-max-size N</tt>;
-add <tt>--warc-cdx</tt> for a sorted CDXJ index, or <tt>--wacz</tt> to bundle the
-archive, index and pages into one WACZ for replay tools such as
-replayweb.page.</small></p>
-
 <h4>HTTrack as a fetch tool</h4>
 <p><tt>httrack --get https://host/file.bin --path tmp</tt><br>
 <small><tt>--get</tt> fetches one file with cache, index, depth, cookies and robots

html/contact.html

@@ -132,7 +132,7 @@ Xavier Roche (xroche at httrack dot com)
   for the main engine and Windows interface
   and maintainer for v2.0 and v3.0
 Yann Philippot (yphilippot at lemel dot fr)
-  past contributor (java binary .class parser)
+  for the java binary  dot class parser
 David Lawrie (dalawrie at lineone dot net)
 Robert Lagadec (rlagadec at yahoo dot fr)
   for checking both English & French translations

html/faq.html

@@ -3,7 +3,7 @@
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 	<meta name="description" content="HTTrack is an easy-to-use website mirror utility. It allows you to download a World Wide website from the Internet to a local directory,building recursively all structures, getting html, images, and other files from the server to your computer. Links are rebuiltrelatively so that you can freely browse to the local site (works with any browser). You can mirror several sites together so that you can jump from one toanother. You can, also, update an existing mirror site, or resume an interrupted download. The robot is fully configurable, with an integrated help" />
-	<meta name="keywords" content="httrack, HTTRACK, HTTrack, winhttrack, WINHTTRACK, WinHTTrack, offline browser, web mirror utility, aspirateur web, surf offline, web capture, www mirror utility, browse offline, local  site builder, website mirroring, aspirateur www, internet grabber, capture de site web, internet tool, hors connexion, unix, linux, windows, macos, HTS, HTGet, web aspirator, web aspirateur, libre, GPL, GNU, free software" />
+	<meta name="keywords" content="httrack, HTTRACK, HTTrack, winhttrack, WINHTTRACK, WinHTTrack, offline browser, web mirror utility, aspirateur web, surf offline, web capture, www mirror utility, browse offline, local  site builder, website mirroring, aspirateur www, internet grabber, capture de site web, internet tool, hors connexion, unix, dos, windows vista, windows seven, windows 8, solaris, ibm580, AIX 4.0, HTS, HTGet, web aspirator, web aspirateur, libre, GPL, GNU, free software" />
 	<title>HTTrack Website Copier - Offline Browser</title>
 
 	<style type="text/css">
@@ -135,7 +135,9 @@ clear language!
 
 <li><a href="#QG2">Where can I find French/other languages documentation?</a><br></li>
 
-<li><a href="#QG3">Which systems does HTTrack run on?</a><br></li>
+<li><a href="#QG3b">Is HTTrack working on Windows Vista/Windows Seven/Windows 8 ?</a><br></li>
+
+<li><a href="#QG3">Is HTTrack working on Windows 95/98 ?</a><br></li>
 
 <li><a href="#QG4">What's the difference between HTTrack, WinHTTrack and WebHTTrack?</a><br></li>
 
@@ -318,10 +320,10 @@ This can easily done by using filters: go to the Option panel, select the 'Scan
 <tt>+www.example.com/gallery/trees/*<br>
 +www.example.com/photos/*</tt><br>
 <br>
-This means "accept all links beginning with <tt>www.example.com/gallery/trees/</tt> and <tt>www.example.com/photos/</tt>" 
+This means "accept all links begining with <tt>www.example.com/gallery/trees/</tt> and <tt>www.example.com/photos/</tt>" 
 - the <tt>+</tt> means "accept" and the final <tt>*</tt> means "any character will match after the previous ones".
 Remember the <tt>*.doc</tt> or <tt>*.zip</tt> encountered when you want to select all files from a certain type on your computer: 
-it is almost the same here, except the beginning "+"<br>
+it is almost the same here, except the begining "+"<br>
 <br>
 Now, we might want to exclude all links in <tt>www.example.com/gallery/trees/hugetrees/</tt>, because with the previous filter,
 we accepted too many files. Here again, you can add a filter rule to refuse these links. Modify the previous filters to:<br>
@@ -329,8 +331,8 @@ we accepted too many files. Here again, you can add a filter rule to refuse thes
 +www.example.com/photos/*<br>
 -www.example.com/gallery/trees/hugetrees/*</tt><br>
 <br>
-You have noticed the <tt>-</tt> in the beginning of the third rule: this means "refuse links matching the rule" 
-; and the rule is "any files beginning with <tt>www.example.com/gallery/trees/hugetrees/</tt><br>
+You have noticed the <tt>-</tt> in the begining of the third rule: this means "refuse links matching the rule" 
+; and the rule is "any files begining with <tt>www.example.com/gallery/trees/hugetrees/</tt><br>
 
 Voila! With these three rules, you have precisely defined what you wanted to capture.<br>
 <br>
@@ -359,12 +361,12 @@ You can freely download it, without paying any fees, copy it to your friends, an
 There are NO official/authorized resellers, because HTTrack is <b>NOT</b> a commercial product.
 But you can be charged for duplication fees, or any other services (example: software CDroms or shareware collections, or fees for maintenance), 
 but you should have been informed that the software was free software/GPL, and you <b><u>MUST</u></b> have received a copy of the GNU General Public License.
-Otherwise this is dishonest and unfair (ie. selling httrack on ebay without telling that it was a free software is a scam).
+Otherwise this is dishonnest and unfair (ie. selling httrack on ebay without telling that it was a free software is a scam).
 </em>
 
 <br><br><a NAME="QG0b">Q: <strong>Are there any risks of viruses with this software?</strong></a><br>
 A: <em>For the software itself: 
-All official releases (at httrack.com) are checked against all known viruses, and the packaging process is also checked. Archives are stored on Un*x servers, not really concerned by viruses. It has been reported, however, that some rogue freeware sites are embedding free software and freeware inside badware installers. Always download httrack from the main site (www.httrack.com), and never from an untrusted source!<br>
+All official releases (at httrack.com) are checked against all known viruses, and the packaging process is also checked. Archives are stored on Un*x servers, not really concerned by viruses. It has been reported, however, that some rogue freeware sites are embedding free softwares and freewares inside badware installers. Always download httrack from the main site (www.httrack.com), and never from an untrusted source!<br>
 For files you are downloading on the WWW using HTTrack: You may encounter websites which were corrupted by viruses, and downloading data on these websites might be dangerous if you execute downloaded executables, or if embedded pages contain infected material (as dangerous as if using a regular Browser). Always ensure that websites you are crawling are safe.
  (Note: remember that using an antivirus software is a good idea once you are connected to the Internet)</em>
 
@@ -374,8 +376,11 @@ A: <em>That's right. You can, however, install WinHTTrack on your own machine, a
 <br><br><a NAME="QG2">Q: <strong>Where can I find French/other languages documentation?</strong></a><br>
 A: <em>Windows interface is available on several languages, but not yet the documentation!</em>
 
-<br><br><a NAME="QG3">Q: <strong>Which systems does HTTrack run on?</strong></a><br>
-A: <em>HTTrack runs on current Windows, Linux and other Unix-like systems, and macOS. Very old platforms such as Windows 95/98 are no longer supported; you may try an older release (such as 3.33) on those.</em>
+<br><br><a NAME="QG3b">Q: <strong>Is HTTrack working on Windows Vista/Windows Seven/Windows 8 ?</strong></a><br>
+A: <em>Yes, it does</em>
+
+<br><br><a NAME="QG3">Q: <strong>Is HTTrack working on Windows 95/98 ?</strong></a><br>
+A: <em>No, not anymore. You may try to pick an older release (such as 3.33)</em>
 
 <br><br><a NAME="QG4">Q: <strong>What's the difference between HTTrack, WinHTTrack and WebHTTrack?</strong></a><br>
 A: <em>WinHTTrack is the Windows GUI release of HTTrack (with a native graphic shell) and WebHTTrack is the Linux/Posix release of HTTrack (with an html graphic shell)</em>
@@ -389,7 +394,7 @@ A: <em>It should. The <tt>configure.ac</tt> may be modified in some cases, howev
 <br><br><a NAME="QG7">Q: <strong>I use HTTrack for professional purpose. What about restrictions/license fee?</strong></a><br>
 A: <em>HTTrack is covered by the GNU General Public License (GPL). There is no restrictions using HTTrack for professional purpose, 
 except if you develop a software which uses HTTrack components (parts of the source, or any other component).
-See the <tt>license.txt</tt> file for more information</em>. See also the next question regarding copyright issues when redistributing downloaded material.
+See the <tt>license.txt</tt> file for more information</em>. See also the next question regarding copyright issues when reditributing downloaded material.
 
 <br><br><a NAME="QG7b">Q: <strong>Is there any license royalties for distributing a mirror made with HTTrack?</strong></a><br>
 A: <em>On the HTTrack side, no. However, sharing, publishing or reusing copyrighted material downloaded from a site requires the authorization of the copyright holders, and possibly paying royalty fees. Always ask the authorization before creating a mirror of a site, even if the site appears to be royalty-free and/or without copyright notice.</em>
@@ -410,7 +415,7 @@ There are several reasons (and solutions) for a mirror to fail. Reading the log
 
 <ul>
  <li>Links within the site refers to external links, or links located in another (or upper) directories, not captured by default - the use of filters is generally THE solution, as this is one of the powerful option in HTTrack. <u>See the above questions/answers</u>.</li>
- <li>Website <a href="#Q1b1">'robots.txt' rules</a> forbid access to several website parts - you can disable them, but only with great care!</li>
+ <li>Website <a href="#Q1b1">'robots.txt' rules</a> forbide access to several website parts - you can disable them, but only with great care!</li>
  <li>HTTrack is filtered (by its default User-agent IDentity) - you can change the Browser User-Agent identity to an anonymous one (MSIE, Netscape..) - here again, use this option with care, as this measure might have been put to avoid some bandwidth abuse (see also the <a href="abuse.html">abuse faq</a>!)</li>
 </ul>
 
@@ -452,14 +457,14 @@ A: <em>Yes, HTTrack does support (since 3.20 release) ipv6 sites, using A/AAAA e
 A: <em>Check the build options (you may have selected user-defined structure with wrong parameters!)</em>
 
 <br><br><a NAME="QT5">Q: <strong>When capturing real audio/video links (.ram), I only get a shortcut!</a></strong></a></br>
-A: <em>The .ra/.rm associated file can be captured together with the shortcut, if proper filters are set. Streaming protocols such as rtsp:// are out of scope: HTTrack is an HTTP/FTP mirror and does not capture rtsp streams.</em>
+A: <em>Yes, but .ra/.rm associated file should be captured together - except if rtsp:// protocol is used (not supported by HTTrack yet), or if proper filters are needed</em>
 
 <br><br><a NAME="QT6">Q: <strong>Using user:password@address is not working!</a></strong></a></br>
 A: <em>Again, first check the <tt>hts-log.txt</tt> and <tt>hts-err.txt</tt> error log files - this can give you precious information<br>
 The site may have a different authentication scheme - form based authentication, for example.
 In this case, use the URL capture features of HTTrack, it might work.
 <br>Note: If your username and/or password contains a '<tt>@</tt>' character, you may have to replace all '<tt>@</tt>' 
-occurrences by '<tt>%40</tt>' so that it can work, such as in <tt>user%40domain.com:foobar@www.foo.com/auth/. 
+occurences by '<tt>%40</tt>' so that it can work, such as in <tt>user%40domain.com:foobar@www.foo.com/auth/. 
 You may have to do the same for all "special" characters like spaces (%20), quotes (%22)..</tt>
 </em>
 <br><br>
@@ -515,7 +520,7 @@ These rules, stored in a file called robots.txt, are given by the website, to sp
 - for example, /cgi-bin or large images files.
 They are followed by default by HTTrack, as it is advised. Therefore, you may miss some files that would have been downloaded without
 these rules - check in your logs if it is the case:<br>
-<tt>Info: Note: due to www.foobar.com remote robots.txt rules, links beginning with these path will be forbidden: /cgi-bin/,/images/ (see in the options to disable this)
+<tt>Info: Note: due to www.foobar.com remote robots.txt rules, links begining with these path will be forbidden: /cgi-bin/,/images/ (see in the options to disable this)
 </tt>
 <br>
 If you want to disable them, just change the corresponding option in the option list! (but only disable this option with great care, 
@@ -535,7 +540,7 @@ HTTrack must find one. Therefore, two index.html will be produced, one with the
 <br>
 It might be a good idea to consider that http://www.foobar.com/ and http://www.foobar.com/index.html are the same links, to avoid
 duplicate files, isn't it?
-NO, because the top index (/) can refer to ANY filename, and if index.html is generally the default name, index.htm can be chosen,
+NO, because the top index (/) can refer to ANY filename, and if index.html is generally the default name, index.htm can be choosen,
 or index.php3, mydog.jpg, or anything you may imagine. (some webmasters are really crazy)
 <br>
 <br>
@@ -590,7 +595,8 @@ A: <em>Simply use the <tt>--assume dat=application/x-zip</tt> option
 A: <em>You may need cookies! Cookies are specific data (for example, your username or password) that are sent to your browser once
 you have logged in certain sites so that you only have to log-in once. For example, after having entered your username in a website, you can
 view pages and articles, and the next time you will go to this site, you will not have to re-enter your username/password.<br>
-To supply your own cookies to an HTTrack project, put a Netscape-format <tt>cookies.txt</tt> file in your project folder, or point HTTrack at one with the <tt>--cookies-file</tt> option. You can export your browser's session cookies to that format with a browser extension.
+To "merge" your personnal cookies to an HTTrack project, just copy the cookies.txt file from your Netscape folder (or the cookies located into the Temporary Internet Files folder for IE)
+into your project folder (or even the HTTrack folder)
 </em>
 <br>
 <br>
@@ -655,7 +661,7 @@ Shell version, skip some slow files, too.</em><br>
 
 </a><a NAME="Q3b">Q: <strong>I want to update a site, but it's taking too much time! What's happening?</strong><br>
 A: <em>First, HTTrack always tries to minimize the download flow by interrogating the server about the
-file changes. But, because HTTrack has to rescan all files from the beginning to rebuild the local site structure, 
+file changes. But, because HTTrack has to rescan all files from the begining to rebuild the local site structure, 
 it can take some time. 
 Besides, some servers are not very smart and always consider that they get newer files, forcing HTTrack to reload them,
 even if no changes have been made!
@@ -734,7 +740,7 @@ retransferred.</em><br>
 </a><a NAME="Q7">Q: <strong>I just want to retrieve all ZIP files or other files in a web
 site/in a page. How do I do it?</strong><br>
 A: <em>You can use different methods. You can use the 'get files near a link' option if
-files are in a foreign domain. You can use, too, a filter address: adding <tt>+*.zip</tt>
+files are in a foreign domain. You can use, too, a filter adress: adding <tt>+*.zip</tt>
 in the URL list (or in the filter list) will accept all ZIP files, even if these files are
 outside the address. <br>
 Example : <tt>httrack www.example.com/someaddress.html +*.zip</tt> will allow

html/filters.html

@@ -111,7 +111,7 @@ See also: The <a href="faq.html#VF1">FAQ</a><br>
     starts links, the default mode is to mirror these links - i.e. if one of your start page is
     www.example.com/test/index.html, all links starting with www.example.com/test/ will be
     accepted. But links directly in www.example.com/.. will not be accepted, however, because
-    they are in a higher structure. This prevent HTTrack from mirroring the whole site. (All
+    they are in a higher strcuture. This prevent HTTrack from mirroring the whole site. (All
     files in structure levels equal or lower than the primary links will be retrieved.)<br>
     </i>
     <br>
@@ -127,15 +127,13 @@ See also: The <a href="faq.html#VF1">FAQ</a><br>
     an authorization filter, like <b><tt>+*.gif</tt></b>. The pattern is a plus (this one: <b><tt>+</tt></b>),
     followed by a pattern composed of letters and wildcards (this one: <b><tt>*</tt></b>). 
     <br><br>
-    To forbid a family of links, define
+    To forbide a family of links, define
     an authorization filter, like <b><tt>-*.gif</tt></b>. The pattern is a dash (this one: <b><tt>-</tt></b>),
     followed by a the same kind of pattern as for the authorization filter.
     <br><br>
     Example: +*.gif will accept all files finished by .gif<br>
     Example: -*.gif will refuse all files finished by .gif<br>
     <br>
-    To see which rule accepted or blocked a given URL, run HTTrack with the <b><tt>--why</tt></b> (<b><tt>-%Y</tt></b>) option, described in <a href="httrack.man.html#OPTIONS">the manual page</a>.<br>
-    <br>
     
 <p>    
     <h4>Scan rules based on size (e.g. accept or refuse files bigger/smaller than a certain size)</h4>
@@ -145,7 +143,7 @@ See also: The <a href="faq.html#VF1">FAQ</a><br>
     size to ensure that you won't reach a defined limit.
     
     Example: You may want to accept all files on the domain www.example.com, using '+www.example.com/*', 
-    including gif files inside this domain and outside (external images), but not take to large images, 
+    including gif files inside this domain and outside (eternal images), but not take to large images, 
     or too small ones (thumbnails)<br>
     Excluding gif images smaller than 5KB and images larger than 100KB is therefore a good option;
     +www.example.com +*.gif -*.gif*[<5] -*.gif*[>100] 

html/index.html

@@ -109,12 +109,12 @@ h4 { margin: 0;  font-weight: bold;  font-size: 1.18em; }
   <li>How to Use</li>
   <ul>
     <li><a href="shelldoc.html">WinHTTrack/WebHTTrack (GUI version for Windows or Linux/Unix)</a></li>
-    <br>HTTrack GUI documentation, with step-by-step example, for the Windows release (WinHTTrack) and the Linux/Unix release (WebHTTrack)<br>
+    <br>HTTrack GUI documentation, with step-by-step example, for the Windows release (WinHTTrack) and the Linux/Unix relese (WebHTTrack)<br>
     <br>
     <li><a href="android.html">HTTrack on Android</a></li>
     <br>Step-by-step guide for the Android app<br>
     <br>
-    <li><a href="httrack.man.html">Command-line version</a></li>
+    <li><a href="cmddoc.html">Command-line version</a></li>
     <br>How to run HTTrack from the command line, and where to find every option<br>
     <br>
     <li><a href="cmdguide.html">Command-line Guide</a></li>
@@ -123,7 +123,7 @@ h4 { margin: 0;  font-weight: bold;  font-size: 1.18em; }
     <li><a href="fcguide.html">HTTrack Users Guide By Fred Cohen</a></li>
     <br>A tutorial that describes all command-line options, for Linux and Windows users<br>
     <br>
-    <li><a href="dev.html">Developer/Programming</a></li>
+    <li><a href="dev.html">Developper/Programming</a></li>
     <br>How to use HTTrack in batch files, and how to use the library<br>
   </ul>
   <br>

html/options.html

@@ -101,10 +101,6 @@ h4 { margin: 0;  font-weight: bold;  font-size: 1.18em; }
 
 <h2 align="center"><em>Options</em></h2>
 
-<p><strong>Note:</strong> this is a legacy option list and may be out of date.
-For the authoritative, always-current reference see <a href="httrack.man.html">the httrack manual page</a>,
-and for a task-oriented walkthrough see the <a href="cmdguide.html">Command-line Guide</a>.</p>
-
 <ul>
   <li>Filters: <a href="filters.html">how to use them</a></li>
   <br><small>Here you can find informations on filters: how to accept all gif files in a mirror, for example</small>

html/server/option2b.html

@@ -103,7 +103,7 @@ ${LANG_Q3}
 <tr><td>
 	<table width="100%">
 	<tr><td align="left">
-	<input type="submit" value="${LANG_OK}"
+	<input type="submit" value="${LANG_OK]" 
 ${do:output-mode:html-urlescaped}
 		onClick="if (confirm(str_replace(str_replace('${LANG_DIAL7}', '%20', ' '), '%0a', ' '))) { form.closeme.value=1; form.submit(); } return false;"
 ${do:output-mode:}

html/server/option9.html

@@ -103,17 +103,6 @@ ${do:end-if}
 > ${LANG_I61}
 <br><br>
 
-<input type="checkbox" name="warc" ${checked:warc}
-			title='${html:LANG_WARCTIP}' onMouseOver="info('${html:LANG_WARCTIP}'); return true" onMouseOut="info('&nbsp;'); return true"
-> ${LANG_WARC}
-<br><br>
-
-${LANG_WARCFILE}
-<input name="warcfile" value="${warcfile}" size="40"
-			title='${html:LANG_WARCFILETIP}' onMouseOver="info('${html:LANG_WARCFILETIP}'); return true" onMouseOut="info('&nbsp;'); return true"
->
-<br><br>
-
 <input type="checkbox" name="norecatch" ${checked:norecatch}
 			title='${html:LANG_I5b}' onMouseOver="info('${html:LANG_I5b}'); return true" onMouseOut="info('&nbsp;'); return true"
 > ${LANG_I34b}

html/server/step2.html

@@ -141,8 +141,6 @@ ${do:copy:KeepSlashes:keepslashes}
 ${do:copy:KeepQueryOrder:keepqueryorder}
 ${do:copy:StripQuery:stripquery}
 ${do:copy:StoreAllInCache:cache2}
-${do:copy:Warc:warc}
-${do:copy:WarcFile:warcfile}
 ${do:copy:LogType:logtype}
 ${do:copy:UseHTTPProxyForFTP:ftpprox}
 ${do:copy:ProxyType:proxytype}

html/server/step3.html

@@ -95,7 +95,7 @@ ${do:end-if}
 
 <table border="0" width="100%">
 <tr><td width="90%">
-	<h2 align="center"><em>${LANG_G44}</em></h2>
+	<h2 align="center"><em>Select URLs</em></h2>
 </td>
 ${/* show help only if available */}
 ${do:if-file-exists:html/index.html}

html/server/step4.html

@@ -77,7 +77,7 @@ ${do:end-if}
 
 <table border="0" width="100%">
 <tr><td width="90%">
-	<h2 align="center"><em>${LANG_J9}</em></h2>
+	<h2 align="center"><em>Start</em></h2>
 </td>
 ${/* show help only if available */}
 ${do:if-file-exists:html/index.html}
@@ -121,9 +121,9 @@ httrack \
 	--quiet \
 	--build-top-index \
 	${test:todo:--mirror:--mirror:--mirror-wizard:--get:--mirrorlinks:--testlinks:--continue:--update}
-	${unquoted:urls}
-	${test:filelist:-%L "}${arg:filelist}${test:filelist:"}
-	--path "${arg:path}/${arg:projname}" 
+	${urls}
+	${test:filelist:-%L "}${filelist}${test:filelist:"}
+	--path "${html:path}/${html:projname}" 
 \
 	${test:parseall:--near}
 	${test:link:--test}
@@ -131,7 +131,7 @@ httrack \
 	${test:htmlfirst::--priority=7}
 \
 ${do:if-not-empty:BuildString}
-	--structure "${arg:BuildString}"
+	--structure "${BuildString}"
 ${do:end-if}
 	${test:build:-N0:-N0:-N1:-N2:-N3:-N4:-N5:-N100:-N101:-N102:-N103:-N104:-N105:-N99:-N199:}
 \
@@ -150,30 +150,29 @@ ${do:end-if}
 	${test:travel3::--keep-links=0:--keep-links:--keep-links=3:--keep-links=4}
 	${test:windebug:--debug-headers}
 \
-	${test:connexion:--sockets=}${unquoted:connexion}
+	${test:connexion:--sockets=}${connexion}
 	${test:ka:--keep-alive}
-	${test:timeout:--timeout=}${unquoted:timeout}
+	${test:timeout:--timeout=}${timeout}
 	${test:remt:--host-control=1}
-	${test:retry:--retries=}${unquoted:retry}
-	${test:rate:--min-rate=}${unquoted:rate}
+	${test:retry:--retries=}${retry}
+	${test:rate:--min-rate=}${rate}
 	${test:rems:--host-control=2}
 \
-	${test:depth:--depth=}${unquoted:depth}
-	${test:depth2:--ext-depth=}${unquoted:depth2}
-${/* -m<n> resets the html limit, so the bare form must precede the -m,<n> one */}
-	${test:othermax:--max-files=}${unquoted:othermax}
-	${test:maxhtml:--max-files=,}${unquoted:maxhtml}
-	${test:sizemax:--max-size=}${unquoted:sizemax}
-	${test:pausebytes:--max-pause=}${unquoted:pausebytes}
-	${test:maxtime:--max-time=}${unquoted:maxtime}
-	${test:maxrate:--max-rate=}${unquoted:maxrate}
-	${test:maxconn:--connection-per-second=}${unquoted:maxconn}
-	${test:maxlinks:--advanced-maxlinks=}${unquoted:maxlinks}
+	${test:depth:--depth=}${depth}
+	${test:depth2:--ext-depth=}${depth2}
+	${test:maxhtml:--max-files=,}${maxhtml}
+	${test:othermax:--max-files=}${othermax}
+	${test:sizemax:--max-files=}${sizemax}
+	${test:pausebytes:--max-pause=}${pausebytes}
+	${test:maxtime:--max-time=}${maxtime}
+	${test:maxrate:--max-rate=}${maxrate}
+	${test:maxconn:--connection-per-second=}${maxconn}
+	${test:maxlinks:--advanced-maxlinks=}${maxlinks}
 \
-	--user-agent "${arg:user}"
-	--footer "${arg:footer}"
+	--user-agent "${html:user}"
+	--footer "${html:footer}"
 \
-	${unquoted:url2}
+	${url2}
 \
 	${test:cookies:--cookies=0:}
 	${test:parsejava:--parse-java=0:}
@@ -182,20 +181,18 @@ ${/* -m<n> resets the html limit, so the bare form must precede the -m,<n> one *
 	${test:keepwww:--keep-www-prefix}
 	${test:keepslashes:--keep-double-slashes}
 	${test:keepqueryorder:--keep-query-order}
-	${test:cookiesfile:--cookies-file "}${arg:cookiesfile}${test:cookiesfile:"}
-	${test:pausefiles:--pause "}${arg:pausefiles}${test:pausefiles:"}
-	${test:stripquery:--strip-query "}${arg:stripquery}${test:stripquery:"}
+	${test:cookiesfile:--cookies-file "}${html:cookiesfile}${test:cookiesfile:"}
+	${test:pausefiles:--pause "}${pausefiles}${test:pausefiles:"}
+	${test:stripquery:--strip-query "}${html:stripquery}${test:stripquery:"}
 	${test:toler:--tolerant}
 	${test:http10:--http-10}
 	${test:cache2:--store-all-in-cache}
-	${test:warc:--warc}
-	${test:warcfile:--warc-file "}${arg:warcfile}${test:warcfile:"}
 	${test:norecatch:--do-not-recatch}
 	${test:logf:--single-log}
 	${test:logtype:::--extra-log:--debug-log}
 	${test:index:--index=0:}
 	${test:index2:--search-index=0:--search-index}
-	${test:prox:--proxy "}${do:if-not-empty:prox}${test:proxytype::socks5:connect}${test:proxytype:\3A//}${do:end-if}${do:output-mode:html}${arg:prox}${test:prox:\3A}${arg:portprox}${test:prox:"}
+	${test:prox:--proxy "}${do:if-not-empty:prox}${test:proxytype::socks5:connect}${test:proxytype:\3A//}${do:end-if}${do:output-mode:html}${prox}${test:prox:\3A}${portprox}${test:prox:"}
 	${test:ftpprox:--httpproxy-ftp=0:--httpproxy-ftp}
 </textarea>
 
@@ -214,7 +211,7 @@ ParseAll=${ztest:parseall:0:1}
 HTMLFirst=${ztest:htmlfirst:0:1}
 Cache=${ztest:cache:0:1}
 NoRecatch=${ztest:norecatch:0:1}
-Dos=${dos}
+Dos=${dos
 Index=${ztest:index:0:1}
 WordIndex=${ztest:index2:0:1}
 Log=${ztest:logf:0:1:2}
@@ -240,8 +237,6 @@ KeepSlashes=${ztest:keepslashes:0:1}
 KeepQueryOrder=${ztest:keepqueryorder:0:1}
 StripQuery=${stripquery}
 StoreAllInCache=${ztest:cache2:0:1}
-Warc=${ztest:warc:0:1}
-WarcFile=${warcfile}
 LogType=${logtype}
 UseHTTPProxyForFTP=${ztest:ftpprox:0:1}
 ProxyType=${proxytype}

lang.def

@@ -713,7 +713,7 @@ Disconnect when finished
 LANG_J17
 Disconnect modem on completion
 LANG_K1
-\r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
+\r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\nJavaParserClasses: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
 LANG_K2
 About WinHTTrack Website Copier
 LANG_K3
@@ -1034,11 +1034,3 @@ LANG_STRIPQUERY
 Strip query keys:
 LANG_STRIPQUERYTIP
 Comma-separated query keys to drop from the saved-file naming (e.g. sid,utm_source).
-LANG_WARC
-Write a WARC archive of the crawl
-LANG_WARCTIP
-Also save every fetched response into an ISO-28500 WARC/1.1 archive, next to the mirror.
-LANG_WARCFILE
-WARC archive name:
-LANG_WARCFILETIP
-Optional base name for the WARC archive; leave blank to auto-name it under the output directory.

lang/Bulgarian.txt

@@ -634,8 +634,8 @@ Disconnect when finished
 Ïðåêðàòè âðúçêàòà ñëåä êðàÿ íà îïåðàöèÿòà
 Disconnect modem on completion
 Ñëåä êðàÿ íà îïåðàöèÿòà ðàçêà÷è ìîäåìà
-\r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
-\r\n(Ìîëÿ óâåäîìåòå íè çà âñÿêà ãðåøêà èëè ïðîáëåì)\r\n\r\nÐàçðàáîòêà:\r\nÈíòåðôåéñ (Windows): Xavier Roche\r\nÏàÿê: Xavier Roche\r\n\r\n(C)1998-2003 Xavier Roche è äðóãè ñúòðóäíèöè\r\nÌÍÎÃÎ ÁËÀÃÎÄÀÐÍÎÑÒÈ çà Áúëãàðñêèÿò ïðåâîä íà:\r\nÈëèÿ Ëèíäîâ (ilia@infomat-bg.com)
+\r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\nJavaParserClasses: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
+\r\n(Ìîëÿ óâåäîìåòå íè çà âñÿêà ãðåøêà èëè ïðîáëåì)\r\n\r\nÐàçðàáîòêà:\r\nÈíòåðôåéñ (Windows): Xavier Roche\r\nÏàÿê: Xavier Roche\r\nJava Ðàçáîðíè Êëàñîâå: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche è äðóãè ñúòðóäíèöè\r\nÌÍÎÃÎ ÁËÀÃÎÄÀÐÍÎÑÒÈ çà Áúëãàðñêèÿò ïðåâîä íà:\r\nÈëèÿ Ëèíäîâ (ilia@infomat-bg.com)
 About WinHTTrack Website Copier
 Çà WinHTTrack Website Copier
 Please visit our Web page
@@ -956,11 +956,3 @@ Strip query keys:
 Ïðåìàõâàíå íà êëþ÷îâå îò çàÿâêàòà:
 Comma-separated query keys to drop from the saved-file naming (e.g. sid,utm_source).
 Êëþ÷îâå îò çàÿâêàòà, ðàçäåëåíè ñúñ çàïåòàÿ, êîèòî äà ñå ïðåìàõíàò îò èìåòî íà çàïèñàíèÿ ôàéë (íàïðèìåð sid,utm_source).
-Write a WARC archive of the crawl
-Çàïèñâàíå íà WARC àðõèâ íà îáõîæäàíåòî
-Also save every fetched response into an ISO-28500 WARC/1.1 archive, next to the mirror.
-Çàïèñâàíå íà âñåêè èçòåãëåí îòãîâîð è â WARC/1.1 àðõèâ ïî ISO-28500, äî îãëåäàëîòî.
-WARC archive name:
-Èìå íà WARC àðõèâà:
-Optional base name for the WARC archive; leave blank to auto-name it under the output directory.
-Íåçàäúëæèòåëíî áàçîâî èìå çà WARC àðõèâà; îñòàâåòå ïðàçíî çà àâòîìàòè÷íî èìåíóâàíå â èçõîäíàòà äèðåêòîðèÿ.

lang/Castellano.txt

@@ -634,8 +634,8 @@ Disconnect when finished
 Desconectar al terminar la operación
 Disconnect modem on completion
 Desconectar el modem al terminar
-\r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
-\r\n(notifíquenos fallos o problemas)\r\n\r\nDesarrollo:\r\nInterface (Windows): Xavier Roche\r\nMotor: Xavier Roche\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for Spanish translations to:\r\nJuan Pablo Barrio Lera (Universidad de León)
+\r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\nJavaParserClasses: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
+\r\n(notifíquenos fallos o problemas)\r\n\r\nDesarrollo:\r\nInterface (Windows): Xavier Roche\r\nMotor: Xavier Roche\r\nJavaParserClasses: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for Spanish translations to:\r\nJuan Pablo Barrio Lera (Universidad de León)
 About WinHTTrack Website Copier
 Acerca de...
 Please visit our Web page
@@ -956,11 +956,3 @@ Strip query keys:
 Eliminar claves de query string:
 Comma-separated query keys to drop from the saved-file naming (e.g. sid,utm_source).
 Claves de query string, separadas por comas, que se eliminarán del nombre de los archivos guardados (p. ej. sid,utm_source).
-Write a WARC archive of the crawl
-Escribir un archivo WARC del rastreo
-Also save every fetched response into an ISO-28500 WARC/1.1 archive, next to the mirror.
-Guardar también cada respuesta descargada en un archivo WARC/1.1 ISO-28500, junto a la réplica.
-WARC archive name:
-Nombre del archivo WARC:
-Optional base name for the WARC archive; leave blank to auto-name it under the output directory.
-Nombre base opcional para el archivo WARC; déjelo en blanco para nombrarlo automáticamente en el directorio de salida.

lang/Cesky.txt

@@ -634,8 +634,8 @@ Disconnect when finished
 Odpojit po dokonèení
 Disconnect modem on completion
 Odpojit modem po dokonèení
-\r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
-\r\n(Prosíme o podání hlášení o jakýchkoliv chybách)\r\n\r\nVývoj:\r\nRozhraní (Windows): Xavier Roche\r\nPavouk: Xavier Roche\r\n\r\n(C)1998-2003 Xavier Roche a ostatní, kdo pøispìli\r\nÈeský pøeklad:\r\nAntonín Matìjèík (matejcik@volny.cz)
+\r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\nJavaParserClasses: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
+\r\n(Prosíme o podání hlášení o jakýchkoliv chybách)\r\n\r\nVývoj:\r\nRozhraní (Windows): Xavier Roche\r\nPavouk: Xavier Roche\r\nJavaParserClasses: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche a ostatní, kdo pøispìli\r\nÈeský pøeklad:\r\nAntonín Matìjèík (matejcik@volny.cz)
 About WinHTTrack Website Copier
 O programu WinHTTrack Website Copier
 Please visit our Web page
@@ -956,11 +956,3 @@ Strip query keys:
 Odebrat klíèe dotazu:
 Comma-separated query keys to drop from the saved-file naming (e.g. sid,utm_source).
 Klíèe dotazu oddìlené èárkami, které se vynechají z pojmenování ukládaných souborù (napø. sid,utm_source).
-Write a WARC archive of the crawl
-Zapsat archiv WARC z procházení
-Also save every fetched response into an ISO-28500 WARC/1.1 archive, next to the mirror.
-Uložit také každou staženou odpovìï do archivu WARC/1.1 podle ISO-28500 vedle zrcadla.
-WARC archive name:
-Název archivu WARC:
-Optional base name for the WARC archive; leave blank to auto-name it under the output directory.
-Volitelný základní název archivu WARC; ponechte prázdné pro automatické pojmenování ve výstupním adresáøi.

lang/Chinese-BIG5.txt

@@ -634,8 +634,8 @@ Disconnect when finished
 完成時切斷連線
 Disconnect modem on completion
 完成時切斷數據機
-\r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
-\r\n(有任何程序錯誤或問題請聯絡我們)\r\n\r\n開發:\r\n界面設計 (Windows): Xavier Roche\r\n分析引擎: Xavier Roche\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\n感謝:\r\nDavid Hing Cheong Hung (DAVEHUNG@mtr.com.hk) 提供翻譯
+\r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\nJavaParserClasses: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
+\r\n(有任何程序錯誤或問題請聯絡我們)\r\n\r\n開發:\r\n界面設計 (Windows): Xavier Roche\r\n分析引擎: Xavier Roche\r\nJava分析引擎: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\n感謝:\r\nDavid Hing Cheong Hung (DAVEHUNG@mtr.com.hk) 提供翻譯
 About WinHTTrack Website Copier
 關於WinHTTrack Website Copier
 Please visit our Web page
@@ -956,11 +956,3 @@ Strip query keys:
 移除查詢鍵:
 Comma-separated query keys to drop from the saved-file naming (e.g. sid,utm_source).
 以逗號分隔的查詢鍵，將其從儲存檔案的命名中移除 (例如 sid,utm_source)。
-Write a WARC archive of the crawl
-寫入此次抓取的 WARC 封存檔
-Also save every fetched response into an ISO-28500 WARC/1.1 archive, next to the mirror.
-同時將每個已擷取的回應儲存為 ISO-28500 WARC/1.1 封存檔，置於鏡像網站旁。
-WARC archive name:
-WARC 封存檔名稱：
-Optional base name for the WARC archive; leave blank to auto-name it under the output directory.
-WARC 封存檔的選用基本名稱；留空則於輸出目錄中自動命名。

lang/Chinese-Simplified.txt

@@ -634,8 +634,8 @@ Disconnect when finished
 完成时断掉连接
 Disconnect modem on completion
 完成时断掉调制解调器
-\r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
-\r\n(有任何程序错误或问题请联系我们)\r\n\r\n开发:\r\n界面设计 (Windows): Xavier Roche\r\n解析引擎: Xavier Roche\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\n感谢:\r\nRobert Lagadec (rlagadec@yahoo.fr) 提供翻译技巧
+\r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\nJavaParserClasses: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
+\r\n(有任何程序错误或问题请联系我们)\r\n\r\n开发:\r\n界面设计 (Windows): Xavier Roche\r\n解析引擎: Xavier Roche\r\nJava解析引擎: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\n感谢:\r\nRobert Lagadec (rlagadec@yahoo.fr) 提供翻译技巧
 About WinHTTrack Website Copier
 关于WinHTTrack Website Copier
 Please visit our Web page
@@ -956,11 +956,3 @@ Strip query keys:
 剥离查询键:
 Comma-separated query keys to drop from the saved-file naming (e.g. sid,utm_source).
 用逗号分隔的查询键，将其从保存文件的命名中删除 (例如 sid,utm_source)。
-Write a WARC archive of the crawl
-写入本次抓取的 WARC 归档
-Also save every fetched response into an ISO-28500 WARC/1.1 archive, next to the mirror.
-同时将每个已获取的响应保存为 ISO-28500 WARC/1.1 归档，置于镜像站点旁边。
-WARC archive name:
-WARC 归档名称：
-Optional base name for the WARC archive; leave blank to auto-name it under the output directory.
-WARC 归档的可选基本名称；留空则在输出目录中自动命名。

lang/Croatian.txt

@@ -636,8 +636,8 @@ Disconnect when finished
 Prekinuti vezu kada bude gotovo
 Disconnect modem on completion
 Po dovršetku odvojiti modemsku vezu
-\r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
-\r\n(Molimo da nas obavijestite o svim pogreškama i poteškoæama)\r\n\r\nRazvoj:\r\nSuèelje (Windows): Xavier Roche\r\nPauk: Xavier Roche\r\n\r\n(C)1998-2003 Xavier Roche i drugi suradnici\r\nPUNO HVALA za prijevodne preporuke upuæujemo:\r\nRobert Lagadec (rlagadec@yahoo.fr)
+\r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\nJavaParserClasses: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
+\r\n(Molimo da nas obavijestite o svim pogreškama i poteškoæama)\r\n\r\nRazvoj:\r\nSuèelje (Windows): Xavier Roche\r\nPauk: Xavier Roche\r\nRazrediRašèlanjivaèaJave: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche i drugi suradnici\r\nPUNO HVALA za prijevodne preporuke upuæujemo:\r\nRobert Lagadec (rlagadec@yahoo.fr)
 About WinHTTrack Website Copier
 O programu WinHTTrack Website Copier
 Please visit our Web page
@@ -958,11 +958,3 @@ Strip query keys:
 Ukloniti kljuèeve upita:
 Comma-separated query keys to drop from the saved-file naming (e.g. sid,utm_source).
 Zarezom odvojeni kljuèevi upita koji se izostavljaju iz naziva spremljenih datoteka (npr. sid,utm_source).
-Write a WARC archive of the crawl
-Zapi¹i WARC arhivu obilaska
-Also save every fetched response into an ISO-28500 WARC/1.1 archive, next to the mirror.
-Spremi i svaki preuzeti odgovor u ISO-28500 WARC/1.1 arhivu, uz zrcalo.
-WARC archive name:
-Naziv WARC arhive:
-Optional base name for the WARC archive; leave blank to auto-name it under the output directory.
-Neobavezni osnovni naziv WARC arhive; ostavite prazno za automatsko imenovanje u izlaznom direktoriju.

lang/Dansk.txt

@@ -652,8 +652,8 @@ Disconnect when finished
 Afbryd forbindelsen når overførslen er færdig
 Disconnect modem on completion
 Afbryd modem når overførslen er færdig
-\r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
-\r\n(finder du fejl eller opstår der problemer så kontakt os venligst)\r\n\r\nUdvikling:\r\nBrugerflade (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\n\r\n(C)1998-2003 Xavier Roche og andre bidragydere\r\nMange tak for dansk oversættelse til:\r\nJesper Bramm (bramm@get2net.dk)\r\nscootergrisen
+\r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\nJavaParserClasses: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
+\r\n(finder du fejl eller opstår der problemer så kontakt os venligst)\r\n\r\nUdvikling:\r\nBrugerflade (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\nJavaParserClasses: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche og andre bidragydere\r\nMange tak for dansk oversættelse til:\r\nJesper Bramm (bramm@get2net.dk)\r\nscootergrisen
 About WinHTTrack Website Copier
 Om WinHTTrack Website Copier
 Please visit our Web page
@@ -1004,11 +1004,3 @@ Strip query keys:
 Fjern forespørgselsnøgler:
 Comma-separated query keys to drop from the saved-file naming (e.g. sid,utm_source).
 Kommaseparerede forespørgselsnøgler, der udelades i navngivningen af gemte filer (f.eks. sid,utm_source).
-Write a WARC archive of the crawl
-Skriv et WARC-arkiv af gennemsøgningen
-Also save every fetched response into an ISO-28500 WARC/1.1 archive, next to the mirror.
-Gem også hvert hentet svar i et ISO-28500 WARC/1.1-arkiv ved siden af spejlet.
-WARC archive name:
-Navn på WARC-arkiv:
-Optional base name for the WARC archive; leave blank to auto-name it under the output directory.
-Valgfrit basisnavn til WARC-arkivet; lad feltet stå tomt for automatisk navngivning i outputmappen.

lang/Deutsch.txt

@@ -634,8 +634,8 @@ Disconnect when finished
 Nach der Aktion Verbindung trennen
 Disconnect modem on completion
 Modemverbindung trennen, wenn fertig
-\r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
-\r\n(Bitte benachrichtigen Sie uns über Fehler und Probleme)\r\n\r\nEntwicklung:\r\nOberfläche (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for German translations to:\r\nRainer Klueting (rainer@klueting.de)
+\r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\nJavaParserClasses: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
+\r\n(Bitte benachrichtigen Sie uns über Fehler und Probleme)\r\n\r\nEntwicklung:\r\nOberfläche (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\nJavaParserClasses: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for German translations to:\r\nRainer Klueting (rainer@klueting.de)
 About WinHTTrack Website Copier
 Über WinHTTrack Website Copier
 Please visit our Web page
@@ -956,11 +956,3 @@ Strip query keys:
 Query-Schlüssel entfernen:
 Comma-separated query keys to drop from the saved-file naming (e.g. sid,utm_source).
 Kommagetrennte Query-Schlüssel, die bei der Benennung gespeicherter Dateien entfallen (z. B. sid,utm_source).
-Write a WARC archive of the crawl
-WARC-Archiv des Crawls schreiben
-Also save every fetched response into an ISO-28500 WARC/1.1 archive, next to the mirror.
-Jede heruntergeladene Antwort zusätzlich in einem ISO-28500-WARC/1.1-Archiv neben dem Spiegel speichern.
-WARC archive name:
-Name des WARC-Archivs:
-Optional base name for the WARC archive; leave blank to auto-name it under the output directory.
-Optionaler Basisname für das WARC-Archiv; leer lassen, um es automatisch im Ausgabeverzeichnis zu benennen.

lang/Eesti.txt

@@ -634,8 +634,8 @@ Disconnect when finished
 Lahuta ühendus, kui on lõpetatud
 Disconnect modem on completion
 Lahuta modem lõpetamisel
-\r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
-\r\n(Palun teata meile igast veast või probleemist)\r\n\r\nArendajad:\r\nKasutajaliides (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nEestikeelne tõlge: Tõnu Virma
+\r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\nJavaParserClasses: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
+\r\n(Palun teata meile igast veast või probleemist)\r\n\r\nArendajad:\r\nKasutajaliides (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\nJavaParserClasses: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nEestikeelne tõlge: Tõnu Virma
 About WinHTTrack Website Copier
 Info WinHTTrack Website Copier'i kohta
 Please visit our Web page
@@ -956,11 +956,3 @@ Strip query keys:
 Eemalda päringuvõtmed:
 Comma-separated query keys to drop from the saved-file naming (e.g. sid,utm_source).
 Komadega eraldatud päringuvõtmed, mis jäetakse salvestatud faili nimest välja (nt sid,utm_source).
-Write a WARC archive of the crawl
-Kirjuta läbimise WARC-arhiiv
-Also save every fetched response into an ISO-28500 WARC/1.1 archive, next to the mirror.
-Salvesta iga alla laaditud vastus ka ISO-28500 WARC/1.1 arhiivi peegli kõrvale.
-WARC archive name:
-WARC-arhiivi nimi:
-Optional base name for the WARC archive; leave blank to auto-name it under the output directory.
-WARC-arhiivi valikuline põhinimi; jäta tühjaks, et see väljundkataloogis automaatselt nimetada.

lang/English.txt

@@ -652,8 +652,8 @@ Disconnect when finished
 Disconnect when finished
 Disconnect modem on completion
 Disconnect modem on completion
-\r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
-\r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
+\r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\nJavaParserClasses: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
+\r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\nJavaParserClasses: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
 About WinHTTrack Website Copier
 About WinHTTrack Website Copier
 Please visit our Web page
@@ -1004,11 +1004,3 @@ Strip query keys:
 Strip query keys:
 Comma-separated query keys to drop from the saved-file naming (e.g. sid,utm_source).
 Comma-separated query keys to drop from the saved-file naming (e.g. sid,utm_source).
-Write a WARC archive of the crawl
-Write a WARC archive of the crawl
-Also save every fetched response into an ISO-28500 WARC/1.1 archive, next to the mirror.
-Also save every fetched response into an ISO-28500 WARC/1.1 archive, next to the mirror.
-WARC archive name:
-WARC archive name:
-Optional base name for the WARC archive; leave blank to auto-name it under the output directory.
-Optional base name for the WARC archive; leave blank to auto-name it under the output directory.

lang/Finnish.txt

@@ -636,8 +636,8 @@ Disconnect when finished
 Katkaise yhteys, kun on valmista
 Disconnect modem on completion
 Katkaise modeemiyhteys, kun on valmista
-\r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
-\r\n(Kerro meille bugeista ja ongelmista)\r\n\r\nKehitys:\r\nKäyttöliittymä (Windows): Xavier Roche\r\nNettirobotti: Xavier Roche\r\n\r\n(C) 1998-2003 Xavier Roche ja muut avustajat\r\nSuomentanut Mika Kähkönen 22.-24.7.2005\r\nmika.kahkonen@mbnet.fi\r\nhttp://koti.mbnet.fi/kahoset
+\r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\nJavaParserClasses: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
+\r\n(Kerro meille bugeista ja ongelmista)\r\n\r\nKehitys:\r\nKäyttöliittymä (Windows): Xavier Roche\r\nNettirobotti: Xavier Roche\r\nJavaParserClasses: Yann Philippot\r\n\r\n(C) 1998-2003 Xavier Roche ja muut avustajat\r\nSuomentanut Mika Kähkönen 22.-24.7.2005\r\nmika.kahkonen@mbnet.fi\r\nhttp://koti.mbnet.fi/kahoset
 About WinHTTrack Website Copier
 Tietoja WinHTTrack Website Copier
 Please visit our Web page
@@ -958,11 +958,3 @@ Strip query keys:
 Poista kyselyavaimet:
 Comma-separated query keys to drop from the saved-file naming (e.g. sid,utm_source).
 Pilkuin erotellut kyselyavaimet, jotka jätetään pois tallennettujen tiedostojen nimeämisestä (esim. sid,utm_source).
-Write a WARC archive of the crawl
-Kirjoita imuroinnin WARC-arkisto
-Also save every fetched response into an ISO-28500 WARC/1.1 archive, next to the mirror.
-Tallenna myös jokainen noudettu vastaus ISO-28500 WARC/1.1 -arkistoon peilin viereen.
-WARC archive name:
-WARC-arkiston nimi:
-Optional base name for the WARC archive; leave blank to auto-name it under the output directory.
-Valinnainen WARC-arkiston perusnimi; jätä tyhjäksi, jotta se nimetään automaattisesti tulostehakemistoon.

lang/Francais.txt

@@ -644,8 +644,8 @@ Disconnect when finished
 Déconnecter à la fin de l'opération
 Disconnect modem on completion
 Déconnecter le modem lorsque l'opération sera finie
-\r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
-\r\n(signalez-nous tout bug ou problème)\r\n\r\nDéveloppement:\r\nInterface (Windows): Xavier Roche\r\nMoteur: Xavier Roche\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMERCI pour la relecture à:\r\nRobert Lagadec
+\r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\nJavaParserClasses: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
+\r\n(signalez-nous tout bug ou problème)\r\n\r\nDéveloppement:\r\nInterface (Windows): Xavier Roche\r\nMoteur: Xavier Roche\r\nParseurClassesJava: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMERCI pour la relecture à:\r\nRobert Lagadec
 About WinHTTrack Website Copier
 A propos de WinHTTrack Website Copier
 Please visit our Web page
@@ -1004,11 +1004,3 @@ Strip query keys:
 Supprimer les clés de query string :
 Comma-separated query keys to drop from the saved-file naming (e.g. sid,utm_source).
 Clés de query string à retirer du nommage des fichiers enregistrés, séparées par des virgules (par ex. sid,utm_source).
-Write a WARC archive of the crawl
-Écrire une archive WARC du crawl
-Also save every fetched response into an ISO-28500 WARC/1.1 archive, next to the mirror.
-Enregistrer aussi chaque réponse téléchargée dans une archive WARC/1.1 (ISO-28500), à côté du miroir.
-WARC archive name:
-Nom de l'archive WARC :
-Optional base name for the WARC archive; leave blank to auto-name it under the output directory.
-Nom de base optionnel pour l'archive WARC ; laissez vide pour le générer automatiquement dans le répertoire de sortie.

lang/Greek.txt

@@ -636,8 +636,8 @@ Disconnect when finished
 Αποσύνδεση στο τέλος
 Disconnect modem on completion
 Αποσύνδεση του modem στο τέλος
-\r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
-\r\n(Παρακαλώ να μας ενημερώσετε για κάθε πρόβλημα ή bug)\r\n\r\nΑνάπτυξη:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for Greek translations to:\r\nMichael Papadakis (mikepap at freemail dot gr)
+\r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\nJavaParserClasses: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
+\r\n(Παρακαλώ να μας ενημερώσετε για κάθε πρόβλημα ή bug)\r\n\r\nΑνάπτυξη:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\nJavaParserClasses: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for Greek translations to:\r\nMichael Papadakis (mikepap at freemail dot gr)
 About WinHTTrack Website Copier
 Σχετικά με το WinHTTrack Website Copier
 Please visit our Web page
@@ -958,11 +958,3 @@ Strip query keys:
 Αφαίρεση κλειδιών ερωτήματος:
 Comma-separated query keys to drop from the saved-file naming (e.g. sid,utm_source).
 Κλειδιά ερωτήματος χωρισμένα με κόμμα, που θα αφαιρεθούν από την ονομασία των αποθηκευμένων αρχείων (π.χ. sid,utm_source).
-Write a WARC archive of the crawl
-Εγγραφή αρχείου WARC της ανίχνευσης
-Also save every fetched response into an ISO-28500 WARC/1.1 archive, next to the mirror.
-Αποθήκευση κάθε ληφθείσας απόκρισης και σε αρχείο WARC/1.1 ISO-28500, δίπλα στο είδωλο.
-WARC archive name:
-Όνομα αρχείου WARC:
-Optional base name for the WARC archive; leave blank to auto-name it under the output directory.
-Προαιρετικό βασικό όνομα για το αρχείο WARC. Αφήστε το κενό για αυτόματη ονομασία στον κατάλογο εξόδου.

lang/Italiano.txt

@@ -634,8 +634,8 @@ Disconnect when finished
 Disconnetti alla fine
 Disconnect modem on completion
 Disconnetti il modem quando il mirror è finito
-\r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
-\r\n(informateci degli errori o problemi)\r\n\rSviluppo:\r\nInterfacccia: Xavier Roche\r\nSpider: Xavier Roche\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for Italian translations to:\r\nWitold Krakowski (wkrakowski@libero.it)
+\r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\nJavaParserClasses: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
+\r\n(informateci degli errori o problemi)\r\n\rSviluppo:\r\nInterfacccia: Xavier Roche\r\nSpider: Xavier Roche\r\nJavaParserClasses: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for Italian translations to:\r\nWitold Krakowski (wkrakowski@libero.it)
 About WinHTTrack Website Copier
 Informazioni su WinHTTrack Website Copier
 Please visit our Web page
@@ -956,11 +956,3 @@ Strip query keys:
 Rimuovi chiavi della query string:
 Comma-separated query keys to drop from the saved-file naming (e.g. sid,utm_source).
 Chiavi della query string, separate da virgole, da rimuovere dai nomi dei file salvati (ad es. sid,utm_source).
-Write a WARC archive of the crawl
-Scrivi un archivio WARC della scansione
-Also save every fetched response into an ISO-28500 WARC/1.1 archive, next to the mirror.
-Salva anche ogni risposta scaricata in un archivio WARC/1.1 ISO-28500, accanto al mirror.
-WARC archive name:
-Nome dell'archivio WARC:
-Optional base name for the WARC archive; leave blank to auto-name it under the output directory.
-Nome di base facoltativo per l'archivio WARC; lascia vuoto per assegnarlo automaticamente nella directory di output.

lang/Japanese.txt

@@ -634,8 +634,8 @@ Disconnect when finished
 終了したら接続を切断する
 Disconnect modem on completion
 完了したらモデムとの接続を切断する
-\r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
-\r\n(バグまたは問題についてわれわれに知らせてください)\r\n\r\nDevelopment:\r\nInterface(Windows): Xavier Roche\r\nSpider: Xavier Roche\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nJapanese translation :TAPKAL(nakataka@mars.dti.ne.jp)
+\r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\nJavaParserClasses: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
+\r\n(バグまたは問題についてわれわれに知らせてください)\r\n\r\nDevelopment:\r\nInterface(Windows): Xavier Roche\r\nSpider: Xavier Roche\r\nJavaParserClasses: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nJapanese translation :TAPKAL(nakataka@mars.dti.ne.jp)
 About WinHTTrack Website Copier
 WinHTTrackについて
 Please visit our Web page
@@ -956,11 +956,3 @@ Strip query keys:
 削除するクエリキー:
 Comma-separated query keys to drop from the saved-file naming (e.g. sid,utm_source).
 保存ファイル名の生成から除外するクエリキーをカンマ区切りで指定します (例: sid,utm_source)。
-Write a WARC archive of the crawl
-クロールの WARC アーカイブを書き出す
-Also save every fetched response into an ISO-28500 WARC/1.1 archive, next to the mirror.
-取得した各レスポンスを ISO-28500 WARC/1.1 アーカイブとしてミラーの隣にも保存します。
-WARC archive name:
-WARC アーカイブ名:
-Optional base name for the WARC archive; leave blank to auto-name it under the output directory.
-WARC アーカイブの任意のベース名。空欄にすると出力ディレクトリ内で自動的に名前が付けられます。

lang/Macedonian.txt

@@ -634,8 +634,8 @@ Disconnect when finished
 Äèñêîíåêòèð༠ñå êîãà <20>å çàâðøè
 Disconnect modem on completion
 Äèñêîíåêòèð༠ãî ìîäåìîò íà êðà¼
-\r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
-\r\Âå ìîëèìå èçâåñòåòå íå çà áèëî êàêâà ãðåøêà èëè ïðîáëåì)\r\n\r\nDevelopment:\r\nÈíòåðôå¼ñ (Windows):Xavier Roche\r\nSpider:Xavier Roche\r\n\r\n(C)1998-2003 Xavier Roche è äðóãè\r\nÌÍÎÃÓ ÁËÀÃÎÄÀÐÍÎÑÒ çà ìàêåäîíñêèîò ïðåâîä íà:\r\nÀëåêñàíäàð Ñàâè<C3A2> (aleks@macedonia.eu.org)
+\r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\nJavaParserClasses: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
+\r\Âå ìîëèìå èçâåñòåòå íå çà áèëî êàêâà ãðåøêà èëè ïðîáëåì)\r\n\r\nDevelopment:\r\nÈíòåðôå¼ñ (Windows):Xavier Roche\r\nSpider:Xavier Roche\r\nJavaParserClasses: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche è äðóãè\r\nÌÍÎÃÓ ÁËÀÃÎÄÀÐÍÎÑÒ çà ìàêåäîíñêèîò ïðåâîä íà:\r\nÀëåêñàíäàð Ñàâè<C3A2> (aleks@macedonia.eu.org)
 About WinHTTrack Website Copier
 Çà WinHTTrack Website Copier
 Please visit our Web page
@@ -956,11 +956,3 @@ Strip query keys:
 ¾âáâàÐÝØ ÚÛãçÕÒØ ÞÔ ÑÐàÐúÕâÞ:
 Comma-separated query keys to drop from the saved-file naming (e.g. sid,utm_source).
 ºÛãçÕÒØ ÞÔ ÑÐàÐúÕâÞ, ÞÔÔÕÛÕÝØ áÞ ×ÐßØàÚÐ, èâÞ áÕ ÞâáâàÐÝãÒÐÐâ ÞÔ ØÜÕâÞ ÝÐ ×ÐçãÒÐÝÐâÐ ÔÐâÞâÕÚÐ (ÝÐ ßàØÜÕà sid,utm_source).
-Write a WARC archive of the crawl
-·ÐßØèØ WARC ÐàåØÒÐ ÝÐ ßàÕÑÐàãÒÐúÕâÞ
-Also save every fetched response into an ISO-28500 WARC/1.1 archive, next to the mirror.
-·ÐçãÒÐø ÓÞ áÕÚÞø ßàÕ×ÕÜÕÝ ÞÔÓÞÒÞà Ø ÒÞ ISO-28500 WARC/1.1 ÐàåØÒÐ, ßÞÚàÐø ÞÓÛÕÔÐÛÞâÞ.
-WARC archive name:
-¸ÜÕ ÝÐ WARC ÐàåØÒÐâÐ:
-Optional base name for the WARC archive; leave blank to auto-name it under the output directory.
-¸×ÑÞàÝÞ ÞáÝÞÒÝÞ ØÜÕ ×Ð WARC ÐàåØÒÐâÐ; ÞáâÐÒÕâÕ ßàÐ×ÝÞ ×Ð ÐÒâÞÜÐâáÚÞ ØÜÕÝãÒÐúÕ ÒÞ Ø×ÛÕ×ÝØÞâ ÔØàÕÚâÞàØãÜ.

lang/Magyar.txt

@@ -634,8 +634,8 @@ Disconnect when finished
 Vonalbontás, ha kész
 Disconnect modem on completion
 Modem leválasztása, ha kész
-\r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
-\r\n(Kérjük, jelezzen nekünk bármilyen hibát vagy problémát)\r\n\r\nFejlesztés:\r\nKezelõfelület (Windows): Xavier Roche\r\nIndexelés: Xavier Roche\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nEZER KÖSZÖNET a magyar fordításért:\r\nHerczeg József Tamásnak (hdodi@freemail.hu)
+\r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\nJavaParserClasses: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
+\r\n(Kérjük, jelezzen nekünk bármilyen hibát vagy problémát)\r\n\r\nFejlesztés:\r\nKezelõfelület (Windows): Xavier Roche\r\nIndexelés: Xavier Roche\r\nJavaElemzõOsztályok: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nEZER KÖSZÖNET a magyar fordításért:\r\nHerczeg József Tamásnak (hdodi@freemail.hu)
 About WinHTTrack Website Copier
 WinHTTrack webhely másoló névjegye
 Please visit our Web page
@@ -956,11 +956,3 @@ Strip query keys:
 Lekérdezési kulcsok eltávolítása:
 Comma-separated query keys to drop from the saved-file naming (e.g. sid,utm_source).
 Vesszõvel elválasztott lekérdezési kulcsok, amelyeket el kell hagyni a mentett fájl elnevezésébõl (pl. sid,utm_source).
-Write a WARC archive of the crawl
-A bejárás WARC archívumának írása
-Also save every fetched response into an ISO-28500 WARC/1.1 archive, next to the mirror.
-Minden letöltött válasz mentése ISO-28500 WARC/1.1 archívumba is, a tükör mellé.
-WARC archive name:
-WARC archívum neve:
-Optional base name for the WARC archive; leave blank to auto-name it under the output directory.
-A WARC archívum opcionális alapneve; hagyja üresen az automatikus elnevezéshez a kimeneti könyvtárban.

lang/Nederlands.txt

@@ -634,8 +634,8 @@ Disconnect when finished
 Indien gedaan verbinding verbreken
 Disconnect modem on completion
 Indien gedaan modemverbinding verbreken
-\r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
-\r\n(Ons fouten en problemen mede te delen)\r\n\r\nOntwikkeling:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for Dutch translations to:\r\nRudi Ferrari (Wyando@netcologne.de)
+\r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\nJavaParserClasses: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
+\r\n(Ons fouten en problemen mede te delen)\r\n\r\nOntwikkeling:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\nJavaParserClasses: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for Dutch translations to:\r\nRudi Ferrari (Wyando@netcologne.de)
 About WinHTTrack Website Copier
 Over WinHTTrack Website Copier
 Please visit our Web page
@@ -956,11 +956,3 @@ Strip query keys:
 Query-sleutels verwijderen:
 Comma-separated query keys to drop from the saved-file naming (e.g. sid,utm_source).
 Door komma's gescheiden query-sleutels die bij het benoemen van opgeslagen bestanden worden weggelaten (bijv. sid,utm_source).
-Write a WARC archive of the crawl
-Schrijf een WARC-archief van de crawl
-Also save every fetched response into an ISO-28500 WARC/1.1 archive, next to the mirror.
-Sla ook elke opgehaalde respons op in een ISO-28500 WARC/1.1-archief, naast de mirror.
-WARC archive name:
-Naam van WARC-archief:
-Optional base name for the WARC archive; leave blank to auto-name it under the output directory.
-Optionele basisnaam voor het WARC-archief; laat leeg om het automatisch een naam te geven in de uitvoermap.

lang/Norsk.txt

@@ -634,8 +634,8 @@ Disconnect when finished
 Koble fra når fullført
 Disconnect modem on completion
 Koble fra modem når fullført
-\r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
-\r\n(Vennligst fortell oss om feil eller problemer med programmet)\r\n\r\nUtvikling (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\n\r\n(C)1998-2003 Xavier Roche og andre bidragsytere\r\n\r\nNorwegian translation:\r\nTobias "Spug" Langhoff ( spug_enigma@hotmail.com )
+\r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\nJavaParserClasses: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
+\r\n(Vennligst fortell oss om feil eller problemer med programmet)\r\n\r\nUtvikling (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\nJavaParserClasses: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche og andre bidragsytere\r\n\r\nNorwegian translation:\r\nTobias "Spug" Langhoff ( spug_enigma@hotmail.com )
 About WinHTTrack Website Copier
 Om WinHTTrack Website Copier
 Please visit our Web page
@@ -956,11 +956,3 @@ Strip query keys:
 Fjern spørrenøkler:
 Comma-separated query keys to drop from the saved-file naming (e.g. sid,utm_source).
 Kommaseparerte spørrenøkler som utelates i navngivingen av lagrede filer (f.eks. sid,utm_source).
-Write a WARC archive of the crawl
-Skriv et WARC-arkiv av gjennomgangen
-Also save every fetched response into an ISO-28500 WARC/1.1 archive, next to the mirror.
-Lagre også hvert nedlastet svar i et ISO-28500 WARC/1.1-arkiv ved siden av speilet.
-WARC archive name:
-Navn på WARC-arkiv:
-Optional base name for the WARC archive; leave blank to auto-name it under the output directory.
-Valgfritt basisnavn for WARC-arkivet; la feltet stå tomt for automatisk navngivning i utdatamappen.

lang/Polski.txt

@@ -634,8 +634,8 @@ Disconnect when finished
 Zakoñcz po³¹czenie z us³ugodawc¹ po pobraniu
 Disconnect modem on completion
 Po pobraniu roz³¹cz modem
-\r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
-\r\n(proszê poinformowaæ nas o jakichkolwiek b³êdach w dzia³aniu programu)\r\n\r\nTwórcy:\r\nInterfejs(Windows): Xavier Roche\r\nMotor: Xavier Roche\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nPolska wersja jêzykowa: £ukasz Jokiel (Opole University of Technology, Lukasz.Jokiel@po.opole.pl)
+\r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\nJavaParserClasses: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
+\r\n(proszê poinformowaæ nas o jakichkolwiek b³êdach w dzia³aniu programu)\r\n\r\nTwórcy:\r\nInterfejs(Windows): Xavier Roche\r\nMotor: Xavier Roche\r\nJavaParserClasses: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nPolska wersja jêzykowa: £ukasz Jokiel (Opole University of Technology, Lukasz.Jokiel@po.opole.pl)
 About WinHTTrack Website Copier
 O... WinHTTrack Website Copier
 Please visit our Web page
@@ -956,11 +956,3 @@ Strip query keys:
 Usuñ klucze zapytania:
 Comma-separated query keys to drop from the saved-file naming (e.g. sid,utm_source).
 Rozdzielone przecinkami klucze zapytania pomijane przy nazywaniu zapisanych plików (np. sid,utm_source).
-Write a WARC archive of the crawl
-Zapisz archiwum WARC z indeksowania
-Also save every fetched response into an ISO-28500 WARC/1.1 archive, next to the mirror.
-Zapisz te¿ ka¿d± pobran± odpowied¼ do archiwum WARC/1.1 ISO-28500, obok kopii lustrzanej.
-WARC archive name:
-Nazwa archiwum WARC:
-Optional base name for the WARC archive; leave blank to auto-name it under the output directory.
-Opcjonalna nazwa bazowa archiwum WARC; pozostaw puste, aby nazwaæ je automatycznie w katalogu wyj¶ciowym.

lang/Portugues-Brasil.txt

@@ -652,8 +652,8 @@ Disconnect when finished
 Desconectar ao finalizar
 Disconnect modem on completion
 Desconectar o modem ao finalizar
-\r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
-\r\n(por favor nos comunique sobre erros ou problemas)\r\n\r\nDesenvolvimento:\r\nInterface (Windows): Xavier Roche\r\nMotor: Xavier Roche\r\n\r\n(C)1998-2003 Xavier Roche e outros colaboradores\r\nTraduzido para o Português-Brasil por :\r\nPaulo Neto (layoutbr@lexxa.com.br)
+\r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\nJavaParserClasses: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
+\r\n(por favor nos comunique sobre erros ou problemas)\r\n\r\nDesenvolvimento:\r\nInterface (Windows): Xavier Roche\r\nMotor: Xavier Roche\r\nJavaParserClasses: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche e outros colaboradores\r\nTraduzido para o Português-Brasil por :\r\nPaulo Neto (layoutbr@lexxa.com.br)
 About WinHTTrack Website Copier
 Sobre o WinHTTrack Website Copier
 Please visit our Web page
@@ -1004,11 +1004,3 @@ Strip query keys:
 Remover chaves da query string:
 Comma-separated query keys to drop from the saved-file naming (e.g. sid,utm_source).
 Chaves da query string, separadas por vírgulas, a serem removidas da nomeação dos arquivos salvos (ex.: sid,utm_source).
-Write a WARC archive of the crawl
-Gravar um arquivo WARC do rastreamento
-Also save every fetched response into an ISO-28500 WARC/1.1 archive, next to the mirror.
-Salvar também cada resposta baixada em um arquivo WARC/1.1 ISO-28500, ao lado do espelho.
-WARC archive name:
-Nome do arquivo WARC:
-Optional base name for the WARC archive; leave blank to auto-name it under the output directory.
-Nome base opcional para o arquivo WARC; deixe em branco para nomeá-lo automaticamente no diretório de saída.

lang/Portugues.txt

@@ -634,8 +634,8 @@ Disconnect when finished
 Desligar no fim da operação
 Disconnect modem on completion
 Desconectar o modem no final
-\r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
-\r\n(Por favor avise-nos acerca de erros ou problemas)\r\n\r\nDesenvolvimento:\r\nInterface (Windows): Xavier Roche\r\nMotor: Xavier Roche\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nAgradecimentos pela tradução para o Português para:\r\nRui Fernandes (CANTIC, ruiefe@mail.malhatlantica.pt)
+\r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\nJavaParserClasses: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
+\r\n(Por favor avise-nos acerca de erros ou problemas)\r\n\r\nDesenvolvimento:\r\nInterface (Windows): Xavier Roche\r\nMotor: Xavier Roche\r\nJavaParserClasses: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nAgradecimentos pela tradução para o Português para:\r\nRui Fernandes (CANTIC, ruiefe@mail.malhatlantica.pt)
 About WinHTTrack Website Copier
 Acerca do WinHTTrack Website Copier
 Please visit our Web page
@@ -956,11 +956,3 @@ Strip query keys:
 Remover chaves da query string:
 Comma-separated query keys to drop from the saved-file naming (e.g. sid,utm_source).
 Chaves da query string, separadas por vírgulas, a remover da nomeação dos ficheiros guardados (por ex. sid,utm_source).
-Write a WARC archive of the crawl
-Escrever um arquivo WARC do rastreio
-Also save every fetched response into an ISO-28500 WARC/1.1 archive, next to the mirror.
-Guardar também cada resposta transferida num arquivo WARC/1.1 ISO-28500, ao lado do espelho.
-WARC archive name:
-Nome do arquivo WARC:
-Optional base name for the WARC archive; leave blank to auto-name it under the output directory.
-Nome base opcional para o arquivo WARC; deixe em branco para o nomear automaticamente no diretório de saída.

lang/Romanian.txt

@@ -634,7 +634,7 @@ Disconnect when finished
 Deconectează şa terminare
 Disconnect modem on completion
 Deconectează modemul la terminare
-\r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
+\r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\nJavaParserClasses: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
 
 About WinHTTrack Website Copier
 Despre WinHTTrack Website Copier
@@ -956,11 +956,3 @@ Strip query keys:
 Elimina cheile din query string:
 Comma-separated query keys to drop from the saved-file naming (e.g. sid,utm_source).
 Chei din query string, separate prin virgula, de eliminat din denumirea fisierelor salvate (de ex. sid,utm_source).
-Write a WARC archive of the crawl
-Scrie o arhiva WARC a parcurgerii
-Also save every fetched response into an ISO-28500 WARC/1.1 archive, next to the mirror.
-Salveaza si fiecare raspuns descarcat intr-o arhiva WARC/1.1 ISO-28500, langa oglinda.
-WARC archive name:
-Numele arhivei WARC:
-Optional base name for the WARC archive; leave blank to auto-name it under the output directory.
-Nume de baza optional pentru arhiva WARC; lasati gol pentru a-l denumi automat in directorul de iesire.

lang/Russian.txt

@@ -634,8 +634,8 @@ Disconnect when finished
 Îòñîåäèíèòüñÿ ïðè çàâåðøåíèè
 Disconnect modem on completion
 Îòñîåäèíèòü ïðè çàâåðøåíèè
-\r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
-\r\n(Ñîîáùèòå íàì, ïîæàëóéñòà, î çàìå÷åííûõ ïðîáëåìàõ è îøèáêàõ)\r\n\r\nÐàçðàáîòêà:\r\nÈíòåðôåéñ (Windows): Xavier Roche\r\nÊà÷àëêà (spider): Xavier Roche\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for Russian translations to:\r\nAndrei Iliev (andreiiliev@mail.ru)
+\r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\nJavaParserClasses: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
+\r\n(Ñîîáùèòå íàì, ïîæàëóéñòà, î çàìå÷åííûõ ïðîáëåìàõ è îøèáêàõ)\r\n\r\nÐàçðàáîòêà:\r\nÈíòåðôåéñ (Windows): Xavier Roche\r\nÊà÷àëêà (spider): Xavier Roche\r\nÏàðñåð ÿâà-êëàññîâ: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for Russian translations to:\r\nAndrei Iliev (andreiiliev@mail.ru)
 About WinHTTrack Website Copier
 Î ïðîãðàììå WinHTTrack Website Copier
 Please visit our Web page
@@ -956,11 +956,3 @@ Strip query keys:
 Óäàëÿòü êëþ÷è çàïðîñà:
 Comma-separated query keys to drop from the saved-file naming (e.g. sid,utm_source).
 Êëþ÷è çàïðîñà ÷åðåç çàïÿòóþ, óäàëÿåìûå èç èìåíè ñîõðàíÿåìîãî ôàéëà (íàïðèìåð, sid,utm_source).
-Write a WARC archive of the crawl
-Çàïèñàòü WARC-àðõèâ îáõîäà
-Also save every fetched response into an ISO-28500 WARC/1.1 archive, next to the mirror.
-Ñîõðàíÿòü êàæäûé çàãðóæåííûé îòâåò òàêæå â àðõèâ WARC/1.1 ISO-28500 ðÿäîì ñ çåðêàëîì.
-WARC archive name:
-Èìÿ WARC-àðõèâà:
-Optional base name for the WARC archive; leave blank to auto-name it under the output directory.
-Íåîáÿçàòåëüíîå áàçîâîå èìÿ WARC-àðõèâà; îñòàâüòå ïóñòûì äëÿ àâòîìàòè÷åñêîãî èìåíîâàíèÿ â âûõîäíîì êàòàëîãå.

lang/Slovak.txt

@@ -634,8 +634,8 @@ Disconnect when finished
 Odpoji<EFBFBD>, ak je kopírovanie ukonèené
 Disconnect modem on completion
 Odpoji<EFBFBD> modem po dokonèení
-\r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
-\r\n(Oznám nám akúko¾vek chybu alebo problém)\r\n\r\nVývoj:\r\nProstredie (Windows): Xavier Roche\r\nPavúk: Xavier Roche\r\n\r\n(C)1998-2001 Xavier Roche a ostatní pomocníci\r\nVE¼KÉ POÏAKOVANIE za preklady:\r\nDr. Martin Sereday (sereday@slovanet.sk)
+\r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\nJavaParserClasses: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
+\r\n(Oznám nám akúko¾vek chybu alebo problém)\r\n\r\nVývoj:\r\nProstredie (Windows): Xavier Roche\r\nPavúk: Xavier Roche\r\nKontrolór Javy: Yann Philippot\r\n\r\n(C)1998-2001 Xavier Roche a ostatní pomocníci\r\nVE¼KÉ POÏAKOVANIE za preklady:\r\nDr. Martin Sereday (sereday@slovanet.sk)
 About WinHTTrack Website Copier
 O WinHTTrack Website Copier...
 Please visit our Web page
@@ -956,11 +956,3 @@ Strip query keys:
 Odstráni» kµúèe dotazu:
 Comma-separated query keys to drop from the saved-file naming (e.g. sid,utm_source).
 Kµúèe dotazu oddelené èiarkami, ktoré sa vynechajú z pomenovania ukladaných súborov (napr. sid,utm_source).
-Write a WARC archive of the crawl
-Zapísa» archív WARC z prehµadávania
-Also save every fetched response into an ISO-28500 WARC/1.1 archive, next to the mirror.
-Ulo¾i» aj ka¾dú stiahnutú odpoveï do archívu WARC/1.1 ISO-28500 vedµa zrkadla.
-WARC archive name:
-Názov archívu WARC:
-Optional base name for the WARC archive; leave blank to auto-name it under the output directory.
-Voliteµný základný názov archívu WARC; ponechajte prázdne pre automatické pomenovanie vo výstupnom adresári.

lang/Slovenian.txt

@@ -634,8 +634,8 @@ Disconnect when finished
 Prekini povezavo, ko bo konèano
 Disconnect modem on completion
 Izkljuèi modem ob dokonèanju
-\r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
-\r\n(Prosimo Vas, da nas obvestite o kakršnih koli težavah ali napakah)\r\n\r\nRazvoj:\r\nVmesnik (Okna): Xavier Roche\r\nHitrost: Xavier Roche\r\n\r\n(C)1998-2003 Xavier Roche in drugi sodelujoèi\r\nVELIKA ZAHVALA za namige prevodov gre:\r\nRobertu Lagadecu (rlagadec@yahoo.fr)
+\r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\nJavaParserClasses: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
+\r\n(Prosimo Vas, da nas obvestite o kakršnih koli težavah ali napakah)\r\n\r\nRazvoj:\r\nVmesnik (Okna): Xavier Roche\r\nHitrost: Xavier Roche\r\nJavaParserRazredi: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche in drugi sodelujoèi\r\nVELIKA ZAHVALA za namige prevodov gre:\r\nRobertu Lagadecu (rlagadec@yahoo.fr)
 About WinHTTrack Website Copier
 O programu WinHTTrack Website Copier
 Please visit our Web page
@@ -956,11 +956,3 @@ Strip query keys:
 Odstrani kljuce poizvedbe:
 Comma-separated query keys to drop from the saved-file naming (e.g. sid,utm_source).
 Z vejicami loceni kljuci poizvedbe, ki se izpustijo pri poimenovanju shranjenih datotek (npr. sid,utm_source).
-Write a WARC archive of the crawl
-Zapisi arhiv WARC iz pregledovanja
-Also save every fetched response into an ISO-28500 WARC/1.1 archive, next to the mirror.
-Shrani tudi vsak preneseni odgovor v arhiv WARC/1.1 ISO-28500 poleg zrcala.
-WARC archive name:
-Ime arhiva WARC:
-Optional base name for the WARC archive; leave blank to auto-name it under the output directory.
-Neobvezno osnovno ime arhiva WARC; pustite prazno za samodejno poimenovanje v izhodni mapi.

lang/Svenska.txt

@@ -634,8 +634,8 @@ Disconnect when finished
 Koppla ner förbindelsen när överföringen är klar
 Disconnect modem on completion
 Koppla ned modemet efter avslutning
-\r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
-\r\n(Hittar du fel eller uppstår det problem, kontakta oss)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for Swedish translations to:\r\nStaffan Ström (staffan@fam-strom.org)
+\r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\nJavaParserClasses: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
+\r\n(Hittar du fel eller uppstår det problem, kontakta oss)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\nJavaParserClasses: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for Swedish translations to:\r\nStaffan Ström (staffan@fam-strom.org)
 About WinHTTrack Website Copier
 Om WinHTTrack Website Copier...
 Please visit our Web page
@@ -956,11 +956,3 @@ Strip query keys:
 Ta bort frågenycklar:
 Comma-separated query keys to drop from the saved-file naming (e.g. sid,utm_source).
 Kommaseparerade frågenycklar som utelämnas vid namngivningen av sparade filer (t.ex. sid,utm_source).
-Write a WARC archive of the crawl
-Skriv ett WARC-arkiv av genomsökningen
-Also save every fetched response into an ISO-28500 WARC/1.1 archive, next to the mirror.
-Spara även varje hämtat svar i ett ISO-28500 WARC/1.1-arkiv, bredvid spegeln.
-WARC archive name:
-WARC-arkivets namn:
-Optional base name for the WARC archive; leave blank to auto-name it under the output directory.
-Valfritt basnamn för WARC-arkivet; lämna tomt för att namnge det automatiskt i utdatakatalogen.

lang/Turkish.txt

@@ -634,8 +634,8 @@ Disconnect when finished
 Bittiðinde baðlantýyý kes
 Disconnect modem on completion
 Ýþlem tamamlandýðýnda modemden baðlantýyý kopar
-\r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
-\r\n(Lütfen bize her türlü hatayý ve problemi aktarýnýz)\r\n\r\nGeliþtirme:\r\nArayüz (Windows): Xavier Roche\r\nAð: Xavier Roche\r\n\r\n(C)1998-2003 Xavier Roche ve diðerleri\r\nÇeviri ipuçlarý için teþekkürler: \r\nRobert Lagadec (rlagadec@yahoo.fr)
+\r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\nJavaParserClasses: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
+\r\n(Lütfen bize her türlü hatayý ve problemi aktarýnýz)\r\n\r\nGeliþtirme:\r\nArayüz (Windows): Xavier Roche\r\nAð: Xavier Roche\r\nJava Ayýklama Sýnýflarý: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche ve diðerleri\r\nÇeviri ipuçlarý için teþekkürler: \r\nRobert Lagadec (rlagadec@yahoo.fr)
 About WinHTTrack Website Copier
 WinHTTrack Website Copier Hakkýnda
 Please visit our Web page
@@ -956,11 +956,3 @@ Strip query keys:
 Sorgu anahtarlarýný çýkar:
 Comma-separated query keys to drop from the saved-file naming (e.g. sid,utm_source).
 Kaydedilen dosya adlandýrmasýndan çýkarýlacak, virgülle ayrýlmýþ sorgu anahtarlarý (örn. sid,utm_source).
-Write a WARC archive of the crawl
-Taramanýn WARC arþivini yaz
-Also save every fetched response into an ISO-28500 WARC/1.1 archive, next to the mirror.
-Ýndirilen her yanýtý ayrýca aynanýn yanýna bir ISO-28500 WARC/1.1 arþivine kaydet.
-WARC archive name:
-WARC arþivi adý:
-Optional base name for the WARC archive; leave blank to auto-name it under the output directory.
-WARC arþivi için isteðe baðlý temel ad; çýktý dizininde otomatik adlandýrma için boþ býrakýn.

lang/Ukrainian.txt

@@ -634,8 +634,8 @@ Disconnect when finished
 ³ä'ºäíàòèñü ïðè çàâåðøåíí³
 Disconnect modem on completion
 ³ä'ºäíàòè ïðè çàâåðøåíí³
-\r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
-\r\n(Ïîâ³äîìèòå íàì áóäü ëàñêà ïðî ïîì³÷åí³ ïðîáëåìè ³ ïîìèëêè)\r\n\r\nðàçðàáîòêà:\r\nèíòåðôåéñ (Windows): Xavier Roche\r\nêà÷àëêà (spider): Xavier Roche\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for Ukrainian translations to:\r\nAndrij Shevchuk (andrijsh@mail.lviv.ua) http://programy.com.ua, http://vic-info.com.ua
+\r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\nJavaParserClasses: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
+\r\n(Ïîâ³äîìèòå íàì áóäü ëàñêà ïðî ïîì³÷åí³ ïðîáëåìè ³ ïîìèëêè)\r\n\r\nðàçðàáîòêà:\r\nèíòåðôåéñ (Windows): Xavier Roche\r\nêà÷àëêà (spider): Xavier Roche\r\nïàðñåð java-êëàñ³â: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for Ukrainian translations to:\r\nAndrij Shevchuk (andrijsh@mail.lviv.ua) http://programy.com.ua, http://vic-info.com.ua
 About WinHTTrack Website Copier
 Ïðî ïðîãðàìó WinHTTrack Website Copier
 Please visit our Web page
@@ -956,11 +956,3 @@ Strip query keys:
 Âèëó÷àòè êëþ÷³ çàïèòó:
 Comma-separated query keys to drop from the saved-file naming (e.g. sid,utm_source).
 Êëþ÷³ çàïèòó ÷åðåç êîìó, ÿê³ âèëó÷àþòüñÿ ç ³ìåí³ çáåðåæåíîãî ôàéëó (íàïðèêëàä, sid,utm_source).
-Write a WARC archive of the crawl
-Çàïèñàòè WARC-àðõ³â îáõîäó
-Also save every fetched response into an ISO-28500 WARC/1.1 archive, next to the mirror.
-Çáåð³ãàòè êîæíó çàâàíòàæåíó â³äïîâ³äü òàêîæ ó àðõ³â WARC/1.1 ISO-28500 ïîðÿä ³ç äçåðêàëîì.
-WARC archive name:
-²ì'ÿ WARC-àðõ³âó:
-Optional base name for the WARC archive; leave blank to auto-name it under the output directory.
-Íåîáîâ'ÿçêîâà áàçîâà íàçâà WARC-àðõ³âó; çàëèøòå ïîðîæí³ì äëÿ àâòîìàòè÷íîãî íàéìåíóâàííÿ ó âèõ³äíîìó êàòàëîç³.

lang/Uzbek.txt

@@ -634,8 +634,8 @@ Disconnect when finished
 Îòñîåäèíèòüñÿ ïðè çàâåðøåíèè
 Disconnect modem on completion
 Îòñîåäåíèòü ïðè çàâåðøåíèè
-\r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
-\r\n(Ñîîáùèòå íàì ïîæàëóéñòà î çàìå÷åííûõ ïðîáëåìàõ è îøèáêàõ)\r\n\r\nÐàçðàáîòêà:\r\nÈíòåðôåéñ (Windows): Xavier Roche\r\nÊà÷àëêà (spider): Xavier Roche\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for Russian translations to:\r\nAndrei Iliev (andreiiliev@mail.ru)
+\r\n(Please notify us of any bug or problem)\r\n\r\nDevelopment:\r\nInterface (Windows): Xavier Roche\r\nSpider: Xavier Roche\r\nJavaParserClasses: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for translation tips to:\r\nRobert Lagadec (rlagadec@yahoo.fr)
+\r\n(Ñîîáùèòå íàì ïîæàëóéñòà î çàìå÷åííûõ ïðîáëåìàõ è îøèáêàõ)\r\n\r\nÐàçðàáîòêà:\r\nÈíòåðôåéñ (Windows): Xavier Roche\r\nÊà÷àëêà (spider): Xavier Roche\r\nÏàðñåð ÿâà-êëàññîâ: Yann Philippot\r\n\r\n(C)1998-2003 Xavier Roche and other contributors\r\nMANY THANKS for Russian translations to:\r\nAndrei Iliev (andreiiliev@mail.ru)
 About WinHTTrack Website Copier
 Î ïðîãðàììå WinHTTrack Website Copier
 Please visit our Web page
@@ -956,11 +956,3 @@ Strip query keys:
 Olib tashlanadigan so’rov kalitlari:
 Comma-separated query keys to drop from the saved-file naming (e.g. sid,utm_source).
 Saqlangan fayl nomidan olib tashlanadigan, vergul bilan ajratilgan so’rov kalitlari (masalan, sid,utm_source).
-Write a WARC archive of the crawl
-Qidiruvning WARC arxivini yozish
-Also save every fetched response into an ISO-28500 WARC/1.1 archive, next to the mirror.
-Har bir yuklab olingan javobni ISO-28500 WARC/1.1 arxiviga ham, ko'zgu yonida saqlash.
-WARC archive name:
-WARC arxivi nomi:
-Optional base name for the WARC archive; leave blank to auto-name it under the output directory.
-WARC arxivi uchun ixtiyoriy asosiy nom; chiqish katalogida avtomatik nomlash uchun bo'sh qoldiring.

man/Makefile.am

@@ -16,11 +16,6 @@ regen-man: makeman.sh $(top_builddir)/src/httrack$(EXEEXT)
 
 # Render html/httrack.man.html from httrack.1. Needs the groff html device
 # (Debian: full "groff" package, not "groff-base"). Run by hand: make -C man regen-man-html
-# Strip groff's version-stamp and creation-date comments so the committed file
-# doesn't churn across groff versions or rebuilds; the ci man-page-sync guard
-# only requires this file to change whenever httrack.1 does.
 regen-man-html: httrack.1
-	groff -t -man -Thtml $(srcdir)/httrack.1 \
-		| sed -e 's/groff version [0-9][0-9.]*/groff/' -e '/^<!-- CreationDate:/d' \
-		> $(top_srcdir)/html/httrack.man.html
+	groff -t -man -Thtml $(srcdir)/httrack.1 > $(top_srcdir)/html/httrack.man.html
 .PHONY: regen-man-html

man/httrack.1

@@ -3,7 +3,7 @@
 .\"
 .\" This file is generated by man/makeman.sh; do not edit by hand.
 .\" SPDX-License-Identifier: GPL-3.0-or-later
-.TH httrack 1 "23 July 2026" "httrack website copier"
+.TH httrack 1 "22 July 2026" "httrack website copier"
 .SH NAME
 httrack \- offline browser : copy websites to a local directory
 .SH SYNOPSIS
@@ -58,7 +58,6 @@ httrack \- offline browser : copy websites to a local directory
 [ \fB\-sN, \-\-robots[=N]\fR ]
 [ \fB\-%h, \-\-http\-10\fR ]
 [ \fB\-%k, \-\-keep\-alive\fR ]
-[ \fB\-%z, \-\-disable\-compression\fR ]
 [ \fB\-%B, \-\-tolerant\fR ]
 [ \fB\-%s, \-\-updatehack\fR ]
 [ \fB\-%u, \-\-urlhack\fR ]
@@ -74,7 +73,6 @@ httrack \- offline browser : copy websites to a local directory
 [ \fB\-%X, \-\-headers\fR ]
 [ \fB\-C, \-\-cache[=N]\fR ]
 [ \fB\-k, \-\-store\-all\-in\-cache\fR ]
-[ \fB\-%r, \-\-warc\fR ]
 [ \fB\-%n, \-\-do\-not\-recatch\fR ]
 [ \fB\-%v, \-\-display\fR ]
 [ \fB\-Q, \-\-do\-not\-log\fR ]
@@ -100,7 +98,6 @@ httrack \- offline browser : copy websites to a local directory
 [ \fB\-%!, \-\-disable\-security\-limits\fR ]
 [ \fB\-V, \-\-userdef\-cmd\fR ]
 [ \fB\-%W, \-\-callback\fR ]
-[ \fB\-y, \-\-background\-on\-suspend\fR ]
 [ \fB\-K, \-\-keep\-links[=N]\fR ]
 .SH DESCRIPTION
 .B httrack
@@ -198,8 +195,6 @@ delayed type check, don't make any link test but wait for files download to star
 cached delayed type check, don't wait for remote type during updates, to speedup them (%D0 wait, * %D1 don't wait) (\-\-cached\-delayed\-type\-check)
 .IP \-%M
 generate a RFC MIME\-encapsulated full\-archive (.mht) (\-\-mime\-html)
-.IP \-%t
-keep the original file extension, don't rewrite it from the MIME type (%t0 rewrite)
 .IP \-LN
 long names (L1 *long names / L0 8\-3 conversion / L2 ISO9660 compatible) (\-\-long\-names[=N])
 .IP \-KN
@@ -237,8 +232,6 @@ follow robots.txt and meta robots tags (0=never,1=sometimes,* 2=always, 3=always
 force HTTP/1.0 requests (reduce update features, only for old servers or proxies) (\-\-http\-10)
 .IP \-%k
 use keep\-alive if possible, greately reducing latency for small files and test requests (%k0 don't use) (\-\-keep\-alive)
-.IP \-%z
-do not request compressed content (%z0 request) (\-\-disable\-compression)
 .IP \-%B
 tolerant requests (accept bogus responses on some servers, but not standard!) (\-\-tolerant)
 .IP \-%s
@@ -265,7 +258,7 @@ default referer field sent in HTTP headers (\-\-referer <param>)
 .IP \-%E
 from email address sent in HTTP headers (\-\-from <param>)
 .IP \-%F
-footer string in Html code (\-%F "Mirrored from {url} on {date}"; fields {addr} {path} {url} {date} {lastmodified} {version} {mime} {charset} {status} {size}, or legacy %s) (\-\-footer <param>)
+footer string in Html code (\-%F "Mirrored [from host %s [file %s [at %s]]]" (\-\-footer <param>)
 .IP \-%l
 preferred language (\-%l "fr, en, jp, *" (\-\-language <param>)
 .IP \-%a
@@ -277,8 +270,6 @@ additional HTTP header line (\-%X "X\-Magic: 42" (\-\-headers <param>)
 create/use a cache for updates and retries (C0 no cache,C1 cache is prioritary,* C2 test update before) (\-\-cache[=N])
 .IP \-k
 store all files in cache (not useful if files on disk) (\-\-store\-all\-in\-cache)
-.IP \-%r
-write an ISO\-28500 WARC/1.1 archive; \-\-warc\-file NAME sets the output name, \-\-warc\-max\-size N rotates segments past N bytes, \-\-warc\-cdx also writes a sorted CDXJ index, \-\-wacz packages it all as a WACZ file (\-\-warc)
 .IP \-%n
 do not re\-download locally erased files (\-\-do\-not\-recatch)
 .IP \-%v
@@ -335,6 +326,8 @@ go everywhere on the web (\-\-go\-everywhere)
 .IP \-%H
 debug HTTP headers in logfile (\-\-debug\-headers)
 .SS Guru options: (do NOT use if possible)
+.IP \-#X
+*use optimized engine (limited memory boundary checks) (\-\-fast\-engine)
 .IP \-#test
 list engine self\-tests (run one with \-#test=NAME [args])
 .IP \-#C
@@ -359,6 +352,8 @@ maximum number of links (\-#L1000000) (\-\-advanced\-maxlinks[=N])
 display ugly progress information (\-\-advanced\-progressinfo)
 .IP \-#P
 catch URL (\-\-catch\-url)
+.IP \-#R
+old FTP routines (debug) (\-\-repair\-cache)
 .IP \-#T
 generate transfer ops. log every minutes (\-\-debug\-xfrstats)
 .IP \-#u
@@ -377,8 +372,6 @@ USE IT WITH EXTREME CARE
 execute system command after each files ($0 is the filename: \-V "rm \\$0") (\-\-userdef\-cmd <param>)
 .IP \-%W
 use an external library function as a wrapper (\-%W myfoo.so[,myparameters]) (\-\-callback <param>)
-.IP \-y
-go to background when suspended (y0 don't) (\-\-background\-on\-suspend)
 .SS Details: Option N
 .IP \-N0
 Site\-structure (default)

src/Makefile.am

@@ -32,9 +32,7 @@ AM_LDFLAGS = \
 
 bin_PROGRAMS = proxytrack httrack htsserver
 
-httrack_SOURCES = httrack.c htsbacktrace.c htsbacktrace.h
-# $(DL_LIBS): dladdr() in the crash handler, still in libdl on pre-2.34 glibc.
-httrack_LDADD = $(THREADS_LIBS) $(DL_LIBS) libhttrack.la
+httrack_LDADD = $(THREADS_LIBS) libhttrack.la
 htsserver_LDADD = $(THREADS_LIBS) $(SOCKET_LIBS) libhttrack.la
 proxytrack_LDADD = $(THREADS_LIBS) $(SOCKET_LIBS)
 
@@ -49,7 +47,6 @@ htsserver_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_PIE)
 lib_LTLIBRARIES = libhttrack.la
 
 htsserver_SOURCES = htsserver.c htsserver.h htsweb.c htsweb.h \
-	htscmdline.c htscmdline.h \
 	htsurlport.c htsurlport.h
 proxytrack_SOURCES = proxy/main.c \
 	proxy/proxytrack.c proxy/store.c \
@@ -63,21 +60,21 @@ whttrackrun_SCRIPTS = webhttrack
 libhttrack_la_SOURCES =  htscore.c htsparse.c htsback.c htscache.c \
 	htscache_selftest.c htsdns_selftest.c htsselftest.c \
 	htscatchurl.c htsfilters.c htsftp.c htshash.c coucal/coucal.c \
-	htscmdline.c htshelp.c htslib.c htsurlport.c htscoremain.c \
+	htshelp.c htslib.c htsurlport.c htscoremain.c \
 	htsname.c htsrobots.c htstools.c htswizard.c \
 	htsalias.c htsthread.c htsindex.c htsbauth.c \
-	htsmd5.c htscodec.c htswarc.c htsproxy.c htszlib.c htswrap.c htsconcat.c \
+	htsmd5.c htscodec.c htsproxy.c htszlib.c htswrap.c htsconcat.c \
 	htsmodules.c htscharset.c punycode.c htsencoding.c htssniff.c \
 	md5.c \
 	minizip/ioapi.c minizip/mztools.c minizip/unzip.c minizip/zip.c \
 	hts-indextmpl.h htsalias.h htsback.h htsbase.h htssafe.h \
 	htsbasenet.h htsbauth.h htscache.h htscache_selftest.h htsdns_selftest.h htsselftest.h htscatchurl.h  \
-	htscmdline.h htsconfig.h htscore.h htsparse.h htscoremain.h htsdefines.h  \
+	htsconfig.h htscore.h htsparse.h htscoremain.h htsdefines.h  \
 	htsfilters.h htsftp.h htsglobal.h htshash.h coucal/coucal.h \
 	htshelp.h htsindex.h htslib.h htsurlport.h htsmd5.h \
 	htsmodules.h htsname.h htsnet.h htssniff.h \
 	htsopt.h htsrobots.h htsthread.h  \
-	htstools.h htswizard.h htswrap.h htscodec.h htswarc.h htsproxy.h htszlib.h  \
+	htstools.h htswizard.h htswrap.h htscodec.h htsproxy.h htszlib.h  \
 	htsstrings.h htsarrays.h httrack-library.h \
 	htscharset.h punycode.h htsencoding.h \
 	htsentities.h htsentities.sh htsbasiccharsets.sh htscodepages.h \

src/htsalias.c

@@ -114,15 +114,6 @@ const char *hts_optalias[][4] = {
    "strip [host/pattern=]key1,key2,... from URLs"},
   {"cookies-file", "-%K", "param1",
    "load extra cookies from a Netscape cookies.txt"},
-  {"warc", "-%r", "single", "write an ISO-28500 WARC/1.1 archive of the crawl"},
-  {"warc-file", "-%rf", "param1", "write a WARC archive to the given base name"},
-  {"warc-max-size", "-%rs", "param1",
-   "rotate the WARC archive once a segment passes N bytes (0: single file)"},
-  {"warc-cdx", "-%rc", "single",
-   "write a sorted CDXJ index next to the WARC archive"},
-  {"warc-cdxj", "-%rc", "single", ""},
-  {"wacz", "-%rz", "single",
-   "package the WARC archive, CDXJ index and pages as a WACZ file"},
   {"why", "-%Y", "param1",
    "explain which filter rule accepts or rejects a URL, then exit"},
   {"pause", "-%G", "param1",

src/htsback.c

@@ -37,7 +37,6 @@ Please visit our Website: http://www.httrack.com
 /* specific definitions */
 #include "htsnet.h"
 #include "htscore.h"
-#include "htswarc.h"
 #include "htsthread.h"
 #include <time.h>
 /* END specific definitions */
@@ -541,15 +540,9 @@ static int create_back_tmpfile(httrackp *opt, lien_back *const back,
                                const char *ext) {
   // do not use tempnam() but a regular filename
   back->tmpfile_buffer[0] = '\0';
-  if (back->url_sav[0] != '\0') {
-    /* same capacity as url_sav, so truncation drops the extension and aliases
-       the temp name onto the live file that back_finalize_backup() UNLINKs */
-    if (!sprintfbuff(back->tmpfile_buffer, "%s.%s", back->url_sav, ext)) {
-      hts_log_print(opt, LOG_WARNING, "temporary filename too long for %s",
-                    back->url_sav);
-      back->tmpfile_buffer[0] = '\0';
-      return -1;
-    }
+  if (back->url_sav != NULL && back->url_sav[0] != '\0') {
+    snprintf(back->tmpfile_buffer, sizeof(back->tmpfile_buffer), "%s.%s",
+             back->url_sav, ext);
     back->tmpfile = back->tmpfile_buffer;
     if (structcheck(back->tmpfile) != 0) {
       hts_log_print(opt, LOG_WARNING, "can not create directory to %s",
@@ -557,15 +550,8 @@ static int create_back_tmpfile(httrackp *opt, lien_back *const back,
       return -1;
     }
   } else {
-    /* truncation here would collide distinct tmpnameid's onto one name */
-    if (!sprintfbuff(back->tmpfile_buffer, "%s/tmp%d.%s",
-                     StringBuff(opt->path_html_utf8), opt->state.tmpnameid++,
-                     ext)) {
-      hts_log_print(opt, LOG_WARNING, "temporary filename too long in %s",
-                    StringBuff(opt->path_html_utf8));
-      back->tmpfile_buffer[0] = '\0';
-      return -1;
-    }
+    snprintf(back->tmpfile_buffer, sizeof(back->tmpfile_buffer), "%s/tmp%d.%s",
+             StringBuff(opt->path_html_utf8), opt->state.tmpnameid++, ext);
     back->tmpfile = back->tmpfile_buffer;
   }
   /* OK */
@@ -763,20 +749,9 @@ int back_finalize(httrackp * opt, cache_back * cache, struct_back * sback,
                     fexist_utf8(back[p].url_sav))
                   filenote(&opt->state.strc, back[p].url_sav, NULL);
               }
-              /* Keep the compressed spool so the WARC record stores the body
-                 verbatim (Content-Encoding preserved) instead of unlinking it.
-               */
-              if (StringNotEmpty(opt->warc_file)) {
-                warc_adopt_rawspool(&back[p].r, back[p].tmpfile);
-                if (back[p].r.warc_rawpath != NULL)
-                  back[p].tmpfile =
-                      NULL; /* adopted: freed via warc_free_request */
-              }
               /* ensure that no remaining temporary file exists */
-              if (back[p].tmpfile != NULL) {
-                unlink(back[p].tmpfile);
-                back[p].tmpfile = NULL;
-              }
+              unlink(back[p].tmpfile);
+              back[p].tmpfile = NULL;
             }
             // stats
             HTS_STAT.total_packed += back[p].compressed_size;
@@ -900,7 +875,8 @@ int back_finalize(httrackp * opt, cache_back * cache, struct_back * sback,
               HTS_STAT.stat_bytes += back[p].r.size;
               HTS_STAT.stat_files++;
               hts_log_print(opt, LOG_TRACE, "added file %s%s => %s",
-                            back[p].url_adr, back[p].url_fil, back[p].url_sav);
+                            back[p].url_adr, back[p].url_fil,
+                            back[p].url_sav != NULL ? back[p].url_sav : "");
             }
             if ((!back[p].r.notmodified) && (opt->is_update)) {
               HTS_STAT.stat_updated_files++;    // page modifiée
@@ -1003,10 +979,6 @@ int back_finalize(httrackp * opt, cache_back * cache, struct_back * sback,
         // status finished callback
         RUN_CALLBACK1(opt, xfrstatus, &back[p]);
 
-        // WARC archive of the transaction (request + response/revisit)
-        if (StringNotEmpty(opt->warc_file))
-          warc_write_backtransaction(opt, &back[p]);
-
         return 0;
       } else {                  // testmode
         if (back[p].r.statuscode / 100 >= 3) {  /* Store 3XX, 4XX, 5XX test response codes, but NOT 2XX */
@@ -1083,11 +1055,6 @@ void back_copy_static(const lien_back * src, lien_back * dst) {
   dst->r.soc = INVALID_SOCKET;
   dst->r.adr = NULL;
   dst->r.headers = NULL;
-  dst->r.warc_reqhdr = NULL;
-  dst->r.warc_resphdr = NULL;
-  dst->r.warc_rawpath =
-      NULL; /* the spool stays owned by src (no double-unlink) */
-  dst->r.warc_truncated = 0;
   dst->r.out = NULL;
   dst->r.location = dst->location_buffer;
   dst->r.fp = NULL;
@@ -1151,10 +1118,6 @@ int back_unserialize(FILE * fp, lien_back ** dst) {
     (*dst)->chunk_adr = NULL;
     (*dst)->r.adr = NULL;
     (*dst)->r.out = NULL;
-    (*dst)->r.warc_reqhdr = NULL;
-    (*dst)->r.warc_resphdr = NULL;
-    (*dst)->r.warc_rawpath = NULL;
-    (*dst)->r.warc_truncated = 0;
     (*dst)->r.location = (*dst)->location_buffer;
     (*dst)->r.fp = NULL;
     (*dst)->r.soc = INVALID_SOCKET;
@@ -1622,7 +1585,6 @@ int back_clear_entry(lien_back * back) {
       freet(back->r.headers);
       back->r.headers = NULL;
     }
-    warc_free_request(&back->r);
     // Tout nettoyer
     memset(back, 0, sizeof(lien_back));
     back->r.soc = INVALID_SOCKET;
@@ -2314,24 +2276,26 @@ int back_add(struct_back *sback, httrackp *opt, cache_back *cache,
               && slot_can_be_finalized(opt, &back[i]);
             int may_serialize = slot_can_be_cached_on_disk(&back[i]);
 
-            hts_log_print(
-                opt, LOG_DEBUG,
-                "back[%03d]: may_clean=%d, may_finalize_disk=%d, "
-                "may_serialize=%d:" LF "\t"
-                "finalized(%d), status(%d), locked(%d), delayed(%d), "
-                "test(%d), " LF "\t"
-                "statuscode(%d), size(%d), is_write(%d), may_hypertext(%d), " LF
-                "\t"
-                "contenttype(%s), url(%s%s), save(%s)",
-                i, may_clean, may_finalize, may_serialize, back[i].finalized,
-                back[i].status, back[i].locked, IS_DELAYED_EXT(back[i].url_sav),
-                back[i].testmode, back[i].r.statuscode, (int) back[i].r.size,
-                back[i].r.is_write,
-                may_be_hypertext_mime(opt, back[i].r.contenttype,
-                                      back[i].url_fil),
-                /* */
-                back[i].r.contenttype, back[i].url_adr, back[i].url_fil,
-                back[i].url_sav);
+            hts_log_print(opt, LOG_DEBUG,
+                          "back[%03d]: may_clean=%d, may_finalize_disk=%d, may_serialize=%d:"
+                          LF "\t"
+                          "finalized(%d), status(%d), locked(%d), delayed(%d), test(%d), "
+                          LF "\t"
+                          "statuscode(%d), size(%d), is_write(%d), may_hypertext(%d), "
+                          LF "\t" "contenttype(%s), url(%s%s), save(%s)", i,
+                          may_clean, may_finalize, may_serialize,
+                          back[i].finalized, back[i].status, back[i].locked,
+                          IS_DELAYED_EXT(back[i].url_sav), back[i].testmode,
+                          back[i].r.statuscode, (int) back[i].r.size,
+                          back[i].r.is_write, may_be_hypertext_mime(opt,
+                                                                    back[i].r.
+                                                                    contenttype,
+                                                                    back[i].
+                                                                    url_fil),
+                          /* */
+                          back[i].r.contenttype, back[i].url_adr,
+                          back[i].url_fil,
+                          back[i].url_sav ? back[i].url_sav : "<null>");
           }
         }
       }
@@ -2545,19 +2509,6 @@ void back_wait(struct_back * sback, httrackp * opt, cache_back * cache,
 
     for (i = 0; i < (unsigned int) back_max; i++) {
       if (back[i].status > 0 && back[i].status < STATUS_FTP_TRANSFER) {
-        /* A cap-truncated body is deliberate, not broken: archive what arrived
-           with WARC-Truncated before the abort overwrites the slot's real 2xx
-           status. HTTrack still treats the slot as incomplete afterwards. */
-        if (StringNotEmpty(opt->warc_file) && back[i].r.statuscode > 0 &&
-            back[i].r.warc_resphdr != NULL && back[i].r.size > 0 &&
-            !(back[i].r.is_write && IS_DELAYED_EXT(back[i].url_sav))) {
-          if (back[i].r.is_write && back[i].r.out != NULL)
-            fflush(back[i].r.out);
-          back[i].r.warc_truncated = (limit == HTS_MIRROR_LIMIT_SIZE)
-                                         ? WARC_TRUNC_LENGTH
-                                         : WARC_TRUNC_TIME;
-          warc_write_backtransaction(opt, &back[i]);
-        }
         if (back[i].r.soc != INVALID_SOCKET) {
           deletehttp(&back[i].r);
         }
@@ -2867,8 +2818,7 @@ void back_wait(struct_back * sback, httrackp * opt, cache_back * cache,
               // new session
               back[i].r.ssl_con = SSL_new(openssl_ctx);
               if (back[i].r.ssl_con) {
-                /* non-const twin: the OpenSSL macro casts the qualifier away */
-                char *hostname = jump_protocol(back[i].url_adr);
+                const char* hostname = jump_protocol_const(back[i].url_adr);
                 // some servers expect the hostname on the clienthello (SNI TLS extension)
                 SSL_set_tlsext_host_name(back[i].r.ssl_con, hostname);
                 SSL_clear(back[i].r.ssl_con);
@@ -3681,10 +3631,6 @@ void back_wait(struct_back * sback, httrackp * opt, cache_back * cache,
                     deleteaddr(&back[i].r);
                     back[i].r.headers = block;
                   }
-                  // Stash the raw response headers for WARC (deletehttp frees
-                  // r.headers when the socket closes, before back_finalize)
-                  if (StringNotEmpty(opt->warc_file))
-                    warc_stash_response(&back[i].r, back[i].r.headers);
 
                   /* 
                      Status code and header-response hacks

src/htsbacktrace.c

@@ -1,238 +0,0 @@
-/* ------------------------------------------------------------ */
-/*
-HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998 Xavier Roche and other contributors
-
-SPDX-License-Identifier: GPL-3.0-or-later
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-Ethical use: we kindly ask that you NOT use this software to harvest email
-addresses or to collect any other private information about people. Doing so
-would dishonor our work and waste the many hours we have spent on it.
-
-Please visit our Website: http://www.httrack.com
-*/
-
-/* ------------------------------------------------------------ */
-/* File: crash backtrace printer                                 */
-/* Author: Xavier Roche                                          */
-/* ------------------------------------------------------------ */
-
-/* Before every header: glibc gates dladdr() on it. */
-#if defined(__linux) && !defined(_GNU_SOURCE)
-#define _GNU_SOURCE
-#endif
-
-#include "htsbacktrace.h"
-
-#include "htsglobal.h"
-
-#include <stdlib.h>
-#include <string.h>
-#ifdef _WIN32
-#include <io.h> /* write */
-#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#if (defined(__linux) && defined(HAVE_EXECINFO_H))
-#include <dlfcn.h>
-#include <errno.h>
-#include <execinfo.h>
-#include <signal.h>
-#include <time.h>
-#include <sys/wait.h>
-#define USES_BACKTRACE
-#endif
-
-#ifdef USES_BACKTRACE
-#define BT_MAX_FRAMES 64     /* frames we try to name */
-#define BT_MAX_MODULES 8     /* distinct modules, one child each */
-#define BT_HEX_SIZE 19       /* "0x" + 16 nibbles + NUL */
-#define BT_PATH_SIZE 1024    /* module path; longer is skipped */
-#define BT_WAIT_TICKS 300    /* 10ms ticks, shared: cap a slow child */
-#define BT_NO_SYMBOLIZER 127 /* child exit: execvp() found none */
-
-static hts_boolean symbolize_crash = HTS_TRUE;
-
-/* "0x"-prefixed hex: the handler must stay stdio-free. */
-static void print_hex(char *buffer, uintptr_t value) {
-  static const char digits[] = "0123456789abcdef";
-  size_t i = 2, a, b;
-
-  buffer[0] = '0';
-  buffer[1] = 'x';
-  do {
-    buffer[i++] = digits[value & 0xf];
-    value >>= 4;
-  } while (value != 0);
-  buffer[i] = '\0';
-  for (a = 2, b = i - 1; a < b; a++, b--) {
-    const char c = buffer[a];
-
-    buffer[a] = buffer[b];
-    buffer[b] = c;
-  }
-}
-
-/* HTS_FALSE if src does not fit: a truncated module path would point the
-   symbolizer at the wrong file. */
-static hts_boolean copy_bounded(char *dest, size_t size, const char *src) {
-  size_t i;
-
-  for (i = 0; i < size - 1 && src[i] != '\0'; i++) {
-    dest[i] = src[i];
-  }
-  dest[i] = '\0';
-  return src[i] == '\0' ? HTS_TRUE : HTS_FALSE;
-}
-
-/* Run the symbolizer on argv, output on fd, within *budget ticks. HTS_FALSE
-   only if none could be run at all; otherwise silent, the raw trace stands. */
-static hts_boolean spawn_symbolizer(char **argv, int fd, int *budget) {
-  const pid_t pid = fork();
-  int status = 0;
-
-  if (pid == -1)
-    return HTS_FALSE;
-  if (pid == 0) {
-    static char llvm_prog[] = "llvm-symbolizer";
-    static char llvm_opts[] = "-p";
-
-    dup2(fd, 1); /* both symbolizers write on stdout */
-    execvp(argv[0], argv);
-    argv[0] = llvm_prog; /* an LLVM-only install ships no addr2line */
-    argv[1] = llvm_opts;
-    execvp(argv[0], argv);
-    _exit(BT_NO_SYMBOLIZER);
-  }
-  for (; *budget > 0; (*budget)--) {
-    const struct timespec tick = {0, 10 * 1000 * 1000};
-    const pid_t reaped = waitpid(pid, &status, WNOHANG);
-
-    if (reaped == pid)
-      return WIFEXITED(status) && WEXITSTATUS(status) == BT_NO_SYMBOLIZER
-                 ? HTS_FALSE
-                 : HTS_TRUE;
-    if (reaped == -1 && errno != EINTR)
-      return HTS_TRUE;
-    nanosleep(&tick, NULL);
-  }
-  kill(pid, SIGKILL);
-  waitpid(pid, NULL, 0);
-  return HTS_TRUE;
-}
-
-/* Name the frames backtrace_symbols_fd() leaves as module+offset:
-   -fvisibility=hidden keeps them out of .dynsym, but DWARF has them. dladdr()
-   is not formally async-signal-safe; accepted, this path is already fatal. */
-static void symbolize_backtrace(void *const *stack, int size, int fd) {
-  static char prog[] = "addr2line";
-  static char opts[] = "-Cfipa";
-  static char dashe[] = "-e";
-  char hex[BT_MAX_FRAMES][BT_HEX_SIZE];
-  const void *base[BT_MAX_FRAMES];
-  const char *name[BT_MAX_FRAMES];
-  hts_boolean grouped[BT_MAX_FRAMES];
-  char module[BT_PATH_SIZE];
-  char *argv[4 + BT_MAX_FRAMES + 1];
-  int budget = BT_WAIT_TICKS;
-  int i, spawned;
-
-  if (size > BT_MAX_FRAMES)
-    size = BT_MAX_FRAMES;
-
-  for (i = 0; i < size; i++) {
-    Dl_info info;
-
-    grouped[i] = HTS_TRUE; /* skipped unless dladdr() places the frame */
-    if (dladdr(stack[i], &info) == 0 || info.dli_fname == NULL ||
-        info.dli_fname[0] == '\0')
-      continue;
-    base[i] = info.dli_fbase;
-    name[i] = info.dli_fname;
-    print_hex(hex[i], (uintptr_t) ((const char *) stack[i] -
-                                   (const char *) info.dli_fbase));
-    grouped[i] = HTS_FALSE;
-  }
-
-  /* One child per module: addr2line takes a single -e. Each frame is claimed
-     once, so argc cannot exceed argv[]. */
-  for (spawned = 0; spawned < BT_MAX_MODULES; spawned++) {
-    int first, j, argc = 0;
-
-    for (first = 0; first < size && grouped[first]; first++)
-      ;
-    if (first >= size)
-      break;
-    argv[argc++] = prog;
-    argv[argc++] = opts;
-    argv[argc++] = dashe;
-    argv[argc++] = module;
-    for (j = first; j < size; j++) {
-      if (grouped[j] || base[j] != base[first])
-        continue;
-      grouped[j] = HTS_TRUE;
-      argv[argc++] = hex[j];
-    }
-    argv[argc] = NULL;
-    /* access(): skip pseudo-modules like linux-vdso, which have no file and
-       would draw nothing but an addr2line complaint. */
-    if (copy_bounded(module, sizeof(module), name[first]) &&
-        access(module, R_OK) == 0) {
-      const size_t len = strlen(module);
-
-      /* addr2line -a prints offsets only: say which module they are in. */
-      (void) (write(fd, module, len) == (ssize_t) len);
-      (void) (write(fd, ":\n", 2) == 2);
-      if (!spawn_symbolizer(argv, fd, &budget))
-        break; /* no symbolizer: stop at one header */
-    }
-  }
-}
-#endif
-
-void hts_backtrace_init(void) {
-#ifdef USES_BACKTRACE
-  symbolize_crash =
-      getenv("HTTRACK_NO_SYMBOLIZE") == NULL ? HTS_TRUE : HTS_FALSE;
-#endif
-}
-
-void hts_print_backtrace(int fd) {
-#ifdef USES_BACKTRACE
-  void *stack[256];
-  const int size = backtrace(stack, sizeof(stack) / sizeof(stack[0]));
-
-  /* A fault inside the handler lands back here: symbolizing twice interleaves
-     two traces on fd and spends a second budget. */
-  static volatile sig_atomic_t entered = 0;
-
-  if (size != 0) {
-    backtrace_symbols_fd(stack, size, fd);
-    if (symbolize_crash && entered == 0) {
-      entered = 1;
-      symbolize_backtrace(stack, size, fd);
-      entered = 0;
-    }
-  }
-#else
-  const char msg[] = "No stack trace available on this OS :(\n";
-
-  if (write(fd, msg, sizeof(msg) - 1) != sizeof(msg) - 1) {
-    /* sorry GCC */
-  }
-#endif
-}

src/htsbacktrace.h

@@ -1,45 +0,0 @@
-/* ------------------------------------------------------------ */
-/*
-HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998 Xavier Roche and other contributors
-
-SPDX-License-Identifier: GPL-3.0-or-later
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-Ethical use: we kindly ask that you NOT use this software to harvest email
-addresses or to collect any other private information about people. Doing so
-would dishonor our work and waste the many hours we have spent on it.
-
-Please visit our Website: http://www.httrack.com
-*/
-
-/* ------------------------------------------------------------ */
-/* File: crash backtrace printer                                 */
-/* Author: Xavier Roche                                          */
-/* ------------------------------------------------------------ */
-
-#ifndef HTSBACKTRACE_DEFH
-#define HTSBACKTRACE_DEFH
-
-/* Sample HTTRACK_NO_SYMBOLIZE before any crash: getenv() is not signal-safe.
-   Call once, from the process that installs the fatal-signal handlers. */
-void hts_backtrace_init(void);
-
-/* Write the calling thread's stack to fd, callable from a fatal signal handler:
-   raw frames first, then whatever an external symbolizer can name. Allocates
-   nothing; prints a one-line notice where the OS has no backtrace(). */
-void hts_print_backtrace(int fd);
-
-#endif

src/htsbauth.c

@@ -39,9 +39,6 @@ Please visit our Website: http://www.httrack.com
 #include "htsglobal.h"
 #include "htslib.h"
 #include "htscore.h"
-#ifdef _WIN32
-#include "htscharset.h" /* hts_pathToUCS2, hts_convertUCS2StringToUTF8 */
-#endif
 
 /* END specific definitions */
 
@@ -203,36 +200,28 @@ char *cookie_nextfield(char *a) {
   return a;
 }
 
-// Read cookies.txt (+ copied IE cookies *@*.txt on Windows); !=0 on error.
+// lire cookies.txt
+// lire également (Windows seulement) les *@*.txt (cookies IE copiés)
+// !=0 : erreur
 int cookie_load(t_cookie * cookie, const char *fpath, const char *name) {
   char catbuff[CATBUFF_SIZE];
   char buffer[8192];
 
-  // Merge any IE cookies first
+  // Fusionner d'abord les éventuels cookies IE
 #ifdef _WIN32
   {
-    WIN32_FIND_DATAW find;
+    WIN32_FIND_DATAA find;
     HANDLE h;
-    char pth[HTS_URLMAXSIZE];
-    LPWSTR wpth;
+    char pth[MAX_PATH + 32];
 
     strcpybuff(pth, fpath);
     strcatbuff(pth, "*@*.txt");
-    // Wide glob so a long or non-ASCII IE-cookie folder is scanned (#133).
-    wpth = hts_pathToUCS2(pth);
-    h = wpth != NULL ? FindFirstFileW(wpth, &find) : INVALID_HANDLE_VALUE;
-    freet(wpth);
+    h = FindFirstFileA((char *) pth, &find);
     if (h != INVALID_HANDLE_VALUE) {
       do {
         if (!(find.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY))
           if (!(find.dwFileAttributes & FILE_ATTRIBUTE_SYSTEM)) {
-            // cFileName is UTF-16: convert to UTF-8 so the mirror path and
-            // file wrappers stay UTF-8 (no CP_ACP mojibake).
-            char *u = hts_convertUCS2StringToUTF8(find.cFileName, -1);
-            FILE *fp =
-                u != NULL
-                    ? FOPEN(fconcat(catbuff, sizeof(catbuff), fpath, u), "rb")
-                    : NULL;
+            FILE *fp = fopen(fconcat(catbuff, sizeof(catbuff), fpath, find.cFileName), "rb");
 
             if (fp) {
               char cook_name[256];
@@ -240,9 +229,11 @@ int cookie_load(t_cookie * cookie, const char *fpath, const char *name) {
               char domainpathpath[512];
               char dummy[512];
 
-              lien_adrfil af; // host + path (/)
+              //
+              lien_adrfil af;   // chemin (/)
               int cookie_merged = 0;
 
+              //
               // Read all cookies
               while(!feof(fp)) {
                 cook_name[0] = cook_value[0] = domainpathpath[0]
@@ -271,11 +262,10 @@ int cookie_load(t_cookie * cookie, const char *fpath, const char *name) {
               }
               fclose(fp);
               if (cookie_merged)
-                UNLINK(fconcat(catbuff, sizeof(catbuff), fpath, u));
+                remove(fconcat(catbuff, sizeof(catbuff), fpath, find.cFileName));
             }                   // if fp
-            freet(u);
           }
-      } while (FindNextFileW(h, &find));
+      } while(FindNextFileA(h, &find));
       FindClose(h);
     }
   }
@@ -283,7 +273,7 @@ int cookie_load(t_cookie * cookie, const char *fpath, const char *name) {
 
   // Ensuite, cookies.txt
   {
-    FILE *fp = FOPEN(fconcat(catbuff, sizeof(catbuff), fpath, name), "rb");
+    FILE *fp = fopen(fconcat(catbuff, sizeof(catbuff), fpath, name), "rb");
 
     if (fp) {
       char BIGSTK line[8192];
@@ -325,7 +315,7 @@ int cookie_save(t_cookie * cookie, const char *name) {
   if (strnotempty(cookie->data)) {
     char BIGSTK line[8192];
 #ifdef _WIN32
-    FILE *fp = FOPEN(fconv(catbuff, sizeof(catbuff), name), "wb");
+    FILE *fp = fopen(fconv(catbuff, sizeof(catbuff), name), "wb");
 #else
     const int fd = open(fconv(catbuff, sizeof(catbuff), name),
                         O_WRONLY | O_CREAT | O_TRUNC, HTS_PROTECT_FILE);

src/htscache.c

@@ -629,8 +629,8 @@ static htsblk cache_readex_new(httrackp * opt, cache_back * cache,
                 // File exists on disk with declared cache name (this is expected!)
                 if (fexist_utf8(fconv(catbuff, sizeof(catbuff), previous_save))) {       // un fichier existe déja
                   // Expected size ?
-                  const LLint fsize = fsize_utf8(
-                      fconv(catbuff, sizeof(catbuff), previous_save));
+                  const size_t fsize =
+                    fsize_utf8(fconv(catbuff, sizeof(catbuff), previous_save));
                   if (fsize == r.size) {
                     // Target name is the previous name, and the file looks good: nothing to do!
                     if (strcmp(previous_save, target_save) == 0) {
@@ -666,8 +666,7 @@ static htsblk cache_readex_new(httrackp * opt, cache_back * cache,
                 // Suppose a broken mirror, with a file being renamed: OK
                 else if (fexist_utf8(fconv(catbuff, sizeof(catbuff), target_save))) {
                   // Expected size ?
-                  const LLint fsize =
-                      fsize_utf8(fconv(catbuff, sizeof(catbuff), target_save));
+                  const size_t fsize = fsize_utf8(fconv(catbuff, sizeof(catbuff), target_save));
 
                   if (fsize == r.size) {
                     // So far so good
@@ -1441,7 +1440,7 @@ int cache_brstr(char *adr, char *s, size_t s_size) {
 
 /* binput bounded to a NUL-terminated buffer: refuse to start a read at or
    past `end`, so a prior over-advance can't walk a cache-index parse OOB. */
-int cache_binput(const char *adr, const char *end, char *s, int max) {
+int cache_binput(char *adr, const char *end, char *s, int max) {
   if (adr >= end) {
     s[0] = '\0';
     return 0;

src/htscache.h

@@ -93,7 +93,7 @@ void cache_rstr(FILE *fp, char *s, size_t s_size);
 char *cache_rstr_addr(FILE * fp);
 int cache_brstr(char *adr, char *s, size_t s_size);
 /* binput over a NUL-terminated buffer, bounded: no read starts at/past end. */
-int cache_binput(const char *adr, const char *end, char *s, int max);
+int cache_binput(char *adr, const char *end, char *s, int max);
 int cache_brint(char *adr, int *i);
 void cache_rint(FILE * fp, int *i);
 void cache_rLLint(FILE * fp, LLint * i);

src/htscharset.c

@@ -390,10 +390,6 @@ HTSEXT_API char *hts_convertStringSystemToUTF8(const char *s, size_t size) {
   return hts_convertStringCPToUTF8(s, size, GetACP());
 }
 
-HTSEXT_API char *hts_convertStringUTF8ToSystem(const char *s, size_t size) {
-  return hts_convertStringCPFromUTF8(s, size, GetACP());
-}
-
 HTSEXT_API void hts_argv_utf8(int *pargc, char ***pargv) {
   int wargc = 0;
   LPWSTR *const wargv = CommandLineToArgvW(GetCommandLineW(), &wargc);

src/htscharset.h

@@ -171,25 +171,12 @@ extern LPWSTR hts_convertUTF8StringToUCS2(const char *s, int size, int *pwsize);
  **/
 extern char *hts_convertUCS2StringToUTF8(LPWSTR woutput, int wsize);
 
-/**
- * UTF-8 path to UCS-2 for the wide file/FindFirst APIs, \\?\-prefixed above
- * MAX_PATH (#133). Internal, not exported; caller frees.
- * This function is WIN32 specific.
- **/
-extern LPWSTR hts_pathToUCS2(const char *path);
-
 /**
  * Convert current system codepage to UTF-8.
  * This function is WIN32 specific.
  **/
 HTSEXT_API char *hts_convertStringSystemToUTF8(const char *s, size_t size);
 
-/**
- * Convert UTF-8 to the current system codepage. Caller frees; NULL upon error.
- * This function is WIN32 specific.
- **/
-HTSEXT_API char *hts_convertStringUTF8ToSystem(const char *s, size_t size);
-
 /**
  * Replace the CRT's ANSI argv by a UTF-8 one decoded from the real UTF-16
  * command line: every char* is UTF-8 on Windows (FOPEN, STAT, ... convert at

src/htscmdline.c

@@ -1,95 +0,0 @@
-/* ------------------------------------------------------------ */
-/*
-HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998 Xavier Roche and other contributors
-
-SPDX-License-Identifier: GPL-3.0-or-later
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-Ethical use: we kindly ask that you NOT use this software to harvest email
-addresses or to collect any other private information about people. Doing so
-would dishonor our work and waste the many hours we have spent on it.
-
-Please visit our Website: http://www.httrack.com
-*/
-
-/* ------------------------------------------------------------ */
-/* File: command line splitter, shared by the engine and         */
-/*       htsserver                                               */
-/* Author: Xavier Roche                                          */
-/* ------------------------------------------------------------ */
-
-#include "htscmdline.h"
-
-#include "htssafe.h"
-
-#include <limits.h>
-#include <stdint.h>
-
-char **hts_split_cmdline(char *cmd, int *nargs) {
-  size_t nsep = 0;
-  size_t capacity;
-  size_t r;
-  size_t w;
-  int argc = 0;
-  hts_boolean quoted = HTS_FALSE;
-  char **argv;
-
-  *nargs = 0;
-
-  /* fold the other separators, so counting them sizes the vector exactly */
-  for (r = 0; cmd[r] != '\0'; r++) {
-    if (cmd[r] == '\t' || cmd[r] == '\r' || cmd[r] == '\n') {
-      cmd[r] = ' ';
-    }
-    if (cmd[r] == ' ') {
-      nsep++;
-    }
-  }
-
-  /* at most one argument per separator, plus the leading one and the NULL */
-  if (nsep > (size_t) INT_MAX - 1 || nsep > SIZE_MAX / sizeof(char *) - 2) {
-    return NULL;
-  }
-  capacity = nsep + 2;
-  argv = (char **) malloct(capacity * sizeof(char *));
-  if (argv == NULL) {
-    return NULL;
-  }
-
-  argv[argc++] = cmd;
-  for (r = 0, w = 0; cmd[r] != '\0';) {
-    if (quoted && cmd[r] == '\\' &&
-        (cmd[r + 1] == '\\' || cmd[r + 1] == '\"')) {
-      r++;
-      cmd[w++] = cmd[r++];
-    } else if (cmd[r] == '\"') {
-      quoted = !quoted;
-      cmd[w++] = cmd[r++];
-    } else if (cmd[r] == ' ' && !quoted) {
-      cmd[w++] = '\0';
-      assertf((size_t) argc < capacity - 1); /* the last slot holds the NULL */
-      argv[argc++] = cmd + w;
-      r++;
-    } else {
-      cmd[w++] = cmd[r++];
-    }
-  }
-  cmd[w] = '\0';
-  argv[argc] = NULL; /* callers may rely on argv[argc] == NULL */
-
-  *nargs = argc;
-  return argv;
-}

src/htscmdline.h

@@ -1,45 +0,0 @@
-/* ------------------------------------------------------------ */
-/*
-HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998 Xavier Roche and other contributors
-
-SPDX-License-Identifier: GPL-3.0-or-later
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-Ethical use: we kindly ask that you NOT use this software to harvest email
-addresses or to collect any other private information about people. Doing so
-would dishonor our work and waste the many hours we have spent on it.
-
-Please visit our Website: http://www.httrack.com
-*/
-
-/* ------------------------------------------------------------ */
-/* File: command line splitter, shared by the engine and         */
-/*       htsserver                                               */
-/* Author: Xavier Roche                                          */
-/* ------------------------------------------------------------ */
-
-#ifndef HTSCMDLINE_DEFH
-#define HTSCMDLINE_DEFH
-
-#include "htsglobal.h"
-
-/* Split "cmd" in place into a NULL-terminated argv vector of *nargs entries,
-   argv[0] being the program name and quotes left for the engine to strip.
-   Returns a malloct'ed vector of pointers into cmd (freet the vector, never its
-   entries), or NULL when it cannot be sized or allocated. */
-char **hts_split_cmdline(char *cmd, int *nargs);
-
-#endif

src/htscore.c

@@ -39,7 +39,6 @@ Please visit our Website: http://www.httrack.com
 
 /* File defs */
 #include "htscore.h"
-#include "htswarc.h"
 
 /* specific definitions */
 #include "htsbase.h"
@@ -447,22 +446,13 @@ void hts_finish_makeindex(httrackp *opt, int *makeindex_done,
                           const char *fil) {
   if (!*makeindex_done) {
     if (*makeindex_fp) {
-      /* sized off link_escaped below: at the old flat 1024 a long first link
-         produced a redirect to a clipped URL */
-      char BIGSTK tempo[HTS_URLMAXSIZE * 2 + 64];
+      char BIGSTK tempo[1024];
       if (makeindex_links == 1) {
         char BIGSTK link_escaped[HTS_URLMAXSIZE * 2];
         escape_uri_utf(makeindex_firstlink, link_escaped, sizeof(link_escaped));
-        /* no redirect beats one pointing at a clipped URL */
-        if (!sprintfbuff(
-                tempo,
-                "<meta HTTP-EQUIV=\"Refresh\" CONTENT=\"0; URL=%s\">" CRLF,
-                link_escaped)) {
-          hts_log_print(opt, LOG_WARNING,
-                        "index redirect omitted: first link too long (%s)",
-                        makeindex_firstlink);
-          tempo[0] = '\0';
-        }
+        snprintf(tempo, sizeof(tempo),
+                 "<meta HTTP-EQUIV=\"Refresh\" CONTENT=\"0; URL=%s\">" CRLF,
+                 link_escaped);
       } else
         tempo[0] = '\0';
       hts_template_format(*makeindex_fp, template_footer,
@@ -705,19 +695,17 @@ int httpmirror(char *url1, httrackp * opt) {
   // copier adresse(s) dans liste des adresses
   {
     char *a = url1;
-    const LLint list_sz = StringNotEmpty(opt->filelist)
-                              ? fsize_utf8(StringBuff(opt->filelist))
-                              : 0;
-    /* two bytes reserved per list byte; -1 makes an undoublable size refused */
-    const LLint list_room =
-        list_sz > 0 ? (list_sz <= INT64_MAX / 2 ? list_sz * 2 : -1) : 0;
-    const size_t primary_len =
-        llint_grow_size_t(8192 + strlen(url1) * 2, list_room, 0);
+    int primary_len = 8192;
+
+    if (StringNotEmpty(opt->filelist)) {
+      primary_len += max(0, fsize(StringBuff(opt->filelist)) * 2);
+    }
+    primary_len += (int) strlen(url1) * 2;
 
     // création de la première page, qui contient les liens de base à scanner
     // c'est plus propre et plus logique que d'entrer à la main les liens dans la pile
     // on bénéficie ainsi des vérifications et des tests du robot pour les liens "primaires"
-    primary = primary_len != (size_t) -1 ? (char *) malloct(primary_len) : NULL;
+    primary = (char *) malloct(primary_len);
     if (!primary) {
       printf("PANIC! : Not enough memory [%d]\n", __LINE__);
       XH_extuninit;
@@ -867,19 +855,19 @@ int httpmirror(char *url1, httrackp * opt) {
       char *filelist_buff = NULL;
       size_t filelist_sz = 0;
       const char *filelist_err = NULL; /* failure reason, NULL on success */
-      const LLint fs = fsize_utf8(StringBuff(opt->filelist));
+      const LLint fs = fsize(StringBuff(opt->filelist));
 
       if (fs < 0) {
         /* fsize() hides the cause; redo stat() for a precise errno (#49) */
-        STRUCT_STAT st;
-        filelist_err = STAT(StringBuff(opt->filelist), &st) != 0
+        struct stat st;
+        filelist_err = stat(StringBuff(opt->filelist), &st) != 0
                            ? strerror(errno)
                            : "not a regular file";
       } else if ((filelist_sz = llint_to_size_t(fs)) == (size_t) -1) {
         filelist_err = "file too large";
         filelist_sz = 0;
       } else {
-        FILE *fp = FOPEN(StringBuff(opt->filelist), "rb");
+        FILE *fp = fopen(StringBuff(opt->filelist), "rb");
 
         if (fp == NULL) {
           filelist_err = strerror(errno);
@@ -898,7 +886,7 @@ int httpmirror(char *url1, httrackp * opt) {
       }
 
       if (filelist_buff != NULL) {
-        size_t filelist_ptr = 0;
+        int filelist_ptr = 0;
         int n = 0;
         char BIGSTK line[HTS_URLMAXSIZE * 2];
 
@@ -987,9 +975,10 @@ int httpmirror(char *url1, httrackp * opt) {
   }
   // statistiques
   if (opt->makestat) {
-    makestat_fp = FOPEN(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                                StringBuff(opt->path_log), "hts-stats.txt"),
-                        "wb");
+    makestat_fp =
+      fopen(fconcat
+            (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_log), "hts-stats.txt"),
+            "wb");
     if (makestat_fp != NULL) {
       fprintf(makestat_fp, "HTTrack statistics report, every minutes" LF LF);
       fflush(makestat_fp);
@@ -997,9 +986,10 @@ int httpmirror(char *url1, httrackp * opt) {
   }
   // tracking -- débuggage
   if (opt->maketrack) {
-    maketrack_fp = FOPEN(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                                 StringBuff(opt->path_log), "hts-track.txt"),
-                         "wb");
+    maketrack_fp =
+      fopen(fconcat
+            (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_log), "hts-track.txt"),
+            "wb");
     if (maketrack_fp != NULL) {
       fprintf(maketrack_fp, "HTTrack tracking report, every minutes" LF LF);
       fflush(maketrack_fp);
@@ -1648,8 +1638,7 @@ int httpmirror(char *url1, httrackp * opt) {
 
           /* Remove file if being processed */
           if (is_loaded_from_file) {
-            (void) UNLINK(
-                fconv(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), savename()));
+            (void) unlink(fconv(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), savename()));
             is_loaded_from_file = 0;
           }
 
@@ -1962,8 +1951,8 @@ int httpmirror(char *url1, httrackp * opt) {
            } else */
 
         /* External modules */
-        if (opt->parsejava && (opt->parsejava & HTSPARSE_NO_CLASS) == 0 &&
-            fexist_utf8(savename())) {
+        if (opt->parsejava && (opt->parsejava & HTSPARSE_NO_CLASS) == 0
+            && fexist(savename())) {
           char BIGSTK buff_err_msg[1024];
           htsmoduleStruct BIGSTK str;
 
@@ -2004,7 +1993,7 @@ int httpmirror(char *url1, httrackp * opt) {
       }                         // text/html ou autre
 
       /* Post-processing */
-      if (fexist_utf8(savename())) {
+      if (fexist(savename())) {
         usercommand(opt, 0, NULL, savename(), urladr(), urlfil());
       }
 
@@ -2095,16 +2084,18 @@ int httpmirror(char *url1, httrackp * opt) {
       //
       opt->state._hts_in_html_parsing = 3;
       //
-      old_lst = FOPEN(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                              StringBuff(opt->path_log), "hts-cache/old.lst"),
-                      "rb");
+      old_lst =
+        fopen(fconcat
+              (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_log),
+               "hts-cache/old.lst"), "rb");
       if (old_lst) {
-        const size_t sz = llint_to_size_t(fsize_utf8(
-            fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                    StringBuff(opt->path_log), "hts-cache/new.lst")));
-        new_lst = FOPEN(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                                StringBuff(opt->path_log), "hts-cache/new.lst"),
-                        "rb");
+        const size_t sz = llint_to_size_t(
+            fsize(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
+                          StringBuff(opt->path_log), "hts-cache/new.lst")));
+        new_lst =
+          fopen(fconcat
+                (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_log),
+                 "hts-cache/new.lst"), "rb");
         if (new_lst != NULL && sz != (size_t) -1) {
           /* +1 for the NUL below: new.lst is read raw, and the strstr()
              that follows needs a terminated C string. */
@@ -2124,9 +2115,9 @@ int httpmirror(char *url1, httrackp * opt) {
                   strcpybuff(file, StringBuff(opt->path_html));
                   strcatbuff(file, line + 1);
                   file[strlen(file) - 1] = '\0';
-                  if (fexist_utf8(file)) { // toujours sur disque: virer
+                  if (fexist(file)) {   // toujours sur disque: virer
                     hts_log_print(opt, LOG_INFO, "Purging %s", file);
-                    UNLINK(file);
+                    remove(file);
                     purge = 1;
                   }
                 }
@@ -2147,8 +2138,7 @@ int httpmirror(char *url1, httrackp * opt) {
 
                       strcpybuff(file, StringBuff(opt->path_html));
                       strcatbuff(file, line + 1);
-                      while ((strnotempty(file)) &&
-                             (RMDIR(file) == 0)) { // ok, éliminé (existait)
+                      while((strnotempty(file)) && (rmdir(file) == 0)) {        // ok, éliminé (existait)
                         purge = 1;
                         if (opt->log) {
                           hts_log_print(opt, LOG_INFO, "Purging directory %s/",
@@ -2255,7 +2245,6 @@ int httpmirror(char *url1, httrackp * opt) {
 
   // ending
   usercommand(opt, 0, NULL, NULL, NULL, NULL);
-  warc_close_opt(opt);
 
   // désallocation mémoire & buffers
   XH_uninit;
@@ -2971,8 +2960,8 @@ static void postprocess_file(httrackp *opt, const char *save, const char *adr,
     if (adr != NULL && strcmp(adr, "primary") == 0) {
       adr = NULL;
     }
-    if (save != NULL && opt != NULL && adr != NULL && adr[0] &&
-        strnotempty(save) && fexist_utf8(save)) {
+    if (save != NULL && opt != NULL && adr != NULL && adr[0]
+        && strnotempty(save) && fexist(save)) {
       const char *rsc_save = save;
       const char *rsc_fil = strrchr(fil, '/');
       int n;
@@ -2994,11 +2983,13 @@ static void postprocess_file(httrackp *opt, const char *save, const char *adr,
 
       if (!opt->state.mimehtml_created) {
         opt->state.mimefp =
-            FOPEN(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                          StringBuff(opt->path_html), "index.mht"),
-                  "wb");
-        (void) UNLINK(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                              StringBuff(opt->path_html), "index.eml"));
+          fopen(fconcat
+                (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
+                StringBuff(opt->path_html), "index.mht"),
+                "wb");
+        (void) unlink(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
+          StringBuff(opt->path_html),
+                              "index.eml"));
 #ifndef _WIN32
         if (symlink("index.mht",
                     fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_html),
@@ -3637,12 +3628,6 @@ HTSEXT_API int copy_htsopt(const httrackp * from, httrackp * to) {
   if (StringNotEmpty(from->cookies_file))
     StringCopyS(to->cookies_file, from->cookies_file);
 
-  if (StringNotEmpty(from->warc_file))
-    StringCopyS(to->warc_file, from->warc_file);
-  to->warc_max_size = from->warc_max_size;
-  to->warc_cdx = from->warc_cdx;
-  to->warc_wacz = from->warc_wacz;
-
   if (from->pause_max_ms > 0) {
     to->pause_min_ms = from->pause_min_ms;
     to->pause_max_ms = from->pause_max_ms;

src/htscoremain.c

@@ -40,7 +40,6 @@ Please visit our Website: http://www.httrack.com
 #include "htscore.h"
 #include "htsdefines.h"
 #include "htsalias.h"
-#include "htswarc.h"
 #include "htsbauth.h"
 #include "htswrap.h"
 #include "htsmodules.h"
@@ -145,7 +144,7 @@ static int hts_main_internal(int argc, char **argv, httrackp * opt) {
   int argv_url = -1;            // ==0 : utiliser cache et doit.log
   char *argv_firsturl = NULL;   // utilisé pour nommage par défaut
   char *url = NULL;             // URLS séparées par un espace
-  size_t url_sz = 65535;
+  int url_sz = 65535;
 
   // the parametres
   int httrack_logmode = 3;      // ONE log file
@@ -224,22 +223,21 @@ static int hts_main_internal(int argc, char **argv, httrackp * opt) {
 
   /* create x_argvblk buffer for transformed command line */
   {
-    size_t current_size = 0;
-    const LLint size = fsize("config");
-    size_t blk_size;
+    int current_size = 0;
+    int size;
     int na;
 
     for(na = 0; na < argc; na++)
-      current_size += strlen(argv[na]) + 1;
-    /* a huge file named "config" must saturate, not wrap, the capacity */
-    blk_size = llint_grow_size_t(current_size, size > 0 ? size : 0, 32768);
-    x_argvblk = blk_size != (size_t) -1 ? (char *) malloct(blk_size) : NULL;
+      current_size += (int) (strlen(argv[na]) + 1);
+    if ((size = fsize("config")) > 0)
+      current_size += size;
+    x_argvblk = (char *) malloct(current_size + 32768);
     if (x_argvblk == NULL) {
       HTS_PANIC_PRINTF("Error, not enough memory");
       htsmain_free();
       return -1;
     }
-    x_argvblk_size = blk_size;
+    x_argvblk_size = (size_t) (current_size + 32768);
     x_argvblk[0] = '\0';
     x_ptr = 0;
 
@@ -443,10 +441,11 @@ static int hts_main_internal(int argc, char **argv, httrackp * opt) {
           || (strnotempty(StringBuff(opt->path_html))))
         loops++;                // do not loop once again and do not include rc file (O option exists)
       else {
-        if ((!fexist_utf8(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                                  StringBuff(opt->path_log),
-                                  "hts-cache/doit.log"))) ||
-            (argv_url > 0)) {
+        if ((!fexist
+             (fconcat
+              (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
+              StringBuff(opt->path_log),
+               "hts-cache/doit.log"))) || (argv_url > 0)) {
           if (!optinclude_file(
                   fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
                           StringBuff(opt->path_log), HTS_HTTRACKRC),
@@ -473,12 +472,16 @@ static int hts_main_internal(int argc, char **argv, httrackp * opt) {
   }                             // traiter -O
 
   /* load doit.log and insert in current command line */
-  if (fexist_utf8(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                          StringBuff(opt->path_log), "hts-cache/doit.log")) &&
-      (argv_url <= 0)) {
-    FILE *fp = FOPEN(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                             StringBuff(opt->path_log), "hts-cache/doit.log"),
-                     "rb");
+  if (fexist
+      (fconcat
+       (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
+       StringBuff(opt->path_log), "hts-cache/doit.log"))
+      && (argv_url <= 0)) {
+    FILE *fp =
+      fopen(fconcat
+            (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
+            StringBuff(opt->path_log),
+             "hts-cache/doit.log"), "rb");
     if (fp) {
       int insert_after = 1;     /* insérer après nom au début */
 
@@ -527,16 +530,23 @@ static int hts_main_internal(int argc, char **argv, httrackp * opt) {
 
   /* Interrupted mirror detected */
   if (!opt->quiet) {
-    if (fexist_utf8(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                            StringBuff(opt->path_log),
-                            "hts-in_progress.lock"))) {
+    if (fexist
+        (fconcat
+         (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
+         StringBuff(opt->path_log),
+          "hts-in_progress.lock"))) {
       /* Old cache */
-      if ((fexist_utf8(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                               StringBuff(opt->path_log),
-                               "hts-cache/old.dat"))) &&
-          (fexist_utf8(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                               StringBuff(opt->path_log),
-                               "hts-cache/old.ndx")))) {
+      if ((fexist
+           (fconcat
+            (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
+            StringBuff(opt->path_log),
+             "hts-cache/old.dat")))
+          &&
+          (fexist
+           (fconcat
+            (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
+            StringBuff(opt->path_log),
+             "hts-cache/old.ndx")))) {
         if (opt->log != NULL) {
           fprintf(opt->log, "Warning!\n");
           fprintf(opt->log,
@@ -565,82 +575,111 @@ static int hts_main_internal(int argc, char **argv, httrackp * opt) {
         if (argv[i][1] == '-') {        // --xxx
           if ((strfield2(argv[i] + 2, "clean")) || (strfield2(argv[i] + 2, "tide"))) {  // nettoyer
             argv[i][1] = '\0';
-            if (fexist_utf8(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                                    StringBuff(opt->path_log), "hts-log.txt")))
-              UNLINK(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                             StringBuff(opt->path_log), "hts-log.txt"));
-            if (fexist_utf8(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                                    StringBuff(opt->path_log), "hts-err.txt")))
-              UNLINK(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                             StringBuff(opt->path_log), "hts-err.txt"));
-            if (fexist_utf8(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                                    StringBuff(opt->path_html), "index.html")))
-              UNLINK(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                             StringBuff(opt->path_html), "index.html"));
+            if (fexist
+                (fconcat
+                 (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_log), "hts-log.txt")))
+              remove(fconcat
+                     (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_log),
+                      "hts-log.txt"));
+            if (fexist
+                (fconcat
+                 (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_log), "hts-err.txt")))
+              remove(fconcat
+                     (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_log),
+                      "hts-err.txt"));
+            if (fexist
+                (fconcat
+                 (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_html), "index.html")))
+              remove(fconcat
+                     (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_html),
+                      "index.html"));
             /* */
-            if (fexist_utf8(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                                    StringBuff(opt->path_log),
-                                    "hts-cache/new.zip")))
-              UNLINK(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                             StringBuff(opt->path_log), "hts-cache/new.zip"));
-            if (fexist_utf8(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                                    StringBuff(opt->path_log),
-                                    "hts-cache/old.zip")))
-              UNLINK(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                             StringBuff(opt->path_log), "hts-cache/old.zip"));
-            if (fexist_utf8(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                                    StringBuff(opt->path_log),
-                                    "hts-cache/new.dat")))
-              UNLINK(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                             StringBuff(opt->path_log), "hts-cache/new.dat"));
-            if (fexist_utf8(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                                    StringBuff(opt->path_log),
-                                    "hts-cache/new.ndx")))
-              UNLINK(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                             StringBuff(opt->path_log), "hts-cache/new.ndx"));
-            if (fexist_utf8(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                                    StringBuff(opt->path_log),
-                                    "hts-cache/old.dat")))
-              UNLINK(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                             StringBuff(opt->path_log), "hts-cache/old.dat"));
-            if (fexist_utf8(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                                    StringBuff(opt->path_log),
-                                    "hts-cache/old.ndx")))
-              UNLINK(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                             StringBuff(opt->path_log), "hts-cache/old.ndx"));
-            if (fexist_utf8(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                                    StringBuff(opt->path_log),
-                                    "hts-cache/new.lst")))
-              UNLINK(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                             StringBuff(opt->path_log), "hts-cache/new.lst"));
-            if (fexist_utf8(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                                    StringBuff(opt->path_log),
-                                    "hts-cache/old.lst")))
-              UNLINK(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                             StringBuff(opt->path_log), "hts-cache/old.lst"));
-            if (fexist_utf8(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                                    StringBuff(opt->path_log),
-                                    "hts-cache/new.txt")))
-              UNLINK(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                             StringBuff(opt->path_log), "hts-cache/new.txt"));
-            if (fexist_utf8(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                                    StringBuff(opt->path_log),
-                                    "hts-cache/old.txt")))
-              UNLINK(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                             StringBuff(opt->path_log), "hts-cache/old.txt"));
-            if (fexist_utf8(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                                    StringBuff(opt->path_log),
-                                    "hts-cache/doit.log")))
-              UNLINK(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                             StringBuff(opt->path_log), "hts-cache/doit.log"));
-            if (fexist_utf8(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                                    StringBuff(opt->path_log),
-                                    "hts-in_progress.lock")))
-              UNLINK(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                             StringBuff(opt->path_log),
-                             "hts-in_progress.lock"));
-            RMDIR(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                          StringBuff(opt->path_log), "hts-cache"));
+            if (fexist
+                (fconcat
+                 (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_log),
+                  "hts-cache/new.zip")))
+              remove(fconcat
+                     (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_log),
+                      "hts-cache/new.zip"));
+            if (fexist
+                (fconcat
+                 (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_log),
+                  "hts-cache/old.zip")))
+              remove(fconcat
+                     (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_log),
+                      "hts-cache/old.zip"));
+            if (fexist
+                (fconcat
+                 (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_log),
+                  "hts-cache/new.dat")))
+              remove(fconcat
+                     (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_log),
+                      "hts-cache/new.dat"));
+            if (fexist
+                (fconcat
+                 (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_log),
+                  "hts-cache/new.ndx")))
+              remove(fconcat
+                     (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_log),
+                      "hts-cache/new.ndx"));
+            if (fexist
+                (fconcat
+                 (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_log),
+                  "hts-cache/old.dat")))
+              remove(fconcat
+                     (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_log),
+                      "hts-cache/old.dat"));
+            if (fexist
+                (fconcat
+                 (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_log),
+                  "hts-cache/old.ndx")))
+              remove(fconcat
+                     (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_log),
+                      "hts-cache/old.ndx"));
+            if (fexist
+                (fconcat
+                 (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_log),
+                  "hts-cache/new.lst")))
+              remove(fconcat
+                     (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_log),
+                      "hts-cache/new.lst"));
+            if (fexist
+                (fconcat
+                 (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_log),
+                  "hts-cache/old.lst")))
+              remove(fconcat
+                     (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_log),
+                      "hts-cache/old.lst"));
+            if (fexist
+                (fconcat
+                 (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_log),
+                  "hts-cache/new.txt")))
+              remove(fconcat
+                     (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_log),
+                      "hts-cache/new.txt"));
+            if (fexist
+                (fconcat
+                 (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_log),
+                  "hts-cache/old.txt")))
+              remove(fconcat
+                     (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_log),
+                      "hts-cache/old.txt"));
+            if (fexist
+                (fconcat
+                 (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_log),
+                  "hts-cache/doit.log")))
+              remove(fconcat
+                     (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_log),
+                      "hts-cache/doit.log"));
+            if (fexist
+                (fconcat
+                 (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_log),
+                  "hts-in_progress.lock")))
+              remove(fconcat
+                     (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_log),
+                      "hts-in_progress.lock"));
+            rmdir(fconcat
+                  (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_log), "hts-cache"));
             //
           } else if (strfield2(argv[i] + 2, "catchurl")) {      // capture d'URL via proxy temporaire!
             argv_url = 1;       // forcer a passer les parametres
@@ -697,27 +736,29 @@ static int hts_main_internal(int argc, char **argv, httrackp * opt) {
 #endif
   if (argv_url == 0) {
     // Présence d'un cache, que faire?..
-    if ((fexist_utf8(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                             StringBuff(opt->path_log),
-                             "hts-cache/new.zip"))) ||
-        (fexist_utf8(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                             StringBuff(opt->path_log), "hts-cache/new.dat")) &&
-         fexist_utf8(
-             fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                     StringBuff(opt->path_log),
-                     "hts-cache/new.ndx")))) { // il existe déja un cache
-                                               // précédent.. renommer
-      if (fexist_utf8(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                              StringBuff(opt->path_log),
-                              "hts-cache/doit.log"))) { // un cache est présent
+    if ((fexist
+         (fconcat
+          (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), 
+          StringBuff(opt->path_log), "hts-cache/new.zip")))
+        ||
+        (fexist
+         (fconcat
+          (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), 
+          StringBuff(opt->path_log), "hts-cache/new.dat"))
+         &&
+         fexist(fconcat
+                (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
+                StringBuff(opt->path_log),
+                 "hts-cache/new.ndx")))
+      ) {                       // il existe déja un cache précédent.. renommer
+      if (fexist(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
+        StringBuff(opt->path_log), "hts-cache/doit.log"))) {        // un cache est présent
         if (x_argvblk != NULL) {
           int m;
 
           // établir mode - mode cache: 1 (cache valide) 2 (cache à vérifier)
-          if (fexist_utf8(
-                  fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                          StringBuff(opt->path_log),
-                          "hts-in_progress.lock"))) { // cache prioritaire
+          if (fexist(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
+            StringBuff(opt->path_log), "hts-in_progress.lock"))) {  // cache prioritaire
             m = 1;
           } else {
             m = 2;
@@ -752,7 +793,7 @@ static int hts_main_internal(int argc, char **argv, httrackp * opt) {
           htsmain_free();
           return -1;
         }
-      } else { // log existe pas
+      } else {                  // log existe pas
         HTS_PANIC_PRINTF("A cache has been found, but no command line");
         printf
           ("Please launch httrack with proper parameters to reuse the cache\n");
@@ -760,7 +801,7 @@ static int hts_main_internal(int argc, char **argv, httrackp * opt) {
         return -1;
       }
 
-    } else { // aucune URL définie et pas de cache
+    } else {                    // aucune URL définie et pas de cache
       if (opt->quiet) {
         help(argv[0], !opt->quiet);
         htsmain_free();
@@ -775,21 +816,26 @@ static int hts_main_internal(int argc, char **argv, httrackp * opt) {
     }
   } else {                      // plus de 2 paramètres
     // un fichier log existe?
-    if (fexist_utf8(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                            StringBuff(opt->path_log),
-                            "hts-in_progress.lock"))) { // fichier lock?
+    if (fexist(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
+                       StringBuff(opt->path_log),
+                       "hts-in_progress.lock"))) { // fichier lock?
 
       opt->cache = HTS_CACHE_PRIORITY; // cache prioritaire
       if (opt->quiet == 0) {
-        if ((fexist_utf8(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                                 StringBuff(opt->path_log),
-                                 "hts-cache/new.zip"))) ||
-            (fexist_utf8(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                                 StringBuff(opt->path_log),
-                                 "hts-cache/new.dat")) &&
-             fexist_utf8(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                                 StringBuff(opt->path_log),
-                                 "hts-cache/new.ndx")))) {
+        if ((fexist
+             (fconcat
+              (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_log),
+               "hts-cache/new.zip")))
+            ||
+            (fexist
+             (fconcat
+              (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_log),
+               "hts-cache/new.dat"))
+             &&
+             fexist(fconcat
+                    (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_log),
+                     "hts-cache/new.ndx")))
+          ) {
           HT_REQUEST_START;
           HT_PRINT("There is a lock-file in the directory ");
           HT_PRINT(StringBuff(opt->path_log));
@@ -803,19 +849,24 @@ static int hts_main_internal(int argc, char **argv, httrackp * opt) {
           }
         }
       }
-    } else if (fexist_utf8(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                                   StringBuff(opt->path_html), "index.html"))) {
+    } else if (fexist(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
+                              StringBuff(opt->path_html), "index.html"))) {
       opt->cache = HTS_CACHE_TEST_UPDATE;
       if (opt->quiet == 0) {
-        if ((fexist_utf8(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                                 StringBuff(opt->path_log),
-                                 "hts-cache/new.zip"))) ||
-            (fexist_utf8(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                                 StringBuff(opt->path_log),
-                                 "hts-cache/new.dat")) &&
-             fexist_utf8(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                                 StringBuff(opt->path_log),
-                                 "hts-cache/new.ndx")))) {
+        if ((fexist
+             (fconcat
+              (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_log),
+               "hts-cache/new.zip")))
+            ||
+            (fexist
+             (fconcat
+              (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_log),
+               "hts-cache/new.dat"))
+             &&
+             fexist(fconcat
+                    (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_log),
+                     "hts-cache/new.ndx")))
+          ) {
           HT_REQUEST_START;
           HT_PRINT
             ("There is an index.html and a hts-cache folder in the directory ");
@@ -1448,38 +1499,29 @@ static int hts_main_internal(int argc, char **argv, httrackp * opt) {
                   LLint fz;
 
                   na++;
-                  fz = fsize_utf8(argv[na]);
+                  fz = fsize(argv[na]);
                   if (fz < 0) {
                     HTS_PANIC_PRINTF("File url list could not be opened");
                     htsmain_free();
                     return -1;
                   } else {
-                    FILE *fp = FOPEN(argv[na], "rb");
+                    FILE *fp = fopen(argv[na], "rb");
 
                     if (fp != NULL) {
-                      size_t cl = strlen(url);
-                      const size_t fzs = llint_to_size_t(fz);
-                      const size_t capa = llint_grow_size_t(cl, fz, 8192);
+                      int cl = (int) strlen(url);
 
-                      if (capa == (size_t) -1) {
-                        fclose(fp);
-                        HTS_PANIC_PRINTF("File url list too large");
-                        htsmain_free();
-                        return -1;
-                      }
-                      ensureUrlCapacity(url, url_sz, capa);
+                      ensureUrlCapacity(url, url_sz, cl + fz + 8192);
                       if (cl > 0) {     /* don't stick! (3.43) */
                         url[cl] = ' ';
                         cl++;
                       }
-                      if (fread(url + cl, 1, fzs, fp) != fzs) {
-                        fclose(fp);
+                      if (fread(url + cl, 1, fz, fp) != fz) {
                         HTS_PANIC_PRINTF("File url list could not be read");
                         htsmain_free();
                         return -1;
                       }
                       fclose(fp);
-                      *(url + cl + fzs) = '\0';
+                      *(url + cl + fz) = '\0';
                     }
                   }
                 }
@@ -1580,9 +1622,10 @@ static int hts_main_internal(int argc, char **argv, httrackp * opt) {
                 if ((na + 1 >= argc) || (argv[na + 1][0] == '-')) {
                   HTS_PANIC_PRINTF
                     ("Option %F needs to be followed by a blank space, and a footer string");
-                  printf("Example: -%%F \"<!-- Mirrored from {addr}{path} by "
-                         "HTTrack Website Copier/"
-                         "{version} " HTTRACK_AFF_AUTHORS ", {date} -->\"\n");
+                  printf
+                    ("Example: -%%F \"<!-- Mirrored from %%s by HTTrack Website Copier/"
+                     HTTRACK_AFF_VERSION " " HTTRACK_AFF_AUTHORS
+                     ", %%s -->\"\n");
                   htsmain_free();
                   return -1;
                 } else {
@@ -1747,54 +1790,6 @@ static int hts_main_internal(int argc, char **argv, httrackp * opt) {
                   StringCopy(opt->cookies_file, argv[na]);
                 }
                 break;
-              case 'r': // warc / warc-file: write an ISO-28500 WARC archive
-                if (*(com + 1) == 'f') { // --warc-file NAME: explicit basename
-                  com++;
-                  if ((na + 1 >= argc) || (argv[na + 1][0] == '-')) {
-                    HTS_PANIC_PRINTF(
-                        "Option warc-file needs a blank space and a WARC name");
-                    htsmain_free();
-                    return -1;
-                  }
-                  na++;
-                  if (strlen(argv[na]) >= 1024) {
-                    HTS_PANIC_PRINTF("WARC file name too long");
-                    htsmain_free();
-                    return -1;
-                  }
-                  StringCopy(opt->warc_file, argv[na]);
-                } else if (*(com + 1) == 's') { // --warc-max-size N: rotation
-                  com++;
-                  if ((na + 1 >= argc) || (argv[na + 1][0] == '-')) {
-                    HTS_PANIC_PRINTF(
-                        "Option warc-max-size needs a blank space and a size");
-                    htsmain_free();
-                    return -1;
-                  }
-                  na++;
-                  { // reject non-numeric/negative/overflow; keep default 0
-                    // (single file)
-                    char *end;
-                    LLint v;
-                    errno = 0;
-                    v = strtoll(argv[na], &end, 10);
-                    if (isdigit((unsigned char) argv[na][0]) && *end == '\0' &&
-                        errno != ERANGE)
-                      opt->warc_max_size = v;
-                  }
-                } else if (*(com + 1) == 'c') { // --warc-cdx: sorted CDXJ index
-                  com++;
-                  opt->warc_cdx = 1;
-                } else if (*(com + 1) == 'z') { // --wacz: WACZ package
-                  com++;
-                  opt->warc_wacz = 1;
-                  opt->warc_cdx = 1; // WACZ embeds the CDXJ index
-                  if (!StringNotEmpty(opt->warc_file))
-                    StringCopy(opt->warc_file, WARC_AUTONAME);
-                } else { // --warc: auto-named archive under the output dir
-                  StringCopy(opt->warc_file, WARC_AUTONAME);
-                }
-                break;
               case 'Y': // why: explain the filter verdict for a URL, no crawl
                 if ((na + 1 >= argc) || (argv[na + 1][0] == '-')) {
                   HTS_PANIC_PRINTF("Option why needs a blank space and a URL");
@@ -2007,7 +2002,7 @@ static int hts_main_internal(int argc, char **argv, httrackp * opt) {
                                      /*cache */ &cache, /*hash */ NULL, /*ptr */
                                      0, /*numero_passe */ 0, /*mime_type */
                                      NULL) != -1) {
-                                  if (fexist_utf8(afs.save)) {
+                                  if (fexist(afs.save)) {
                                     fprintf(stdout, "Content-location: %s\r\n",
                                             afs.save);
                                   }
@@ -2105,16 +2100,18 @@ static int hts_main_internal(int argc, char **argv, httrackp * opt) {
                   uLong repaired = 0;
                   uLong repairedBytes = 0;
 
-                  if (fexist_utf8(fconcat(
-                          OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                          StringBuff(opt->path_log), "hts-cache/new.zip"))) {
+                  if (fexist
+                      (fconcat
+                       (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_log),
+                        "hts-cache/new.zip"))) {
                     name =
                       fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_log),
                               "hts-cache/new.zip");
-                  } else if (fexist_utf8(fconcat(OPT_GET_BUFF(opt),
-                                                 OPT_GET_BUFF_SIZE(opt),
-                                                 StringBuff(opt->path_log),
-                                                 "hts-cache/old.zip"))) {
+                  } else
+                    if (fexist
+                        (fconcat
+                         (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_log),
+                          "hts-cache/old.zip"))) {
                     name =
                       fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_log),
                               "hts-cache/old.zip");
@@ -2133,11 +2130,10 @@ static int hts_main_internal(int argc, char **argv, httrackp * opt) {
                        fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_log),
                                "hts-cache/repair.tmp"), &repaired,
                        &repairedBytes) == Z_OK) {
-                    UNLINK(name);
-                    RENAME(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                                   StringBuff(opt->path_log),
-                                   "hts-cache/repair.zip"),
-                           name);
+                    unlink(name);
+                    rename(fconcat
+                           (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_log),
+                            "hts-cache/repair.zip"), name);
                     fprintf(stderr,
                             "Cache: %d bytes successfully recovered in %d entries\n",
                             (int) repairedBytes, (int) repaired);
@@ -2306,8 +2302,8 @@ static int hts_main_internal(int argc, char **argv, httrackp * opt) {
 
       } else {                  // URL/filters
         char catbuff[CATBUFF_SIZE];
-        const size_t urlSize = strlen(argv[na]);
-        const size_t capa = strlen(url) + urlSize + 32;
+        const int urlSize = (int) strlen(argv[na]);
+        const int capa = (int) (strlen(url) + urlSize + 32);
 
         assertf(urlSize < HTS_URLMAXSIZE);
         if (urlSize < HTS_URLMAXSIZE) {
@@ -2355,9 +2351,10 @@ static int hts_main_internal(int argc, char **argv, httrackp * opt) {
   hts_cache_reconcile(opt, CACHE_RECONCILE_INTERRUPTED);
   // Débuggage des en têtes
   if (_DEBUG_HEAD) {
-    ioinfo = FOPEN(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                           StringBuff(opt->path_log), "hts-ioinfo.txt"),
-                   "wb");
+    ioinfo =
+      fopen(fconcat
+            (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_log), "hts-ioinfo.txt"),
+            "wb");
   }
 
   {
@@ -2432,9 +2429,9 @@ static int hts_main_internal(int argc, char **argv, httrackp * opt) {
       /* readme for information purpose */
       {
         FILE *fp =
-            FOPEN(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                          StringBuff(opt->path_log), "hts-cache/readme.txt"),
-                  "wb");
+          fopen(fconcat
+                (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_log),
+                 "hts-cache/readme.txt"), "wb");
         if (fp) {
           fprintf(fp, "What's in this folder?" LF);
           fprintf(fp, "" LF);
@@ -2486,16 +2483,17 @@ static int hts_main_internal(int argc, char **argv, httrackp * opt) {
         int i;
 
 #ifdef _WIN32
-        hts_mkdir_utf8(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                               StringBuff(opt->path_log), "hts-cache"));
+        mkdir(fconcat
+              (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_log), "hts-cache"));
 #else
         mkdir(fconcat
               (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_log), "hts-cache"),
               HTS_PROTECT_FOLDER);
 #endif
-        fp = FOPEN(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                           StringBuff(opt->path_log), "hts-cache/doit.log"),
-                   "wb");
+        fp =
+          fopen(fconcat
+                (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_log),
+                 "hts-cache/doit.log"), "wb");
         if (fp) {
           for(i = 0 + 1; i < argc; i++) {
             if (((strchr(argv[i], ' ') != NULL)
@@ -2540,7 +2538,7 @@ static int hts_main_internal(int argc, char **argv, httrackp * opt) {
         }
       }
       // petit message dans le lock
-      if ((fp = FOPEN(n_lock, "wb")) != NULL) {
+      if ((fp = fopen(n_lock, "wb")) != NULL) {
         int i;
 
         fprintf(fp, "Mirror in progress since %s .. please wait!" LF, t);
@@ -2700,15 +2698,16 @@ static int hts_main_internal(int argc, char **argv, httrackp * opt) {
           char *f = OPT_GET_BUFF(opt);
 
           sprintf(f, "%s/%s", CACHE_REFNAME, entry->d_name);
-          (void) UNLINK(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                                StringBuff(opt->path_log), f));
+          (void)
+            unlink(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_log), f));
         }
       }
       if (dir != NULL) {
         (void) closedir(dir);
       }
-      (void) RMDIR(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                           StringBuff(opt->path_log), CACHE_REFNAME));
+      (void)
+        rmdir(fconcat
+              (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), StringBuff(opt->path_log), CACHE_REFNAME));
     }
 
     /* Info for wrappers */
@@ -2736,7 +2735,7 @@ static int hts_main_internal(int argc, char **argv, httrackp * opt) {
       }
     }
     // supprimer lock
-    UNLINK(n_lock);
+    remove(n_lock);
   }
 
   if (x_argvblk)

src/htsftp.c

@@ -251,7 +251,7 @@ int run_launch_ftp(FTPDownloadStruct * pStruct) {
       // folding a nonsense port into 1..65535 fetches one the link never named;
       // an empty "host:" just means the default (#614)
       if (a[1] != '\0' && !hts_parse_url_port(a + 1, &port)) {
-        htsblk_failf(&back->r, "Invalid port: %s", a + 1);
+        snprintf(back->r.msg, sizeof(back->r.msg), "Invalid port: %s", a + 1);
         back->r.statuscode = STATUSCODE_INVALID; // permanent, unlike a DNS miss
         _HALT_FTP return 0;
       }
@@ -262,7 +262,8 @@ int run_launch_ftp(FTPDownloadStruct * pStruct) {
     // récupérer adresse résolue
     strcpybuff(back->info, "host name");
     if (hts_dns_resolve2(opt, _adr, &server, &error) == NULL) {
-      htsblk_failf(&back->r, "Unable to get server's address: %s", error);
+      snprintf(back->r.msg, sizeof(back->r.msg),
+               "Unable to get server's address: %s", error);
       back->r.statuscode = STATUSCODE_NON_FATAL;
       _HALT_FTP return 0;
     }
@@ -331,15 +332,18 @@ int run_launch_ftp(FTPDownloadStruct * pStruct) {
             }
 
           } else {
-            htsblk_failf(&back->r, "Bad password: %s", linejmp(line));
+            snprintf(back->r.msg, sizeof(back->r.msg), "Bad password: %s",
+                     linejmp(line));
             back->r.statuscode = STATUSCODE_INVALID;
           }
         } else {
-          htsblk_failf(&back->r, "Bad user name: %s", linejmp(line));
+          snprintf(back->r.msg, sizeof(back->r.msg), "Bad user name: %s",
+                   linejmp(line));
           back->r.statuscode = STATUSCODE_INVALID;
         }
       } else {
-        htsblk_failf(&back->r, "Connection refused: %s", linejmp(line));
+        snprintf(back->r.msg, sizeof(back->r.msg), "Connection refused: %s",
+                 linejmp(line));
         back->r.statuscode = STATUSCODE_INVALID;
       }
 
@@ -406,7 +410,8 @@ int run_launch_ftp(FTPDownloadStruct * pStruct) {
             }
             // -- fin analyse de l'adresse IP et du port --
           } else {
-            htsblk_failf(&back->r, "PASV incorrect: %s", linejmp(line));
+            snprintf(back->r.msg, sizeof(back->r.msg), "PASV incorrect: %s",
+                     linejmp(line));
             back->r.statuscode = STATUSCODE_INVALID;
           }                     // sinon on est prêts
         } else {
@@ -437,11 +442,13 @@ int run_launch_ftp(FTPDownloadStruct * pStruct) {
                 }
               }
             } else {
-              htsblk_failf(&back->r, "EPSV incorrect: %s", linejmp(line));
+              snprintf(back->r.msg, sizeof(back->r.msg), "EPSV incorrect: %s",
+                       linejmp(line));
               back->r.statuscode = STATUSCODE_INVALID;
             }
           } else {
-            htsblk_failf(&back->r, "PASV/EPSV error: %s", linejmp(line));
+            snprintf(back->r.msg, sizeof(back->r.msg), "PASV/EPSV error: %s",
+                     linejmp(line));
             back->r.statuscode = STATUSCODE_INVALID;
           }                     // sinon on est prêts
         }
@@ -547,8 +554,8 @@ int run_launch_ftp(FTPDownloadStruct * pStruct) {
                   deletesoc(soc_dat);
                   soc_dat = INVALID_SOCKET;
                   //
-                  htsblk_failf(&back->r, "RETR command error: %s",
-                               linejmp(line));
+                  snprintf(back->r.msg, sizeof(back->r.msg),
+                           "RETR command error: %s", linejmp(line));
                   back->r.statuscode = STATUSCODE_INVALID;
                 }               // sinon on est prêts
               } else {
@@ -566,12 +573,13 @@ int run_launch_ftp(FTPDownloadStruct * pStruct) {
               back->r.statuscode = STATUSCODE_INVALID;
             }                   // sinon on est prêts
           } else {
-            htsblk_failf(&back->r, "Unable to resolve IP %s: %s", adr_ip,
-                         error);
+            snprintf(back->r.msg, sizeof(back->r.msg),
+                     "Unable to resolve IP %s: %s", adr_ip, error);
             back->r.statuscode = STATUSCODE_INVALID;
           }                     // sinon on est prêts
         } else {
-          htsblk_failf(&back->r, "PASV incorrect: %s", linejmp(line));
+          snprintf(back->r.msg, sizeof(back->r.msg), "PASV incorrect: %s",
+                   linejmp(line));
           back->r.statuscode = STATUSCODE_INVALID;
         }                       // sinon on est prêts
 #else
@@ -595,11 +603,13 @@ int run_launch_ftp(FTPDownloadStruct * pStruct) {
                 back->r.statuscode = STATUSCODE_INVALID;
               }
             } else {
-              htsblk_failf(&back->r, "RETR command error: %s", linejmp(line));
+              snprintf(back->r.msg, sizeof(back->r.msg),
+                       "RETR command error: %s", linejmp(line));
               back->r.statuscode = STATUSCODE_INVALID;
             }
           } else {
-            htsblk_failf(&back->r, "PORT command error: %s", linejmp(line));
+            snprintf(back->r.msg, sizeof(back->r.msg), "PORT command error: %s",
+                     linejmp(line));
             back->r.statuscode = STATUSCODE_INVALID;
           }
 #ifdef _WIN32
@@ -642,7 +652,8 @@ int run_launch_ftp(FTPDownloadStruct * pStruct) {
                 len = 0;        // fin
                 break;
               case 0:
-                htsblk_failf(&back->r, "Time out (%d)", timeout);
+                snprintf(back->r.msg, sizeof(back->r.msg), "Time out (%d)",
+                         timeout);
                 back->r.statuscode = STATUSCODE_INVALID;
                 len = 0;        // fin
                 break;
@@ -705,7 +716,8 @@ int run_launch_ftp(FTPDownloadStruct * pStruct) {
                 strcpybuff(back->r.msg, "OK");
                 back->r.statuscode = HTTP_OK;
               } else {
-                htsblk_failf(&back->r, "RETR incorrect: %s", linejmp(line));
+                snprintf(back->r.msg, sizeof(back->r.msg), "RETR incorrect: %s",
+                         linejmp(line));
                 back->r.statuscode = STATUSCODE_INVALID;
               }
             } else {

src/htsglobal.h

@@ -43,8 +43,8 @@ Please visit our Website: http://www.httrack.com
    configure.ac, decoupled from these). VERSION is the display form, VERSIONID
    the dotted numeric form, AFF_VERSION the short form shown in footers,
    LIB_VERSION the data/cache format generation. */
-#define HTTRACK_VERSION "3.49-14"
-#define HTTRACK_VERSIONID "3.49.14"
+#define HTTRACK_VERSION "3.49-13"
+#define HTTRACK_VERSIONID "3.49.13"
 #define HTTRACK_AFF_VERSION "3.x"
 #define HTTRACK_LIB_VERSION "2.0"
 
@@ -72,8 +72,7 @@ Please visit our Website: http://www.httrack.com
    HTS_UNUSED: suppress unused-symbol warnings. HTS_STATIC: an unused-safe
    static. HTS_PRINTF_FUN(fmt, arg): mark a printf-like function so the
    compiler type-checks the format string at argument index fmt against the
-   varargs starting at arg. HTS_CHECK_RESULT: the return value carries the only
-   error signal, so dropping it is a bug; a (void) cast does not silence it. */
+   varargs starting at arg. */
 #ifndef HTS_UNUSED
 #ifdef __GNUC__
 #define HTS_UNUSED __attribute__((unused))
@@ -81,13 +80,10 @@ Please visit our Website: http://www.httrack.com
 #define HTS_STATIC static __attribute__((unused))
 
 #define HTS_PRINTF_FUN(fmt, arg) __attribute__((format(printf, fmt, arg)))
-
-#define HTS_CHECK_RESULT __attribute__((warn_unused_result))
 #else
 #define HTS_UNUSED
 #define HTS_STATIC static
 #define HTS_PRINTF_FUN(fmt, arg)
-#define HTS_CHECK_RESULT
 #endif
 #endif
 
@@ -340,20 +336,16 @@ typedef int INTsys;
 #endif
 
 /* Socket-handle type. An unsigned integer wide enough for a Windows SOCKET;
-   a plain int file descriptor on POSIX. T_SOCP is its printf conversion,
-   '%' included: unsigned __int64 on Win64 must not be printed with "%d". */
+   a plain int file descriptor on POSIX. */
 #ifdef _WIN32
 #if defined(_WIN64)
 
 typedef unsigned __int64 T_SOC;
-#define T_SOCP "%" PRIu64
 #else
 typedef unsigned __int32 T_SOC;
-#define T_SOCP "%" PRIu32
 #endif
 #else
 typedef int T_SOC;
-#define T_SOCP "%d"
 #endif
 
 /* Buffer size for a printed network address (IPv4 or IPv6, NUL included). */

src/htshelp.c

@@ -124,9 +124,7 @@ typedef struct help_wizard_buffers {
   char stropt[2048];        // options
   char stropt2[2048];       // options longues
   char strwild[2048];       // wildcards
-  /* holds all four of the above plus separators: at 4096 a long answer set
-     clipped the filters off the command line */
-  char cmd[HTS_URLMAXSIZE * 2 + 3 * 2048 + 4];
+  char cmd[4096];
   char str[256];
   char *argv[256];
 } help_wizard_buffers;
@@ -158,7 +156,9 @@ void help_wizard(httrackp * opt) {
   char *a;
 
   //
-  if (buffers == NULL) {
+  if (urls == NULL || mainpath == NULL || projname == NULL || stropt == NULL
+      || stropt2 == NULL || strwild == NULL || cmd == NULL || str == NULL
+      || argv == NULL) {
     fprintf(stderr, "* memory exhausted in %s, line %d\n", __FILE__, __LINE__);
     return;
   }
@@ -251,7 +251,6 @@ void help_wizard(httrackp * opt) {
       strcatbuff(stropt2, "--update ");
       break;
     case 0:
-      freet(buffers);
       return;
       break;
     }
@@ -310,23 +309,14 @@ void help_wizard(httrackp * opt) {
       printf("\n");
       if (strlen(stropt) == 1)
         stropt[0] = '\0';       // aucune
-      /* the tail is the filter list, and cmd is split into the argv handed to
-         hts_main() below: a clipped line would silently widen the crawl */
-      if (!sprintfbuff(cmd, "%s %s %s %s", urls, stropt, stropt2, strwild)) {
-        printf("* command line too long (%d bytes max)\n",
-               (int) sizeof(cmd) - 1);
-        freet(buffers);
-        return;
-      }
+      snprintf(cmd, sizeof(cmd), "%s %s %s %s", urls, stropt, stropt2, strwild);
       printf("---> Wizard command line: httrack %s\n\n", cmd);
       printf("Ready to launch the mirror? (Y/n) :");
       fflush(stdout);
       linput(stdin, str, 250);
       if (strnotempty(str)) {
-        if (!((str[0] == 'y') || (str[0] == 'Y'))) {
-          freet(buffers);
+        if (!((str[0] == 'y') || (str[0] == 'Y')))
           return;
-        }
       }
       printf("\n");
 
@@ -350,7 +340,7 @@ void help_wizard(httrackp * opt) {
   }
 
   /* Free buffers */
-  freet(buffers);
+  free(buffers);
 #undef urls
 #undef mainpath
 #undef projname
@@ -422,9 +412,9 @@ void help_catchurl(const char *dest_path) {
       do {
         snprintf(dest, sizeof(dest), "%s%s%d", dest_path, "hts-post", i);
         i++;
-      } while (fexist_utf8(dest));
+      } while(fexist(dest));
       {
-        FILE *fp = FOPEN(dest, "wb");
+        FILE *fp = fopen(dest, "wb");
 
         if (fp) {
           fwrite(data, strlen(data), 1, fp);
@@ -534,8 +524,6 @@ void help(const char *app, int more) {
   infomsg
     (" %D  cached delayed type check, don't wait for remote type during updates, to speedup them (%D0 wait, * %D1 don't wait)");
   infomsg(" %M  generate a RFC MIME-encapsulated full-archive (.mht)");
-  infomsg(" %t  keep the original file extension, don't rewrite it from the "
-          "MIME type (%t0 rewrite)");
   infomsg
     ("  LN long names (L1 *long names / L0 8-3 conversion / L2 ISO9660 compatible)");
   infomsg
@@ -566,7 +554,6 @@ void help(const char *app, int more) {
     (" %h  force HTTP/1.0 requests (reduce update features, only for old servers or proxies)");
   infomsg
     (" %k  use keep-alive if possible, greately reducing latency for small files and test requests (%k0 don't use)");
-  infomsg(" %z  do not request compressed content (%z0 request)");
   infomsg
     (" %B  tolerant requests (accept bogus responses on some servers, but not standard!)");
   infomsg
@@ -591,10 +578,8 @@ void help(const char *app, int more) {
     ("  F  user-agent field sent in HTTP headers (-F \"user-agent name\")");
   infomsg(" %R  default referer field sent in HTTP headers");
   infomsg(" %E  from email address sent in HTTP headers");
-  infomsg(
-      " %F  footer string in Html code (-%F \"Mirrored from {url} on "
-      "{date}\"; fields {addr} {path} {url} {date} {lastmodified} {version} "
-      "{mime} {charset} {status} {size}, or legacy %s)");
+  infomsg
+    (" %F  footer string in Html code (-%F \"Mirrored [from host %s [file %s [at %s]]]\"");
   infomsg(" %l  preferred language (-%l \"fr, en, jp, *\"");
   infomsg(" %a  accepted formats (-%a \"text/html,image/png;q=0.9,*/*;q=0.1\"");
   infomsg(" %X  additional HTTP header line (-%X \"X-Magic: 42\"");
@@ -603,10 +588,6 @@ void help(const char *app, int more) {
   infomsg
     ("  C  create/use a cache for updates and retries (C0 no cache,C1 cache is prioritary,* C2 test update before)");
   infomsg("  k  store all files in cache (not useful if files on disk)");
-  infomsg(" %r  write an ISO-28500 WARC/1.1 archive; --warc-file NAME sets the "
-          "output name, --warc-max-size N rotates segments past N bytes, "
-          "--warc-cdx also writes a sorted CDXJ index, --wacz packages it all "
-          "as a WACZ file");
   infomsg(" %n  do not re-download locally erased files");
   infomsg
     (" %v  display on screen filenames downloaded (in realtime) - * %v1 short version - %v2 full animation");
@@ -639,6 +620,7 @@ void help(const char *app, int more) {
   infomsg(" %H  debug HTTP headers in logfile");
   infomsg("");
   infomsg("Guru options: (do NOT use if possible)");
+  infomsg(" #X *use optimized engine (limited memory boundary checks)");
   infomsg(" #test  list engine self-tests (run one with -#test=NAME [args])");
   infomsg(" #C  cache list (-#C '*.com/spider*.gif'");
   infomsg(" #R  cache repair (damaged cache)");
@@ -651,6 +633,7 @@ void help(const char *app, int more) {
   infomsg(" #L  maximum number of links (-#L1000000)");
   infomsg(" #p  display ugly progress information");
   infomsg(" #P  catch URL");
+  infomsg(" #R  old FTP routines (debug)");
   infomsg(" #T  generate transfer ops. log every minutes");
   infomsg(" #u  wait time");
   infomsg(" #Z  generate transfer rate statistics every minutes");
@@ -667,7 +650,6 @@ void help(const char *app, int more) {
     ("  V execute system command after each files ($0 is the filename: -V \"rm \\$0\")");
   infomsg(" %W use an external library function as a wrapper (-%W "
           "myfoo.so[,myparameters])");
-  infomsg("  y  go to background when suspended (y0 don't)");
   infomsg("");
   infomsg("Details: Option N");
   infomsg("  N0 Site-structure (default)");

src/htsindex.c

@@ -349,13 +349,9 @@ void index_finish(const char *indexpath, int mode) {
 
             // Write new file
             if (mode == 1)      // TEXT
-              fp = FOPEN(
-                  concat(catbuff, sizeof(catbuff), indexpath, "index.txt"),
-                  "wb");
+              fp = fopen(concat(catbuff, sizeof(catbuff), indexpath, "index.txt"), "wb");
             else                // HTML
-              fp = FOPEN(
-                  concat(catbuff, sizeof(catbuff), indexpath, "sindex.html"),
-                  "wb");
+              fp = fopen(concat(catbuff, sizeof(catbuff), indexpath, "sindex.html"), "wb");
             if (fp) {
               char current_word[KEYW_LEN + 32];
               char word[KEYW_LEN + 32];

src/htslib.c

@@ -36,7 +36,6 @@ Please visit our Website: http://www.httrack.com
 // Fichier librairie .c
 
 #include "htscore.h"
-#include "htswarc.h"
 
 /* specific definitions */
 #include "htsbase.h"
@@ -704,16 +703,18 @@ T_SOC http_xfopen(httrackp *opt, int mode, int treat, int waitconnect,
   /* Check for errors */
   if (soc == INVALID_SOCKET) {
     if (retour) {
-      if (!strnotempty(retour->msg)) {
+      if (retour->msg) {
+        if (!strnotempty(retour->msg)) {
 #ifdef _WIN32
-        int last_errno = WSAGetLastError();
+          int last_errno = WSAGetLastError();
 
-        sprintf(retour->msg, "Connect error: %s", strerror(last_errno));
+          sprintf(retour->msg, "Connect error: %s", strerror(last_errno));
 #else
-        int last_errno = errno;
+          int last_errno = errno;
 
-        sprintf(retour->msg, "Connect error: %s", strerror(last_errno));
+          sprintf(retour->msg, "Connect error: %s", strerror(last_errno));
 #endif
+        }
       }
     }
   }
@@ -1200,11 +1201,6 @@ int http_sendhead(httrackp * opt, t_cookie * cookie, int mode,
   }                             // Fin test pas postfile
   //
 
-  // Stash the raw request for the WARC request record (freed at
-  // back_clear_entry)
-  if (StringNotEmpty(opt->warc_file))
-    warc_stash_request(retour, bstr.buffer);
-
   // Callback
   {
     int test_head =
@@ -2118,8 +2114,6 @@ htsblk http_test(httrackp * opt, const char *adr, const char *fil, char *loc) {
 #if HTS_DEBUG_CLOSESOCK
     DEBUG_W("http_test: deletehttp\n");
 #endif
-    // this probe's htsblk is discarded by callers, so free any WARC stash here
-    warc_free_request(&retour);
     deletehttp(&retour);
     retour.soc = INVALID_SOCKET;
   }
@@ -2205,7 +2199,7 @@ T_SOC newhttp_addr(httrackp *opt, const char *_iadr, htsblk *retour, int port,
 #if DEBUG
       printf("erreur gethostbyname\n");
 #endif
-      if (retour != NULL) {
+      if (retour && retour->msg) {
 #ifdef _WIN32
         snprintf(retour->msg, sizeof(retour->msg),
                  "Unable to get server's address: %s", error);
@@ -2236,7 +2230,7 @@ T_SOC newhttp_addr(httrackp *opt, const char *_iadr, htsblk *retour, int port,
     DEBUG_W("socket()=%d\n" _(int) soc);
 #endif
     if (soc == INVALID_SOCKET) {
-      if (retour != NULL) {
+      if (retour && retour->msg) {
 #ifdef _WIN32
         int last_errno = WSAGetLastError();
 
@@ -2260,8 +2254,17 @@ T_SOC newhttp_addr(httrackp *opt, const char *_iadr, htsblk *retour, int port,
                              &bind_addr, &error) == NULL
           || bind(soc, &SOCaddr_sockaddr(bind_addr), 
                   SOCaddr_size(bind_addr)) != 0) {
-        snprintf(retour->msg, sizeof(retour->msg),
-                 "Unable to bind the specificied server address: %s", error);
+        if (retour && retour->msg) {
+#ifdef _WIN32
+          snprintf(retour->msg, sizeof(retour->msg),
+                   "Unable to bind the specificied server address: %s",
+                   error);
+#else
+          snprintf(retour->msg, sizeof(retour->msg),
+                   "Unable to bind the specificied server address: %s",
+                   error);
+#endif
+        }
         deletesoc(soc);
         return INVALID_SOCKET;
       }
@@ -2308,7 +2311,7 @@ T_SOC newhttp_addr(httrackp *opt, const char *_iadr, htsblk *retour, int port,
 #if HDEBUG
         printf("unable to connect!\n");
 #endif
-        if (retour != NULL) {
+        if (retour != NULL && retour->msg) {
 #ifdef _WIN32
           const int last_errno = WSAGetLastError();
 
@@ -2537,15 +2540,6 @@ void fil_simplifie(char *f) {
   }
 }
 
-void htsblk_failf(htsblk *r, const char *fmt, ...) {
-  va_list args;
-
-  va_start(args, fmt);
-  // deliberate clip: the reason is quoted from a remote reply
-  (void) vslprintfbuff(r->msg, sizeof(r->msg), fmt, args);
-  va_end(args);
-}
-
 // fermer liaison fichier ou socket
 void deletehttp(htsblk * r) {
 #if HTS_DEBUG_CLOSESOCK
@@ -2596,15 +2590,13 @@ void deletesoc(T_SOC soc) {
     if (closesocket(soc) != 0) {
       int err = WSAGetLastError();
 
-      fprintf(stderr, "* error closing socket " T_SOCP ": %s\n", soc,
-              strerror(err));
+      fprintf(stderr, "* error closing socket %d: %s\n", soc, strerror(err));
     }
 #else
     if (close(soc) != 0) {
       const int err = errno;
 
-      fprintf(stderr, "* error closing socket " T_SOCP ": %s\n", soc,
-              strerror(err));
+      fprintf(stderr, "* error closing socket %d: %s\n", soc, strerror(err));
     }
 #endif
 #if HTS_WIDE_DEBUG
@@ -3017,7 +3009,7 @@ int finput(T_SOC fd, char *s, int max) {
 }
 
 // Like linput, but in memory (optimized)
-int binput(const char *buff, char *s, int max) {
+int binput(char *buff, char *s, int max) {
   int count = 0;
   int destCount = 0;
 
@@ -6018,8 +6010,6 @@ HTSEXT_API httrackp *hts_create_opt(void) {
   StringCopy(opt->footer, HTS_DEFAULT_FOOTER);
   StringCopy(opt->strip_query, "");
   StringCopy(opt->cookies_file, "");
-  StringCopy(opt->warc_file, "");
-  opt->warc_max_size = 0; /* no rotation unless --warc-max-size sets it */
   StringCopy(opt->why_url, "");
   opt->pause_min_ms = 0;
   opt->pause_max_ms = 0;
@@ -6171,7 +6161,6 @@ HTSEXT_API void hts_free_opt(httrackp * opt) {
     StringFree(opt->strip_query);
     StringFree(opt->cookies_file);
     StringFree(opt->why_url);
-    StringFree(opt->warc_file);
 
     StringFree(opt->path_html);
     StringFree(opt->path_html_utf8);
@@ -6431,28 +6420,21 @@ HTSEXT_API int hts_resetvar(void) {
 #ifdef _WIN32
 
 typedef struct dirent dirent;
-
 DIR *opendir(const char *name) {
   WIN32_FILE_ATTRIBUTE_DATA st;
   DIR *dir;
   size_t len;
   int i;
-  LPWSTR wname;
 
   if (name == NULL || *name == '\0') {
     errno = ENOENT;
     return NULL;
   }
-  // Wide \\?\ path: no MAX_PATH cap, no CP_ACP mis-decode (#133,#630).
-  wname = hts_pathToUCS2(name);
-  if (wname == NULL ||
-      !GetFileAttributesExW(wname, GetFileExInfoStandard, &st) ||
-      (st.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0) {
-    freet(wname);
+  if (!GetFileAttributesEx(name, GetFileExInfoStandard, &st)
+      || (st.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0) {
     errno = ENOENT;
     return NULL;
   }
-  freet(wname);
   dir = calloc(sizeof(DIR), 1);
   if (dir == NULL) {
     errno = ENOMEM;
@@ -6472,29 +6454,19 @@ DIR *opendir(const char *name) {
 }
 
 struct dirent *readdir(DIR * dir) {
-  WIN32_FIND_DATAW find;
+  WIN32_FIND_DATAA find;
 
   if (dir->h == INVALID_HANDLE_VALUE) {
-    // \\?\-prefix so a long/non-ASCII directory enumerates instead of ENOENT.
-    LPWSTR wname = hts_pathToUCS2(dir->name);
-
-    dir->h =
-        wname != NULL ? FindFirstFileW(wname, &find) : INVALID_HANDLE_VALUE;
-    freet(wname);
+    dir->h = FindFirstFileA(dir->name, &find);
   } else {
-    if (!FindNextFileW(dir->h, &find)) {
+    if (!FindNextFile(dir->h, &find)) {
       FindClose(dir->h);
       dir->h = INVALID_HANDLE_VALUE;
     }
   }
   if (dir->h != INVALID_HANDLE_VALUE) {
-    char *u = hts_convertUCS2StringToUTF8(find.cFileName, -1);
-
     dir->entry.d_name[0] = 0;
-    if (u != NULL) {
-      strncat(dir->entry.d_name, u, HTS_DIRENT_SIZE - 1);
-      freet(u);
-    }
+    strncat(dir->entry.d_name, find.cFileName, HTS_DIRENT_SIZE - 1);
     return &dir->entry;
   }
   errno = ENOENT;
@@ -6527,61 +6499,9 @@ static void copyWchar(LPWSTR dest, const char *src) {
   dest[i] = '\0';
 }
 
-/* UTF-8 path -> UCS-2 for the _w* file APIs. At/above HTS_WIN_LONGPATH_MIN,
-   \\?\-prefix it via GetFullPathNameW to clear MAX_PATH (#133); else unchanged.
-   Any prefixing failure falls back to the plain converted path. */
-#define HTS_WIN_LONGPATH_MIN 240 /* stay clear of MAX_PATH (260) */
-
-LPWSTR hts_pathToUCS2(const char *path) {
-  LPWSTR wpath = hts_convertUTF8StringToUCS2(path, (int) strlen(path), NULL);
-
-  if (wpath == NULL) {
-    return NULL;
-  }
-  const size_t len = wcslen(wpath);
-  // Already "\\?\" or "\\.\": don't re-prefix.
-  const int verbatim = len >= 4 && wpath[0] == L'\\' && wpath[1] == L'\\' &&
-                       (wpath[2] == L'?' || wpath[2] == L'.') &&
-                       wpath[3] == L'\\';
-
-  if (len < HTS_WIN_LONGPATH_MIN || verbatim) {
-    return wpath;
-  }
-
-  const DWORD need = GetFullPathNameW(wpath, 0, NULL, NULL); /* incl NUL */
-  LPWSTR full = need != 0 ? malloct((size_t) need * sizeof(WCHAR)) : NULL;
-
-  if (full == NULL) {
-    return wpath; /* fall back to the plain path */
-  }
-  const DWORD written = GetFullPathNameW(wpath, need, full, NULL);
-
-  if (written == 0 || written >= need || full[0] == L'\0') {
-    freet(full);
-    return wpath;
-  }
-
-  const int isUNC = full[0] == L'\\' && full[1] == L'\\';
-  // UNC "\\srv\share" -> "\\?\UNC\srv\share": the prefix subsumes the "\\".
-  const WCHAR *const pfx = isUNC ? L"\\\\?\\UNC\\" : L"\\\\?\\";
-  const WCHAR *const body = isUNC ? full + 2 : full;
-  const size_t pfxLen = wcslen(pfx), bodyLen = wcslen(body);
-  LPWSTR out = malloct((pfxLen + bodyLen + 1) * sizeof(WCHAR));
-
-  if (out == NULL) {
-    freet(full);
-    return wpath;
-  }
-  memcpybuff(out, pfx, pfxLen * sizeof(WCHAR));
-  memcpybuff(out + pfxLen, body, (bodyLen + 1) * sizeof(WCHAR));
-  freet(full);
-  freet(wpath);
-  return out;
-}
-
 FILE *hts_fopen_utf8(const char *path, const char *mode) {
   WCHAR wmode[32];
-  LPWSTR wpath = hts_pathToUCS2(path);
+  LPWSTR wpath = hts_convertUTF8StringToUCS2(path, (int) strlen(path), NULL);
 
   assertf(strlen(mode) < sizeof(wmode) / sizeof(WCHAR));
   copyWchar(wmode, mode);
@@ -6597,7 +6517,7 @@ FILE *hts_fopen_utf8(const char *path, const char *mode) {
 }
 
 int hts_stat_utf8(const char *path, STRUCT_STAT * buf) {
-  LPWSTR wpath = hts_pathToUCS2(path);
+  LPWSTR wpath = hts_convertUTF8StringToUCS2(path, (int) strlen(path), NULL);
 
   if (wpath != NULL) {
     const int result = _wstat64(wpath, buf);
@@ -6611,7 +6531,7 @@ int hts_stat_utf8(const char *path, STRUCT_STAT * buf) {
 }
 
 int hts_unlink_utf8(const char *path) {
-  LPWSTR wpath = hts_pathToUCS2(path);
+  LPWSTR wpath = hts_convertUTF8StringToUCS2(path, (int) strlen(path), NULL);
 
   if (wpath != NULL) {
     const int result = _wunlink(wpath);
@@ -6625,8 +6545,10 @@ int hts_unlink_utf8(const char *path) {
 }
 
 int hts_rename_utf8(const char *oldpath, const char *newpath) {
-  LPWSTR woldpath = hts_pathToUCS2(oldpath);
-  LPWSTR wnewpath = hts_pathToUCS2(newpath);
+  LPWSTR woldpath =
+    hts_convertUTF8StringToUCS2(oldpath, (int) strlen(oldpath), NULL);
+  LPWSTR wnewpath =
+    hts_convertUTF8StringToUCS2(newpath, (int) strlen(newpath), NULL);
   if (woldpath != NULL && wnewpath != NULL) {
     const int result = _wrename(woldpath, wnewpath);
 
@@ -6643,22 +6565,8 @@ int hts_rename_utf8(const char *oldpath, const char *newpath) {
   }
 }
 
-int hts_rmdir_utf8(const char *path) {
-  LPWSTR wpath = hts_pathToUCS2(path);
-
-  if (wpath != NULL) {
-    const int result = _wrmdir(wpath);
-
-    free(wpath);
-    return result;
-  } else {
-    // Fallback on conversion error.
-    return _rmdir(path);
-  }
-}
-
 int hts_mkdir_utf8(const char *path) {
-  LPWSTR wpath = hts_pathToUCS2(path);
+  LPWSTR wpath = hts_convertUTF8StringToUCS2(path, (int) strlen(path), NULL);
 
   if (wpath != NULL) {
     const int result = _wmkdir(wpath);
@@ -6673,7 +6581,7 @@ int hts_mkdir_utf8(const char *path) {
 
 HTSEXT_API int hts_utime_utf8(const char *path, const STRUCT_UTIMBUF * times) {
   STRUCT_UTIMBUF mtimes = *times;
-  LPWSTR wpath = hts_pathToUCS2(path);
+  LPWSTR wpath = hts_convertUTF8StringToUCS2(path, (int) strlen(path), NULL);
 
   if (wpath != NULL) {
     const int result = _wutime(wpath, &mtimes);

src/htslib.h

@@ -199,10 +199,6 @@ T_SOC newhttp(httrackp * opt, const char *iadr, htsblk * retour, int port,
    etc.). */
 T_SOC newhttp_addr(httrackp *opt, const char *iadr, htsblk *retour, int port,
                    int waitconnect, int addr_index, int *addr_count);
-/* Clips the formatted failure reason into r->msg, which also round-trips
-   through the cache as X-StatusMessage. Leaves r->statuscode to the caller. */
-void htsblk_failf(htsblk *r, const char *fmt, ...) HTS_PRINTF_FUN(2, 3);
-
 HTS_INLINE void deletehttp(htsblk * r);
 HTS_INLINE int deleteaddr(htsblk * r);
 HTS_INLINE void deletesoc(T_SOC soc);
@@ -266,7 +262,7 @@ HTS_INLINE void time_rfc822_local(char *s, struct tm *A);
 
 HTS_INLINE int sendc(htsblk * r, const char *s);
 int finput(T_SOC fd, char *s, int max);
-int binput(const char *buff, char *s, int max);
+int binput(char *buff, char *s, int max);
 int linput(FILE * fp, char *s, int max);
 int linputsoc(T_SOC soc, char *s, int max);
 int linputsoc_t(T_SOC soc, char *s, int max, int timeout);
@@ -611,26 +607,9 @@ static HTS_UNUSED size_t llint_to_size_t(LLint o) {
   }
 }
 
-/* Capacity for @p used bytes plus @p extra more plus @p slack spare;
-   (size_t) -1 if the total exceeds (size_t) -2 or @p extra is negative
-   (llint_to_size_t() would map that to a huge valid-looking size). */
-static HTS_UNUSED size_t llint_grow_size_t(size_t used, LLint extra,
-                                           size_t slack) {
-  const size_t max = (size_t) -2; /* (size_t) -1 is the error value */
-  const size_t e = extra >= 0 ? llint_to_size_t(extra) : (size_t) -1;
-
-  if (e == (size_t) -1 || used > max || slack > max - used ||
-      e > max - used - slack) {
-    return (size_t) -1;
-  }
-  return used + e + slack;
-}
-
 /* dirent() compatibility */
 #ifdef _WIN32
-/* Holds a UTF-8 d_name: MAX_PATH (260) UTF-16 units expand to <=3 bytes each.
-   Windows-only struct, ABI free to break. */
-#define HTS_DIRENT_SIZE 1024
+#define HTS_DIRENT_SIZE 256
 struct dirent {
   ino_t d_ino;                  /* ignored */
   off_t d_off;                  /* ignored */

src/htsname.c

@@ -47,7 +47,6 @@ Please visit our Website: http://www.httrack.com
 #include "htszlib.h"
 #endif
 #include <ctype.h>
-#include <limits.h>
 
 #define ADD_STANDARD_PATH \
     {  /* ajout nom */\
@@ -1476,37 +1475,15 @@ int url_savename(lien_adrfilsave *const afs,
                   sizeof(afs->save) - (size_t) (lastDot - afs->save));
     }
   }
-  // Cap the save path: the final parent+name is copied into a fixed buffer that
-  // aborts() on overflow (htssafe.h), so clamp every ceiling to fit it.
-#define HTS_SAVE_BUFSIZE (HTS_URLMAXSIZE * 2) /* sizeof(afs->save) */
-#define HTS_PATH_TAIL_RESERVE 64 /* collision suffix + ".delayed" + NUL */
-#ifdef _WIN32
-  // MAX_PATH minus 8.3 headroom (MSDN) minus the ".delayed" marker; raising it
-  // needs the engine to "\\?\"-prefix its paths, which is separate work.
-#define HTS_MAX_PATH_LEN (260 - 12 - 12)
-#define MAX_SEG_LEN 48
-#else
-  // #133: use the platform's own PATH_MAX/NAME_MAX (Linux/Android 4096, macOS
-  // 1024) rather than the far smaller Windows MAX_PATH.
-#ifdef PATH_MAX
-#define HTS_PATH_MAX_ PATH_MAX
-#else
-#define HTS_PATH_MAX_ 1024
-#endif
-#ifdef NAME_MAX
-#define HTS_NAME_MAX_ NAME_MAX
-#else
-#define HTS_NAME_MAX_ 255
-#endif
-#define HTS_MAX_PATH_LEN                                                       \
-  ((HTS_PATH_MAX_ - HTS_PATH_TAIL_RESERVE) <                                   \
-           (HTS_SAVE_BUFSIZE - HTS_PATH_TAIL_RESERVE)                          \
-       ? (HTS_PATH_MAX_ - HTS_PATH_TAIL_RESERVE)                               \
-       : (HTS_SAVE_BUFSIZE - HTS_PATH_TAIL_RESERVE))
-#define MAX_SEG_LEN (HTS_NAME_MAX_ > 64 ? HTS_NAME_MAX_ - 16 : HTS_NAME_MAX_)
-#endif
+  // enforce 260-character path limit before inserting destination path
+  // note: 12 characters at least for WIN32, and 12 for ".99.delayed"
+  // (MSDN) "When using an API to create a directory, the specified path 
+  // cannot be so long that you cannot append an 8.3 file name 
+  // (that is, the directory name cannot exceed MAX_PATH minus 12)."
+#define HTS_MAX_PATH_LEN ( 260 - 12 - 12 )
 #define MIN_LAST_SEG_RESERVE 12
 #define MAX_LAST_SEG_RESERVE 24
+#define MAX_SEG_LEN 48
   if (hts_stringLengthUTF8(afs->save) +
       hts_stringLengthUTF8(StringBuff(opt->path_html_utf8)) >=
       HTS_MAX_PATH_LEN) {
@@ -1516,7 +1493,7 @@ int url_savename(lien_adrfilsave *const afs,
     if (wsave != NULL) {
       const size_t parentLen =
         hts_stringLengthUTF8(StringBuff(opt->path_html_utf8));
-      // parent path length is not insane (otherwise, ignore and pick 200 as
+      // parent path length is not insane (otherwise, ignore and pick 200 as 
       // suffix length)
       const size_t maxLen =
         parentLen <
@@ -1607,37 +1584,9 @@ int url_savename(lien_adrfilsave *const afs,
     // Re-check again ending space or dot after cut (see bug #5)
     cleanEndingSpaceOrDot(afs->save);
   }
-  // The cut above counts UTF-8 codepoints, but parent+name lands in a fixed
-  // byte buffer that aborts() on overflow (htssafe.h). A multibyte name can
-  // pass the codepoint cap yet overflow in bytes, so hard-cut on a codepoint
-  // boundary to keep parent+name inside the buffer regardless (#133).
-  {
-    const size_t parentBytes = strlen(StringBuff(opt->path_html_utf8));
-    const size_t cap = HTS_SAVE_BUFSIZE - HTS_PATH_TAIL_RESERVE;
-    // Shrink only the name. A parent that alone fills the buffer is left to the
-    // existing prepend abort, not collapsed to an empty name that would collide
-    // across URLs and overrun the unbounded collision-suffix sprintf.
-    if (parentBytes < cap) {
-      size_t budget = cap - parentBytes;
-      if (strlen(afs->save) > budget) {
-        while (budget > 0 && ((unsigned char) afs->save[budget] & 0xC0) == 0x80)
-          budget--; // back off a continuation byte, never split a char
-        afs->save[budget] = '\0';
-        cleanEndingSpaceOrDot(afs->save);
-      }
-    }
-  }
 #undef MAX_UTF8_SEQ_CHARS
 #undef MIN_LAST_SEG_RESERVE
-#undef MAX_LAST_SEG_RESERVE
-#undef MAX_SEG_LEN
 #undef HTS_MAX_PATH_LEN
-#undef HTS_PATH_TAIL_RESERVE
-#undef HTS_SAVE_BUFSIZE
-#ifndef _WIN32
-#undef HTS_PATH_MAX_
-#undef HTS_NAME_MAX_
-#endif
 
   // chemin primaire éventuel A METTRE AVANT
   if (strnotempty(StringBuff(opt->path_html_utf8))) {

src/htsopt.h

@@ -256,7 +256,6 @@ struct htsoptstate {
   unsigned int debug_state;
   unsigned int tmpnameid; /**< counter for temporary file names */
   int is_ended;           /**< mirror has finished */
-  void *warc;             /**< open WARC writer (warc_writer*), or NULL */
 };
 
 /* Library handles */
@@ -539,14 +538,6 @@ struct httrackp {
   int pause_max_ms; /**< inter-file pause upper bound, ms */
   String why_url;   /**< URL to diagnose (--why): print the deciding filter rule
                          and exit without crawling */
-  String warc_file; /**< WARC output: WARC_AUTONAME for --warc, or the
-                         --warc-file basename (appended at the tail: ABI) */
-  LLint warc_max_size;  /**< --warc-max-size: rotate the archive past this many
-                             bytes (<=0: single file). Tail: ABI */
-  hts_boolean warc_cdx; /**< --warc-cdx: write a sorted CDXJ index next to the
-                             archive. Tail: ABI */
-  hts_boolean warc_wacz; /**< --wacz: package archive+index+pages as a WACZ zip
-                              (implies --warc + --warc-cdx). Tail: ABI */
 };
 
 /* Running statistics for a mirror. */
@@ -670,14 +661,6 @@ struct htsblk {
   /* Restart-whole signal: a resume this response rejected (unusable 206) must
      retry with no Range, else a surviving partial/temp-ref loops (#581). */
   hts_boolean refetch_wholefile;
-  char *warc_reqhdr; /**< stashed raw request header block for WARC (or NULL) */
-  char *
-      warc_resphdr; /**< stashed raw response header block for WARC (or NULL) */
-  int warc_truncated; /**< WARC-Truncated reason for a cap-truncated body
-                           (WARC_TRUNC_*, 0=none). Tail: ABI */
-  char *warc_rawpath; /**< verbatim WARC: spooled compressed body path, or NULL
-                           (owns the file; unlinked on free). Tail: ABI */
-  LLint warc_rawsize; /**< byte length of warc_rawpath. Tail: ABI */
   /*char digest[32+2];   // md5 digest generated by the engine ("" if none) */
 };
 

src/htsparse.c

@@ -792,72 +792,17 @@ int htsparse(htsmoduleStruct * str, htsmoduleStructExtended * stre) {
                   char gmttime[256];
                   char BIGSTK safe_adr[HTS_URLMAXSIZE * 3 + 4];
                   char BIGSTK safe_fil[HTS_URLMAXSIZE * 3 + 4];
-                  char BIGSTK safe_url[HTS_URLMAXSIZE * 6 + 16];
-                  char safe_lastmod[sizeof(r->lastmodified) * 3 + 4];
-                  char safe_ctype[sizeof(r->contenttype) * 3 + 4];
-                  char safe_charset[sizeof(r->charset) * 3 + 4];
-                  char status_str[16];
-                  char size_str[32];
-                  // {url} scheme: jump_identification_const strips it for
-                  // http/https/ftp, so re-add it (bare host is http); for any
-                  // other scheme the host keeps its "scheme://" and we add
-                  // none.
-                  const char *const url_host =
-                      jump_identification_const(urladr());
-                  const char *const url_scheme =
-                      strstr(url_host, "://") != NULL  ? ""
-                      : strfield(urladr(), "https://") ? "https://"
-                      : strfield(urladr(), "ftp://")   ? "ftp://"
-                                                       : "http://";
 
-                  // {addr}/{path} are the escaped host and remote path; {url}
-                  // prepends the scheme to them (credentials already stripped
-                  // by jump_identification_const, and the scheme is a safe
-                  // literal, so no re-escaping is needed).
-                  html_inline_safe(url_host, safe_adr, sizeof(safe_adr));
-                  html_inline_safe(urlfil(), safe_fil, sizeof(safe_fil));
-                  snprintf(safe_url, sizeof(safe_url), "%s%s%s", url_scheme,
-                           safe_adr, safe_fil);
-                  snprintf(status_str, sizeof(status_str), "%d", r->statuscode);
-                  snprintf(size_str, sizeof(size_str), LLintP, (LLint) r->size);
+                  tempo[0] = '\0';
                   time_gmt_rfc822(gmttime);
-
-                  {
-                    // Every network-derived string is html_inline_safe()'d: the
-                    // footer sits inside an HTML comment, so a value holding
-                    // "-->" would otherwise close it and inject markup (#165).
-                    // status/size are formatted integers and need no escaping.
-                    const hts_footer_field fields[] = {
-                        {"addr", safe_adr},
-                        {"path", safe_fil},
-                        {"url", safe_url},
-                        {"date", gmttime},
-                        {"lastmodified",
-                         html_inline_safe(r->lastmodified, safe_lastmod,
-                                          sizeof(safe_lastmod))},
-                        {"version", HTTRACK_VERSIONID},
-                        {"mime", html_inline_safe(r->contenttype, safe_ctype,
-                                                  sizeof(safe_ctype))},
-                        {"charset", html_inline_safe(r->charset, safe_charset,
-                                                     sizeof(safe_charset))},
-                        {"status", status_str},
-                        {"size", size_str},
-                    };
-
-                    tempo[0] = '\0';
-                    strcatbuff(tempo, eol);
-                    // hts_footer_format returns <0 on overflow, leaving tempo
-                    // unterminated; emitting it would abort in strcatbuff
-                    // below.
-                    if (hts_footer_format(tempo + strlen(tempo),
-                                          sizeof(tempo) - strlen(tempo),
-                                          StringBuff(opt->footer), fields,
-                                          sizeof(fields) / sizeof(fields[0])) >=
-                        0) {
-                      strcatbuff(tempo, eol);
-                      HT_ADD(tempo);
-                    }
-                  }
+                  strcatbuff(tempo, eol);
+                  hts_template_format_str(tempo + strlen(tempo), sizeof(tempo) - strlen(tempo),
+                          StringBuff(opt->footer),
+                          html_inline_safe(jump_identification_const(urladr()), safe_adr, sizeof(safe_adr)),
+                          html_inline_safe(urlfil(), safe_fil, sizeof(safe_fil)), gmttime,
+                          HTTRACK_VERSIONID, /* EOF */ NULL);
+                  strcatbuff(tempo, eol);
+                  HT_ADD(tempo);
                 }
                 // Emit charset ?
                 if (emited_footer == 1 && strnotempty(r->charset)) {
@@ -3656,7 +3601,7 @@ int hts_mirror_check_moved(htsmoduleStruct * str,
           !ref_existed;
       if (fexist_utf8(heap(ptr)->sav)) {
         had_partial = 1;
-        UNLINK(heap(ptr)->sav);
+        remove(heap(ptr)->sav);
       }
 
       // Re-get once, only if a partial existed and both Range triggers are
@@ -3862,13 +3807,18 @@ void hts_mirror_process_user_interaction(htsmoduleStruct * str,
     int do_pause = 0;
 
     // user pause lockfile : create hts-paused.lock --> HTTrack will be paused
-    if (fexist_utf8(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                            StringBuff(opt->path_log), "hts-stop.lock"))) {
+    if (fexist
+        (fconcat
+         (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
+         StringBuff(opt->path_log), "hts-stop.lock"))) {
       // remove lockfile
-      UNLINK(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                     StringBuff(opt->path_log), "hts-stop.lock"));
-      if (!fexist_utf8(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                               StringBuff(opt->path_log), "hts-stop.lock"))) {
+      remove(fconcat
+             (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
+             StringBuff(opt->path_log), "hts-stop.lock"));
+      if (!fexist
+          (fconcat
+           (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
+           StringBuff(opt->path_log), "hts-stop.lock"))) {
         do_pause = 1;
       }
     }
@@ -3897,9 +3847,11 @@ void hts_mirror_process_user_interaction(htsmoduleStruct * str,
         }
       }
       {
-        FILE *fp = FOPEN(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                                 StringBuff(opt->path_log), "hts-paused.lock"),
-                         "wb");
+        FILE *fp =
+          fopen(fconcat
+                (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
+                StringBuff(opt->path_log),
+                 "hts-paused.lock"), "wb");
         if (fp) {
           fspc(NULL, fp, "info");       // dater
           fprintf(fp,
@@ -4215,17 +4167,18 @@ int hts_mirror_wait_for_next_file(htsmoduleStruct * str,
             int a = 0;
 
             *stre->last_info_shell_ = tl;
-            if (fexist_utf8(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                                    StringBuff(opt->path_log),
-                                    "hts-autopsy"))) { // débuggage: teste si le
-                                                       // robot est vivant
+            if (fexist(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),  StringBuff(opt->path_log), "hts-autopsy"))) { // débuggage: teste si le robot est vivant
               // (oui je sais un robot vivant.. mais bon.. il a le droit de vivre lui aussi)
               // (libérons les robots esclaves de l'internet!)
-              UNLINK(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                             StringBuff(opt->path_log), "hts-autopsy"));
-              fp = FOPEN(fconcat(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
-                                 StringBuff(opt->path_log), "hts-isalive"),
-                         "wb");
+              remove(fconcat
+                     (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
+                     StringBuff(opt->path_log),
+                      "hts-autopsy"));
+              fp =
+                fopen(fconcat
+                      (OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
+                      StringBuff(opt->path_log),
+                       "hts-isalive"), "wb");
               a = 1;
             }
             if ((*stre->info_shell_) || a) {
@@ -4583,7 +4536,7 @@ int hts_wait_delayed(htsmoduleStruct * str, lien_adrfilsave *afs,
             /* seen as in error */
             in_error = back[b].r.statuscode;
             in_error_msg[0] = 0;
-            strncatbuff(in_error_msg, back[b].r.msg, sizeof(in_error_msg) - 1);
+            strncat(in_error_msg, back[b].r.msg, sizeof(in_error_msg) - 1);
             in_error_size = back[b].r.totalsize;
             /* don't break, even with "don't take error pages" switch, because we need to process the slot anyway (and cache the error) */
           }

src/htsproxy.c

@@ -173,8 +173,8 @@ int http_proxy_tunnel(httrackp *opt, htsblk *retour, const char *adr,
   if (sscanf(line, "HTTP/%*d.%*d %d", &code) < 1)
     code = 0;
   if (code < 200 || code >= 300) {
-    htsblk_failf(retour, "proxy CONNECT refused: %s",
-                 strnotempty(line) ? line : "(no status)");
+    snprintf(retour->msg, sizeof(retour->msg), "proxy CONNECT refused: %s",
+             strnotempty(line) ? line : "(no status)");
     return 0;
   }
 

src/htssafe.h

@@ -33,7 +33,6 @@ Please visit our Website: http://www.httrack.com
 #ifndef HTSSAFE_DEFH
 #define HTSSAFE_DEFH
 
-#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -117,15 +116,6 @@ static HTS_UNUSED void abortf_(const char *exp, const char *file, int line) {
 #endif
 #define HTS_IS_NOT_CHAR_BUFFER(VAR) (!HTS_IS_CHAR_BUFFER(VAR))
 
-/* Source capacity for the buff() family, (size_t)-1 when unknown; sizeof of the
-   TYPE keeps a decayed operand ("buf + 1") off -Wsizeof-array-decay. */
-#if (defined(__GNUC__) && !defined(__cplusplus))
-#define HTS_SIZEOF_SRC_(B)                                                     \
-  (HTS_IS_NOT_CHAR_BUFFER(B) ? (size_t) -1 : sizeof(__typeof__(B)))
-#else
-#define HTS_SIZEOF_SRC_(B) (HTS_IS_NOT_CHAR_BUFFER(B) ? (size_t) -1 : sizeof(B))
-#endif
-
 /* Compile-time checks. */
 static HTS_UNUSED void htssafe_compile_time_check_(void) {
   char array[32];
@@ -215,17 +205,19 @@ static char *strncatbuff_ptr_(char *dest, const char *src, size_t n) {
 #if (defined(__GNUC__) && !defined(__cplusplus))
 
 #define strncatbuff(A, B, N)                                                   \
-  __builtin_choose_expr(HTS_IS_CHAR_BUFFER(A),                                 \
-                        strncat_safe_(A, sizeof(A), B, HTS_SIZEOF_SRC_(B), N,  \
-                                      "overflow while appending '" #B          \
-                                      "' to '" #A "'",                         \
-                                      __FILE__, __LINE__),                     \
-                        strncatbuff_ptr_((A), (B), (N)))
+  __builtin_choose_expr(                                                       \
+      HTS_IS_CHAR_BUFFER(A),                                                   \
+      strncat_safe_(A, sizeof(A), B,                                           \
+                    HTS_IS_NOT_CHAR_BUFFER(B) ? (size_t) -1 : sizeof(B), N,    \
+                    "overflow while appending '" #B "' to '" #A "'", __FILE__, \
+                    __LINE__),                                                 \
+      strncatbuff_ptr_((A), (B), (N)))
 #else
 #define strncatbuff(A, B, N)                                                   \
   (HTS_IS_NOT_CHAR_BUFFER(A)                                                   \
        ? strncat(A, B, N)                                                      \
-       : strncat_safe_(A, sizeof(A), B, HTS_SIZEOF_SRC_(B), N,                 \
+       : strncat_safe_(A, sizeof(A), B,                                        \
+                       HTS_IS_NOT_CHAR_BUFFER(B) ? (size_t) -1 : sizeof(B), N, \
                        "overflow while appending '" #B "' to '" #A "'",        \
                        __FILE__, __LINE__))
 #endif
@@ -240,7 +232,9 @@ static char *strncatbuff_ptr_(char *dest, const char *src, size_t n) {
 #define strcatbuff(A, B)                                                       \
   __builtin_choose_expr(                                                       \
       HTS_IS_CHAR_BUFFER(A),                                                   \
-      strncat_safe_(A, sizeof(A), B, HTS_SIZEOF_SRC_(B), (size_t) -1,          \
+      strncat_safe_(A, sizeof(A), B,                                           \
+                    HTS_IS_NOT_CHAR_BUFFER(B) ? (size_t) -1 : sizeof(B),       \
+                    (size_t) -1,                                               \
                     "overflow while appending '" #B "' to '" #A "'", __FILE__, \
                     __LINE__),                                                 \
       strcatbuff_ptr_((A), (B)))
@@ -248,7 +242,9 @@ static char *strncatbuff_ptr_(char *dest, const char *src, size_t n) {
 #define strcatbuff(A, B)                                                       \
   (HTS_IS_NOT_CHAR_BUFFER(A)                                                   \
        ? strcat(A, B)                                                          \
-       : strncat_safe_(A, sizeof(A), B, HTS_SIZEOF_SRC_(B), (size_t) -1,       \
+       : strncat_safe_(A, sizeof(A), B,                                        \
+                       HTS_IS_NOT_CHAR_BUFFER(B) ? (size_t) -1 : sizeof(B),    \
+                       (size_t) -1,                                            \
                        "overflow while appending '" #B "' to '" #A "'",        \
                        __FILE__, __LINE__))
 #endif
@@ -261,17 +257,19 @@ static char *strncatbuff_ptr_(char *dest, const char *src, size_t n) {
 #if (defined(__GNUC__) && !defined(__cplusplus))
 
 #define strcpybuff(A, B)                                                       \
-  __builtin_choose_expr(HTS_IS_CHAR_BUFFER(A),                                 \
-                        strcpy_safe_(A, sizeof(A), B, HTS_SIZEOF_SRC_(B),      \
-                                     "overflow while copying '" #B "' to '" #A \
-                                     "'",                                      \
-                                     __FILE__, __LINE__),                      \
-                        strcpybuff_ptr_((A), (B)))
+  __builtin_choose_expr(                                                       \
+      HTS_IS_CHAR_BUFFER(A),                                                   \
+      strcpy_safe_(A, sizeof(A), B,                                            \
+                   HTS_IS_NOT_CHAR_BUFFER(B) ? (size_t) -1 : sizeof(B),        \
+                   "overflow while copying '" #B "' to '" #A "'", __FILE__,    \
+                   __LINE__),                                                  \
+      strcpybuff_ptr_((A), (B)))
 #else
 #define strcpybuff(A, B)                                                       \
   (HTS_IS_NOT_CHAR_BUFFER(A)                                                   \
        ? strcpy(A, B)                                                          \
-       : strcpy_safe_(A, sizeof(A), B, HTS_SIZEOF_SRC_(B),                     \
+       : strcpy_safe_(A, sizeof(A), B,                                         \
+                      HTS_IS_NOT_CHAR_BUFFER(B) ? (size_t) -1 : sizeof(B),     \
                       "overflow while copying '" #B "' to '" #A "'", __FILE__, \
                       __LINE__))
 #endif
@@ -288,24 +286,24 @@ static char *strncatbuff_ptr_(char *dest, const char *src, size_t n) {
  * Append characters of "B" to "A", "A" having a maximum capacity of "S".
  */
 #define strlcatbuff(A, B, S)                                                   \
-  strncat_safe_(A, S, B, HTS_SIZEOF_SRC_(B), (size_t) -1,                      \
-                "overflow while appending '" #B "' to '" #A "'", __FILE__,     \
-                __LINE__)
+  strncat_safe_(A, S, B, HTS_IS_NOT_CHAR_BUFFER(B) ? (size_t) -1 : sizeof(B),  \
+                (size_t) -1, "overflow while appending '" #B "' to '" #A "'",  \
+                __FILE__, __LINE__)
 
 /**
  * Append at most "N" characters of "B" to "A", "A" having a maximum capacity
  * of "S".
  */
 #define strlncatbuff(A, B, S, N)                                               \
-  strncat_safe_(A, S, B, HTS_SIZEOF_SRC_(B), N,                                \
-                "overflow while appending '" #B "' to '" #A "'", __FILE__,     \
+  strncat_safe_(A, S, B, HTS_IS_NOT_CHAR_BUFFER(B) ? (size_t) -1 : sizeof(B),  \
+                N, "overflow while appending '" #B "' to '" #A "'", __FILE__,  \
                 __LINE__)
 
 /**
  * Copy characters of "B" to "A", "A" having a maximum capacity of "S".
  */
 #define strlcpybuff(A, B, S)                                                   \
-  strcpy_safe_(A, S, B, HTS_SIZEOF_SRC_(B),                                    \
+  strcpy_safe_(A, S, B, HTS_IS_NOT_CHAR_BUFFER(B) ? (size_t) -1 : sizeof(B),   \
                "overflow while copying '" #B "' to '" #A "'", __FILE__,        \
                __LINE__)
 
@@ -424,9 +422,7 @@ static HTS_INLINE HTS_UNUSED htsbuff htsbuff_ptr_(char *buf, size_t cap) {
  */
 static HTS_INLINE HTS_UNUSED void htsbuff_catn(htsbuff *b, const char *s,
                                                size_t n) {
-  /* the (size_t)-1 "no limit" sentinel would reach strnlen as a bound past
-     PTRDIFF_MAX */
-  const size_t add = n != (size_t) -1 ? strnlen(s, n) : strlen(s);
+  const size_t add = strnlen(s, n);
   /* Overflow-safe: keep the (potentially huge) 'add' alone on one side. The
      maintained invariant len < cap makes 'cap - len' >= 1 (no underflow), so
      'add < cap - len' cannot wrap the way 'len + add < cap' could. */
@@ -460,49 +456,6 @@ static HTS_INLINE HTS_UNUSED const char *htsbuff_str(const htsbuff *b) {
   return b->buf;
 }
 
-/**
- * Callers that deliberately ignore truncation use this instead of
- * slprintfbuff(), so it is not HTS_CHECK_RESULT.
- */
-static HTS_INLINE HTS_UNUSED HTS_PRINTF_FUN(3, 0) hts_boolean
-    vslprintfbuff(char *dest, size_t size, const char *fmt, va_list args) {
-  int ret;
-
-  assertf(dest != NULL && size != 0);
-  ret = vsnprintf(dest, size, fmt, args);
-  /* pre-C99 runtimes (msvcrt _vsnprintf) return -1 and do not terminate */
-  dest[size - 1] = '\0';
-  return ret >= 0 && (size_t) ret < size ? HTS_TRUE : HTS_FALSE;
-}
-
-/**
- * Formatted print into dest (capacity size, NUL included), truncating to fit
- * and always NUL-terminating. Returns HTS_TRUE if the whole output fit; the
- * result is the only truncation signal, so it must be acted on. Unlike
- * strcpybuff() it never aborts, so it suits text built from remote input.
- */
-static HTS_INLINE HTS_UNUSED HTS_CHECK_RESULT HTS_PRINTF_FUN(3, 4) hts_boolean
-    slprintfbuff(char *dest, size_t size, const char *fmt, ...) {
-  va_list args;
-  hts_boolean ret;
-
-  va_start(args, fmt);
-  ret = vslprintfbuff(dest, size, fmt, args);
-  va_end(args);
-  return ret;
-}
-
-/**
- * slprintfbuff() over the in-scope array ARR (capacity = sizeof(ARR)).
- * On GCC/Clang a pointer is a compile error; use slprintfbuff() for those.
- */
-#if (defined(__GNUC__) && !defined(__cplusplus))
-#define sprintfbuff(ARR, ...)                                                  \
-  slprintfbuff((ARR), sizeof(ARR) + htsbuff_must_be_array_(ARR), __VA_ARGS__)
-#else
-#define sprintfbuff(ARR, ...) slprintfbuff((ARR), sizeof(ARR), __VA_ARGS__)
-#endif
-
 /* Thin aliases over the libc allocator/memcpy (historical "t" suffix); no
    added bounds checking. freet() also NULLs the freed pointer and tolerates
    NULL. memcpybuff() despite the name is a raw memcpy: the caller owns the

src/htsserver.c

@@ -147,8 +147,7 @@ HTS_UNUSED static int LANG_LIST(const char *path, char *buffer, size_t size);
 // 0- Init the URL catcher with standard port
 
 // smallserver_init(&port,&return_host);
-T_SOC smallserver_init_std(int *port_prox, char *adr_prox, int defaultPort,
-                           const char *bindAddr) {
+T_SOC smallserver_init_std(int *port_prox, char *adr_prox, int defaultPort) {
   T_SOC soc;
 
   if (defaultPort <= 0) {
@@ -161,12 +160,12 @@ T_SOC smallserver_init_std(int *port_prox, char *adr_prox, int defaultPort,
     int i = 0;
 
     do {
-      soc = smallserver_init(&try_to_listen_to[i], adr_prox, bindAddr);
+      soc = smallserver_init(&try_to_listen_to[i], adr_prox);
       *port_prox = try_to_listen_to[i];
       i++;
     } while((soc == INVALID_SOCKET) && (try_to_listen_to[i] >= 0));
   } else {
-    soc = smallserver_init(&defaultPort, adr_prox, bindAddr);
+    soc = smallserver_init(&defaultPort, adr_prox);
     *port_prox = defaultPort;
   }
   return soc;
@@ -244,10 +243,9 @@ static int my_gethostname(char *h_loc, size_t size) {
 }
 
 // smallserver_init(&port,&return_host);
-T_SOC smallserver_init(int *port, char *adr, const char *bindAddr) {
+T_SOC smallserver_init(int *port, char *adr) {
   T_SOC soc = INVALID_SOCKET;
   char h_loc[256 + 2];
-  SOCaddr server;
 
   commandRunning = commandEnd = commandReturn = commandReturnSet =
     commandEndRequested = 0;
@@ -258,23 +256,25 @@ T_SOC smallserver_init(int *port, char *adr, const char *bindAddr) {
     free(commandReturnCmdl);
   commandReturnCmdl = NULL;
 
-  SOCaddr_initany(server);
-  if (bindAddr != NULL && *bindAddr != '\0') {
-    /* advertise the bound address, else the URL we print is unreachable */
-    if (strlen(bindAddr) >= sizeof(h_loc) || !gethost(bindAddr, &server)) {
-      return INVALID_SOCKET;
-    }
-    strcpybuff(h_loc, bindAddr);
-  } else if (my_gethostname(h_loc, 256) != 0) { // host name
-    return INVALID_SOCKET;
-  }
+  if (my_gethostname(h_loc, 256) == 0) {   // host name
+    SOCaddr server;
 
-  if ((soc = (T_SOC) socket(SOCaddr_sinfamily(server), SOCK_STREAM, 0)) !=
-      INVALID_SOCKET) {
-    SOCaddr_initport(server, *port);
-    if (bind(soc, &SOCaddr_sockaddr(server), SOCaddr_size(server)) == 0) {
-      if (listen(soc, 10) >= 0) {
-        strcpy(adr, h_loc);
+    SOCaddr_initany(server);
+    if ((soc =
+         (T_SOC) socket(SOCaddr_sinfamily(server), SOCK_STREAM,
+                        0)) != INVALID_SOCKET) {
+      SOCaddr_initport(server, *port);
+      if (bind(soc, &SOCaddr_sockaddr(server), SOCaddr_size(server)) == 0) {
+        if (listen(soc, 10) >= 0) {
+          strcpy(adr, h_loc);
+        } else {
+#ifdef _WIN32
+          closesocket(soc);
+#else
+          close(soc);
+#endif
+          soc = INVALID_SOCKET;
+        }
       } else {
 #ifdef _WIN32
         closesocket(soc);
@@ -283,13 +283,6 @@ T_SOC smallserver_init(int *port, char *adr, const char *bindAddr) {
 #endif
         soc = INVALID_SOCKET;
       }
-    } else {
-#ifdef _WIN32
-      closesocket(soc);
-#else
-      close(soc);
-#endif
-      soc = INVALID_SOCKET;
     }
   }
   return soc;
@@ -318,88 +311,6 @@ typedef struct {
   error_redirect = "/server/error.html"; \
 } while(0)
 
-/* Longest "sid" value worth unescaping: the expected one is an md5 hex digest,
-   so anything near this is already invalid and is rejected unread. */
-#define SID_VALUE_MAX 64
-
-/** Does the urlencoded request body present the expected session id?
-    True only if at least one "sid" field is present and every occurrence
-    matches, so it holds whichever one a later last-write-wins parse keeps.
-    Non-destructive: it runs before the body is tokenized in place. */
-static hts_boolean body_sid_is_valid(const char *body, const char *expected) {
-  const char *s = body;
-  hts_boolean seen = HTS_FALSE;
-
-  while (s != NULL && *s != '\0') {
-    const char *const amp = strchr(s, '&');
-    const char *const eq = strchr(s, '=');
-
-    if (eq != NULL && (amp == NULL || eq < amp) && (size_t) (eq - s) == 3 &&
-        strncmp(s, "sid", 3) == 0) {
-      const size_t len = amp != NULL ? (size_t) (amp - eq - 1) : strlen(eq + 1);
-      hts_boolean match = HTS_FALSE;
-
-      if (len < SID_VALUE_MAX) {
-        char raw[SID_VALUE_MAX];
-        String value = STRING_EMPTY;
-
-        memcpy(raw, eq + 1, len);
-        raw[len] = '\0';
-        unescapehttp(raw, &value);
-        /* StringBuff is NULL until written, so an empty value lands here. */
-        if (StringBuff(value) != NULL &&
-            strcmp(StringBuff(value), expected) == 0) {
-          match = HTS_TRUE;
-        }
-        StringFree(value);
-      }
-      if (!match) {
-        return HTS_FALSE;
-      }
-      seen = HTS_TRUE;
-    }
-    s = amp != NULL ? amp + 1 : NULL;
-  }
-  return seen;
-}
-
-/* Append c to dst as an HTML entity, or return HTS_FALSE if it needs none. */
-static hts_boolean cat_html_escaped(String *dst, char c) {
-  switch (c) {
-  case '<':
-    StringCat(*dst, "&lt;");
-    break;
-  case '>':
-    StringCat(*dst, "&gt;");
-    break;
-  case '&':
-    StringCat(*dst, "&amp;");
-    break;
-  case '\'':
-    StringCat(*dst, "&#39;");
-    break;
-  default:
-    return HTS_FALSE;
-  }
-  return HTS_TRUE;
-}
-
-/* Append the value of a double-quoted command-line argument: escaped for HTML,
-   which the browser undoes when it posts the command line back, and for the
-   argv splitter, which does not. */
-static void cat_cmdline_arg(String *output, const char *value) {
-  const char *a;
-
-  for (a = value; *a != '\0'; a++) {
-    if (*a == '\\' || *a == '\"') {
-      StringCat(*output, "\\");
-    }
-    if (!cat_html_escaped(output, *a)) {
-      StringMemcat(*output, a, 1);
-    }
-  }
-}
-
 int smallserver(T_SOC soc, char *url, char *method, char *data, char *path) {
   int timeout = 30;
   int retour = 0;
@@ -484,7 +395,6 @@ int smallserver(T_SOC soc, char *url, char *method, char *data, char *path) {
     T_SOC soc_c;
     LLint length = 0;
     const char *error_redirect = NULL;
-    hts_boolean denied = HTS_FALSE;
 
     line[0] = '\0';
     buffer[0] = '\0';
@@ -596,22 +506,6 @@ int smallserver(T_SOC soc, char *url, char *method, char *data, char *path) {
         }
       }
 
-      /* Authenticate the body before parsing it: every field it carries is
-         written straight into the global key store below, "command" included,
-         and that one reaches the engine. Checking afterwards cannot work — the
-         damage is already done, and the pre-seeded "sid" above would compare
-         equal to itself for a request that simply omits the field. */
-      if (meth && buffer[0]) {
-        intptr_t expected = 0;
-
-        if (!coucal_readptr(NewLangList, "_sid", &expected) ||
-            !body_sid_is_valid(buffer, (const char *) expected)) {
-          buffer[0] = '\0';
-          meth = 0;
-          denied = HTS_TRUE;
-        }
-      }
-
       /* check variables */
       if (meth && buffer[0]) {
         char *s = buffer;
@@ -632,6 +526,20 @@ int smallserver(T_SOC soc, char *url, char *method, char *data, char *path) {
         }
       }
 
+      /* Error check */
+      {
+        intptr_t adr = 0;
+        intptr_t adr2 = 0;
+
+        if (coucal_readptr(NewLangList, "sid", &adr)) {
+          if (coucal_readptr(NewLangList, "_sid", &adr2)) {
+            if (strcmp((char *) adr, (char *) adr2) != 0) {
+              meth = 0;
+            }
+          }
+        }
+      }
+
       /* Check variables (internal) */
       if (meth) {
         int doLoad = 0;
@@ -995,11 +903,13 @@ int smallserver(T_SOC soc, char *url, char *method, char *data, char *path) {
                 }
               }
               StringMemcat(headers, redir, strlen(redir));
-              /* client-supplied: a CR/LF here would split the response */
-              if (newfile[strcspn(newfile, "\r\n")] == '\0') {
-                StringCat(headers, "Location: ");
-                StringCat(headers, newfile);
-                StringCat(headers, "\r\n");
+              {
+                char tmp[256];
+
+                if (strlen(file) < sizeof(tmp) - 32) {
+                  sprintf(tmp, "Location: %s\r\n", newfile);
+                  StringMemcat(headers, tmp, strlen(tmp));
+                }
               }
               coucal_write(NewLangList, "redirect", (intptr_t) NULL);
             } else if (is_html(file)) {
@@ -1030,7 +940,6 @@ int smallserver(T_SOC soc, char *url, char *method, char *data, char *path) {
                     int p;
                     int format = 0;
                     int listDefault = 0;
-                    hts_boolean unquoted = HTS_FALSE;
 
                     name[0] = '\0';
                     strlncatbuff(name, str, sizeof(name_), n);
@@ -1040,12 +949,6 @@ int smallserver(T_SOC soc, char *url, char *method, char *data, char *path) {
                     } else if ((p = strfield(name, "html:"))) {
                       name += p;
                       format = 1;
-                    } else if ((p = strfield(name, "unquoted:"))) {
-                      name += p;
-                      unquoted = HTS_TRUE;
-                    } else if ((p = strfield(name, "arg:"))) {
-                      name += p;
-                      format = 5;
                     } else if ((p = strfield(name, "list:"))) {
                       name += p;
                       format = 2;
@@ -1182,8 +1085,8 @@ int smallserver(T_SOC soc, char *url, char *method, char *data, char *path) {
                        test:<if ==0>:<if ==1>:<if == 2>..
                        ztest:<if == 0 || !exist>:<if == 1>:<if == 2>..
                      */
-                    else if ((p = strfield(name, "test:")) ||
-                             (p = strfield(name, "ztest:"))) {
+                    else if ((p = strfield(name, "test:"))
+                             || (p = strfield(name, "ztest:"))) {
                       intptr_t adr = 0;
                       char *pos2;
                       int ztest = (name[0] == 'z');
@@ -1286,12 +1189,6 @@ int smallserver(T_SOC soc, char *url, char *method, char *data, char *path) {
                         }
                       }
                     }
-                    /* consumed here: it shares nothing with the list and
-                       option formats below */
-                    if (format == 5 && langstr != NULL && outputmode != -1) {
-                      cat_cmdline_arg(&output, langstr);
-                      langstr = NULL;
-                    }
                     if (langstr && outputmode != -1) {
                       switch (format) {
                       case 0:
@@ -1309,18 +1206,18 @@ int smallserver(T_SOC soc, char *url, char *method, char *data, char *path) {
                                 StringMemcat(output, &c, 1);
                               }
                               a += 2;
-                            } else if (unquoted && a[0] == '\"') {
-                              /* the browser posts an entity back as a raw
-                                 quote, which would open a quoted run in the
-                                 argv splitter; a URI cannot hold one anyway */
-                              StringCat(output, "%22");
-                            } else if (outputmode &&
-                                       cat_html_escaped(&output, a[0])) {
-                              /* appended as an entity */
+                            } else if (outputmode && a[0] == '<') {
+                              StringCat(output, "&lt;");
+                            } else if (outputmode && a[0] == '>') {
+                              StringCat(output, "&gt;");
+                            } else if (outputmode && a[0] == '&') {
+                              StringCat(output, "&amp;");
+                            } else if (outputmode && a[0] == '\'') {
+                              StringCat(output, "&#39;");
                             } else if (outputmode == 3 && a[0] == ' ') {
                               StringCat(output, "%20");
-                            } else if (outputmode >= 2 &&
-                                       ((unsigned char) a[0]) < 32) {
+                            } else if (outputmode >= 2
+                                       && ((unsigned char) a[0]) < 32) {
                               char tmp[32];
 
                               sprintf(tmp, "%%%02x", (unsigned char) a[0]);
@@ -1381,10 +1278,20 @@ int smallserver(T_SOC soc, char *url, char *method, char *data, char *path) {
                               }
                               StringClear(tmpbuff);
                               break;
+                            case '<':
+                              StringCat(tmpbuff, "&lt;");
+                              break;
+                            case '>':
+                              StringCat(tmpbuff, "&gt;");
+                              break;
+                            case '&':
+                              StringCat(tmpbuff, "&amp;");
+                              break;
+                            case '\'':
+                              StringCat(tmpbuff, "&#39;");
+                              break;
                             default:
-                              if (!cat_html_escaped(&tmpbuff, *fstr)) {
-                                StringMemcat(tmpbuff, fstr, 1);
-                              }
+                              StringMemcat(tmpbuff, fstr, 1);
                               break;
                             }
                             fstr++;
@@ -1461,11 +1368,6 @@ int smallserver(T_SOC soc, char *url, char *method, char *data, char *path) {
             StringCat(output, error);
           }
         }
-      } else if (denied) {
-        StringCat(headers, "HTTP/1.0 403 Forbidden\r\n"
-                           "Server: httrack small server\r\n"
-                           "Content-type: text/html\r\n");
-        StringCat(output, "Missing or invalid session id.\r\n");
       } else {
 #ifdef _DEBUG
         char error_hdr[] =

src/htsserver.h

@@ -43,11 +43,8 @@ Please visit our Website: http://www.httrack.com
 
 // Fonctions
 void socinput(T_SOC soc, char *s, int max);
-/* Listen on bindAddr, or every interface if NULL/empty; adr (>= 258 bytes) gets
-   the address to advertise. INVALID_SOCKET on error. */
-T_SOC smallserver_init_std(int *port_prox, char *adr_prox, int defaultPort,
-                           const char *bindAddr);
-T_SOC smallserver_init(int *port, char *adr, const char *bindAddr);
+T_SOC smallserver_init_std(int *port_prox, char *adr_prox, int defaultPort);
+T_SOC smallserver_init(int *port, char *adr);
 int smallserver(T_SOC soc, char *url, char *method, char *data, char *path);
 
 #define CATCH_RESPONSE \

src/htstools.c

@@ -754,48 +754,35 @@ typedef struct hts_template_format_buf {
   size_t offset;
 } hts_template_format_buf;
 
-// Bounded append to a template buffer (or FILE); returns -1 on overflow/error.
-static int htsfmt_putc(hts_template_format_buf *buf, char c) {
-  if (buf->fp != NULL) {
-    assertf(buf->buffer == NULL);
-    if (fputc(c, buf->fp) < 0)
-      return -1;
-  } else {
-    assertf(buf->buffer != NULL);
-    if (buf->offset + 1 < buf->size)
-      buf->buffer[buf->offset++] = c;
-    else
-      return -1;
-  }
-  return 0;
-}
-
-static int htsfmt_puts(hts_template_format_buf *buf, const char *s) {
-  size_t i;
-  assertf(s != NULL);
-  for (i = 0; s[i] != '\0'; i++) {
-    if (htsfmt_putc(buf, s[i]) < 0)
-      return -1;
-  }
-  return 0;
-}
-
 // note: upstream arg list MUST be NULL-terminated for safety
 // returns a negative value upon error
-static int hts_template_formatv(hts_template_format_buf *buf,
+static int hts_template_formatv(hts_template_format_buf *buf, 
                                 const char *format, va_list args) {
 #undef FPUTC
 #undef FPUTS
-#define FPUTC(C)                                                               \
-  do {                                                                         \
-    if (htsfmt_putc(buf, (C)) < 0)                                             \
-      return -1;                                                               \
-  } while (0)
-#define FPUTS(S)                                                               \
-  do {                                                                         \
-    if (htsfmt_puts(buf, (S)) < 0)                                             \
-      return -1;                                                               \
-  } while (0)
+#define FPUTC(C) do { \
+  if (buf->fp != NULL) { \
+    assertf(buf->buffer == NULL); \
+    if (fputc(C, buf->fp) < 0) { \
+      return -1; \
+    } \
+  } else { \
+    assertf(buf->buffer != NULL); \
+    if (buf->offset + 1 < buf->size) { \
+      buf->buffer[buf->offset++] = (C); \
+    } else { \
+      return -1; \
+    } \
+  } \
+} while(0)
+#define FPUTS(S) do { \
+  size_t i; \
+  const char *const str_ = (S); \
+  assertf(str_ != NULL); \
+  for(i = 0 ; str_[i] != '\0' ; i++) { \
+    FPUTC(str_[i]); \
+  } \
+} while(0)
 
   if (buf != NULL && format != NULL) {
     const char *arg_expanded[32];
@@ -872,74 +859,6 @@ int hts_template_format_str(char *buffer, size_t size, const char *format, ...)
   return success;
 }
 
-// Value of the named field, or "" if absent (never NULL, so callers can pass it
-// straight to a formatter).
-static const char *footer_field_value(const hts_footer_field *fields,
-                                      size_t nfields, const char *name) {
-  size_t j;
-  for (j = 0; j < nfields; j++) {
-    if (strcmp(fields[j].name, name) == 0)
-      return fields[j].value != NULL ? fields[j].value : "";
-  }
-  return "";
-}
-
-int hts_footer_format(char *buffer, size_t size, const char *footer,
-                      const hts_footer_field *fields, size_t nfields) {
-  hts_template_format_buf buf = {NULL, buffer, size, 0};
-  size_t i;
-
-  if (footer == NULL || buffer == NULL || size == 0)
-    return -1;
-  // %s keeps the legacy positional model, byte-for-byte for existing -%F
-  // strings: addr, path, date, version, looked up by name and
-  // order-independent.
-  if (strstr(footer, "%s") != NULL)
-    return hts_template_format_str(
-        buffer, size, footer, footer_field_value(fields, nfields, "addr"),
-        footer_field_value(fields, nfields, "path"),
-        footer_field_value(fields, nfields, "date"),
-        footer_field_value(fields, nfields, "version"), /* EOF */ NULL);
-  // "{{"/"}}" emit a literal brace; an unknown "{...}" is left verbatim so
-  // typos stay visible.
-  for (i = 0; footer[i] != '\0'; i++) {
-    const char c = footer[i];
-    if (c == '{' && footer[i + 1] == '{') {
-      if (htsfmt_putc(&buf, '{') < 0)
-        return -1;
-      i++;
-    } else if (c == '}' && footer[i + 1] == '}') {
-      if (htsfmt_putc(&buf, '}') < 0)
-        return -1;
-      i++;
-    } else if (c == '{') {
-      const char *const end = strchr(footer + i + 1, '}');
-      int matched = 0;
-      if (end != NULL) {
-        const size_t namelen = (size_t) (end - (footer + i + 1));
-        size_t j;
-        for (j = 0; j < nfields; j++) {
-          if (strlen(fields[j].name) == namelen &&
-              strncmp(fields[j].name, footer + i + 1, namelen) == 0) {
-            if (htsfmt_puts(&buf,
-                            fields[j].value != NULL ? fields[j].value : "") < 0)
-              return -1;
-            i += namelen + 1; // consume the name and its closing '}'
-            matched = 1;
-            break;
-          }
-        }
-      }
-      if (!matched && htsfmt_putc(&buf, '{') < 0)
-        return -1;
-    } else if (htsfmt_putc(&buf, c) < 0) {
-      return -1;
-    }
-  }
-  buffer[buf.offset] = '\0';
-  return 1;
-}
-
 /* Note: NOT utf-8 */
 HTSEXT_API int hts_buildtopindex(httrackp * opt, const char *path,
                                  const char *binpath) {
@@ -1027,17 +946,6 @@ HTSEXT_API int hts_buildtopindex(httrackp * opt, const char *path,
                     freet(category);
                     category = NULL;
                   }
-#ifdef _WIN32
-                  /* category is ANSI-codepage, doc is utf-8: convert (#216) */
-                  else {
-                    char *cat_utf8 = hts_convertStringSystemToUTF8(
-                        category, strlen(category));
-                    if (cat_utf8 != NULL) {
-                      freet(category);
-                      category = cat_utf8;
-                    }
-                  }
-#endif
                 }
               }
               if (category == NULL) {
@@ -1055,18 +963,7 @@ HTSEXT_API int hts_buildtopindex(httrackp * opt, const char *path,
                   oldchain->next = chain;
                 }
                 chain->next = NULL;
-#ifdef _WIN32
-                /* name is ANSI-codepage, doc is utf-8: convert (#216) */
-                {
-                  const char *const name = hts_findgetname(h);
-                  char *name_utf8 =
-                      hts_convertStringSystemToUTF8(name, strlen(name));
-                  strcpybuff(chain->name, name_utf8 != NULL ? name_utf8 : name);
-                  freet(name_utf8);
-                }
-#else
                 strcpybuff(chain->name, hts_findgetname(h));
-#endif
                 chain->category = category;
                 chain->level = level;
               }
@@ -1318,19 +1215,19 @@ HTSEXT_API hts_boolean hts_findnext(find_handle find) {
   if (find) {
 #ifdef _WIN32
     if ((FindNextFileA(find->handle, &find->hdata)))
-      return HTS_TRUE;
+      return 1;
 #else
     char catbuff[CATBUFF_SIZE];
 
     memset(&(find->filestat), 0, sizeof(find->filestat));
     if ((find->dirp = readdir(find->hdir)))
-      if (!STAT(
-              concat(catbuff, sizeof(catbuff), find->path, find->dirp->d_name),
-              &find->filestat))
-        return HTS_TRUE;
+      if (find->dirp->d_name)
+        if (!STAT
+            (concat(catbuff, sizeof(catbuff), find->path, find->dirp->d_name), &find->filestat))
+          return 1;
 #endif
   }
-  return HTS_FALSE;
+  return 0;
 }
 
 HTSEXT_API int hts_findclose(find_handle find) {

src/htstools.h

@@ -73,20 +73,6 @@ HTS_INLINE int rech_tageq_all(const char *adr, const char *s);
 int hts_template_format(FILE *const out, const char *format, ...);
 int hts_template_format_str(char *buffer, size_t size, const char *format, ...);
 
-// A footer named field and its already-context-escaped value.
-typedef struct hts_footer_field {
-  const char *name;
-  const char *value;
-} hts_footer_field;
-
-// Expand a footer template. A "%s" in it selects the legacy positional model,
-// consuming the "addr"/"path"/"date"/"version" fields in that order; otherwise
-// "{name}" is substituted from fields by name ("{{"/"}}" emit a literal brace,
-// an unknown "{...}" is left verbatim). Values must already be escaped for the
-// target context by the caller. Returns <0 on overflow.
-int hts_footer_format(char *buffer, size_t size, const char *footer,
-                      const hts_footer_field *fields, size_t nfields);
-
 #define rech_tageq(adr,s) \
   ( \
     ( (*((adr)-1)=='<') || (is_space(*((adr)-1))) ) ? \

src/htswarc.h

@@ -1,131 +0,0 @@
-/* ------------------------------------------------------------ */
-/*
-HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 2026 Xavier Roche and other contributors
-
-SPDX-License-Identifier: GPL-3.0-or-later
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-Ethical use: we kindly ask that you NOT use this software to harvest email
-addresses or to collect any other private information about people. Doing so
-would dishonor our work and waste the many hours we have spent on it.
-
-Please visit our Website: http://www.httrack.com
-*/
-
-/* ------------------------------------------------------------ */
-/* HTTrack WARC/1.1 output writer (ISO 28500). Internal, not installed.
-   All WARC record serialization, gzip-member framing, digests, UUID and
-   revisit dedup live here; the engine only stashes the request, frees it,
-   and calls one entry point per finished transaction. */
-/* ------------------------------------------------------------ */
-
-#ifndef HTS_WARC_DEFH
-#define HTS_WARC_DEFH
-
-#include "htsopt.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* opt->warc_file sentinel: --warc with no argument => auto-name the archive
-   under the project's output directory at open time. */
-#define WARC_AUTONAME "\001auto"
-
-/* htsblk.warc_truncated / WARC-Truncated reason tokens (ISO 28500 sec 5.13).
-   A cap-truncated body is still archived, tagged with why it was cut short. */
-#define WARC_TRUNC_NONE 0
-#define WARC_TRUNC_LENGTH 1     /* hit a size cap (-M mirror / -m per-file) */
-#define WARC_TRUNC_TIME 2       /* hit the mirror time cap (-E/--max-time) */
-#define WARC_TRUNC_DISCONNECT 3 /* connection dropped mid-body */
-
-/* WARC-Truncated token for a warc_truncated code, or NULL for none. */
-const char *warc_truncated_reason(int code);
-
-typedef struct warc_writer warc_writer;
-
-/* Stash the raw request header block (bstr.buffer) on r for the later WARC
-   request record; frees any prior stash. No-op when reqhdr is NULL. */
-void warc_stash_request(htsblk *r, const char *reqhdr);
-
-/* Stash the raw response header block: deletehttp frees r.headers when the
-   socket closes, before back_finalize, so keep a WARC-owned copy. */
-void warc_stash_response(htsblk *r, const char *resphdr);
-
-/* Free both stashed header blocks (idempotent, NULL-safe). */
-void warc_free_request(htsblk *r);
-
-/* Adopt the de-chunked compressed spool at tmpfile_path onto
-   r->warc_rawpath/warc_rawsize (strdupt; frees any prior) so the WARC record
-   stores the body verbatim. No-op leaving warc_rawpath NULL when tmpfile_path
-   is empty or the spool is missing/empty (the record then stores the decoded
-   in-memory/on-disk body instead). */
-void warc_adopt_rawspool(htsblk *r, const char *tmpfile_path);
-
-/* Emit the request + response (or revisit) records for one finished
-   transaction. Lazily opens the writer into opt->state.warc; a no-op (logged
-   once) if the archive cannot be created. */
-void warc_write_backtransaction(httrackp *opt, lien_back *back);
-
-/* Close and free the writer held in opt->state.warc, if any. */
-void warc_close_opt(httrackp *opt);
-
-/* --- Direct writer API (used by the hooks above and the self-test). --- */
-
-/* Create the archive at path (auto-named when path is WARC_AUTONAME), writing
-   the warcinfo record. .warc.gz => one gzip member per record; .warc => raw.
-   Returns NULL on failure. */
-warc_writer *warc_open(httrackp *opt, const char *path);
-
-/* Flush, close and free the writer (NULL-safe). */
-void warc_close(warc_writer *w);
-
-/* SURT-canonicalize url into out[outsz] (the CDXJ sort key). Returns 0 on
-   success, -1 on error or truncation. Exposed for the -#test=warc-surt test. */
-int warc_surt(const char *url, char *out, size_t outsz);
-
-/* Write one transaction's request + response (or revisit) records.
-   target_uri:  absolute URL fetched.
-   ip:          numeric peer IP, or NULL/"" to omit.
-   req_hdr:     exact request header block sent, or NULL to skip the request.
-   resp_hdr:    raw received response header block (status line + headers).
-   body/body_len: decoded in-memory body, or NULL when on disk.
-   body_path:   file re-read for the body when body==NULL (may be NULL).
-   is_update_unchanged: nonzero for a 304 server-not-modified revisit.
-   truncated: a WARC_TRUNC_* reason to tag a cap-truncated body, else 0.
-   The body is stored verbatim: Content-Encoding is kept and Content-Length set
-   to body_len, so body/body_len must be the as-received (coded) bytes.
-   Returns 0 on success, -1 on error. */
-int warc_write_transaction(warc_writer *w, const char *target_uri,
-                           const char *ip, const char *req_hdr,
-                           const char *resp_hdr, const char *body,
-                           size_t body_len, const char *body_path,
-                           int statuscode, int is_update_unchanged,
-                           int truncated);
-
-/* Write one non-HTTP capture as a single WARC 'resource' record: the block is
-   the raw payload (no HTTP envelope), Content-Type is the payload's own MIME.
-   Used for ftp:// transfers. truncated is a WARC_TRUNC_* reason or 0.
-   Returns 0 on success, -1 on error. */
-int warc_write_resource(warc_writer *w, const char *target_uri, const char *ip,
-                        const char *content_type, const char *body,
-                        size_t body_len, const char *body_path, int truncated);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

src/htsweb.c

@@ -62,7 +62,6 @@ Please visit our Website: http://www.httrack.com
 #include "htsmd5.c"
 #include "md5.c"
 
-#include "htscmdline.h"
 #include "htsserver.h"
 #include "htsurlport.h"
 #include "htsweb.h"
@@ -89,7 +88,7 @@ Please visit our Website: http://www.httrack.com
 
 static htsmutex refreshMutex = HTSMUTEX_INIT;
 
-static int help_server(char *dest_path, int defaultPort, const char *bindAddr);
+static int help_server(char *dest_path, int defaultPort);
 extern int commandRunning;
 extern int commandEnd;
 extern int commandReturn;
@@ -154,8 +153,6 @@ int main(int argc, char *argv[]) {
   int ret = 0;
   int defaultPort = 0;
   int parentPid = 0;
-  /* loopback by default: the handler trusts its input; --bind widens it */
-  const char *bindAddr = "127.0.0.1";
 
   printf("Initializing the server..\n");
 
@@ -182,8 +179,7 @@ int main(int argc, char *argv[]) {
   if (argc < 2 || (argc % 2) != 0) {
     fprintf(stderr, "** Warning: use the webhttrack frontend if available\n");
     fprintf(stderr,
-            "usage: %s [--port <port>] [--bind <address>] [--ppid parent-pid] "
-            "<path-to-html-root-dir> [key value [key value]..]\n",
+            "usage: %s [--port <port>] [--ppid parent-pid] <path-to-html-root-dir> [key value [key value]..]\n",
             argv[0]);
     fprintf(stderr, "example: %s /usr/share/httrack/\n", argv[0]);
     return 1;
@@ -271,14 +267,6 @@ int main(int argc, char *argv[]) {
         fprintf(stderr, "couldn't set the port number to %s\n", argv[i + 1]);
         return -1;
       }
-    } else if (strcmp(argv[i], "--bind") == 0 && i + 1 < argc) {
-      /* empty would fall back to every interface, silently undoing the default
-       */
-      if (!strnotempty(argv[i + 1])) {
-        fprintf(stderr, "--bind needs an address\n");
-        return -1;
-      }
-      bindAddr = argv[i + 1];
     } else if (strcmp(argv[i], "--ppid") == 0 && i + 1 < argc) {
       if (sscanf(argv[i + 1], "%u", &parentPid) != 1) {
         fprintf(stderr, "couldn't set the parent PID to %s\n", argv[i + 1]);
@@ -305,7 +293,7 @@ int main(int argc, char *argv[]) {
   }
 
   /* launch */
-  ret = help_server(argv[1], defaultPort, bindAddr);
+  ret = help_server(argv[1], defaultPort);
 
   htsthread_wait_n(background_threads - 1);
   hts_uninit();
@@ -320,8 +308,10 @@ int main(int argc, char *argv[]) {
 static int webhttrack_runmain(httrackp * opt, int argc, char **argv);
 static void back_launch_cmd(void *pP) {
   char *cmd = (char *) pP;
-  char **argv;
+  char **argv = (char **) malloct(1024 * sizeof(char *));
   int argc = 0;
+  int i = 0;
+  int g = 0;
 
   //
   httrackp *opt;
@@ -332,19 +322,28 @@ static void back_launch_cmd(void *pP) {
   commandReturnCmdl = strdup(cmd);
 
   /* split */
-  argv = hts_split_cmdline(cmd, &argc);
-  if (argv == NULL) {
-    if (commandReturnMsg)
-      free(commandReturnMsg);
-    commandReturnMsg = strdup("could not parse the command line");
-    commandReturn = -1;
-    commandRunning = 0;
-    commandEnd = 1;
-    free(cmd);
-    return;
+  argv[0] = strdup("webhttrack");
+  argv[1] = cmd;
+  argc++;
+  i = 0;
+  while(cmd[i]) {
+    if (cmd[i] == '\t' || cmd[i] == '\r' || cmd[i] == '\n') {
+      cmd[i] = ' ';
+    }
+    i++;
+  }
+  i = 0;
+  while(cmd[i]) {
+    if (cmd[i] == '\"')
+      g = !g;
+    if (cmd[i] == ' ') {
+      if (!g) {
+        cmd[i] = '\0';
+        argv[argc++] = cmd + i + 1;
+      }
+    }
+    i++;
   }
-  /* drop the program name the posted command line carries */
-  argv[0] = strdupt("webhttrack");
 
   /* init */
   hts_init();
@@ -373,7 +372,6 @@ static void back_launch_cmd(void *pP) {
 
   /* free */
   free(cmd);
-  freet(argv[0]);
   freet(argv);
   return;
 }
@@ -429,11 +427,11 @@ static int webhttrack_runmain(httrackp * opt, int argc, char **argv) {
   return ret;
 }
 
-static int help_server(char *dest_path, int defaultPort, const char *bindAddr) {
+static int help_server(char *dest_path, int defaultPort) {
   int returncode = 0;
   char adr_prox[HTS_URLMAXSIZE * 2];
   int port_prox;
-  T_SOC soc = smallserver_init_std(&port_prox, adr_prox, defaultPort, bindAddr);
+  T_SOC soc = smallserver_init_std(&port_prox, adr_prox, defaultPort);
 
   if (soc != INVALID_SOCKET) {
     char url[HTS_URLMAXSIZE * 2];
@@ -673,10 +671,10 @@ int __cdecl htsshow_loop(t_hts_callbackarg * carg, httrackp * opt, lien_back * b
                     char *eps = strchr(back[i].url_adr, '/');
                     int count;
 
-                    if (ep != NULL && eps != NULL && ep < eps &&
-                        (count = (int) (ep - back[i].url_adr)) < 4) {
+                    if (ep != NULL && ep < eps
+                        && (count = (int) (ep - back[i].url_adr)) < 4) {
                       proto[0] = '\0';
-                      strncatbuff(proto, back[i].url_adr, count);
+                      strncat(proto, back[i].url_adr, count);
                     }
                   }
                   snprintf(StatsBuffer[index].state, sizeof(StatsBuffer[index].state),

src/htsweb.h

@@ -42,7 +42,7 @@ Please visit our Website: http://www.httrack.com
 typedef struct t_StatsBuffer {
   char name[1024];
   char file[1024];
-  char state[288];                      // a short label plus back->info[256]
+  char state[256];
   char url_sav[HTS_URLMAXSIZE * 2];     // pour cancel
   char url_adr[HTS_URLMAXSIZE * 2];
   char url_fil[HTS_URLMAXSIZE * 2];

src/httrack-library.h

@@ -758,9 +758,6 @@ HTSEXT_API int hts_rename_utf8(const char *oldpath, const char *newpath);
 
 HTSEXT_API int hts_mkdir_utf8(const char *pathname);
 
-#define RMDIR hts_rmdir_utf8
-HTSEXT_API int hts_rmdir_utf8(const char *pathname);
-
 #define UTIME(A, B) hts_utime_utf8(A, B)
 
 typedef struct _utimbuf STRUCT_UTIMBUF;
@@ -775,7 +772,6 @@ typedef struct stat STRUCT_STAT;
 #define UNLINK unlink
 #define RENAME rename
 #define MKDIR(F) mkdir(F, HTS_ACCESS_FOLDER)
-#define RMDIR rmdir
 
 typedef struct utimbuf STRUCT_UTIMBUF;
 

src/httrack.c

@@ -46,7 +46,6 @@ Please visit our Website: http://www.httrack.com
 #include "httrack.h"
 #include "htslib.h"
 #include "htscharset.h" // after htslib.h: winsock2.h must precede windows.h
-#include "htsbacktrace.h"
 
 /* Static definitions */
 static int fexist(const char *s);
@@ -69,10 +68,11 @@ static int linput(FILE * fp, char *s, int max);
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#ifdef HAVE_SYS_IOCTL_H
-#include <sys/ioctl.h>
-#endif
 #include <ctype.h>
+#if (defined(__linux) && defined(HAVE_EXECINFO_H))
+#include <execinfo.h>
+#define USES_BACKTRACE
+#endif
 /* END specific definitions */
 
 static void __cdecl htsshow_init(t_hts_callbackarg * carg);
@@ -185,43 +185,6 @@ static void vt_home(void) {
   printf("%s%s", VT_RESET, VT_GOTOXY("1", "0"));
 }
 
-/* Last known terminal geometry; the defaults are the classic VT100 size. */
-static int term_cols = 80;
-static int term_rows = 24;
-
-/* Returns HTS_TRUE if the terminal size changed since the last call. */
-static hts_boolean vt_size_refresh(void) {
-  int cols = 0;
-  int rows = 0;
-
-#ifdef _WIN32
-  CONSOLE_SCREEN_BUFFER_INFO info;
-  const HANDLE console = GetStdHandle(STD_OUTPUT_HANDLE);
-
-  if (console != INVALID_HANDLE_VALUE &&
-      GetConsoleScreenBufferInfo(console, &info)) {
-    cols = info.srWindow.Right - info.srWindow.Left + 1;
-    rows = info.srWindow.Bottom - info.srWindow.Top + 1;
-  }
-#elif defined(TIOCGWINSZ)
-  struct winsize ws;
-
-  if (ioctl(fileno(stdout), TIOCGWINSZ, &ws) == 0) {
-    cols = ws.ws_col;
-    rows = ws.ws_row;
-  }
-#endif
-  if (cols <= 0)
-    cols = 80;
-  if (rows <= 0)
-    rows = 24;
-  if (cols == term_cols && rows == term_rows)
-    return HTS_FALSE;
-  term_cols = cols;
-  term_rows = rows;
-  return HTS_TRUE;
-}
-
 //
 
 /*
@@ -232,8 +195,7 @@ static hts_boolean vt_size_refresh(void) {
 #define STYLE_STATTEXT   VT_UNBOLD
 #define STYLE_STATRESET  VT_UNBOLD
 #define NStatsBuffer     14
-/* Rows the stats block and "Current job" take above the in-progress list. */
-#define NStatsHeaderRows 7
+#define MAX_LEN_INPROGRESS 40
 
 static int use_show;
 static httrackp *global_opt = NULL;
@@ -329,7 +291,6 @@ static int __cdecl htsshow_start(t_hts_callbackarg * carg, httrackp * opt) {
   use_show = 0;
   if (opt->verbosedisplay == HTS_VERBOSE_FULL) {
     use_show = 1;
-    (void) vt_size_refresh();
     vt_clear();
   }
   return 1;
@@ -435,10 +396,6 @@ static int __cdecl htsshow_loop(t_hts_callbackarg * carg, httrackp * opt, lien_b
 
     prev_mytime = mytime;
 
-    /* A resize leaves stale wrapped text on screen: repaint everything. */
-    if (vt_size_refresh())
-      vt_clear();
-
     st[0] = '\0';
     qsec2str(st, stat_time);
     vt_home();
@@ -478,13 +435,6 @@ static int __cdecl htsshow_loop(t_hts_callbackarg * carg, httrackp * opt, lien_b
       //
       t_StatsBuffer StatsBuffer[NStatsBuffer];
 
-      /* Keep the frame within the terminal, or it scrolls the stats away. */
-      const int nstats =
-          min(NStatsBuffer, max(0, term_rows - NStatsHeaderRows));
-      /* URL budget: half the width, i.e. the historical 40 at 80 columns. */
-      const int maxurl =
-          min((int) sizeof(StatsBuffer[0].name) - 1, max(16, term_cols / 2));
-
       {
         int i;
 
@@ -499,11 +449,10 @@ static int __cdecl htsshow_loop(t_hts_callbackarg * carg, httrackp * opt, lien_b
         }
       }
       for(k = 0; k < 2; k++) {  // 0: lien en cours 1: autres liens
-        for (j = 0; (j < 3) && (index < nstats); j++) { // passe de priorité
+        for(j = 0; (j < 3) && (index < NStatsBuffer); j++) {    // passe de priorité
           int _i;
 
-          for (_i = 0 + k; (_i < max(back_max * k, 1)) && (index < nstats);
-               _i++) {                                  // no lien
+          for(_i = 0 + k; (_i < max(back_max * k, 1)) && (index < NStatsBuffer); _i++) {        // no lien
             int i = (back_index + _i) % back_max;       // commencer par le "premier" (l'actuel)
 
             if (back[i].status >= 0) { // signifie "lien actif"
@@ -578,14 +527,16 @@ static int __cdecl htsshow_loop(t_hts_callbackarg * carg, httrackp * opt, lien_b
                   }
                 }
 
-                if ((l = (int) strlen(s)) < maxurl)
+                if ((l = (int) strlen(s)) < MAX_LEN_INPROGRESS)
                   strcpybuff(StatsBuffer[index].name, s);
                 else {
                   // couper
                   StatsBuffer[index].name[0] = '\0';
-                  strncatbuff(StatsBuffer[index].name, s, maxurl / 2 - 2);
+                  strncatbuff(StatsBuffer[index].name, s,
+                              MAX_LEN_INPROGRESS / 2 - 2);
                   strcatbuff(StatsBuffer[index].name, "...");
-                  strcatbuff(StatsBuffer[index].name, s + l - maxurl / 2 + 2);
+                  strcatbuff(StatsBuffer[index].name,
+                             s + l - MAX_LEN_INPROGRESS / 2 + 2);
                 }
 
                 if (back[i].r.totalsize >= 0) { // taille prédéfinie
@@ -646,7 +597,7 @@ static int __cdecl htsshow_loop(t_hts_callbackarg * carg, httrackp * opt, lien_b
       {
         int i;
 
-        for (i = 0; i < nstats; i++) {
+        for(i = 0; i < NStatsBuffer; i++) {
           if (strnotempty(StatsBuffer[i].state)) {
             printf(VT_CLREOL " %s - \t%s%s \t%s / \t%s", StatsBuffer[i].state,
                    StatsBuffer[i].name, StatsBuffer[i].file, int2bytes(&strc,
@@ -877,6 +828,21 @@ static void sig_doback(int blind) {     // mettre en backing
 #undef FD_ERR
 #define FD_ERR 2
 
+static void print_backtrace(void) {
+#ifdef USES_BACKTRACE
+  void *stack[256];
+  const int size = backtrace(stack, sizeof(stack)/sizeof(stack[0]));
+  if (size != 0) {
+    backtrace_symbols_fd(stack, size, FD_ERR);
+  }
+#else
+  const char msg[] = "No stack trace available on this OS :(\n";
+  if (write(FD_ERR, msg, sizeof(msg) - 1) != sizeof(msg) - 1) {
+    /* sorry GCC */
+  }
+#endif
+}
+
 static size_t print_num(char *buffer, int num) {
   size_t i, j;
   if (num < 0) {
@@ -910,7 +876,7 @@ static void sig_fatal(int code) {
   size += print_num(&buffer[size], code);
   buffer[size++] = '\n';
   (void) (write(FD_ERR, buffer, size) == size);
-  hts_print_backtrace(FD_ERR);
+  print_backtrace();
   (void) (write(FD_ERR, msgreport, sizeof(msgreport) - 1)
     == sizeof(msgreport) - 1);
   abort();
@@ -933,7 +899,6 @@ static void sig_leave(int code) {
 }
 
 static void signal_handlers(void) {
-  hts_backtrace_init();
 #ifdef _WIN32
   signal(SIGINT, sig_leave);    // ^C
   signal(SIGTERM, sig_finish);  // kill <process>

src/httrack.h

@@ -44,7 +44,7 @@ typedef struct t_StatsBuffer t_StatsBuffer;
 struct t_StatsBuffer {
   char name[1024];
   char file[1024];
-  char state[288]; // a short label plus back->info[256]
+  char state[256];
   char BIGSTK url_sav[HTS_URLMAXSIZE * 2];      // pour cancel
   char BIGSTK url_adr[HTS_URLMAXSIZE * 2];
   char BIGSTK url_fil[HTS_URLMAXSIZE * 2];

src/httrack.vcxproj

@@ -100,7 +100,6 @@
 
   <ItemGroup>
     <ClCompile Include="httrack.c" />
-    <ClCompile Include="htsbacktrace.c" />
   </ItemGroup>
 
   <!-- Pulls in libhttrack.lib and builds it first. -->

src/libhttrack.vcxproj

@@ -59,10 +59,9 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <!-- LIBHTTRACK_EXPORTS turns HTSEXT_API into __declspec(dllexport); ZLIB_DLL
-           imports zlib from its DLL, ZLIB_CONST makes its next_in const as the
-           autotools build does. HTS_USEBROTLI/HTS_USEZSTD enable the br and zstd
-           content codings. Windows 7 floor, matching WinHTTrack. -->
-      <PreprocessorDefinitions>WIN32;_WINDOWS;_MBCS;_USRDLL;LIBHTTRACK_EXPORTS;ZLIB_DLL;ZLIB_CONST;HTS_USEBROTLI=1;HTS_USEZSTD=1;WINVER=0x0601;_WIN32_WINNT=0x0601;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+           imports zlib from its DLL. HTS_USEBROTLI/HTS_USEZSTD enable the br and
+           zstd content codings. Windows 7 floor, matching WinHTTrack. -->
+      <PreprocessorDefinitions>WIN32;_WINDOWS;_MBCS;_USRDLL;LIBHTTRACK_EXPORTS;ZLIB_DLL;HTS_USEBROTLI=1;HTS_USEZSTD=1;WINVER=0x0601;_WIN32_WINNT=0x0601;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)coucal;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <WarningLevel>Level3</WarningLevel>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -122,7 +121,6 @@
     <ClCompile Include="htshelp.c" />
     <ClCompile Include="htsindex.c" />
     <ClCompile Include="htslib.c" />
-    <ClCompile Include="htscmdline.c" />
     <ClCompile Include="htsurlport.c" />
     <ClCompile Include="htsmd5.c" />
     <ClCompile Include="htsmodules.c" />
@@ -137,7 +135,6 @@
     <ClCompile Include="htswizard.c" />
     <ClCompile Include="htswrap.c" />
     <ClCompile Include="htszlib.c" />
-    <ClCompile Include="htswarc.c" />
     <ClCompile Include="md5.c" />
     <ClCompile Include="minizip\ioapi.c" />
     <ClCompile Include="minizip\iowin32.c" />

src/proxy/proxytrack.c

@@ -688,7 +688,7 @@ static PT_Element proxytrack_process_DAV_Request(PT_Indexes indexes,
     PT_Element elt = PT_ElementNew();
 
     elt->statuscode = 405;
-    strcpybuff(elt->msg, "Method Not Allowed");
+    strcpy(elt->msg, "Method Not Allowed");
     return elt;
   }
 
@@ -771,7 +771,7 @@ static PT_Element proxytrack_process_DAV_Request(PT_Indexes indexes,
                   PT_ReadIndex(indexes, StringBuff(itemUrl) + 1, FETCH_HEADERS);
                 if (file != NULL && file->statuscode == HTTP_OK) {
                   size = file->size;
-                  if (file->lastmodified[0] != '\0') {
+                  if (file->lastmodified) {
                     timestamp = get_time_rfc822(file->lastmodified);
                   }
                   if (timestamp == (time_t) 0) {
@@ -785,7 +785,7 @@ static PT_Element proxytrack_process_DAV_Request(PT_Indexes indexes,
                     }
                     timestamp = timestampRep;
                   }
-                  if (file->contenttype[0] != '\0') {
+                  if (file->contenttype) {
                     mimeType = file->contenttype;
                   }
                 }
@@ -822,7 +822,7 @@ static PT_Element proxytrack_process_DAV_Request(PT_Indexes indexes,
     elt->statuscode = 207;      /* Multi-Status */
     strcpy(elt->charset, "utf-8");
     strcpy(elt->contenttype, "text/xml");
-    strcpybuff(elt->msg, "Multi-Status");
+    strcpy(elt->msg, "Multi-Status");
     StringFree(response);
 
     fprintf(stderr, "RESPONSE:\n%s\n", elt->adr);
@@ -879,7 +879,7 @@ static PT_Element proxytrack_process_HTTP_List(PT_Indexes indexes,
     elt->statuscode = HTTP_OK;
     strcpy(elt->charset, "iso-8859-1");
     strcpy(elt->contenttype, "text/html");
-    strcpybuff(elt->msg, "OK");
+    strcpy(elt->msg, "OK");
     StringFree(html);
     return elt;
   }

src/proxy/store.c

@@ -407,7 +407,7 @@ PT_Element PT_Index_HTML_BuildRootInfo(PT_Indexes indexes) {
     elt->statuscode = HTTP_OK;
     strcpy(elt->charset, "iso-8859-1");
     strcpy(elt->contenttype, "text/html");
-    strcpybuff(elt->msg, "OK");
+    strcpy(elt->msg, "OK");
     StringFree(html);
     return elt;
   }
@@ -579,10 +579,9 @@ PT_Index PT_LoadCache(const char *filename) {
         if (chain != NULL) {
           const char *scheme = link_has_authority(chain->name) ? "" : "http://";
 
-          /* dropped rather than truncated: empty already reads as "unset" */
-          if (!sprintfbuff(index->slots.common.startUrl, "%s%s", scheme,
-                           (const char *) chain->name))
-            index->slots.common.startUrl[0] = '\0';
+          snprintf(index->slots.common.startUrl,
+                   sizeof(index->slots.common.startUrl), "%s%s", scheme,
+                   (const char *) chain->name);
         }
       }
     }
@@ -828,18 +827,6 @@ PT_Element PT_ElementNew(void) {
   return r;
 }
 
-/* ProxyTrack's htsblk_failf(): a clipped, diagnostic-only failure reason. */
-static void PT_Element_failf(PT_Element r, const char *fmt, ...)
-    HTS_PRINTF_FUN(2, 3);
-
-static void PT_Element_failf(PT_Element r, const char *fmt, ...) {
-  va_list args;
-
-  va_start(args, fmt);
-  (void) vslprintfbuff(r->msg, sizeof(r->msg), fmt, args);
-  va_end(args);
-}
-
 PT_Element PT_ReadCache(PT_Index index, const char *url, int flags) {
   if (index != NULL && SAFE_INDEX(index)) {
     return _IndexFuncts[index->type].PT_ReadCache(index, url, flags);
@@ -985,12 +972,9 @@ int PT_LoadCache__New(PT_Index index_, const char *filename) {
                     const char *scheme =
                         link_has_authority(filenameIndex) ? "" : "http://";
 
-                    /* dropped rather than truncated; try the next entry */
-                    if (sprintfbuff(index->startUrl, "%s%s", scheme,
-                                    filenameIndex))
-                      firstSeen = 1;
-                    else
-                      index->startUrl[0] = '\0';
+                    firstSeen = 1;
+                    snprintf(index->startUrl, sizeof(index->startUrl), "%s%s",
+                             scheme, filenameIndex);
                   }
                 }
               } else {
@@ -1151,9 +1135,8 @@ static PT_Element PT_ReadCache__New_u(PT_Index index_, const char *url,
                   snprintf(previous_save, sizeof(previous_save), "%s%s",
                            index->path, previous_save_ + index->fixedPath);
                 } else {
-                  PT_Element_failf(
-                      r, "Bogus fixePath prefix for %s (prefixLen=%d)",
-                      previous_save_, (int) index->fixedPath);
+                  snprintf(r->msg, sizeof(r->msg), "Bogus fixePath prefix for %s (prefixLen=%d)",
+                          previous_save_, (int) index->fixedPath);
                   r->statuscode = STATUSCODE_INVALID;
                 }
               } else {
@@ -1172,7 +1155,7 @@ static PT_Element PT_ReadCache__New_u(PT_Index index_, const char *url,
             // Peut-on stocker le fichier directement sur disque?
             if (ok) {
               if (r->msg[0] == '\0') {
-                strcpybuff(r->msg, "Cache Read Error : Unexpected error");
+                strcpy(r->msg, "Cache Read Error : Unexpected error");
               }
             } else {            // lire en mémoire
 
@@ -1190,27 +1173,24 @@ static PT_Element PT_ReadCache__New_u(PT_Index index_, const char *url,
                           int last_errno = errno;
 
                           r->statuscode = STATUSCODE_INVALID;
-                          PT_Element_failf(r,
-                                           "Read error in cache disk data: %s",
-                                           strerror(last_errno));
+                          sprintf(r->msg, "Read error in cache disk data: %s",
+                                  strerror(last_errno));
                         }
                         r->adr[r->size] = '\0';
                       } else {
                         r->statuscode = STATUSCODE_INVALID;
-                        strcpybuff(r->msg,
-                                   "Read error (memory exhausted) from cache");
+                        strcpy(r->msg,
+                               "Read error (memory exhausted) from cache");
                       }
                       fclose(fp);
                     } else {
                       r->statuscode = STATUSCODE_INVALID;
-                      PT_Element_failf(
-                          r, "Read error (can't open '%s') from cache",
-                          file_convert(catbuff, sizeof(catbuff),
-                                       previous_save));
+                      snprintf(r->msg, sizeof(r->msg), "Read error (can't open '%s') from cache",
+                              file_convert(catbuff, sizeof(catbuff), previous_save));
                     }
                   } else {
                     r->statuscode = STATUSCODE_INVALID;
-                    strcpybuff(r->msg, "Cached file name is invalid");
+                    strcpy(r->msg, "Cached file name is invalid");
                   }
                 }
               } else {
@@ -1222,12 +1202,12 @@ static PT_Element PT_ReadCache__New_u(PT_Index index_, const char *url,
                       free(r->adr);
                       r->adr = NULL;
                       r->statuscode = STATUSCODE_INVALID;
-                      strcpybuff(r->msg, "Cache Read Error : Read Data");
+                      strcpy(r->msg, "Cache Read Error : Read Data");
                     } else
                       *(r->adr + r->size) = '\0';
                   } else {      // erreur
                     r->statuscode = STATUSCODE_INVALID;
-                    strcpybuff(r->msg, "Cache Memory Error");
+                    strcpy(r->msg, "Cache Memory Error");
                   }
                 }
               }
@@ -1235,21 +1215,21 @@ static PT_Element PT_ReadCache__New_u(PT_Index index_, const char *url,
           }                     // si save==null, ne rien charger (juste en tête)
         } else {
           r->statuscode = STATUSCODE_INVALID;
-          strcpybuff(r->msg, "Cache Read Error : Read Header Data");
+          strcpy(r->msg, "Cache Read Error : Read Header Data");
         }
         unzCloseCurrentFile(index->zFile);
       } else {
         r->statuscode = STATUSCODE_INVALID;
-        strcpybuff(r->msg, "Cache Read Error : Open File");
+        strcpy(r->msg, "Cache Read Error : Open File");
       }
 
     } else {
       r->statuscode = STATUSCODE_INVALID;
-      strcpybuff(r->msg, "Cache Read Error : Bad Offset");
+      strcpy(r->msg, "Cache Read Error : Bad Offset");
     }
   } else {
     r->statuscode = STATUSCODE_INVALID;
-    strcpybuff(r->msg, "File Cache Entry Not Found");
+    strcpy(r->msg, "File Cache Entry Not Found");
   }
   if (r->location[0] != '\0') {
     r->location = strdup(r->location);
@@ -1590,11 +1570,9 @@ static int PT_LoadCache__Old(PT_Index index_, const char *filename) {
                   const char *scheme =
                       link_has_authority(line) ? "" : "http://";
 
-                  /* dropped rather than truncated; try the next entry */
-                  if (sprintfbuff(index->startUrl, "%s%s", scheme, line))
-                    firstSeen = 1;
-                  else
-                    index->startUrl[0] = '\0';
+                  firstSeen = 1;
+                  snprintf(index->startUrl, sizeof(index->startUrl), "%s%s",
+                           scheme, line);
                 }
               }
 
@@ -1815,9 +1793,8 @@ static PT_Element PT_ReadCache__Old_u(PT_Index index_, const char *url,
                 snprintf(previous_save, sizeof(previous_save), "%s%s",
                          index->path, previous_save_ + index->fixedPath);
               } else {
-                PT_Element_failf(r,
-                                 "Bogus fixePath prefix for %s (prefixLen=%d)",
-                                 previous_save_, (int) index->fixedPath);
+                snprintf(r->msg, sizeof(r->msg), "Bogus fixePath prefix for %s (prefixLen=%d)",
+                        previous_save_, (int) index->fixedPath);
                 r->statuscode = STATUSCODE_INVALID;
               }
             } else {
@@ -1843,18 +1820,17 @@ static PT_Element PT_ReadCache__Old_u(PT_Index index_, const char *url,
                 if (r->adr != NULL) {
                   if (r->size > 0 && fread(r->adr, 1, r->size, fp) != r->size) {
                     r->statuscode = STATUSCODE_INVALID;
-                    strcpybuff(r->msg, "Read error in cache disk data");
+                    strcpy(r->msg, "Read error in cache disk data");
                   }
                   r->adr[r->size] = '\0';
                 } else {
                   r->statuscode = STATUSCODE_INVALID;
-                  strcpybuff(r->msg,
-                             "Read error (memory exhausted) from cache");
+                  strcpy(r->msg, "Read error (memory exhausted) from cache");
                 }
                 fclose(fp);
               } else {
                 r->statuscode = STATUSCODE_INVALID;
-                strcpybuff(r->msg, "Previous cache file not found (2)");
+                strcpy(r->msg, "Previous cache file not found (2)");
               }
             }
           } else {
@@ -1866,30 +1842,30 @@ static PT_Element PT_ReadCache__Old_u(PT_Index index_, const char *url,
                   free(r->adr);
                   r->adr = NULL;
                   r->statuscode = STATUSCODE_INVALID;
-                  strcpybuff(r->msg, "Cache Read Error : Read Data");
+                  strcpy(r->msg, "Cache Read Error : Read Data");
                 } else
                   r->adr[r->size] = '\0';
               } else {          // erreur
                 r->statuscode = STATUSCODE_INVALID;
-                strcpybuff(r->msg, "Cache Memory Error");
+                strcpy(r->msg, "Cache Memory Error");
               }
             }
           }
         } else {
           r->statuscode = STATUSCODE_INVALID;
-          strcpybuff(r->msg, "Cache Read Error : Bad Data");
+          strcpy(r->msg, "Cache Read Error : Bad Data");
         }
       } else {                  // erreur
         r->statuscode = STATUSCODE_INVALID;
-        strcpybuff(r->msg, "Cache Read Error : Read Header");
+        strcpy(r->msg, "Cache Read Error : Read Header");
       }
     } else {
       r->statuscode = STATUSCODE_INVALID;
-      strcpybuff(r->msg, "Cache Read Error : Seek Failed");
+      strcpy(r->msg, "Cache Read Error : Seek Failed");
     }
   } else {
     r->statuscode = STATUSCODE_INVALID;
-    strcpybuff(r->msg, "File Cache Entry Not Found");
+    strcpy(r->msg, "File Cache Entry Not Found");
   }
   if (r->location[0] != '\0') {
     r->location = strdup(r->location);
@@ -2215,7 +2191,7 @@ static PT_Element PT_ReadCache__Arc_u(PT_Index index_, const char *url,
           }
           if ((pos = getArcField(index->line, 2)) != NULL) {
             r->msg[0] = '\0';
-            strncatbuff(r->msg, pos, sizeof(r->msg) - 1);
+            strncat(r->msg, pos, sizeof(pos) - 1);
           }
           while(linput(index->file, index->line, sizeof(index->line) - 1)
                 && index->line[0] != '\0') {
@@ -2270,7 +2246,7 @@ static PT_Element PT_ReadCache__Arc_u(PT_Index index_, const char *url,
                 fetchSize = dataLength - metaSize;
               } else if (fetchSize > dataLength - metaSize) {
                 r->statuscode = STATUSCODE_INVALID;
-                strcpybuff(r->msg, "Cache Read Error : Truncated Data");
+                strcpy(r->msg, "Cache Read Error : Truncated Data");
               }
               r->size = 0;
               if (r->statuscode != STATUSCODE_INVALID) {
@@ -2283,13 +2259,12 @@ static PT_Element PT_ReadCache__Arc_u(PT_Index index_, const char *url,
                     int last_errno = errno;
 
                     r->statuscode = STATUSCODE_INVALID;
-                    PT_Element_failf(r, "Read error in cache disk data: %s",
-                                     strerror(last_errno));
+                    sprintf(r->msg, "Read error in cache disk data: %s",
+                            strerror(last_errno));
                   }
                 } else {
                   r->statuscode = STATUSCODE_INVALID;
-                  strcpybuff(r->msg,
-                             "Read error (memory exhausted) from cache");
+                  strcpy(r->msg, "Read error (memory exhausted) from cache");
                 }
               }
             }
@@ -2297,21 +2272,21 @@ static PT_Element PT_ReadCache__Arc_u(PT_Index index_, const char *url,
 
         } else {
           r->statuscode = STATUSCODE_INVALID;
-          strcpybuff(r->msg, "Cache Read Error : Read Header Error");
+          strcpy(r->msg, "Cache Read Error : Read Header Error");
         }
 
       } else {
         r->statuscode = STATUSCODE_INVALID;
-        strcpybuff(r->msg, "Cache Read Error : Read Header Error");
+        strcpy(r->msg, "Cache Read Error : Read Header Error");
       }
     } else {
       r->statuscode = STATUSCODE_INVALID;
-      strcpybuff(r->msg, "Cache Read Error : Seek Error");
+      strcpy(r->msg, "Cache Read Error : Seek Error");
     }
 
   } else {
     r->statuscode = STATUSCODE_INVALID;
-    strcpybuff(r->msg, "File Cache Entry Not Found");
+    strcpy(r->msg, "File Cache Entry Not Found");
   }
   if (r->location[0] != '\0') {
     r->location = strdup(r->location);

src/version.rc

@@ -17,8 +17,8 @@
 #endif
 
 VS_VERSION_INFO VERSIONINFO
-  FILEVERSION 3, 49, 14, 0
-  PRODUCTVERSION 3, 49, 14, 0
+  FILEVERSION 3, 49, 13, 0
+  PRODUCTVERSION 3, 49, 13, 0
   FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
   FILEFLAGS VS_FF_DEBUG
@@ -35,12 +35,12 @@ BEGIN
     BEGIN
       VALUE "CompanyName", "Xavier Roche"
       VALUE "FileDescription", VER_FILE_DESCRIPTION
-      VALUE "FileVersion", "3.49.14"
+      VALUE "FileVersion", "3.49.13"
       VALUE "InternalName", VER_ORIGINAL_FILENAME
       VALUE "LegalCopyright", "Copyright (C) 1998-2026 Xavier Roche and other contributors. GNU GPL v3 or later."
       VALUE "OriginalFilename", VER_ORIGINAL_FILENAME
       VALUE "ProductName", "HTTrack Website Copier"
-      VALUE "ProductVersion", "3.49-14"
+      VALUE "ProductVersion", "3.49-13"
     END
   END
   BLOCK "VarFileInfo"

src/webhttrack.vcxproj

@@ -97,7 +97,6 @@
   <ItemGroup>
     <ClCompile Include="htsserver.c" />
     <ClCompile Include="htsweb.c" />
-    <ClCompile Include="htscmdline.c" />
     <ClCompile Include="htsurlport.c" />
   </ItemGroup>
 

tests/01_engine-cmdline-split.test

@@ -1,8 +0,0 @@
-#!/bin/bash
-#
-
-set -euo pipefail
-
-# webhttrack posts its command line as one string: the argv split must grow past
-# 1024 arguments and keep a quote inside a value out of the option parser.
-httrack -O /dev/null -#test=cmdline-split run | grep -q "cmdline-split self-test OK"

tests/01_engine-cookieimport.test

@@ -1,12 +0,0 @@
-#!/bin/bash
-#
-
-set -euo pipefail
-
-# Drives -#test=cookieimport: load a cookie jar (and, on Windows, copied IE
-# cookies *@*.txt) from a long, non-ASCII folder through the UTF-8/long-path
-# file wrappers (#133,#630).
-dir=$(mktemp -d)
-trap 'rm -rf "$dir"' EXIT
-
-httrack -O /dev/null -#test=cookieimport "$dir" | grep -q "cookieimport:.*OK"