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/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

@@ -5084,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;
@@ -5251,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

@@ -2109,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];
@@ -3142,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/Makefile.am

@@ -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 \