From nobody Sat Apr 30 08:04:25 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 DE1281ABE423; Sat, 30 Apr 2022 08:04:25 +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 4Kr2212h8Vz4Zr8; Sat, 30 Apr 2022 08:04:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651305865; 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=Z/yV9veCkxC/+BSPHHGbT7ygGK/z3M+cEcUtLm4D04U=; b=a46Nh3JS1L1xyoLTgeSYPD73EWfd7oBBdYvrR5vaW0fg8Qvyhfw3Irf9T9dEs7YOdoS77y MXgrgzgVn+SMgcrNpSS6p4u7h/G+JLfS3jMV/a3aBClEnDkt8KqyDVvUud9h81/L1omGwe +Eo0bZDWsgHjBJkJDXaJXIsIF4if0AYpy88e5VGu+hKT5sBC8Mq4jg+NYxa5227R7NUw3M ZRiKdNDY8Q/pnQSUhMB895e5lxyV4CFixSNqjG9dmZP72Mk/SS5YB15A8lJ42stssMLN3o Dj9uP1uM0VuMLQL3xoAZ0YOHh7OC4pdrl/hZyfscEHhffvlxMJkDgZdZ3Xd19g== 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 207F21D979; Sat, 30 Apr 2022 08:04:25 +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 23U84PCf058699; Sat, 30 Apr 2022 08:04:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23U84PAS058698; Sat, 30 Apr 2022 08:04:25 GMT (envelope-from git) Date: Sat, 30 Apr 2022 08:04:25 GMT Message-Id: <202204300804.23U84PAS058698@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: 963fdecd1a26 - stable/13 - uudecode: correct error message 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: 963fdecd1a26676626a7067965a54ca7d5fa48fb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651305865; 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=Z/yV9veCkxC/+BSPHHGbT7ygGK/z3M+cEcUtLm4D04U=; b=K0PuPLH+2xzwK6vXZUXM9C9kJe9dWA1b4qt1Plkqu4fddhStGH9+tslZGvVEjEzN9YhhlA 8kVPl/FWcFS9f0C8BKyxD93nEgBbMfzkMeUGgqn61/XIVdV4wiXp2szqHPLAayT1KoXlyr KXD6JByRQbavgT5Kl74OoOduuuMPAWWUDrtFH6SeGPCyHDCbZFiOmPd7g9dCU5WB6XMyRL PqrgYPI6OTXpYiMpEufvMyOH59NPCGN0jjZoUDnzGLdKghwU+QXWCcxwqG9L4kxwU1Na6n yudj8upL4uo6fcV0ZrpUCvsd/FZuov02MrO6FNGQlWm9gd/z2mo6pSqFQHE2Wg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651305865; a=rsa-sha256; cv=none; b=c51qcQcmLjEf67Owfuhkqdm+4E5nv2W5lv++xb7W8szCkYD/86gGH26vy+spCUVqCEwWTj mlqf29flEua/G+819GjypydTfrIr6h/z6Etsxux27TLNToCITDSSIBcS4BVGcSbQm8Kkky Zd6B3ZfpIb7KwaLlrMCB2dHL3npk3zGygSaevn6Z+NwswjA/kVIFi6wkPTzT39irStWevf UgHwqS5pCmEi0MgRKQYIQWsZ6S3sw6GVq0Js/aYEPvmCclx/1uEHswkGFVx/6hfvcXWh/c 3LkpW9W1Ru8E0JPIpL8kYSJrmk+AjhsoBPUiqYVEEr4dMzfgcmue3sCwSSbRVQ== 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=963fdecd1a26676626a7067965a54ca7d5fa48fb commit 963fdecd1a26676626a7067965a54ca7d5fa48fb Author: Piotr Pawel Stefaniak AuthorDate: 2021-11-08 14:31:03 +0000 Commit: Piotr Pawel Stefaniak CommitDate: 2022-04-30 08:01:22 +0000 uudecode: correct error message PR: 153276 Reported by: David Brennan (cherry picked from commit 9f3203c003144a4ef6309435036f985afe549ff0) uudecode: add missing test files to Makefile (cherry picked from commit 1b3af110bcd522a077f01350b6a51b3ffe434393) uudecode: use SRCDIR in the regression test (cherry picked from commit f5138631fb6f9dc73d696560caa006f3df714b9a) uudecode: move the new uudecode test from uuencode/ to uudecode/ I don't know how that happened. (cherry picked from commit ae6aa2d43daa6276dd18dc974a1c5b7c15264615) --- usr.bin/uudecode/tests/Makefile | 1 + usr.bin/uudecode/tests/regress.153276.in | 4 ++++ usr.bin/uudecode/tests/regress.153276.out | 1 + usr.bin/uudecode/tests/regress.sh | 5 ++++- usr.bin/uudecode/uudecode.c | 2 +- 5 files changed, 11 insertions(+), 2 deletions(-) diff --git a/usr.bin/uudecode/tests/Makefile b/usr.bin/uudecode/tests/Makefile index 6c23c8104413..204f25b18c9e 100644 --- a/usr.bin/uudecode/tests/Makefile +++ b/usr.bin/uudecode/tests/Makefile @@ -8,5 +8,6 @@ ${PACKAGE}FILES+= regress.base64.in ${PACKAGE}FILES+= regress.out ${PACKAGE}FILES+= regress.sh ${PACKAGE}FILES+= regress.traditional.in +${PACKAGE}FILES+= regress.153276.in regress.153276.out .include diff --git a/usr.bin/uudecode/tests/regress.153276.in b/usr.bin/uudecode/tests/regress.153276.in new file mode 100644 index 000000000000..d881c8a9389e --- /dev/null +++ b/usr.bin/uudecode/tests/regress.153276.in @@ -0,0 +1,4 @@ +begin 644 153276 +/5&AI&1') + REGRESSION_END() diff --git a/usr.bin/uudecode/uudecode.c b/usr.bin/uudecode/uudecode.c index 6d31d96ad958..707ba27df62e 100644 --- a/usr.bin/uudecode/uudecode.c +++ b/usr.bin/uudecode/uudecode.c @@ -353,7 +353,7 @@ uu_decode(void) #define OUT_OF_RANGE do { \ warnx("%s: %s: character out of range: [%d-%d]", \ - infile, outfile, 1 + ' ', 077 + ' ' + 1); \ + infile, outfile, ' ', 077 + ' ' + 1); \ return (1); \ } while (0)