From nobody Sat Apr 30 08:04:23 2022 X-Original-To: dev-commits-src-branches@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 DCA3A1ABE14F; Sat, 30 Apr 2022 08:04: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Kr2201YwVz4Zng; Sat, 30 Apr 2022 08:04:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651305864; 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=B8X9gAk79Df0AFN3pfSRtqZYH7co6nzFl8ujMFwTG/4=; b=tpqS9DRzSsIqZmgjFfiAQPC32+K6TSSYdsvdkX2YG03odD3+Pa0fL5BHhp3Fs0pMzEVB6p mDQYNxYtTABgNuXeeaS4xzuQkOeZG0WvSXQo9FWLiQ707xZj2eMHL3A+BasxjuOq/yWE6R 4JncwySL9NOALnPN5alWkKOOJ/HOMJVKBGV/ASX+ladnbkW4kbTSgd/tt62ugbP6FzldrL XN5ekjR6R2YP4WsB8ANJx78eCfBLpAZIuXRggcUzNjfDee4SRl/IVR8nBKD80FcG16RvtU e+yUlQkR/6RHuwoFspfgVRrwi8yVcgYB9hOtALzCGzsJM9wUtxLfKtqW2Ga8Tg== 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 03B2E1D85F; Sat, 30 Apr 2022 08:04:24 +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 23U84Nrh058675; Sat, 30 Apr 2022 08:04:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23U84N4w058674; Sat, 30 Apr 2022 08:04:23 GMT (envelope-from git) Date: Sat, 30 Apr 2022 08:04:23 GMT Message-Id: <202204300804.23U84N4w058674@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Piotr Pawel Stefaniak Subject: git: 2eef2f0f8f60 - stable/13 - uu{encode,decode}: improve style List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 2eef2f0f8f60833e54bcb9d8b81eeef9980b0844 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651305864; 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=B8X9gAk79Df0AFN3pfSRtqZYH7co6nzFl8ujMFwTG/4=; b=klM3TaRtYWEIh4N8bWjzRR2xbYpvDtsoINjzb1Wm/BcK8kEXvxwHgZqI2qpsPwND0NUNMd KQ0mMq7w1C2bOFii+dNwkisbrOVXgw/Xam1jCAi2x72mKydnCMM5RNdqhpDJyJletbja8F sl/Nbd4N44avUAiUBKddtg8g6g6Lx26IHN5ErnH6740WAliUg8wE2nf/ugdRMdYDmGvEgx ZMfWEN0lnae7RYs5vzX18AdAYg0HWkJMZVN8+9HZqY8mJt76KJDW5r2GHWNdcRVQdE4ocg 8+BThWdcjPam7e5Rzu2IyrPvJM+0cMC1LZXlXF87Nz7nVdIExP7Bj8s9ZbfeGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651305864; a=rsa-sha256; cv=none; b=GhFxTsSeW1TgarRKAmhWzFp6eawK8U7bwgKUkah7aaq0nXONAW9k1g6atbWbx0kKRMWP9a myTmaXZ92TeHCX6ee7+n8nCAgFj9C3XOtDuXdtLG5NIqVeGLXrhEbBw1dSFHs2snPweaHw ALtECCVz7bLbp2Kk3ksAmttzQzLXbr98tqxoj8fXZH6XFLLugrNG2V6LxVOHJn8tQOQf/Z XgQaPcbqKWlCDi7LKU8B/GvM7rmbP0NjPVLKJMSmOpruMT33nbE70LqK/32qU8NfrKMLto kCWyXkkRkLoegteiSjj7PGAX8G5aUKV2NaoFLat7LFD10eF63HT0tX8pWGiN7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by pstef: URL: https://cgit.FreeBSD.org/src/commit/?id=2eef2f0f8f60833e54bcb9d8b81eeef9980b0844 commit 2eef2f0f8f60833e54bcb9d8b81eeef9980b0844 Author: Piotr Pawel Stefaniak AuthorDate: 2021-11-08 14:31:01 +0000 Commit: Piotr Pawel Stefaniak CommitDate: 2022-04-30 07:59:08 +0000 uu{encode,decode}: improve style (cherry picked from commit d5d3f5dab209a4643dd189b2012b60329c220662) --- 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)