CC-tea/coreutils
1
0
Fork 0
mirror of git://git.sv.gnu.org/coreutils.git synced 2026-02-20 06:12:14 +02:00
Code Issues Projects Releases Wiki Activity

stat: adjust the printing of SELinux context

Browse Source 
* src/stat.c (default_format): Don't print SELinux context
when in file system (-f) mode, as the context is associated
with the file, not the file system.
Fix logic inversion, so that in terse mode, %C is included
only when is_selinux_enabled and not vice versa.
This commit is contained in:
Pádraig Brady
2010-10-05 08:40:17 +01:00
parent 6ad89f2233
commit 77063bf819
1 changed files with 3 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/stat.c
View File

@@ -1074,12 +1074,7 @@ default_format (bool fs, bool terse, bool device)
if (fs)
{
if (terse)
{
if (0 < is_selinux_enabled ())
format = xstrdup ("%n %i %l %t %s %S %b %f %a %c %d %C\n");
else
format = xstrdup ("%n %i %l %t %s %S %b %f %a %c %d\n");
}
format = xstrdup ("%n %i %l %t %s %S %b %f %a %c %d\n");
else
{
/* TRANSLATORS: This string uses format specifiers from
@@ -1091,17 +1086,6 @@ Block size: %-10s Fundamental block size: %S\n\
Blocks: Total: %-10b Free: %-10f Available: %a\n\
Inodes: Total: %-10c Free: %d\n\
"));
if (0 < is_selinux_enabled ())
{
/* TRANSLATORS: This string uses format specifiers from
'stat --help' with --file-system, and NOT from printf. */
char *temp = format;
format = xasprintf ("%s%s", format, _("\
Context: %C\n\
"));
free (temp);
}
}
}
else /* ! fs */
@@ -1110,10 +1094,10 @@ Context: %C\n\
{
if (0 < is_selinux_enabled ())
format = xstrdup ("%n %s %b %f %u %g %D %i %h %t %T"
" %X %Y %Z %W %o\n");
" %X %Y %Z %W %o %C\n");
else
format = xstrdup ("%n %s %b %f %u %g %D %i %h %t %T"
" %X %Y %Z %W %o %C\n");
" %X %Y %Z %W %o\n");
}
else
{