rpms/coreutils
5
0
Fork 0
Code Issues Pull Requests Releases Activity

- Make 'ls -Z' output more consistent with other output formats.

Browse Source
This commit is contained in:
Tim Waugh 2006-04-20 11:39:12 +00:00
parent 5505e28e55
commit 49a3f898a6
2 changed files with 11 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
coreutils-selinux.patch
View File

@ -1160,8 +1160,8 @@
+ } + }
+ return 1; /* can't reach this statement.... */ + return 1; /* can't reach this statement.... */
+} +}
--- coreutils-5.94/src/ls.c.selinux 2006-03-24 13:23:38.000000000 +0000 --- coreutils-5.94/src/ls.c 2006-03-24 13:23:45.000000000 +0000
+++ coreutils-5.94/src/ls.c 2006-03-24 13:23:45.000000000 +0000 +++ coreutils-5.94/src/ls.c 2006-04-20 12:24:40.000000000 +0100
@@ -135,6 +135,18 @@ @@ -135,6 +135,18 @@
#define AUTHORS "Richard Stallman", "David MacKenzie" #define AUTHORS "Richard Stallman", "David MacKenzie"
@ -1692,10 +1692,7 @@
fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (HELP_OPTION_DESCRIPTION, stdout);
fputs (VERSION_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout);
fputs (_("\n\ fputs (_("\n\
@@ -4244,3 +4403,83 @@ @@ -4246,0 +4406,67 @@
}
exit (status);
}
+ +
+#ifdef WITH_SELINUX +#ifdef WITH_SELINUX
+ +
@ -1734,23 +1731,10 @@
+ +
+ /* print standard user and group */ + /* print standard user and group */
+ +
+ user_name = f->stat_failed ? "?" : + DIRED_FPUTS (buf, stdout, p - buf);
+ (numeric_ids ? NULL : getuser (f->stat.st_uid)); + format_user (f->stat.st_uid, owner_width, f->stat_failed);
+ if (user_name) + format_group (f->stat.st_gid, group_width, f->stat_failed);
+ (void) sprintf (p, "%-8.8s ", user_name); + p = buf;
+ else
+ (void) sprintf (p, "%-8u ", (unsigned int) f->stat.st_uid);
+ p += strlen (p);
+
+ if ( print_group ) {
+ group_name = f->stat_failed ? "?" :
+ (numeric_ids ? NULL : getgroup (f->stat.st_gid));
+ if (group_name)
+ (void) sprintf (p, "%-8.8s ", group_name);
+ else
+ (void) sprintf (p, "%-8u ", (unsigned int) f->stat.st_gid);
+ p += strlen (p);
+ }
+ } + }
+ +
+ (void) sprintf (p, "%-32s ", f->scontext ?: ""); + (void) sprintf (p, "%-32s ", f->scontext ?: "");

5
coreutils.spec
View File

@ -1,7 +1,7 @@
Summary: The GNU core utilities: a set of tools commonly used in shell scripts Summary: The GNU core utilities: a set of tools commonly used in shell scripts
Name: coreutils Name: coreutils
Version: 5.94 Version: 5.94
Release: 2 Release: 3
License: GPL License: GPL
Group: System Environment/Base Group: System Environment/Base
Url: http://www.gnu.org/software/coreutils/ Url: http://www.gnu.org/software/coreutils/
@ -261,6 +261,9 @@ fi
/sbin/runuser /sbin/runuser
%changelog %changelog
* Thu Apr 20 2006 Tim Waugh <twaugh@redhat.com> 5.94-3
- Make 'ls -Z' output more consistent with other output formats.
* Fri Mar 24 2006 Tim Waugh <twaugh@redhat.com> 5.94-2 * Fri Mar 24 2006 Tim Waugh <twaugh@redhat.com> 5.94-2
- 5.94. - 5.94.