From nobody Wed Jan 29 12:35:56 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 4YjhTS6mR3z5mgn8; Wed, 29 Jan 2025 12:35:56 +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 4YjhTS2Y42z4JFZ; Wed, 29 Jan 2025 12:35:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738154156; 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=MkqeNHLOqGb+GeXUbFJvSjybaZpbPzObQQOf/boGjgM=; b=bMjIvBNHYL/iEG8Hihq59R4NEsrxn/eYOqflMyHGCRG4BPRQ1T3O/1sGGaOYNiFy6M0/CN KCzvNzOo8R0KoL4diexqtLTIOb5IOpcHKXX41IbsmbyOwieLiTD8dHnYYl9LVAbylPR5qL ZCx8E1i+8n/Nzos/F/uugTqFooJlEbj4pMjUxsj+jrde89EbykRzNg8ZocuVJYZ98/8ajQ Os+2xZGkH566cfgO8VASvoKbIvinFtgObnKpJ+fKKMw5Q60qvoHGhJq5zyLe2VJ0mgp31M TsOujUr22oo98Dy7wjf6HVdIQsgLtlFOKZi9xLGAmlXSRMyU3CSowC/v5fqMwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738154156; 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=MkqeNHLOqGb+GeXUbFJvSjybaZpbPzObQQOf/boGjgM=; b=Dj3TqdoD1lxn62TrlFICqol6RN1miQ8wGRMFrUfnxxMFqSMyplmKgsEsVJ2PT/fXqvf3E6 T/OCnmGc0j8aNhPqxL+nfDOr9BSpMNG88ipj0bvtX9bRam1jwSC3eheCV2x20qPH1BcDrO 6CnMXVfbey0Bc86aT5WQagKGnOOEtCFqdkKWJOsbwzmfONapDghkJ4t66FABRhfbo32/Ni pK+iY33LPGGp1ZYzkHG+UFlXJvWPpY+KfIUbIY9jMmPAcVlwZzwiuYlnKSuK44K1LG00wV fpGmatehCcTVuMN7wKPWZlKsgIwOp5Kwt8X3zBRcIUJmdzV33cTnF1nYVVJBQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738154156; a=rsa-sha256; cv=none; b=Y4XyqzF5/5R+bQlQfwhdK5pW0/LxmLExOXM5xZ24FmpKiKsluXGJc588XArHL38TCWqY0W AFcc8mnYTszsJicKVn1rYMtrTMH0xbSEhZ4x/qdhPQEDNKTMZCttafbvcJ4tyZc1BcONix k1sPjykVOip7GNkXWX2F3DO1dqc8cgCF5ZQPxofnwvoQP1DFxiI8LvAXnOPZcriiGuVrV4 LKx00o1LB19kGG4qGMFuxxD6oowkpB8UKWxJsSlhuWGhqINjhWfskA3zQKSZPrXH10dsTK VfxP31ZyljQN7cS6a/CwARRWjjAQNDyEDol86Kusd+FbCrXVrJhsaQ+bAtFJng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YjhTS23b0z12FB; Wed, 29 Jan 2025 12:35:56 +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 50TCZuHV051290; Wed, 29 Jan 2025 12:35:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50TCZulQ051287; Wed, 29 Jan 2025 12:35:56 GMT (envelope-from git) Date: Wed, 29 Jan 2025 12:35:56 GMT Message-Id: <202501291235.50TCZulQ051287@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mariusz Zaborski Subject: git: ef3914a56110 - stable/14 - leave(1): Replace magic exit codes with standard macros 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: oshogbo X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ef3914a561102b9ad8330ea88bfa8c32b79a5582 Auto-Submitted: auto-generated The branch stable/14 has been updated by oshogbo: URL: https://cgit.FreeBSD.org/src/commit/?id=ef3914a561102b9ad8330ea88bfa8c32b79a5582 commit ef3914a561102b9ad8330ea88bfa8c32b79a5582 Author: Faraz Vahedi AuthorDate: 2024-10-27 16:33:05 +0000 Commit: Mariusz Zaborski CommitDate: 2025-01-29 09:51:18 +0000 leave(1): Replace magic exit codes with standard macros Signed-off-by: Faraz Vahedi Reviewed by: oshogbo MFC after: 1 week Pull Request: https://github.com/freebsd/freebsd-src/pull/1499 (cherry picked from commit f7a6cf3a020600b77795729d1c01780dae8e6d2e) --- usr.bin/leave/leave.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/usr.bin/leave/leave.c b/usr.bin/leave/leave.c index ccea5d93d460..78bc17be2501 100644 --- a/usr.bin/leave/leave.c +++ b/usr.bin/leave/leave.c @@ -41,8 +41,8 @@ static char sccsid[] = "@(#)leave.c 8.1 (Berkeley) 6/6/93"; #endif #endif /* not lint */ #include -#include #include +#include #include #include #include @@ -84,7 +84,7 @@ main(int argc, char **argv) (void)write(STDOUT_FILENO, MSG1, sizeof(MSG1) - 1); cp = fgets(buf, sizeof(buf), stdin); if (cp == NULL || *cp == '\n') - exit(0); + exit(EXIT_SUCCESS); } else if (argc > 2) usage(); else @@ -135,7 +135,7 @@ main(int argc, char **argv) secs -= now % 60; /* truncate (now + secs) to min */ } doalarm(secs); - exit(0); + exit(EXIT_SUCCESS); } void @@ -151,7 +151,7 @@ doalarm(u_int secs) daytime += secs; strftime(tb, sizeof(tb), "%+", localtime(&daytime)); printf("Alarm set for %s. (pid %d)\n", tb, pid); - exit(0); + exit(EXIT_SUCCESS); } sleep((u_int)2); /* let parent print set message */ if (secs >= 2) @@ -166,7 +166,7 @@ doalarm(u_int secs) if (secs >= FIVEMIN) { sleep(secs - FIVEMIN); if (write(STDOUT_FILENO, MSG2, sizeof(MSG2) - 1) != sizeof(MSG2) - 1) - exit(0); + exit(EXIT_SUCCESS); secs = FIVEMIN; } @@ -175,24 +175,24 @@ doalarm(u_int secs) if (secs >= ONEMIN) { sleep(secs - ONEMIN); if (write(STDOUT_FILENO, MSG3, sizeof(MSG3) - 1) != sizeof(MSG3) - 1) - exit(0); + exit(EXIT_SUCCESS); } #define MSG4 "\07\07Time to leave!\n" for (bother = 10; bother--;) { sleep((u_int)ONEMIN); if (write(STDOUT_FILENO, MSG4, sizeof(MSG4) - 1) != sizeof(MSG4) - 1) - exit(0); + exit(EXIT_SUCCESS); } #define MSG5 "\07\07That was the last time I'll tell you. Bye.\n" (void)write(STDOUT_FILENO, MSG5, sizeof(MSG5) - 1); - exit(0); + exit(EXIT_SUCCESS); } static void usage(void) { fprintf(stderr, "usage: leave [[+]hhmm]\n"); - exit(1); + exit(EXIT_FAILURE); }