diff options
| author | Jim Meyering <jim@meyering.net> | 2002-06-29 13:08:08 +0000 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 2002-06-29 13:08:08 +0000 |
| commit | a9a425d557e96c6e17f500f85e50c39af3dd0584 (patch) | |
| tree | 0a39137f00d04ce9673029938e3861ac963d58b9 /src | |
| parent | 83df3a81652a6d5ddb2a86ec718974d2858b8c92 (diff) | |
| download | coreutils-a9a425d557e96c6e17f500f85e50c39af3dd0584.tar.xz | |
(print_statfs): Use `fputc ('*', stdout)'
instead of the combination of strcat and printf.
(print_statfs) [!FLASK_LINUX]: Print `*' for %S and %C, rather than `S' and `C'.
(print_stat) [!FLASK_LINUX]: Likewise.
Diffstat (limited to 'src')
| -rw-r--r-- | src/stat.c | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/src/stat.c b/src/stat.c index dd6207728..c620c5578 100644 --- a/src/stat.c +++ b/src/stat.c @@ -436,8 +436,7 @@ print_statfs (char *pformat, char m, char const *filename, strcat (pformat, "lx"); printf (pformat, (long int) (statfsbuf->f_type)); /* no equiv. */ #else - strcat (pformat, "s"); - printf (pformat, "*"); + fputc ('*', stdout); #endif break; case 'T': @@ -468,19 +467,28 @@ print_statfs (char *pformat, char m, char const *filename, strcat (pformat, PRIdMAX); printf (pformat, (intmax_t) (statfsbuf->f_ffree)); break; -#ifdef FLASK_LINUX + case 'S': +#ifdef FLASK_LINUX strcat (pformat, "d"); printf (pformat, sid); +#else + fputc ('*', stdout); +#endif break; + case 'C': +#ifdef FLASK_LINUX rv = security_sid_to_context (sid, (security_context_t *) &sbuf, &sbuflen); if (rv < 0) sprintf (sbuf, "<error finding security context %d>", sid); fputs (sbuf, stdout); - break; +#else + fputc ('*', stdout); #endif + break; + default: strcat (pformat, "c"); printf (pformat, m); @@ -564,19 +572,27 @@ print_stat (char *pformat, char m, char const *filename, strcat (pformat, "d"); printf (pformat, (int) statbuf->st_nlink); break; -#ifdef FLASK_LINUX case 'S': +#ifdef FLASK_LINUX strcat (pformat, "d"); printf (pformat, sid); +#else + fputc ('*', stdout); +#endif break; + case 'C': +#ifdef FLASK_LINUX rv = security_sid_to_context (sid, (security_context_t *) &sbuf, &sbuflen); if (rv < 0) sprintf (sbuf, "<error finding security context %d>", sid); fputs (sbuf, stdout); - break; +#else + fputc ('*', stdout); #endif + break; + case 'u': strcat (pformat, "d"); printf (pformat, statbuf->st_uid); |