From nobody Mon Jun 16 08:53:53 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bLP1Z3kY2z5Vpnf; Mon, 16 Jun 2025 08:53:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bLP1Z12L9z3wH7; Mon, 16 Jun 2025 08:53:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750064034; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uiqPJhIUjzFIkLi9aFuBGAeeBbYzovMONCDTTL3yV6s=; b=Vnb72vIbLUPSr2SCTtdj48rIwIpWH/Y1/frFE1pMeWrhHjJYxID1RN8IjPQo9c6AdAUSE6 vzj15DMK+tX7gN/xW/PVsoQz0DSfbCqhYXREy1fg0vIQqn4DzxDthHxa78ol5/X/eK8qQZ 6XFij9dhkityV3ULeLHgPBrR13e2bn8X6TsITl39+3ydQOt8G00x6PgNNAoNlqd+GqokuB 21tGYeThIolKqSX6YGp71Jdqsbj4MEg0LIdJXAldjE2TtOuiY2j3XVaZSzjBmN9FcEHpEh w1K495ro2NUhuBRpMAwUmi22b0ioGOVUwdK8DWjihU+k7gC1Mw1ctoQZ3KKpjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750064034; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uiqPJhIUjzFIkLi9aFuBGAeeBbYzovMONCDTTL3yV6s=; b=Kyr7AshAwlNUswYi3PzjfdtuvzS+5W88AsTQKzHNUQhQF0tuqpE7jYLY7xLAWDl+pvH+yQ UKHKbcosBPmHFq3uItWuiCMlMXgQhT/2BOn/ga6Mx4SR97vJmm3KRsEsP+1X1W4OBhCZD+ Yz9ojW/q3ZAbEieIAmJUUKG3cRdmYSKiAl6QxM1tWd/nlpM9uvMcAYQ6K0ZAtJZMGuu+W/ va/pJF3Ga8r4ZvOogzHM9iSAOLeTlAq1pgsvXA8o6Mqh8MI/Xqzsn2IIjI/xS+5jt5yiXi a1VEZ2QjXkZnZYF2NLvffdY6WmskJa9QXhztm2q1Hr6l4CLULGH9vJB9Bo7PuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750064034; a=rsa-sha256; cv=none; b=XlfVnx4TD53b52BsFPd0DHO6vvhDvfdxRyDm9VB1D1LNYuDu2BNMjcZcPH5NLAaHMkT3G7 eKrNcoF800Zz3kRRutPhWqlM3kYbHTsr5fa1H9QPtevHmWlHo2hcdx62n56o57wew4TrWv cW9MXg4K2Z/v4j3QsxLN7biScOZDddZQE0ojZeSSWvLgo6JJXps+iWOkXkUW37C2AtUSS+ FMdTgCVqrHo9YdUu+kh9AETckg2Ar+vv926btlpG/lVvkuuGPH22pz0D8ctgvVWUP/iBkc xpFrBWtr5P4H6gh7TFNVJZVOEDHTLFkt8d/gdJ/+xANu0DacsXrwjefZKJWPkg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bLP1Z0X9mzqy9; Mon, 16 Jun 2025 08:53:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55G8rrL6042988; Mon, 16 Jun 2025 08:53:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55G8rr9A042984; Mon, 16 Jun 2025 08:53:53 GMT (envelope-from git) Date: Mon, 16 Jun 2025 08:53:53 GMT Message-Id: <202506160853.55G8rr9A042984@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: b57a0597fc1a - stable/14 - timeout(1): Improve duration parsing and error messages List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b57a0597fc1adc207cd5c4298288916c65699908 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b57a0597fc1adc207cd5c4298288916c65699908 commit b57a0597fc1adc207cd5c4298288916c65699908 Author: Aaron LI AuthorDate: 2025-04-02 11:20:02 +0000 Commit: Konstantin Belousov CommitDate: 2025-06-16 08:51:51 +0000 timeout(1): Improve duration parsing and error messages (cherry picked from commit e7bf1e5f1d62c2e735d343c462275e7e2aaf0286) --- bin/timeout/timeout.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/bin/timeout/timeout.c b/bin/timeout/timeout.c index 429ca64349e3..83893ba0a601 100644 --- a/bin/timeout/timeout.c +++ b/bin/timeout/timeout.c @@ -68,19 +68,19 @@ static double parse_duration(const char *duration) { double ret; - char *end; + char *suffix; - ret = strtod(duration, &end); - if (ret == 0 && end == duration) - errx(EXIT_INVALID, "invalid duration"); + ret = strtod(duration, &suffix); + if (suffix == duration) + errx(EXIT_INVALID, "duration is not a number"); - if (end == NULL || *end == '\0') + if (*suffix == '\0') return (ret); - if (end != NULL && *(end + 1) != '\0') - errx(EXIT_INVALID, "invalid duration"); + if (suffix[1] != '\0') + errx(EXIT_INVALID, "duration unit suffix too long"); - switch (*end) { + switch (*suffix) { case 's': break; case 'm': @@ -93,11 +93,11 @@ parse_duration(const char *duration) ret *= 60 * 60 * 24; break; default: - errx(EXIT_INVALID, "invalid duration"); + errx(EXIT_INVALID, "duration unit suffix invalid"); } if (ret < 0 || ret >= 100000000UL) - errx(EXIT_INVALID, "invalid duration"); + errx(EXIT_INVALID, "duration out of range"); return (ret); }