From nobody Mon Mar 28 07:21:42 2022 X-Original-To: dev-commits-src-main@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 4B2751A439C6; Mon, 28 Mar 2022 07:21:43 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KRkdy6N14z4WLY; Mon, 28 Mar 2022 07:21:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648452103; 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=lknx5pvvHmTnycdrft7EJoAVpuLXNuFnje8iHKgY8aw=; b=Kn+6PJiK3Q1TX3b4Zr5XhCSXT/nG67uxYLsJU2lSsjbOevrrMJkkGZHNNDisHylcX8Yne8 vq/GEC9wIopWgPRv5qtxX3TgNDRYx1EUOxwydFXo99kz2XpPJCLN6H/Qz5vPVFM+UwaA9f 374E3rM1onUAeqoyLDn/9v7vor+vtYxayv8CM/CNGNcE8JH9SAgfZW3AFrl+mxq8l+dPLW R55dB1C1wnkKVMdeajYiDMa+W9XH6G2xu/nh+QrYq2wS4Rp8p0jnW8U1EnMjIFfcDB6Jg0 TD4SVkBVmPqloMyxLQAlhc6JnLR1VtXTzaIMaODomAfgdwngXeyOaDOV0/4DTQ== 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 A0F392534E; Mon, 28 Mar 2022 07:21:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22S7Lg0p035866; Mon, 28 Mar 2022 07:21:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22S7Lgfg035865; Mon, 28 Mar 2022 07:21:42 GMT (envelope-from git) Date: Mon, 28 Mar 2022 07:21:42 GMT Message-Id: <202203280721.22S7Lgfg035865@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Piotr Pawel Stefaniak Subject: git: d5d3f5dab209 - main - uu{encode,decode}: improve style List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pstef X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d5d3f5dab209a4643dd189b2012b60329c220662 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648452103; 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=lknx5pvvHmTnycdrft7EJoAVpuLXNuFnje8iHKgY8aw=; b=vqBMFDB6ePU0XA8l81JlF2UfEJkdSEVJ20lOCgNSYjDYUHXiGdP6UnQBQcyNSqOpdgaVMo pJaIN37YuBUxGPsA4VXXwQOlao8P9DIfIkbSXq+P6UZRfvuW1IF/ykaMmP9rxu5kXbdCHT zHd/ebICNRBJhUF3R31tM9Zz+B7YLSjVdRg2nNWzpjbbgecBmCJo/el635LPmNvmmk8QL8 ssPlFkmHt3xzBsP9BxrSsXJu1jOKwcqEi0qS4FoZ787pN/+yuHN8BYV5nn7UbRfqnlegf3 NwT2r1iAoRJNrQT4sdMT34zuCuLoZ2y3JZbkjH68/FCwTisiY0NTIXRL0QZ/Xg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648452103; a=rsa-sha256; cv=none; b=LlqLn69Ll4Vv1y/VYEyP+Gika+rOnDDI1ooo0cjL41WPkOyH5bWKUD+NYGO7yQ65zh9G2w 4fFvS2kqG9IE/fgxMKyVnrjjN5fZhE5JNIXH3tGyzjS9c6QaSjDDTgBrtZH3CNCeH8D3U6 ibRd8OlvXr2MmiWgK8Vu8HVUnjaZwVKTKJ52GGM/kJt6SXPWyKFDY44uWLLDhmkSunGenm YOy2g+ZDpESYpTyBS3JZJ/nhPgjPPkDaphHhfQGUyCQdQqA5hcciJF5WdK4hWrjp86BGrg hS11EOpAmFNS51kT0AsF+/b6wW5dpZYfKO+pM3BBRvi4nk6iFnYXRfG7Ejv6GQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pstef: URL: https://cgit.FreeBSD.org/src/commit/?id=d5d3f5dab209a4643dd189b2012b60329c220662 commit d5d3f5dab209a4643dd189b2012b60329c220662 Author: Piotr Pawel Stefaniak AuthorDate: 2021-11-08 14:31:01 +0000 Commit: Piotr Pawel Stefaniak CommitDate: 2022-03-28 07:01:35 +0000 uu{encode,decode}: improve style --- usr.bin/uudecode/uudecode.c | 27 ++++++++++++++------------- usr.bin/uuencode/uuencode.c | 17 +++++++++-------- 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/usr.bin/uudecode/uudecode.c b/usr.bin/uudecode/uudecode.c index a0cfcf23fb13..6d31d96ad958 100644 --- a/usr.bin/uudecode/uudecode.c +++ b/usr.bin/uudecode/uudecode.c @@ -62,6 +62,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -69,7 +70,7 @@ __FBSDID("$FreeBSD$"); static const char *infile, *outfile; static FILE *infp, *outfp; -static int base64, cflag, iflag, oflag, pflag, rflag, sflag; +static bool base64, cflag, iflag, oflag, pflag, rflag, sflag; static void usage(void); static int decode(void); @@ -83,42 +84,42 @@ main(int argc, char *argv[]) int rval, ch; if (strcmp(basename(argv[0]), "b64decode") == 0) - base64 = 1; + base64 = true; while ((ch = getopt(argc, argv, "cimo:prs")) != -1) { switch (ch) { case 'c': if (oflag || rflag) usage(); - cflag = 1; /* multiple uudecode'd files */ + cflag = true; /* multiple uudecode'd files */ break; case 'i': - iflag = 1; /* ask before override files */ + iflag = true; /* ask before override files */ break; case 'm': - base64 = 1; + base64 = true; break; case 'o': if (cflag || pflag || rflag || sflag) usage(); - oflag = 1; /* output to the specified file */ - sflag = 1; /* do not strip pathnames for output */ + oflag = true; /* output to the specified file */ + sflag = true; /* do not strip pathnames for output */ outfile = optarg; /* set the output filename */ break; case 'p': if (oflag) usage(); - pflag = 1; /* print output to stdout */ + pflag = true; /* print output to stdout */ break; case 'r': if (cflag || oflag) usage(); - rflag = 1; /* decode raw data */ + rflag = true; /* decode raw data */ break; case 's': if (oflag) usage(); - sflag = 1; /* do not strip pathnames for output */ + sflag = true; /* do not strip pathnames for output */ break; default: usage(); @@ -185,14 +186,14 @@ decode2(void) struct stat st; char buf[MAXPATHLEN + 1]; - base64 = 0; + base64 = false; /* search for header line */ for (;;) { if (fgets(buf, sizeof(buf), infp) == NULL) return (EOF); p = buf; if (strncmp(p, "begin-base64 ", 13) == 0) { - base64 = 1; + base64 = true; p += 13; } else if (strncmp(p, "begin ", 6) == 0) p += 6; @@ -378,7 +379,7 @@ uu_decode(void) } else { if (i >= 1) { if (!(IS_DEC(*p) && IS_DEC(*(p + 1)))) - OUT_OF_RANGE; + OUT_OF_RANGE; ch = DEC(p[0]) << 2 | DEC(p[1]) >> 4; putc(ch, outfp); } diff --git a/usr.bin/uuencode/uuencode.c b/usr.bin/uuencode/uuencode.c index 05ead32c7183..b5eff44f1651 100644 --- a/usr.bin/uuencode/uuencode.c +++ b/usr.bin/uuencode/uuencode.c @@ -58,6 +58,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -68,18 +69,18 @@ static void usage(void); static FILE *output; static int mode; -static char raw = 0; +static bool raw; static char **av; int main(int argc, char *argv[]) { struct stat sb; - int base64; + bool base64; int ch; const char *outfile; - base64 = 0; + base64 = false; outfile = NULL; if (strcmp(basename(argv[0]), "b64encode") == 0) @@ -88,13 +89,13 @@ main(int argc, char *argv[]) while ((ch = getopt(argc, argv, "mo:r")) != -1) { switch (ch) { case 'm': - base64 = 1; + base64 = true; break; case 'o': outfile = optarg; break; case 'r': - raw = 1; + raw = true; break; case '?': default: @@ -104,7 +105,7 @@ main(int argc, char *argv[]) argv += optind; argc -= optind; - switch(argc) { + switch (argc) { case 2: /* optional first argument is input file */ if (!freopen(*argv, "r", stdin) || fstat(fileno(stdin), &sb)) err(1, "%s", *argv); @@ -179,8 +180,8 @@ base64_encode(void) static void encode(void) { - register int ch, n; - register char *p; + int ch, n; + char *p; char buf[80]; if (!raw)