Attachment 146845 Details for Bug 173178 – updated patch that applies to current upstream / rhel5beta version

[patch] updated patch that applies to current upstream / rhel5beta version

getfacl-kw2.diff (text/plain), 1.58 KB, created by Klaus Weidner on 2007-01-29 18:13:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Klaus Weidner

Created: 2007-01-29 18:13:46 UTC

Size: 1.58 KB

patch

obsolete

>diff -ur acl-2.2.39/getfacl/getfacl.c acl-2.2.39-kw/getfacl/getfacl.c
>--- acl-2.2.39/getfacl/getfacl.c	2006-06-20 01:51:25.000000000 -0500
>+++ acl-2.2.39-kw/getfacl/getfacl.c	2007-01-29 12:05:31.000000000 -0600
>@@ -70,9 +70,9 @@
> const char *progname;
> const char *cmd_line_options;
> 
>-int opt_recursive;  /* recurse into sub-directories? */
>-int opt_walk_logical;  /* always follow symbolic links */
>-int opt_walk_physical;  /* never follow symbolic links */
>+int opt_recursive = 0;  /* recurse into sub-directories? */
>+int opt_walk_logical = 0;  /* always follow symbolic links */
>+int opt_walk_physical = 0;  /* never follow symbolic links */
> int opt_print_acl = 0;
> int opt_print_default_acl = 0;
> int opt_strip_leading_slash = 1;
>@@ -595,33 +595,13 @@
> 	return 0;
> }
> 
>-char *resolve_symlinks(const char *file)
>-{
>-	static char buffer[4096];
>-	char *path = NULL;
>-	ssize_t len;
>-
>-	len = readlink(file, buffer, sizeof(buffer)-1);
>-	if (len < 0) {
>-		if (errno == EINVAL)	/* not a symlink, use given path */
>-			path = (char *)file;
>-	} else {
>-		buffer[len+1] = '\0';
>-		path = buffer;
>-	}
>-	return path;
>-}
>-
> int walk_tree(const char *file)
> {
> 	const char *p;
>+	int flags = (opt_walk_physical || !opt_walk_logical) * FTW_PHYS;
> 
> 	__errors = 0;
>-	if ((p = resolve_symlinks(file)) == NULL) {
>-		fprintf(stderr, "%s: %s: %s\n", progname,
>-			xquote(file), strerror(errno));
>-		__errors++;
>-	} else if (nftw(p, __do_print, 0, opt_walk_logical? 0 : FTW_PHYS) < 0) {
>+	if (nftw(file, __do_print, 0, flags) < 0) {
> 		fprintf(stderr, "%s: %s: %s\n", progname, xquote(file),
> 			strerror(errno));
> 		__errors++;

Actions: View | Diff

Attachments on bug 173178: 121037 | 146845