From nobody Wed Aug 31 01:32:23 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 4MHRVv4Z8Gz4bq7P; Wed, 31 Aug 2022 01:32:23 +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 4MHRVv3s0Qz3DL6; Wed, 31 Aug 2022 01:32:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661909543; 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=eNPomdbMSLYxThwZt0nBpR92oWrTpgiX/SvUv/S31e4=; b=iDbBj8C77gHbaWL1wTA9CWzXesC4teYThcTMIJB/AyvnFlaYYykCki3SHt+GD+3sYOGjtF d+wR0bm1MDcF4f0Bd1b3/Qxh//54Ubtq3V4CednNton6o3ekC1o4H6AIpYtSNHCIMUwkSg nLyV30GqiDAvMQY+xZUn52qHrYiotFV6pxuTcjCeDSns/V4nJKvB9L8+2EUhBI1Uat9R7h KOSSXzC5QjvqdXsAX/StuKD02qnHYP4dzRTX5DdqMSPVGUg503z+csBwVgb3uvPAePM42V 2bLd9+pgruKX057ake5lH3UMIJxRGnZgGpvGtuDrPOqcJRYrGJSLE3xGY1bGSw== 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 4MHRVv2yKpzyDX; Wed, 31 Aug 2022 01:32:23 +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 27V1WNkM033962; Wed, 31 Aug 2022 01:32:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27V1WNHD033961; Wed, 31 Aug 2022 01:32:23 GMT (envelope-from git) Date: Wed, 31 Aug 2022 01:32:23 GMT Message-Id: <202208310132.27V1WNHD033961@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 066b09c2b1b1 - stable/13 - libc: split scandir() into scandir_dirp() and proper scandir() 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 066b09c2b1b1bcffd4aa7fbf2bf2d05094ebaeba Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661909543; 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=eNPomdbMSLYxThwZt0nBpR92oWrTpgiX/SvUv/S31e4=; b=Ib5dZrVAg57TDu7JNt6naO5BlDY3bQsvTaUN01s5jArIlN3dwvi2uvq5mM3Qychcvf0bp+ rMSTwN/mZjS0skGqTNULw2XFxW+7cKuospZYqf2bB46UHBt70Tkv39+CgC84XE6pshcLcn RTDCfyI2EZq+X6lwpnqCxHBGxR+g4tkMP+EfgvshHJjUvpMdOj+XegcUFR3kU5ucqXZ4Xr GxKktDcQygMoERHVqzS/TVzrE+9G61QGUD0gwElFVfa3p0HK9mIXwPXV6gMiaEKmuEJuJy GJrf3Uv2Pha/etq7fygkpd39sN5muOBm/o88PadGGG6dTP0efO90Tlk8Vm/FKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661909543; a=rsa-sha256; cv=none; b=MtHB6iIMNi8TBI+2ykOGJGToTptDZHwRx+XMD390spHWMdpragLIV7sjj3JBoWKBuDRBQg +810ts9h4wWQYBWEsEb3+RhjvWhDkjpld/CtwaY+hrSuumfZlWFWy8GoGHnb3KHGa7x5gN 6OwTblChSIUYV1xRhdv+CbdIXRHXvNT1964b2IcWdPNbZMzRZMjswsluk+HwG+HW/CCSBA vdTMYCuybyyAYkEo66KOT0PZAGSC/3nhkDMfBayvv/rzjUgiv+EQjAQIAyEJG4G5tMthqX tmv+V+BTvXRnWPyWjoubnkx1mMypEJTJr8pBoF/aOe0qKNubFHK6Kns6QvNpww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=066b09c2b1b1bcffd4aa7fbf2bf2d05094ebaeba commit 066b09c2b1b1bcffd4aa7fbf2bf2d05094ebaeba Author: Konstantin Belousov AuthorDate: 2022-08-23 04:30:40 +0000 Commit: Konstantin Belousov CommitDate: 2022-08-31 01:20:28 +0000 libc: split scandir() into scandir_dirp() and proper scandir() (cherry picked from commit cb6e97f4dae6d0b631b65f23baf2d4c67120f672) --- lib/libc/gen/scandir.c | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/lib/libc/gen/scandir.c b/lib/libc/gen/scandir.c index 10cd7633dac1..4cfc823e4f94 100644 --- a/lib/libc/gen/scandir.c +++ b/lib/libc/gen/scandir.c @@ -64,22 +64,18 @@ typedef DECLARE_BLOCK(int, dcomp_block, const struct dirent **, static int alphasort_thunk(void *thunk, const void *p1, const void *p2); #endif -int +static int #ifdef I_AM_SCANDIR_B -scandir_b(const char *dirname, struct dirent ***namelist, select_block select, +scandir_b_dirp(DIR *dirp, struct dirent ***namelist, select_block select, dcomp_block dcomp) #else -scandir(const char *dirname, struct dirent ***namelist, +scandir_dirp(DIR *dirp, struct dirent ***namelist, int (*select)(const struct dirent *), int (*dcomp)(const struct dirent **, - const struct dirent **)) + const struct dirent **)) #endif { struct dirent *d, *p, **names = NULL; size_t arraysz, numitems; - DIR *dirp; - - if ((dirp = opendir(dirname)) == NULL) - return(-1); numitems = 0; arraysz = 32; /* initial estimate of the array size */ @@ -138,6 +134,30 @@ fail: return (-1); } +int +#ifdef I_AM_SCANDIR_B +scandir_b(const char *dirname, struct dirent ***namelist, select_block select, + dcomp_block dcomp) +#else +scandir(const char *dirname, struct dirent ***namelist, + int (*select)(const struct dirent *), int (*dcomp)(const struct dirent **, + const struct dirent **)) +#endif +{ + DIR *dirp; + + dirp = opendir(dirname); + if (dirp == NULL) + return (-1); + return ( +#ifdef I_AM_SCANDIR_B + scandir_b_dirp +#else + scandir_dirp +#endif + (dirp, namelist, select, dcomp)); +} + #ifndef I_AM_SCANDIR_B /* * Alphabetic order comparison routine for those who want it.