From nobody Mon Apr 18 11:56:27 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 2871011D4485; Mon, 18 Apr 2022 11:56:28 +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 4KhllJ0SVsz3ll0; Mon, 18 Apr 2022 11:56:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650282988; 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=k5INWVK/rlscpdk7znR7/s3m4qB0dvzK178HHIW5tD8=; b=OiLvkJFA1AMxfv1PeqxbohfMotL16NumBWjAhezEEtrEAqtnfN3TsG0zkuZIH93nsb5UDW 9kVA+uR+8CfYOTgV4eYZWa62hN7DGZO3BeOxaPVO4J5BpUYd3a/OWDKu9YxqrmIaf4zdBg dEfOu1NRvLpRXW33g8aM2FZQzVLaskObqUoGRkv6/iqVoFbSx4OlpBI7W/XvQJviOYj66/ o4AXjSHfpf8ZTGOqCkTO3S3XzxB4VxdPNfSAWrdeYc6/wiEvRxsi1GxaidOcMxN+7eZE4F /r3sL80DWsNTqgFQdp0hM3dK99i2hzyJFNNfKANtE18eQ2GXy3MYZbriNiaMOw== 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 D3B02122EE; Mon, 18 Apr 2022 11:56:27 +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 23IBuRP4007315; Mon, 18 Apr 2022 11:56:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23IBuRNS007314; Mon, 18 Apr 2022 11:56:27 GMT (envelope-from git) Date: Mon, 18 Apr 2022 11:56:27 GMT Message-Id: <202204181156.23IBuRNS007314@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: 2ad786c63ae2 - main - b64encode: implement -w to wrap lines 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: 2ad786c63ae2f8018f67414076c9aa023e062028 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650282988; 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=k5INWVK/rlscpdk7znR7/s3m4qB0dvzK178HHIW5tD8=; b=Lvt6KjjVOJsByF4miMIs632XVaF+XwASHfhVElbNaXEufSQlse2pKJSnlWWg6r4m1+cHK6 vi5UdO9tpu5wTqPr2N5xOCJukbXB+mGPFDeUBuvi8tePGHIH41jm4eF5JHkrJ8TIMWtUVv jg15ezyc+zGQz3cJy1xfd7uSJoYjx5zFulsCQ/NxbmOp3/CvojQj00dHM1kTeZ7a38z3nG rl2vyvS5Zf1xbmAPm9MvsaFPJ2lLy2zO8xwec6FQfisquyfSSlvUuCNOOHPdO5LIo0wNLM FwqwDIWsL1P/afOqLaW1X8ORFnurrwCYQOARzWDD8R8oYblTGmO3aOsel/tdgw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650282988; a=rsa-sha256; cv=none; b=UZbBwvwOWmcmeCU/LITVjuSATkygcQg6GfmFaf18I7XkUIl0zIgLdOhomfVtuh8MmX0dDR bFWEqiz6jbiDSJU0AYHmLy4ToxGN4KBbNckv6bKwRFWFmpgxRpZA3o+lJg2B3s+b6xSfPw jYg6fvwBtkcRNQ3h5SmyhXTr1og7kHZ2H3mpae4Mtctz9MRAIEJUPCgj5XgKNNe1VsNmhD g9837cTtcgdwdN99eQGMlSAqfj/svwFMZsiBtsQz0ovVh0TWbDGMHqxpTy3jKuaO10g6/V 2lKoLGFpfk3NgQKEf6SLQZgdyhxV/E9q0924lgH4KXjlGwd2SQ1t5rVf9q0pZA== 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=2ad786c63ae2f8018f67414076c9aa023e062028 commit 2ad786c63ae2f8018f67414076c9aa023e062028 Author: Piotr Pawel Stefaniak AuthorDate: 2022-04-06 18:03:02 +0000 Commit: Piotr Pawel Stefaniak CommitDate: 2022-04-18 11:53:58 +0000 b64encode: implement -w to wrap lines This functionality is present in GNU base64 and I find it useful when I want to generate random, ASCII-clean data of specific width. Reviewed by: delphij Differential Revision: https://reviews.freebsd.org/D32944 --- usr.bin/bintrans/bintrans.1 | 10 ++++++++ usr.bin/bintrans/uuencode.c | 60 ++++++++++++++++++++++++++++++++++++--------- 2 files changed, 59 insertions(+), 11 deletions(-) diff --git a/usr.bin/bintrans/bintrans.1 b/usr.bin/bintrans/bintrans.1 index e3ad5813f4cd..cdc819aa7a18 100644 --- a/usr.bin/bintrans/bintrans.1 +++ b/usr.bin/bintrans/bintrans.1 @@ -56,6 +56,7 @@ .Fl o Ar output_file .Nm b64encode .Op Fl r +.Op Fl w Ar column .Op Fl o Ar output_file .Op Ar file .Ar name @@ -181,6 +182,15 @@ deletes any prefix ending with the last slash '/' for security reasons. .El .Pp +Additionally, +.Nm b64encode +accepts the following option: +.Bl -tag -width ident +.It Fl w Ar column +Wrap encoded output after +.Ar column . +.El +.Pp .Nm is a generic utility that can run any of the aforementioned encoders and decoders. diff --git a/usr.bin/bintrans/uuencode.c b/usr.bin/bintrans/uuencode.c index f2d4b5b2b498..4837d3310578 100644 --- a/usr.bin/bintrans/uuencode.c +++ b/usr.bin/bintrans/uuencode.c @@ -55,6 +55,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include #include @@ -67,12 +68,14 @@ extern int main_encode(int, char *[]); static void encode(void); static void base64_encode(void); +static int arg_to_col(const char *); static void usage(void); static FILE *output; static int mode; static bool raw; static char **av; +static int columns = 76; int main_encode(int argc, char *argv[]) @@ -88,7 +91,7 @@ main_encode(int argc, char *argv[]) if (strcmp(basename(argv[0]), "b64encode") == 0) base64 = 1; - while ((ch = getopt(argc, argv, "mo:r")) != -1) { + while ((ch = getopt(argc, argv, "mo:rw:")) != -1) { switch (ch) { case 'm': base64 = true; @@ -99,6 +102,9 @@ main_encode(int argc, char *argv[]) case 'r': raw = true; break; + case 'w': + columns = arg_to_col(optarg); + break; case '?': default: usage(); @@ -151,27 +157,37 @@ static void base64_encode(void) { /* - * Output must fit into 80 columns, chunks come in 4, leave 1. + * This buffer's length should be a multiple of 24 bits to avoid "=" + * padding. Once it reached ~1 KB, further expansion didn't improve + * performance for me. */ -#define GROUPS ((80 / 4) - 1) - unsigned char buf[3]; + unsigned char buf[1023]; char buf2[sizeof(buf) * 2 + 1]; size_t n; - int rv, sequence; - - sequence = 0; + unsigned carry = 0; + int rv, written; if (!raw) fprintf(output, "begin-base64 %o %s\n", mode, *av); while ((n = fread(buf, 1, sizeof(buf), stdin))) { - ++sequence; rv = b64_ntop(buf, n, buf2, nitems(buf2)); if (rv == -1) errx(1, "b64_ntop: error encoding base64"); - fprintf(output, "%s%s", buf2, (sequence % GROUPS) ? "" : "\n"); + if (columns == 0) { + fputs(buf2, output); + continue; + } + for (int i = 0; i < rv; i += written) { + written = fprintf(output, "%.*s", columns - carry, + &buf2[i]); + + carry = (carry + written) % columns; + if (carry == 0) + fputc('\n', output); + } } - if (sequence % GROUPS) - fprintf(output, "\n"); + if (columns == 0 || carry != 0) + fputc('\n', output); if (!raw) fprintf(output, "====\n"); } @@ -225,6 +241,28 @@ encode(void) (void)fprintf(output, "%c\nend\n", ENC('\0')); } +static int +arg_to_col(const char *w) +{ + char *ep; + long option; + + errno = 0; + option = strtol(w, &ep, 10); + if (option > INT_MAX) + errno = ERANGE; + else if (ep[0] != '\0') + errno = EINVAL; + if (errno != 0) + err(2, NULL); + + if (option < 0) { + errno = EINVAL; + err(2, "columns argument must be non-negative"); + } + return (option); +} + static void usage(void) {