From nobody Tue Feb 8 21:45:37 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 0466D19B3DAF; Tue, 8 Feb 2022 21:45:39 +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 4Jtc4y0HhLz4c90; Tue, 8 Feb 2022 21:45:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644356738; 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=2smpkq3qe8tCwdPYJ/hmInyJIQmkPPvjQ4qnV6vIsMM=; b=MKfieHtP86/IA/A0Z3aUSwN2d/OTCgfPIdSbaQY9aNQeWZsVcY7E9rlIhijCGli7tKSGvf xfY490nJjE8PpgRHoXSQMA9so0wj8Z3Pza8bwjVNpYhnqZDw9Yw47RJbmCAq6S/f3J6GaP Lixf3LlcupFDzRSPzIG4FaUYYXOIeEOZEZgQTLjM3Npi9mUltxy36lhn3M/ZMSGDpYTaDD 6HP8aWGgxxAth7x/tx8vYMJfRkrex71fzMwkvGlNneDtVQ9NZqaYrI8GHC8noOeBaTn6rH mR8CTzIMWECK/OaRHTcnPtgrrS5QFHK2xxu/loJT2cjiaGioMF6NeYS8jzBZyw== 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 B225D20FFF; Tue, 8 Feb 2022 21:45:37 +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 218Ljb9D043087; Tue, 8 Feb 2022 21:45:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 218LjbvO043086; Tue, 8 Feb 2022 21:45:37 GMT (envelope-from git) Date: Tue, 8 Feb 2022 21:45:37 GMT Message-Id: <202202082145.218LjbvO043086@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: c429893a658a - stable/13 - fstyp: fix build WITHOUT_ICONV 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c429893a658afb19ad58a7e858facc138e84cb7c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644356738; 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=2smpkq3qe8tCwdPYJ/hmInyJIQmkPPvjQ4qnV6vIsMM=; b=ZLnZLiC5C7SKe9+cbc7jhL4esZ3yKQ8ojmWX5ZAHqeU/a2gNLtfzZpWCUh700F9VjV50hr V/A8BcjgFs73loewuLiEOuFK4jEy0npWrZZNuSB2NXTtgpSnaWHPHMSh9TuhWpjmFm6qfJ UQnWaIKU4PvbvpDeMAZW+sI6Xq4lE0YY3RRt3+1pxGFjGME6WkHvsFsusZ+UVh6Wpqt6D8 HyI2pdggFx8HfPY5dJoZswwKovCJxaQqqy0uSUJWYWjfoa68s7xS9qXsafjLPNEhy9q0aP BM3cg5GrfX9Nj373LHzNKFL4PO9Ek73x6s02nvEjxzTUZUF+9OO63EAvAYmC8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644356738; a=rsa-sha256; cv=none; b=QDVx3MihIcQNbE9hXU5tr8OL7rK8BXMdb9dH3iKcO43P2gGVa5U3NbJHhYfOEBOnazLiph UCXvdSaUJLq//sHNuwP5van9RxsRGbJdQJuGzwNcFcsJPtC+0klNb1sTS3h6lmcCNtkW8Z 0jenuZ1kQh8HV9Y4f8we7mUchZ1XfR33/OpX1vp/G+F46vLVrC+VkzxijA/sapj6cRffjg 0gHrj7SRRDXYJ+7DQosTknWPY3ZxlQbmka4BSGY9ACC8BZleycoWmmeN3pR4Rf80lvh6og A6rtA/zDCI29JvIhr3fVoixahqr0UV7ULXrtzmZydzMhyVRjoMrRggJQXd9K4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c429893a658afb19ad58a7e858facc138e84cb7c commit c429893a658afb19ad58a7e858facc138e84cb7c Author: Ed Maste AuthorDate: 2021-11-02 13:43:56 +0000 Commit: Ed Maste CommitDate: 2022-02-08 20:50:32 +0000 fstyp: fix build WITHOUT_ICONV Reported by: Michael Dexter, Build Option Survey Sponsored by: The FreeBSD Foundation (cherry picked from commit 3513df4bcc172b2b7b923ba62591490d5df1bf5a) --- usr.sbin/fstyp/exfat.c | 5 +++++ usr.sbin/fstyp/ntfs.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/usr.sbin/fstyp/exfat.c b/usr.sbin/fstyp/exfat.c index 3f10cb6a9e5a..d92d9c828427 100644 --- a/usr.sbin/fstyp/exfat.c +++ b/usr.sbin/fstyp/exfat.c @@ -365,6 +365,11 @@ fstyp_exfat(FILE *fp, char *label, size_t size) #ifdef WITH_ICONV if (show_label) exfat_find_label(fp, ev, bytespersec, label, size); +#else + if (show_label) { + warnx("label not available without iconv support"); + memset(label, 0, size); + } #endif out: diff --git a/usr.sbin/fstyp/ntfs.c b/usr.sbin/fstyp/ntfs.c index 0ce1fa81181a..c286d950dc2b 100644 --- a/usr.sbin/fstyp/ntfs.c +++ b/usr.sbin/fstyp/ntfs.c @@ -179,6 +179,11 @@ fstyp_ntfs(FILE *fp, char *label, size_t size) } ok: +#else + if (show_label) { + warnx("label not available without iconv support"); + memset(label, 0, size); + } #endif /* WITH_ICONV */ free(bf); free(filerecp);