Walk the option cluster the way the parser does

The helper tested the second character only, which disagreed with the parser
in both directions: it dropped continue mode for -%qi and -%Mi, where the
trailing i does reach the main set, and it still mistook the i of -q%i for
-i, leaving that spelling on the usage screen.

Walk the cluster instead, letting %, &, @ and # take the letter after them
into another set wherever they sit. & matters because the -& to -% rewrite
only fires at position 0, so -q&i reaches the parser as-is.

None of this is reachable through a documented option or an alias, which all
place the prefix first; it keeps the helper honest against hand-written
clusters.

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

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 "16 July 2026" "httrack website copier"
+.TH httrack 1 "14 July 2026" "httrack website copier"
 .SH NAME
 httrack \- offline browser : copy websites to a local directory
 .SH SYNOPSIS
@@ -165,7 +165,7 @@ pause transfer if N bytes reached, and wait until lock file is deleted (\-\-max\
 .IP \-cN
 number of multiple connections (*c8) (\-\-sockets[=N])
 .IP \-TN
-timeout, number of seconds after a non\-responding link is shutdown; also bounds host name resolution (\-\-timeout[=N])
+timeout, number of seconds after a non\-responding link is shutdown (\-\-timeout[=N])
 .IP \-RN
 number of retries, in case of timeout or non\-fatal errors (*R1) (\-\-retries[=N])
 .IP \-JN

src/htsalias.c

@@ -567,29 +567,24 @@ int optinclude_file(const char *name, int *argc, char **argv, char *x_argvblk,
   return 0;
 }
 
-/* Get home directory, '.' if unset or empty */
+/* Get home directory, '.' if failed */
 /* example: /home/smith */
 const char *hts_gethome(void) {
   const char *home = getenv("HOME");
 
-  /* An empty $HOME would expand ~/foo into the absolute /foo */
-  return strnotempty(home) ? home : ".";
+  if (home)
+    return home;
+  else
+    return ".";
 }
 
-/* Convert ~/foo into /home/smith/foo (~user/ left alone: no getpwnam here) */
+/* Convert ~/foo into /home/smith/foo */
 void expand_home(String * str) {
-  if (StringNotEmpty(*str) && StringSub(*str, 0) == '~' &&
-      (StringLength(*str) == 1 || StringSub(*str, 1) == '/')) {
+  if (StringSub(*str, 1) == '~') {
     char BIGSTK tempo[HTS_URLMAXSIZE * 2];
-    const char *const home = hts_gethome();
-    const size_t homelen = strlen(home);
-    const size_t taillen = StringLength(*str) - 1;
 
-    /* Leave untouched rather than abort() in strcatbuff on a huge $HOME */
-    if (taillen < sizeof(tempo) && homelen < sizeof(tempo) - taillen) {
-      strcpybuff(tempo, home);
-      strcatbuff(tempo, StringBuff(*str) + 1);
-      StringCopy(*str, tempo);
-    }
+    strcpybuff(tempo, hts_gethome());
+    strcatbuff(tempo, StringBuff(*str) + 1);
+    StringCopy(*str, tempo);
   }
 }

src/htsback.c

@@ -2816,9 +2816,6 @@ void back_wait(struct_back * sback, httrackp * opt, cache_back * cache,
                 if (SSL_set_fd(back[i].r.ssl_con, (int) back[i].r.soc) == 1) {
                   SSL_set_connect_state(back[i].r.ssl_con);
                   back[i].status = STATUS_SSL_WAIT_HANDSHAKE;   /* handshake wait */
-                  // the handshake gets its own timeout window, as connect does
-                  if (back[i].timeout > 0)
-                    back[i].timeout_refresh = time_local();
                 } else
                   back[i].r.statuscode = STATUSCODE_SSL_HANDSHAKE;
               } else
@@ -2878,11 +2875,6 @@ void back_wait(struct_back * sback, httrackp * opt, cache_back * cache,
       }
 #if HTS_USEOPENSSL
       else if (back[i].status == STATUS_SSL_WAIT_HANDSHAKE) {       // wait for SSL handshake
-        // a peer that never speaks TLS must be reaped by --timeout too (#607)
-        if (!gestion_timeout)
-          if (back[i].timeout > 0)
-            gestion_timeout = 1;
-
         /* SSL mode */
         if (back[i].r.ssl) {
           int conn_code;
@@ -4273,8 +4265,6 @@ void back_wait(struct_back * sback, httrackp * opt, cache_back * cache,
                 strcpybuff(back[i].r.msg, "Connect Time Out");
               else if (back[i].status == STATUS_WAIT_DNS)
                 strcpybuff(back[i].r.msg, "DNS Time Out");
-              else if (back[i].status == STATUS_SSL_WAIT_HANDSHAKE)
-                strcpybuff(back[i].r.msg, "SSL/TLS Handshake Time Out");
               else
                 strcpybuff(back[i].r.msg, "Receive Time Out");
               back[i].status = STATUS_READY;    // terminé

src/htscoremain.c

@@ -113,6 +113,7 @@ HTSEXT_API int hts_main(int argc, char **argv) {
 }
 
 static int hts_main_internal(int argc, char **argv, httrackp * opt);
+static hts_boolean cmdl_shortopt_has(const char *s, char c);
 
 // Main, récupère les paramètres et appelle le robot
 HTSEXT_API int hts_main2(int argc, char **argv, httrackp * opt) {
@@ -304,12 +305,12 @@ static int hts_main_internal(int argc, char **argv, httrackp * opt) {
                      hts_get_version_info(opt));
               return 0;
             } else {
-              if (strncmp(tmp_argv[0], "--", 2)) {      /* pas */
-                if ((strchr(tmp_argv[0], 'q') != NULL))
-                  opt->quiet = 1;       // ne pas poser de questions! (nohup par exemple)
-                if ((strchr(tmp_argv[0], 'i') != NULL)) {       // doit.log!
-                  argv_url = -1;        /* forcer */
-                  opt->quiet = 1;
+              if (strncmp(tmp_argv[0], "--", 2)) { /* not a long option */
+                if (cmdl_shortopt_has(tmp_argv[0], 'q'))
+                  opt->quiet = HTS_TRUE; // never ask questions (nohup)
+                if (cmdl_shortopt_has(tmp_argv[0], 'i')) { // doit.log!
+                  argv_url = -1;
+                  opt->quiet = HTS_TRUE;
                 }
               } else if (strcmp(tmp_argv[0] + 2, "quiet") == 0) {
                 opt->quiet = 1; // ne pas poser de questions! (nohup par exemple)
@@ -2807,6 +2808,32 @@ int check_path(String * s, char *defaultname) {
   return return_value;
 }
 
+/* Does the short-option cluster s carry c from the main option set (-i, -iC2,
+   -%Mi)? Walked as the parser does below: %, &, @ and # each take the letter
+   after them into another set, so the i of -%i is not the main-set -i. */
+static hts_boolean cmdl_shortopt_has(const char *s, char c) {
+  const char *com;
+
+  if (s[0] != '-' || s[1] == '-')
+    return HTS_FALSE;
+  for (com = s + 1; *com != '\0'; com++) {
+    switch (*com) {
+    case '%':
+    case '&':
+    case '@':
+    case '#':
+      if (*(com + 1) != '\0')
+        com++; /* skip the other set's letter */
+      break;
+    default:
+      if (*com == c)
+        return HTS_TRUE;
+      break;
+    }
+  }
+  return HTS_FALSE;
+}
+
 // détermine si l'argument est une option
 int cmdl_opt(char *s) {
   if (s[0] == '-') {            // c'est peut être une option

src/htsdns_selftest.c

@@ -63,14 +63,9 @@ typedef struct mock_host {
   int gai_err; /* non-zero: getaddrinfo returns this */
   int naddr;
   mock_addr addr[6];
-  int calls;   /* times the backend resolved this host */
-  int slow_ms; /* non-zero: block this long, as a black-hole resolver would */
+  int calls; /* times the backend resolved this host */
 } mock_host;
 
-/* Long enough to outlast the 1s --timeout the bounded resolve is checked
-   against, short enough to keep the self-test quick. */
-#define MOCK_SLOW_MS 3000
-
 static mock_host mock_hosts[] = {
     {"v4only.test", 0, 1, {{AF_INET, {1, 2, 3, 4}}}, 0},
     {"v6only.test", 0, 1, {{AF_INET6, {0x20, 0x01, 0x0d, 0xb8, [15] = 1}}}, 0},
@@ -100,15 +95,8 @@ static mock_host mock_hosts[] = {
       {AF_INET, {10, 0, 0, 6}}},
      0},
     {"nodns.test", EAI_NONAME, 0, {{0}}, 0},
-    /* resolves, but only well after --timeout: the #606 wedge */
-    {"slow.test", 0, 1, {{AF_INET, {127, 0, 0, 9}}}, 0, MOCK_SLOW_MS},
 };
 
-/* Serializes mock_host bookkeeping: a timed-out resolve is abandoned, so its
-   worker is still inside the backend while the test reads the counters. */
-static htsmutex mock_lock = HTSMUTEX_INIT;
-static int mock_finished = 0; /* backend calls that have returned */
-
 static mock_host *mock_find(const char *name) {
   for (size_t i = 0; i < sizeof(mock_hosts) / sizeof(mock_hosts[0]); i++) {
     if (strcmp(mock_hosts[i].name, name) == 0)
@@ -118,34 +106,8 @@ static mock_host *mock_find(const char *name) {
 }
 
 static void mock_reset_calls(void) {
-  hts_mutexlock(&mock_lock);
   for (size_t i = 0; i < sizeof(mock_hosts) / sizeof(mock_hosts[0]); i++)
     mock_hosts[i].calls = 0;
-  mock_finished = 0;
-  hts_mutexrelease(&mock_lock);
-}
-
-static int mock_read_calls(const char *name) {
-  int calls;
-
-  hts_mutexlock(&mock_lock);
-  calls = mock_find(name)->calls;
-  hts_mutexrelease(&mock_lock);
-  return calls;
-}
-
-/* Wait for n backend calls to return, ordering their writes against ours. */
-static void mock_wait_finished(int n) {
-  for (;;) {
-    hts_boolean done;
-
-    hts_mutexlock(&mock_lock);
-    done = (mock_finished >= n) ? HTS_TRUE : HTS_FALSE;
-    hts_mutexrelease(&mock_lock);
-    if (done)
-      break;
-    Sleep(10);
-  }
 }
 
 /* Build one addrinfo node owning its sockaddr (freed by mock_freeaddrinfo). */
@@ -171,10 +133,10 @@ static struct addrinfo *mock_mkai(const mock_addr *a) {
   return ai;
 }
 
-static int HTS_RESOLVER_CALL mock_getaddrinfo_(const char *node,
-                                               const char *service,
-                                               const struct addrinfo *hints,
-                                               struct addrinfo **res) {
+static int HTS_RESOLVER_CALL mock_getaddrinfo(const char *node,
+                                              const char *service,
+                                              const struct addrinfo *hints,
+                                              struct addrinfo **res) {
   mock_host *const h = mock_find(node);
   const int want = (hints != NULL) ? hints->ai_family : PF_UNSPEC;
   struct addrinfo *head = NULL, *tail = NULL;
@@ -183,11 +145,7 @@ static int HTS_RESOLVER_CALL mock_getaddrinfo_(const char *node,
   *res = NULL;
   if (h == NULL)
     return EAI_NONAME;
-  hts_mutexlock(&mock_lock);
   h->calls++; /* a real backend hit; a cached host skips this */
-  hts_mutexrelease(&mock_lock);
-  if (h->slow_ms != 0)
-    Sleep(h->slow_ms);
   if (h->gai_err != 0)
     return h->gai_err;
   for (int i = 0; i < h->naddr; i++) {
@@ -207,18 +165,6 @@ static int HTS_RESOLVER_CALL mock_getaddrinfo_(const char *node,
   return 0;
 }
 
-static int HTS_RESOLVER_CALL mock_getaddrinfo(const char *node,
-                                              const char *service,
-                                              const struct addrinfo *hints,
-                                              struct addrinfo **res) {
-  const int ret = mock_getaddrinfo_(node, service, hints, res);
-
-  hts_mutexlock(&mock_lock);
-  mock_finished++;
-  hts_mutexrelease(&mock_lock);
-  return ret;
-}
-
 static void HTS_RESOLVER_CALL mock_freeaddrinfo(struct addrinfo *res) {
   while (res != NULL) {
     struct addrinfo *const next = res->ai_next;
@@ -424,91 +370,6 @@ int dns_selftests(httrackp *opt) {
   return failures;
 }
 
-/* Probes how long acquiring opt->state.lock takes while a resolve is in
-   flight. hts_has_stopped() takes that same lock and mutates nothing, and the
-   API promises it stays callable from another thread during a mirror. */
-typedef struct lock_probe {
-  httrackp *opt;
-  htsmutex lock;
-  hts_boolean done;
-  TStamp blocked_ms;
-} lock_probe;
-
-static void lock_probe_thread(void *arg) {
-  lock_probe *const p = (lock_probe *) arg;
-  TStamp start;
-
-  Sleep(MOCK_SLOW_MS / 10); /* let the resolve get under way first */
-  start = mtime_local();
-  (void) hts_has_stopped(p->opt);
-  hts_mutexlock(&p->lock);
-  p->blocked_ms = mtime_local() - start;
-  p->done = HTS_TRUE;
-  hts_mutexrelease(&p->lock);
-}
-
-int dns_timeout_selftests(httrackp *opt) {
-  SOCaddr addrs[HTS_MAXADDRNUM];
-  const char *err = NULL;
-  lock_probe probe;
-  TStamp start, elapsed;
-  int count;
-
-  failures = 0;
-  hts_dns_set_resolver_backend(&mock_backend);
-  IPV6_resolver = 0;
-  mock_reset_calls();
-  opt->timeout = 1; /* the bound under test */
-
-  memset(&probe, 0, sizeof(probe));
-  probe.opt = opt;
-  probe.lock = HTSMUTEX_INIT;
-  hts_mutexinit(&probe.lock);
-  CHECK(hts_newthread(lock_probe_thread, &probe) == 0);
-
-  start = mtime_local();
-  count = hts_dns_resolve_all(opt, "slow.test", addrs, HTS_MAXADDRNUM, &err);
-  elapsed = mtime_local() - start;
-
-  /* the resolve returns on opt->timeout, not when the resolver deigns to
-     answer: this is what lets --max-time and --timeout fire (#606). The bound
-     is derived from opt->timeout, never from the mock's sleep, or a resolve
-     that ignored opt->timeout would still pass under the mock. */
-  CHECK(elapsed < (TStamp) opt->timeout * 1000 + 500);
-  CHECK(count == 0); /* a timeout is reported as "does not resolve" */
-
-  /* state.lock is not held across the resolve; a concurrent stop query, which
-     the mirror API promises stays live, is not blocked behind it */
-  for (;;) {
-    hts_boolean done;
-    TStamp blocked;
-
-    hts_mutexlock(&probe.lock);
-    done = probe.done;
-    blocked = probe.blocked_ms;
-    hts_mutexrelease(&probe.lock);
-    if (done) {
-      CHECK(blocked < 500);
-      break;
-    }
-    Sleep(20);
-  }
-  hts_mutexfree(&probe.lock);
-
-  /* a timeout is not an answer, so it must not be negative-cached: the host is
-     resolved again rather than written off for the rest of the crawl */
-  CHECK(mock_read_calls("slow.test") == 1);
-  count = hts_dns_resolve_all(opt, "slow.test", addrs, HTS_MAXADDRNUM, &err);
-  CHECK(count == 0);
-  CHECK(mock_read_calls("slow.test") == 2); /* re-resolved, not cached */
-
-  /* Both resolves were abandoned mid-backend; wait for their workers to leave
-     it before returning. The backend stays installed: an abandoned worker
-     still reads it (to free its addrinfo) after the last call returns. */
-  mock_wait_finished(2);
-  return failures;
-}
-
 #else
 
 int dns_selftests(httrackp *opt) {

src/htsdns_selftest.h

@@ -46,12 +46,6 @@ typedef struct httrackp httrackp;
    Returns the number of failed checks (0 == success). */
 int dns_selftests(httrackp *opt);
 
-/* Drive a deliberately slow (mock) resolver, asserting that a resolve is
-   bounded by opt->timeout, does not hold opt->state.lock while it runs, and
-   does not cache a timeout as an answer (#606). Takes a few seconds.
-   Returns the number of failed checks (0 == success). */
-int dns_timeout_selftests(httrackp *opt);
-
 #endif
 
 #endif

src/htshelp.c

@@ -496,8 +496,8 @@ void help(const char *app, int more) {
   infomsg("");
   infomsg("Flow control:");
   infomsg("  cN number of multiple connections (*c8)");
-  infomsg("  TN timeout, number of seconds after a non-responding link is"
-          " shutdown; also bounds host name resolution");
+  infomsg
+    ("  TN timeout, number of seconds after a non-responding link is shutdown");
   infomsg
     ("  RN number of retries, in case of timeout or non-fatal errors (*R1)");
   infomsg

src/htslib.c

@@ -65,7 +65,6 @@ Please visit our Website: http://www.httrack.com
 #endif /* _WIN32 */
 #include <stdarg.h>
 
-#include <ctype.h>
 #include <string.h>
 #include <time.h>
 #include <stdarg.h>
@@ -3748,20 +3747,6 @@ static int proxy_default_port(const char *arg) {
   return hts_proxy_is_socks(arg) ? 1080 : 8080;
 }
 
-// port "a" of -P argument "arg": digits fitting TCP's 1..65535, else the scheme
-// default. Not sscanf("%d"): past INT_MAX it wraps to a garbage port (#602)
-static int parse_proxy_port(const char *a, const char *arg) {
-  char *end;
-  long p;
-
-  if (!isdigit((unsigned char) *a)) // strtol would eat a sign or leading space
-    return proxy_default_port(arg);
-  p = strtol(a, &end, 10);
-  if (*end != '\0' || p < 1 || p > 65535) // ERANGE lands out of range too
-    return proxy_default_port(arg);
-  return (int) p;
-}
-
 void hts_parse_proxy(const char *arg, char *name, size_t name_size, int *port) {
   const char *authority = strstr(arg, "://");
   const char *a;
@@ -3777,7 +3762,10 @@ void hts_parse_proxy(const char *arg, char *name, size_t name_size, int *port) {
   while (a > authority && a[-1] != ':' && a[-1] != '@' && a[-1] != ']')
     a--;
   if (a > authority && a[-1] == ':') {
-    *port = parse_proxy_port(a, arg);
+    int p = -1;
+
+    sscanf(a, "%d", &p);
+    *port = (p > 0) ? p : proxy_default_port(arg);
     namelen = (size_t) (a - 1 - arg);
   } else {
     *port = proxy_default_port(arg);
@@ -5096,164 +5084,50 @@ HTSEXT_API int check_hostname_dns(const char *const hostname) {
   return hts_dns_resolve_nocache(hostname, &buffer) != NULL;
 }
 
-/* A resolve in flight. Refcounted: a timed-out resolve is abandoned, not
-   cancelled, so the last of caller/worker to leave frees the job. */
-typedef struct dns_resolve_job {
-  htsmutex lock;
-  int refcount;
-  hts_boolean done;
-  char *hostname;
-  SOCaddr addr[HTS_MAXADDRNUM];
+// Needs locking
+// Internal DNS cache. Fill out[0..count-1] with up to max addresses for _iadr,
+// resolving (and caching the full list) on a miss. Returns the count.
+static int hts_dns_resolve_list_(httrackp *opt, const char *_iadr,
+                                 SOCaddr *const out, const int max,
+                                 const char **error) {
+  char BIGSTK iadr[HTS_URLMAXSIZE * 2];
+  coucal cache = hts_cache(opt); // le cache dns
   int count;
-  const char *error;
-} dns_resolve_job;
-
-/* Copy the first min(count, max) addresses of src into dest. */
-static void dns_copy_addrs(SOCaddr *dest, SOCaddr *src, int count, int max) {
-  int i;
-
-  for (i = 0; i < count && i < max; i++)
-    SOCaddr_copy_SOCaddr(dest[i], src[i]);
-}
-
-static void dns_job_release(dns_resolve_job *job) {
-  hts_boolean last;
-
-  hts_mutexlock(&job->lock);
-  last = (--job->refcount == 0) ? HTS_TRUE : HTS_FALSE;
-  hts_mutexrelease(&job->lock);
-  if (last) {
-    hts_mutexfree(&job->lock);
-    freet(job->hostname);
-    freet(job);
-  }
-}
-
-/* Outlives a timed-out resolve, so it writes only the job: never opt (freed
-   before the thread wait at exit) nor the DNS cache. */
-static void dns_resolve_thread(void *arg) {
-  dns_resolve_job *const job = (dns_resolve_job *) arg;
-  SOCaddr resolved[HTS_MAXADDRNUM];
-  const char *error = NULL;
-  const int count = hts_dns_resolve_nocache_list(job->hostname, resolved,
-                                                 HTS_MAXADDRNUM, &error);
-
-  hts_mutexlock(&job->lock);
-  dns_copy_addrs(job->addr, resolved, count, HTS_MAXADDRNUM);
-  job->count = count;
-  job->error = error;
-  job->done = HTS_TRUE; /* published last: gates the caller's read of addr[] */
-  hts_mutexrelease(&job->lock);
-  dns_job_release(job);
-}
-
-/* Resolve hostname on a worker thread, giving up after timeout seconds.
-   Returns the address count, or -1 on timeout -- distinct from 0 ("does not
-   resolve"), which is a real answer and gets negative-cached. */
-static int hts_dns_resolve_nocache_list_bounded(const char *hostname,
-                                                SOCaddr *const out,
-                                                const int max,
-                                                const int timeout,
-                                                const char **error) {
-  dns_resolve_job *job;
-  TStamp deadline;
-  int count = -1;
-  int poll_ms = 1;
-
-  if (timeout <= 0) /* no bound asked for (--timeout 0) */
-    return hts_dns_resolve_nocache_list(hostname, out, max, error);
-
-  job = calloct(1, sizeof(*job));
-  assertf(job != NULL);
-  hts_mutexinit(&job->lock);
-  job->hostname = strdupt(hostname);
-  job->refcount = 2; /* this caller + the worker */
-  if (hts_newthread(dns_resolve_thread, job) != 0) {
-    job->refcount = 1; /* no worker: fall back to resolving inline */
-    dns_job_release(job);
-    return hts_dns_resolve_nocache_list(hostname, out, max, error);
-  }
-
-  deadline = mtime_local() + (TStamp) timeout * 1000;
-  for (;;) {
-    hts_boolean done;
-
-    hts_mutexlock(&job->lock);
-    done = job->done;
-    if (done) {
-      count = job->count;
-      dns_copy_addrs(out, job->addr, count, max);
-      if (error != NULL)
-        *error = job->error;
-    }
-    hts_mutexrelease(&job->lock);
-    if (done || mtime_local() >= deadline)
-      break;
-    Sleep(poll_ms);
-    if (poll_ms < 50) /* short first polls keep a fast resolve fast */
-      poll_ms *= 2;
-  }
-  dns_job_release(job);
-  return count;
-}
-
-int hts_dns_resolve_all(httrackp *opt, const char *iadr, SOCaddr *out, int max,
-                        const char **error) {
-  char BIGSTK host[HTS_URLMAXSIZE * 2];
-  SOCaddr resolved[HTS_MAXADDRNUM];
-  coucal cache;
-  int count, i;
 
   assertf(opt != NULL);
+  assertf(_iadr != NULL);
   assertf(out != NULL);
-  if (!strnotempty(iadr) || max <= 0) {
-    return 0;
-  }
 
-  /* cache key and resolver input: identification and any ":port" stripped */
-  strcpybuff(host, jump_identification_const(iadr));
+  strcpybuff(iadr, jump_identification_const(_iadr));
+  // couper éventuel :
   {
     char *a;
 
-    if ((a = jump_toport(host)))
+    if ((a = jump_toport(iadr)))
       *a = '\0';
   }
 
-  hts_mutexlock(&opt->state.lock);
-  cache = hts_cache(opt);
-#if HTS_INET6 != 0
-  hts_resolver_check_env(); /* settle the backend before a worker reads it */
-#endif
-  count = hts_ghbn_all(cache, host, out, max);
-  hts_mutexrelease(&opt->state.lock);
+  /* get IP from the dns cache */
+  count = hts_ghbn_all(cache, iadr, out, max);
   if (count >= 0) { // cache hit (0 == negative-cached)
     return count;
-  }
+  } else { // non présent dans le cache dns, tester
+    SOCaddr resolved[HTS_MAXADDRNUM];
+    t_dnscache *record;
+    int i;
 
 #if DEBUGDNS
-  printf("resolving (not cached) %s\n", host);
+    printf("resolving (not cached) %s\n", iadr);
 #endif
 
-  /* Resolve with no lock held: getaddrinfo can block for a long time, and
-     state.lock also gates the stop request (#606). */
-  count = hts_dns_resolve_nocache_list_bounded(host, resolved, HTS_MAXADDRNUM,
-                                               opt->timeout, error);
+    count = hts_dns_resolve_nocache_list(iadr, resolved, HTS_MAXADDRNUM, error);
 
 #if HTS_WIDE_DEBUG
-  DEBUG_W("gethostbyname done\n");
+    DEBUG_W("gethostbyname done\n");
 #endif
 
-  if (count < 0) { /* timed out: no answer to cache, and none to report */
-    if (error != NULL)
-      *error = "host name resolution timed out";
-    return 0;
-  }
-
-  hts_mutexlock(&opt->state.lock);
-  { /* store the full list (coucal owns the record and dups the host key; a
-       concurrent resolve of the same host replaces, and frees, this one) */
-    t_dnscache *const record = malloct(sizeof(t_dnscache));
-
+    /* attempt to store new entry (coucal owns it and dups the host key) */
+    record = malloct(sizeof(t_dnscache));
     if (record != NULL) {
       memset(record, 0, sizeof(*record));
       record->host_count = count;
@@ -5263,13 +5137,28 @@ int hts_dns_resolve_all(httrackp *opt, const char *iadr, SOCaddr *out, int max,
         memcpy(record->host_addr[i], &SOCaddr_sockaddr(resolved[i]),
                record->host_length[i]);
       }
-      coucal_add_pvoid(cache, host, record);
+      coucal_add_pvoid(cache, iadr, record);
     }
-  }
-  hts_mutexrelease(&opt->state.lock);
 
-  /* copy result to caller (cache store may have failed; result still valid) */
-  dns_copy_addrs(out, resolved, count, max);
+    /* copy result to caller (cache store may have failed; result still valid)
+     */
+    for (i = 0; i < count && i < max; i++) {
+      SOCaddr_copy_SOCaddr(out[i], resolved[i]);
+    }
+    return count;
+  } // retour hp du cache
+}
+
+int hts_dns_resolve_all(httrackp *opt, const char *iadr, SOCaddr *out, int max,
+                        const char **error) {
+  int count;
+
+  if (!strnotempty(iadr) || max <= 0) {
+    return 0;
+  }
+  hts_mutexlock(&opt->state.lock);
+  count = hts_dns_resolve_list_(opt, iadr, out, max, error);
+  hts_mutexrelease(&opt->state.lock);
   return count;
 }
 

src/htslib.h

@@ -222,8 +222,7 @@ LLint http_xfread1(htsblk * r, int bufl);
 /* Cached resolver: fill out[0..count-1] with up to max addresses for iadr (in
    resolver order), returning the count (0 = does not resolve, negative-cached).
    Resolves once per host; later calls read the DNS cache. Must hold no lock
-   (brackets opt->state.lock itself, never across the resolve). A miss resolves
-   on a worker thread bounded by opt->timeout; a timeout reports 0, uncached. */
+   (brackets opt->state.lock itself). */
 int hts_dns_resolve_all(httrackp *opt, const char *iadr, SOCaddr *out, int max,
                         const char **error);
 HTS_INLINE SOCaddr *hts_dns_resolve2(httrackp *opt, const char *iadr,

src/htsselftest.c

@@ -45,7 +45,6 @@ Please visit our Website: http://www.httrack.com
 #include "htscore.h"
 #include "htsdefines.h"
 #include "htslib.h"
-#include "htsalias.h"
 #include "htsparse.h"
 #include "htscache.h"
 #include "htscache_selftest.h"
@@ -826,21 +825,6 @@ static int st_simplify(httrackp *opt, int argc, char **argv) {
   return 0;
 }
 
-static int st_expandhome(httrackp *opt, int argc, char **argv) {
-  String path = STRING_EMPTY;
-
-  (void) opt;
-  if (argc < 1) {
-    fprintf(stderr, "expandhome: needs a path\n");
-    return 1;
-  }
-  StringCopy(path, argv[0]);
-  expand_home(&path);
-  printf("expanded=%s\n", StringBuff(path));
-  StringFree(path);
-  return 0;
-}
-
 static int st_mime(httrackp *opt, int argc, char **argv) {
   char mime[256];
 
@@ -2125,15 +2109,6 @@ static int st_dns(httrackp *opt, int argc, char **argv) {
   return err;
 }
 
-static int st_dnstimeout(httrackp *opt, int argc, char **argv) {
-  const int err = dns_timeout_selftests(opt);
-
-  (void) argc;
-  (void) argv;
-  printf("dns-timeout-selftest: %s\n", err ? "FAIL" : "OK");
-  return err;
-}
-
 static int st_cookies(httrackp *opt, int argc, char **argv) {
   static t_cookie cookie;
   char hdr[1024];
@@ -3095,7 +3070,6 @@ static const struct selftest_entry {
     {"filterbounds", "", "matcher length/work caps reject hostile patterns",
      st_filterbounds},
     {"simplify", "<path>", "collapse ./ and ../ in a path", st_simplify},
-    {"expandhome", "<path>", "expand a leading ~/ into $HOME", st_expandhome},
     {"stripquery", "", "--strip-query pattern/key stripping self-test",
      st_stripquery},
     {"urlhack", "", "-%u url-hack sub-flag (www/slash/query) self-test",
@@ -3159,8 +3133,6 @@ static const struct selftest_entry {
     {"cache-corrupt", "<dir>", "cache read-side corruption self-test",
      st_cache_corrupt},
     {"dns", "", "DNS resolver/cache self-test", st_dns},
-    {"dnstimeout", "", "a slow DNS resolve is bounded and holds no lock",
-     st_dnstimeout},
     {"cookies", "", "cookie request-header self-test", st_cookies},
     {"useragent", "", "default User-Agent self-test", st_useragent},
     {"makeindex", "[dir]", "hts_finish_makeindex footer/refresh self-test",

tests/01_engine-cmdline.test

@@ -54,6 +54,13 @@ refused() {
         ! echo "FAIL: $1 (exit $RC)" || exit 1
 }
 
+# assert continue mode was entered: it drops the URL list, so with no cache to
+# resume the run ends on the usage screen rather than on any other error
+continued() {
+    { test "$RC" -ne 0 && grep -q 'usage:' "$1/.log"; } ||
+        ! echo "FAIL: $2 (exit $RC)" || exit 1
+}
+
 # a value past the old 126/256 caps but within the cap is accepted, on both the
 # short and long form of each option
 long=$(nchars 900)
@@ -102,4 +109,50 @@ for bad in nan nan:5 5:nan inf 10:5 99999; do
     refused "#185: invalid --pause '$bad' not refused cleanly"
 done
 
+# An option is not -i (continue) merely because its name contains an 'i' (#615).
+# These used to wipe the URL given before them and exit on the usage screen.
+run "$tmp/ord-bti" --build-top-index
+accepted "$tmp/ord-bti" "#615: --build-top-index after the URL wiped the URL list"
+run "$tmp/ord-bti-s" "-%i"
+accepted "$tmp/ord-bti-s" "#615: -%i after the URL wiped the URL list"
+run "$tmp/ord-proto" --protocol 2
+accepted "$tmp/ord-proto" "#615: --protocol after the URL wiped the URL list"
+run "$tmp/ord-proto-s" "-@i2"
+accepted "$tmp/ord-proto-s" "#615: -@i2 after the URL wiped the URL list"
+
+# %, &, @ and # take the letter after them into another option set, wherever
+# they sit in the cluster, so the i of -q%i is not the main-set -i either.
+run "$tmp/ord-qpi" "-q%i"
+accepted "$tmp/ord-qpi" "#615: -q%i after the URL wiped the URL list"
+run "$tmp/ord-qai" "-q@i"
+accepted "$tmp/ord-qai" "#615: -q@i after the URL wiped the URL list"
+
+# -%q only forces quiet mode, which nothing here can see: a run whose stdout is
+# not a tty is quiet from the start (htscoremain.c:174). Just check it crawls.
+run "$tmp/ord-iqs" "-%q"
+accepted "$tmp/ord-iqs" "#615: -%q after the URL broke the crawl"
+
+# The real -i still forces continue mode and drops the URL list, in every form:
+# a fix that merely stopped looking for 'i' would pass the checks above.
+run "$tmp/cont-s" -i
+continued "$tmp/cont-s" "#615: -i after the URL no longer forces continue mode"
+run "$tmp/cont-c" -iC2
+continued "$tmp/cont-c" "#615: -iC2 after the URL no longer forces continue mode"
+run "$tmp/cont-l" --continue
+continued "$tmp/cont-l" "#615: --continue after the URL no longer forces continue mode"
+run "$tmp/cont-u" --update
+continued "$tmp/cont-u" "#615: --update after the URL no longer forces continue mode"
+
+# ...including where another set's letter precedes it in the cluster.
+run "$tmp/cont-pq" "-%qi"
+continued "$tmp/cont-pq" "#615: -%qi after the URL no longer forces continue mode"
+run "$tmp/cont-pm" "-%Mi"
+continued "$tmp/cont-pm" "#615: -%Mi after the URL no longer forces continue mode"
+
+# Placed before the URL these always worked; they must keep working.
+run_only "$tmp/pre-bti" "-%i" "file://$tmp/index.html"
+accepted "$tmp/pre-bti" "#615: -%i before the URL broke the crawl"
+run_only "$tmp/pre-proto" "-@i2" "file://$tmp/index.html"
+accepted "$tmp/pre-proto" "#615: -@i2 before the URL broke the crawl"
+
 exit 0

tests/01_engine-dnstimeout.test

@@ -1,15 +0,0 @@
-#!/bin/bash
-#
-
-set -euo pipefail
-
-# A resolve against a deliberately slow mock getaddrinfo (no network) must
-# return on --timeout, must not hold opt->state.lock meanwhile, and must not
-# cache the timeout as an answer (#606).
-# 'run' is an ignored placeholder argument.
-out=$(httrack -#test=dnstimeout run)
-
-test "$out" = "dns-timeout-selftest: OK" || {
-    echo "expected 'dns-timeout-selftest: OK', got: $out" >&2
-    exit 1
-}

tests/01_engine-expandhome.test

@@ -1,53 +0,0 @@
-#!/bin/bash
-#
-
-# SC2088: the literal, unexpanded '~' is the input under test.
-# shellcheck disable=SC2088
-
-set -euo pipefail
-
-# ~ expansion for the -O base path (expand_home). $HOME is pinned so the cases
-# cannot depend on the caller's, but MSYS rewrites it into a Windows path
-# before the native httrack.exe reads it: ask the engine what it saw rather
-# than hardcoding the value.
-ask() {
-    HOME=HTSHOME httrack -O /dev/null -#test=expandhome "$1"
-}
-exp() {
-    test "$(ask "$1")" == "expanded=$2" || exit 1
-}
-
-home=$(ask '~')
-home=${home#expanded=}
-
-# or every case below is vacuous: '~' means expansion never fired, '.' means it
-# fell back to the default without ever reading $HOME
-test "$home" != '~' || exit 1
-test "$home" != '.' || exit 1
-
-exp '~' "$home"
-exp '~/foo' "$home/foo"
-exp '~/foo/bar/#' "$home/foo/bar/#"
-exp '~/' "$home/"
-exp '~/../x' "$home/../x"
-
-# ~user/ needs getpwnam: left alone rather than mangled into $HOME + "user/"
-exp '~smith/foo' '~smith/foo'
-exp '~root' '~root'
-
-# only a leading '~' expands; anything else is a literal path component
-exp 'a~/x' 'a~/x'
-exp './~/x' './~/x'
-exp 'foo~bar' 'foo~bar'
-
-# an unset or empty $HOME must not turn ~/foo into the absolute /foo
-test "$(env -u HOME httrack -O /dev/null -#test=expandhome '~/foo')" == "expanded=./foo" || exit 1
-test "$(HOME='' httrack -O /dev/null -#test=expandhome '~/foo')" == "expanded=./foo" || exit 1
-
-# A $HOME past the 2 * HTS_URLMAXSIZE buffer is left alone: strcatbuff aborts
-# rather than truncates. Only meaningful where the engine sees the value we set:
-# MSYS rewrites HOME into a path of its own choosing, long or not.
-if test "$home" = HTSHOME; then
-    long=$(printf '%04096d' 0 | tr '0' 'A')
-    test "$(HOME="$long" httrack -O /dev/null -#test=expandhome '~/foo')" == "expanded=~/foo" || exit 1
-fi

tests/01_engine-proxyurl.test

@@ -71,23 +71,3 @@ p 'http://a]b:c@host' 'name=http://a]b:c@host port=8080 host=host kind=http'
 
 # a lone ':' must not underflow the backward scan
 p ':' 'name= port=8080 host= kind=http'
-
-# a port is *DIGIT in 1..65535, else the scheme default: sscanf("%d") used to
-# wrap past INT_MAX and hand back a garbage port (#602)
-p 'http://host:65535' 'name=http://host port=65535 host=host kind=http'
-p 'http://host:1' 'name=http://host port=1 host=host kind=http'
-p 'http://host:65536' 'name=http://host port=8080 host=host kind=http'
-p 'http://host:2147483648' 'name=http://host port=8080 host=host kind=http'
-p 'http://host:4294967296' 'name=http://host port=8080 host=host kind=http'
-p 'http://host:99999999999999' 'name=http://host port=8080 host=host kind=http'
-# discriminating: this one wrapped to a plausible 80, so range-checking the
-# sscanf result instead of rejecting the overflow still passes everything above
-p 'http://host:4294967376' 'name=http://host port=8080 host=host kind=http'
-p 'http://host:999999999999999999999999999999' 'name=http://host port=8080 host=host kind=http'
-p 'http://host:0' 'name=http://host port=8080 host=host kind=http'
-p 'http://host:-1' 'name=http://host port=8080 host=host kind=http'
-p 'http://host:80x' 'name=http://host port=8080 host=host kind=http'
-p 'http://host: 80' 'name=http://host port=8080 host=host kind=http'
-p 'http://host:' 'name=http://host port=8080 host=host kind=http'
-# the fallback is the scheme's own default, not a hardcoded 8080
-p 'socks5://host:99999999999999' 'name=socks5://host port=1080 host=host kind=socks'

tests/59_local-tls-stall.test

@@ -1,95 +0,0 @@
-#!/bin/bash
-#
-# Issue #607: a peer that accepts the TCP connect but never speaks TLS leaves the
-# slot stuck in the handshake. The per-slot --timeout must reap it; before the
-# fix only --max-time did, so these crawls ran until the kill guard.
-
-set -euo pipefail
-
-: "${top_srcdir:=..}"
-
-# shellcheck source=tests/testlib.sh
-. "$top_srcdir/tests/testlib.sh"
-
-if test "${HTTPS_SUPPORT:-}" == "no"; then
-    echo "no https support compiled, skipping"
-    exit 77
-fi
-python=$(find_python) || {
-    echo "python3 missing, skipping"
-    exit 77
-}
-
-server=$(nativepath "$top_srcdir/tests/tls-stall-server.py")
-tmpdir=$(mktemp -d)
-serverpid=
-
-cleanup() {
-    stop_server "$serverpid"
-    rm -rf "$tmpdir"
-    return 0
-}
-trap cleanup EXIT
-
-# start_stall_server <tag> <mode-args...>: sets $port from the announced one.
-start_stall_server() {
-    local tag="$1"
-    shift
-    "$python" "$server" "$@" >"$tmpdir/$tag.out" 2>"$tmpdir/$tag.err" &
-    serverpid=$!
-    port=
-    for _ in $(seq 1 50); do
-        line=$(head -n1 "$tmpdir/$tag.out" 2>/dev/null || true)
-        if test "${line%% *}" == "PORT"; then
-            port="${line#PORT }"
-            return 0
-        fi
-        kill -0 "$serverpid" 2>/dev/null || {
-            echo "server exited early: $(cat "$tmpdir/$tag.err")"
-            exit 1
-        }
-        sleep 0.1
-    done
-    echo "could not discover server port"
-    exit 1
-}
-
-# no -E/--max-time on purpose: --timeout is the only thing that can end these.
-# The kill guard stands in for the hang, so a wall time near it means no reap.
-crawl_wall() {
-    local out="$tmpdir/$1"
-    shift
-    local start
-    start=$(date +%s)
-    run_with_timeout 60 httrack -O "$out" -c1 --robots=0 --retries=0 --quiet -Z \
-        "$@" >>"$tmpdir/log" 2>&1 || true
-    echo $(($(date +%s) - start))
-}
-
-# 1. handshake stalled from the first byte: reaped at --timeout, not before.
-start_stall_server direct direct
-wall=$(crawl_wall crawl1 "https://127.0.0.1:$port/" --timeout=5)
-if test "$wall" -ge 30 || test "$wall" -lt 3; then
-    echo "FAIL: stalled handshake reaped after ${wall}s, expected about 5s" >&2
-    cat "$tmpdir/log" >&2
-    exit 1
-fi
-grep -q 'Handshake Time Out' "$tmpdir/crawl1/hts-log.txt" || {
-    echo "FAIL: crawl ended in ${wall}s but not on a handshake timeout" >&2
-    cat "$tmpdir/crawl1/hts-log.txt" >&2
-    exit 1
-}
-echo "OK: stalled TLS handshake reaped by --timeout after ${wall}s"
-
-# 2. the handshake window is its own, not what the connect left over: a proxy
-# that takes 4s to answer CONNECT must still leave the full --timeout=5 for the
-# handshake (~9s total). Sharing the connect's clock would reap at ~5s.
-stop_server "$serverpid"
-start_stall_server proxy proxy 4
-wall=$(crawl_wall crawl2 "https://127.0.0.1:443/" -P "127.0.0.1:$port" --timeout=5)
-if test "$wall" -ge 20 || test "$wall" -lt 7; then
-    echo "FAIL: handshake after a slow connect reaped at ${wall}s, expected about 9s" >&2
-    cat "$tmpdir/log" >&2
-    exit 1
-fi
-echo "OK: handshake keeps its own timeout window after a slow connect (${wall}s)"

tests/Makefile.am

@@ -3,7 +3,7 @@
 # silently drop it from the dist tarball and break "make distcheck".
 EXTRA_DIST = $(TESTS) crawl-test.sh run-all-tests.sh check-network.sh \
 	proxy-https-server.py socks5-server.py proxy-connect-server.py \
-	proxytestlib.py tls-stall-server.py \
+	proxytestlib.py \
 	local-crawl.sh local-server.py testlib.sh server.crt server.key \
 	server-root/simple/basic.html server-root/simple/link.html \
 	server-root/stripquery/index.html server-root/stripquery/a.html \
@@ -35,7 +35,6 @@ TESTS = \
 	01_engine-copyopt.test \
 	01_engine-crange.test \
 	01_engine-dns.test \
-	01_engine-dnstimeout.test \
 	01_engine-doitlog.test \
 	01_engine-entities.test \
 	01_engine-filelist.test \
@@ -59,7 +58,6 @@ TESTS = \
 	01_engine-pause.test \
 	01_engine-rcfile.test \
 	01_engine-reconcile.test \
-	01_engine-expandhome.test \
 	01_engine-fsize.test \
 	01_engine-redirect.test \
 	01_engine-relative.test \
@@ -138,7 +136,6 @@ TESTS = \
 	55_local-chunked.test \
 	56_local-proxy-noleak.test \
 	57_local-proxy-connect.test \
-	58_watchdog.test \
-	59_local-tls-stall.test
+	58_watchdog.test
 
 CLEANFILES = check-network_sh.cache

tests/proxytestlib.py

@@ -18,15 +18,6 @@ PROXY_LOG = "proxy.log"
 ORIGIN_LOG = "origin-headers.log"
 
 
-def bind_ephemeral():
-    """Listening socket on a free loopback port, and that port."""
-    srv = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-    srv.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-    srv.bind(("127.0.0.1", 0))
-    srv.listen(16)
-    return srv, srv.getsockname()[1]
-
-
 def pipe(src, dst):
     """Relay bytes one way until EOF, then tear both ends down."""
     try:
@@ -122,7 +113,11 @@ def handle_client(conn, logdir, mode, default_port):
 
 
 def start_proxy(logdir, mode, default_port):
-    srv, port = bind_ephemeral()
+    srv = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+    srv.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+    srv.bind(("127.0.0.1", 0))
+    srv.listen(16)
+    port = srv.getsockname()[1]
 
     def accept_loop():
         while True:

tests/socks5-server.py

@@ -19,7 +19,7 @@ import threading
 # python3 -P (PYTHONSAFEPATH) drops the script's own directory from sys.path
 sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
 
-from proxytestlib import bind_ephemeral, pipe  # noqa: E402
+from proxytestlib import pipe  # noqa: E402
 
 # The one name the proxy answers for; a .invalid TLD never resolves (RFC 6761),
 # so a locally-resolving client could not reach us -- success proves remote DNS.
@@ -180,7 +180,11 @@ def handle_socks(conn, logdir, mode):
 
 
 def start_socks(logdir, mode):
-    srv, port = bind_ephemeral()
+    srv = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+    srv.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+    srv.bind(("127.0.0.1", 0))
+    srv.listen(16)
+    port = srv.getsockname()[1]
 
     def serve():
         while True:

tests/tls-stall-server.py

@@ -1,43 +0,0 @@
-#!/usr/bin/env python3
-"""Peers that accept a connection and never speak TLS (#607).
-
-Modes: "direct" stalls the handshake straight away; "proxy <secs>" answers a
-CONNECT after <secs> before stalling, so the handshake starts on a clock the
-connect has already eaten into. Prints "PORT <n>" once listening.
-Usage: tls-stall-server.py [direct | proxy <secs>]
-"""
-import os
-import sys
-import threading
-import time
-
-# python3 -P (PYTHONSAFEPATH) drops the script's own directory from sys.path
-sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
-
-from proxytestlib import bind_ephemeral  # noqa: E402
-
-held = []  # keep every socket open: a close would fail the handshake outright
-
-
-def stall(conn, delay):
-    if delay is not None:
-        rfile = conn.makefile("rb")
-        while rfile.readline() not in (b"\r\n", b"\n", b""):
-            pass
-        time.sleep(delay)
-        conn.sendall(b"HTTP/1.0 200 Connection established\r\n\r\n")
-    held.append(conn)
-
-
-def main():
-    mode = sys.argv[1] if len(sys.argv) > 1 else "direct"
-    delay = float(sys.argv[2]) if mode == "proxy" else None
-    srv, port = bind_ephemeral()
-    sys.stdout.reconfigure(newline="\n")  # Windows would emit \r\n
-    print("PORT %d" % port, flush=True)
-    while True:
-        conn, _ = srv.accept()
-        threading.Thread(target=stall, args=(conn, delay), daemon=True).start()
-
-
-main()