| Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 1 | From 1a5671a4eb13b81b98c3e71f00370781563f66d8 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Thu, 10 Nov 2022 17:57:24 -0800 |
| 4 | Subject: [PATCH] chacl: Use portable version of dirent and readdir |
| 5 | |
| 6 | Using 64bit versions on 32bit architectures should be enabled with |
| 7 | --enable-largefile, this makes it portable across musl and glibc |
| 8 | |
| 9 | Upstream-Status: Backport [https://git.savannah.nongnu.org/cgit/acl.git/commit/?id=2b42f64737adf6a2ddd491213580d6e9cdd2f5af] |
| 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 11 | --- |
| 12 | tools/chacl.c | 4 ++-- |
| 13 | 1 file changed, 2 insertions(+), 2 deletions(-) |
| 14 | |
| 15 | diff --git a/tools/chacl.c b/tools/chacl.c |
| 16 | index 525a7ff..8fff875 100644 |
| 17 | --- a/tools/chacl.c |
| 18 | +++ b/tools/chacl.c |
| 19 | @@ -320,7 +320,7 @@ walk_dir(acl_t acl, acl_t dacl, const char *fname) |
| 20 | { |
| 21 | int failed = 0; |
| 22 | DIR *dir; |
| 23 | - struct dirent64 *d; |
| 24 | + struct dirent *d; |
| 25 | char *name; |
| 26 | |
| 27 | if ((dir = opendir(fname)) == NULL) { |
| 28 | @@ -332,7 +332,7 @@ walk_dir(acl_t acl, acl_t dacl, const char *fname) |
| 29 | return(0); /* got a file, not an error */ |
| 30 | } |
| 31 | |
| 32 | - while ((d = readdir64(dir)) != NULL) { |
| 33 | + while ((d = readdir(dir)) != NULL) { |
| 34 | /* skip "." and ".." entries */ |
| 35 | if (strcmp(d->d_name, ".") == 0 || strcmp(d->d_name, "..") == 0) |
| 36 | continue; |
| 37 | -- |
| 38 | 2.38.1 |
| 39 | |