Deleted Added
sdiff udiff text old ( 196712 ) new ( 196773 )
full compact
print.c (196712) print.c (196773)
1/*-
2 * Copyright (c) 1989, 1993, 1994
3 * The Regents of the University of California. All rights reserved.
4 *
5 * This code is derived from software contributed to Berkeley by
6 * Michael Fischbein.
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 22 unchanged lines hidden (view full) ---

31 */
32
33#if 0
34#ifndef lint
35static char sccsid[] = "@(#)print.c 8.4 (Berkeley) 4/17/94";
36#endif /* not lint */
37#endif
38#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 1989, 1993, 1994
3 * The Regents of the University of California. All rights reserved.
4 *
5 * This code is derived from software contributed to Berkeley by
6 * Michael Fischbein.
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 22 unchanged lines hidden (view full) ---

31 */
32
33#if 0
34#ifndef lint
35static char sccsid[] = "@(#)print.c 8.4 (Berkeley) 4/17/94";
36#endif /* not lint */
37#endif
38#include <sys/cdefs.h>
39__FBSDID("$FreeBSD: head/bin/ls/print.c 196712 2009-08-31 20:53:01Z trasz $");
39__FBSDID("$FreeBSD: head/bin/ls/print.c 196773 2009-09-02 20:50:39Z trasz $");
40
41#include <sys/param.h>
42#include <sys/stat.h>
43#include <sys/acl.h>
44
45#include <err.h>
46#include <errno.h>
47#include <fts.h>

--- 570 unchanged lines hidden (view full) ---

618 /*
619 * XXX: ACLs are not supported on whiteouts and device files
620 * residing on UFS.
621 */
622 if (S_ISCHR(p->fts_statp->st_mode) || S_ISBLK(p->fts_statp->st_mode) ||
623 S_ISWHT(p->fts_statp->st_mode))
624 return;
625
40
41#include <sys/param.h>
42#include <sys/stat.h>
43#include <sys/acl.h>
44
45#include <err.h>
46#include <errno.h>
47#include <fts.h>

--- 570 unchanged lines hidden (view full) ---

618 /*
619 * XXX: ACLs are not supported on whiteouts and device files
620 * residing on UFS.
621 */
622 if (S_ISCHR(p->fts_statp->st_mode) || S_ISBLK(p->fts_statp->st_mode) ||
623 S_ISWHT(p->fts_statp->st_mode))
624 return;
625
626 if (previous_dev == p->fts_statp->st_dev && supports_acls == 0)
627 return;
628
629 if (p->fts_level == FTS_ROOTLEVEL)
630 snprintf(name, sizeof(name), "%s", p->fts_name);
631 else
632 snprintf(name, sizeof(name), "%s/%s",
633 p->fts_parent->fts_accpath, p->fts_name);
634
626 if (previous_dev != p->fts_statp->st_dev) {
627 previous_dev = p->fts_statp->st_dev;
628 supports_acls = 0;
629
635 if (previous_dev != p->fts_statp->st_dev) {
636 previous_dev = p->fts_statp->st_dev;
637 supports_acls = 0;
638
630 if (p->fts_level == FTS_ROOTLEVEL)
631 snprintf(name, sizeof(name), "%s", p->fts_name);
632 else
633 snprintf(name, sizeof(name), "%s/%s",
634 p->fts_parent->fts_accpath, p->fts_name);
635 ret = lpathconf(name, _PC_ACL_NFS4);
636 if (ret > 0) {
637 type = ACL_TYPE_NFS4;
638 supports_acls = 1;
639 } else if (ret < 0 && errno != EINVAL) {
640 warn("%s", name);
641 return;
642 }

--- 27 unchanged lines hidden --- 		639 ret = lpathconf(name, _PC_ACL_NFS4);
640 if (ret > 0) {
641 type = ACL_TYPE_NFS4;
642 supports_acls = 1;
643 } else if (ret < 0 && errno != EINVAL) {
644 warn("%s", name);
645 return;
646 }

--- 27 unchanged lines hidden ---