From nobody Wed Apr 16 19:46:23 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 4ZdBNc0SsBz5t8Kv; Wed, 16 Apr 2025 19:46:24 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZdBNb60m8z3kpl; Wed, 16 Apr 2025 19:46:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744832783; 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=jLpY/0iOICxJsWjL6TFNiT8CkabCeFjeCle+ia5EKFc=; b=Jg7Hj289tJ74F+oWFz0JIOSMoqeBmLy1q0sJKxNP76T/D/5kQZexAa0psA8bWmez0Bcq+D jTc9pbOGbhrdhfhqm8LU4TGlbISp7K87MXqoX5djx67KkGfzJ8q7x1oKCNGLvFgbtl/dRO jrXcy6VLcDWQ6qr0g7Q4fmmkPFj/pK8gxGxqEU1uFMpMMv4HDRJhwhQEG++uq0FfWPxOy5 jp/SFcAyE5BaW875/WwbfXGEapds484hhUGGVjRjXkS2x4kw5BNb14CONuWQNYWcVkvD/I 86WAOUE75vyP703eMUjtpCqWA0wafMWKbpV/WGkSOK7ISSpdpur1/lmtW91Ucw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744832783; a=rsa-sha256; cv=none; b=rjRLUCiJpvOI7x7sdjLOQnNvTLA2jjRfY4MFblpNcvmc8647XQ6AGHONk0HQQZfIP38v9o staRzisxAG/KW9fk0HtKmsPKyyTYM5g/PXmSiqM/4CHnSUQOzM7YzvuoPYpgDNknHaoqPN 3lbC6COc5ZNKzpichdRi9McYO5HHFuYiqok2Br6gsms7zxydvtFXjNm+oXZEgp11DLdznn mxN3wW5cGzsr/iU/fjVMo/td68E+l+msCL+0hn+Gz4bz2DGKv2DpM96xSk2Nkcljxzgvxg IoxM3DMK7EkAZUJEmHTnqVY4O8pLZXMu8IkyVwCVhKL2fh8A15aOuJEqF24E3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744832783; 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=jLpY/0iOICxJsWjL6TFNiT8CkabCeFjeCle+ia5EKFc=; b=TXJm3aZc0Z8v2YroSJDzPGCPrNHaVytsDObjz8WLFUqyOujQKznZFlMsLlEo3y2pvaPJjx pghuceZfKdHxHvvR/YAceLazkC/kzMim05tQ7Hw5JTEYbWHn9Xur6lGBtOJpXILM90Qbwm j/ga5r999y/VPcixg6hbWnnkWqkY67I/9by0+C0DCxvGKvUepho6mRXgcuKdJVqbg4m0cr oweHnrQoFKXNrjjvvcFgKvakVe8RIJ3pMIA7M29EbCUrBAdsP8iJtJSqTmyTrmW0d5UUAA a2/EceOovMV7nwhtd2wjW6mXfbYlQo3k4bFdxuS6Xi+VoGRQqmK+lDTYDQlEgw== 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 4ZdBNb5GmDz1tD; Wed, 16 Apr 2025 19:46:23 +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 53GJkNFI063498; Wed, 16 Apr 2025 19:46:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53GJkNOu063495; Wed, 16 Apr 2025 19:46:23 GMT (envelope-from git) Date: Wed, 16 Apr 2025 19:46:23 GMT Message-Id: <202504161946.53GJkNOu063495@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: e7bf1e5f1d62 - main - 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e7bf1e5f1d62c2e735d343c462275e7e2aaf0286 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=e7bf1e5f1d62c2e735d343c462275e7e2aaf0286 commit e7bf1e5f1d62c2e735d343c462275e7e2aaf0286 Author: Aaron LI AuthorDate: 2025-04-02 11:20:02 +0000 Commit: Baptiste Daroussin CommitDate: 2025-04-16 19:45:37 +0000 timeout(1): Improve duration parsing and error messages Obtained-from: OpenBSD (via DragonFly BSD) --- 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); }