From nobody Mon Apr 18 11:56:28 2022 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 128A111D4506; Mon, 18 Apr 2022 11:56:30 +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 4KhllK2Mmqz3lgQ; Mon, 18 Apr 2022 11:56:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650282989; 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=n0zPHnjDmxyhLqJCMN1ORS5QUvp2QJc+biM0ouOBfvA=; b=NNFu5fqW+Zp3xRQSv0hJNBwhxqhAfejED0uIvURlE9pxTZVHjkd2Im/gRPwATPwBQHKEfo pcLhGNecrrfo2a3sDLbTFyYDPFAV3oaNd+ZHfxBlciG2P16EYyp56BuZcvXMoMlcWbLBUd ER9/d8XwiGVL0t/q5uvi/hMPWu9Ci4chU6IiihxAnf9ZasZg4PflFI2gTR6zvKTsYTr0I1 hgt2tmLEV4EK6/w6GBmn8QmLgribIxRYgTSHOonaUj3dpx1jhctyCFQk4sAp45uQlB1nmq SPWd52Nfj6KBGB61AZjEQdbumk2ItnMq+G6Pz3JvsyJlzlUzlLbFm8zpk/Ts+Q== 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 0AC6912435; Mon, 18 Apr 2022 11:56:29 +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 23IBuS6u007346; Mon, 18 Apr 2022 11:56:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23IBuS6K007345; Mon, 18 Apr 2022 11:56:28 GMT (envelope-from git) Date: Mon, 18 Apr 2022 11:56:28 GMT Message-Id: <202204181156.23IBuS6K007345@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: 540a99289bb1 - main - Add the base64 command using b64encode and b64decode 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 540a99289bb142cba89891d715f6ac3e1f7c7cb1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650282989; 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=n0zPHnjDmxyhLqJCMN1ORS5QUvp2QJc+biM0ouOBfvA=; b=E+HJhLlZmYloO4FTWUDtKCqNP9Djlcb2y2y0xEbreGIGYBSfOg1xpwvZENwyGFXPuNKC1F VuQt7dptGSBaabZ+MxNrFXk3hDd46CxhQf1Q370Nn7EnHS1IyB34GElNcvKpt9DxmbyuAu CHrpR29wlZ7kJj2risMegW6cZpZ/utSSITHyWswl0ZtNZ6TTl0YMGpBSHKlDHy6asB/CHU l7W7jkzX+JxIvxxIvAnzqJe8IaiZq6cxNn995GhxBZP95+BwR3m7Va8wZ6mroHzKZcjSwa 2XOV68lngJWqbo8//hjmotINe0RdsWco2XXAcpcBHjEYzVoTPUqKJqHcsDyXRg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650282989; a=rsa-sha256; cv=none; b=sz9+hZYzPzgVDTRn9kHF8XGzA0m/fYzOz3f+k/A9K9Q2Zl8qPMxLXDZD6N02Xwrs55BFRS xc5dDF9w8Fl9iZ/v8h0vwfYPwWiptVYKSlIcWmdeyyk/K1/YjeYKEQeTd7Nprf0ARp2kXT BORwBk10LS61aOtVaiOwt1WNY2P9WDYuWDT8H0WSdCelM7UIxdUgEoaNTHfnGMQrcNufDC mfc7hslq4+T2eIE2wB2Xn5qTkU+3e3ieIs1BhsV/j2aLwSOs3f/k6i2DkK74+dzqamC3Hr N0fVdO/tCPlKJt1QTEzkWDDf9pLdpfCuccUg0Y2/UwN52VV3y+y4eVOD0T/4mg== 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=540a99289bb142cba89891d715f6ac3e1f7c7cb1 commit 540a99289bb142cba89891d715f6ac3e1f7c7cb1 Author: Piotr Pawel Stefaniak AuthorDate: 2022-04-07 12:27:45 +0000 Commit: Piotr Pawel Stefaniak CommitDate: 2022-04-18 11:53:59 +0000 Add the base64 command using b64encode and b64decode Various scripts expect the base64 command to be present. We've had the code and it's been exposed as b64encode/b64decode, but it wasn't widely known under these names and the syntax is much different. Reviewed by: delphij Differential Revision: https://reviews.freebsd.org/D32945 --- usr.bin/bintrans/Makefile | 4 ++- usr.bin/bintrans/bintrans.1 | 31 ++++++++++++++++++ usr.bin/bintrans/bintrans.c | 77 ++++++++++++++++++++++++++++++++++++++++++--- usr.bin/bintrans/uudecode.c | 18 +++++++++++ usr.bin/bintrans/uuencode.c | 16 ++++++++++ 5 files changed, 140 insertions(+), 6 deletions(-) diff --git a/usr.bin/bintrans/Makefile b/usr.bin/bintrans/Makefile index ef9686aa290f..49acec470d76 100644 --- a/usr.bin/bintrans/Makefile +++ b/usr.bin/bintrans/Makefile @@ -10,11 +10,13 @@ LINKS+= ${BINDIR}/bintrans ${BINDIR}/uuencode LINKS+= ${BINDIR}/bintrans ${BINDIR}/b64encode LINKS+= ${BINDIR}/bintrans ${BINDIR}/uudecode LINKS+= ${BINDIR}/bintrans ${BINDIR}/b64decode +LINKS+= ${BINDIR}/bintrans ${BINDIR}/base64 MLINKS= bintrans.1 uudecode.1 \ bintrans.1 uuencode.1 \ uuencode.format.5 uuencode.5 \ bintrans.1 b64encode.1 \ - b64encode.1 b64decode.1 + b64encode.1 b64decode.1 \ + b64encode.1 base64.1 HAS_TESTS= SUBDIR.${MK_TESTS}+= tests diff --git a/usr.bin/bintrans/bintrans.1 b/usr.bin/bintrans/bintrans.1 index cdc819aa7a18..f489eb6fc258 100644 --- a/usr.bin/bintrans/bintrans.1 +++ b/usr.bin/bintrans/bintrans.1 @@ -67,6 +67,10 @@ .Op Fl i .Fl o Ar output_file .Op Ar file +.Nm base64 +.Op Fl d +.Op Fl w Ar column +.Op Ar file .Sh DESCRIPTION The .Nm uuencode @@ -92,6 +96,33 @@ with the flag specified. .Pp The +.Nm base64 +utility acts as a base64 decoder when passed the +.Fl -decode +.Po or +.Fl d +.Pc +flag and as a base64 encoder otherwise. +As a decoder it only accepts raw base64 input +and as an encoder it does not produce the framing lines. +.Nm base64 +reads standard input or +.Ar file +if it is provided and writes to standard output. +Options +.Fl -wrap +.Po or +.Fl w +.Pc +and +.Fl -ignore-garbage +.Po or +.Fl i +.Pc +are accepted for compatibility with GNU base64, +but the latter is unimplemented and silently ignored. +.Pp +The .Nm uuencode utility reads .Ar file diff --git a/usr.bin/bintrans/bintrans.c b/usr.bin/bintrans/bintrans.c index e158dd2c1b5c..435f982ac520 100644 --- a/usr.bin/bintrans/bintrans.c +++ b/usr.bin/bintrans/bintrans.c @@ -26,7 +26,9 @@ */ #include +#include #include +#include #include #include #include @@ -34,11 +36,16 @@ extern int main_decode(int, char *[]); extern int main_encode(int, char *[]); +extern int main_base64_decode(const char *); +extern int main_base64_encode(const char *, const char *); static int search(const char *const); +static void usage_base64(bool); +static void version_base64(void); +static void base64_encode_or_decode(int, char *[]); enum coders { - uuencode, uudecode, b64encode, b64decode + uuencode, uudecode, b64encode, b64decode, base64 }; int @@ -61,11 +68,15 @@ main(int argc, char *argv[]) case b64decode: main_decode(argc, argv); break; + case base64: + base64_encode_or_decode(argc, argv); + break; default: (void)fprintf(stderr, - "usage: %s ...\n" - " %s ...\n", - progname, progname); + "usage: %1$s ...\n" + " %1$s ...\n" + " %1$s ...\n", + progname); exit(EX_USAGE); } } @@ -78,7 +89,8 @@ search(const char *const progname) DESIGNATE(uuencode), DESIGNATE(uudecode), DESIGNATE(b64encode), - DESIGNATE(b64decode) + DESIGNATE(b64decode), + DESIGNATE(base64) }; for (size_t i = 0; i < nitems(known); i++) @@ -86,3 +98,58 @@ search(const char *const progname) return ((int)i); return (-1); } + +static void +usage_base64(bool failure) +{ + (void)fputs("usage: base64 [-w col | --wrap=col] " + "[-d | --decode] [FILE]\n" + " base64 --help\n" + " base64 --version\n", stderr); + exit(failure ? EXIT_FAILURE : EXIT_SUCCESS); +} + +static void +version_base64(void) +{ + (void)fputs("FreeBSD base64\n", stderr); + exit(EXIT_SUCCESS); +} + +static void +base64_encode_or_decode(int argc, char *argv[]) +{ + int ch; + bool decode = false; + const char *w = NULL; + enum { HELP, VERSION }; + static const struct option opts[] = + { + {"decode", no_argument, NULL, 'd'}, + {"ignore-garbage",no_argument, NULL, 'i'}, + {"wrap", required_argument, NULL, 'w'}, + {"help", no_argument, NULL, HELP}, + {"version", no_argument, NULL, VERSION}, + {NULL, no_argument, NULL, 0} + }; + + while ((ch = getopt_long(argc, argv, "diw:", opts, NULL)) != -1) + switch (ch) { + case 'd': + decode = true; + break; + case 'w': + w = optarg; + break; + case VERSION: + version_base64(); + case HELP: + default: + usage_base64(ch == '?'); + } + + if (decode) + main_base64_decode(argv[optind]); + else + main_base64_encode(argv[optind], w); +} diff --git a/usr.bin/bintrans/uudecode.c b/usr.bin/bintrans/uudecode.c index cd97f7406cc2..29e31d474aae 100644 --- a/usr.bin/bintrans/uudecode.c +++ b/usr.bin/bintrans/uudecode.c @@ -69,6 +69,7 @@ __FBSDID("$FreeBSD$"); #include extern int main_decode(int, char *[]); +extern int main_base64_decode(const char *); static const char *infile, *outfile; static FILE *infp, *outfp; @@ -80,6 +81,23 @@ static int decode2(void); static int uu_decode(void); static int base64_decode(void); +int +main_base64_decode(const char *in) +{ + base64 = 1; + rflag = 1; + if (in != NULL) { + infile = in; + infp = fopen(infile, "r"); + if (infp == NULL) + err(1, "%s", in); + } else { + infile = "stdin"; + infp = stdin; + } + exit(decode()); +} + int main_decode(int argc, char *argv[]) { diff --git a/usr.bin/bintrans/uuencode.c b/usr.bin/bintrans/uuencode.c index 4837d3310578..cb3669dd55d0 100644 --- a/usr.bin/bintrans/uuencode.c +++ b/usr.bin/bintrans/uuencode.c @@ -65,6 +65,7 @@ __FBSDID("$FreeBSD$"); #include extern int main_encode(int, char *[]); +extern int main_base64_encode(const char *, const char *); static void encode(void); static void base64_encode(void); @@ -77,6 +78,21 @@ static bool raw; static char **av; static int columns = 76; +int +main_base64_encode(const char *in, const char *w) +{ + raw = 1; + if (in != NULL && freopen(in, "r", stdin) == NULL) + err(1, "%s", in); + output = stdout; + if (w != NULL) + columns = arg_to_col(w); + base64_encode(); + if (ferror(output)) + errx(1, "write error"); + exit(0); +} + int main_encode(int argc, char *argv[]) {