diff options
Diffstat (limited to 'coreutils')
| -rw-r--r-- | coreutils/cp.c | 2 | ||||
| -rw-r--r-- | coreutils/id.c | 38 | ||||
| -rw-r--r-- | coreutils/install.c | 4 | ||||
| -rw-r--r-- | coreutils/ls.c | 2 | ||||
| -rw-r--r-- | coreutils/mv.c | 2 | ||||
| -rw-r--r-- | coreutils/stat.c | 4 |
6 files changed, 26 insertions, 26 deletions
diff --git a/coreutils/cp.c b/coreutils/cp.c index 64cf63797..a80e0d286 100644 --- a/coreutils/cp.c +++ b/coreutils/cp.c @@ -51,7 +51,7 @@ int cp_main(int argc, char **argv) if (flags & OPT_H) ... // deref command-line params only */ -#if ENABLE_SELINUX +#if ENABLE_SELINUX if (flags & FILEUTILS_PRESERVE_SECURITY_CONTEXT) { selinux_or_die(); } diff --git a/coreutils/id.c b/coreutils/id.c index e183402fa..8a604195d 100644 --- a/coreutils/id.c +++ b/coreutils/id.c @@ -48,7 +48,7 @@ int id_main(int argc, char **argv) unsigned long flags; short status; #if ENABLE_SELINUX - security_context_t scontext; + security_context_t scontext; #endif /* Don't allow -n -r -nr -ug -rug -nug -rnug */ /* Don't allow more than one username */ @@ -78,26 +78,26 @@ int id_main(int argc, char **argv) puts((flags & JUST_USER) ? bb_getpwuid(NULL, uid, -1 ) : bb_getgrgid(NULL, gid, -1 )); } else { if (flags & JUST_USER) { - printf("%u\n", uid); - } - if (flags & JUST_GROUP) { - printf("%u\n", gid); - } - } - + printf("%u\n", uid); + } + if (flags & JUST_GROUP) { + printf("%u\n", gid); + } + } + #if ENABLE_SELINUX - if (flags & JUST_CONTEXT) { + if (flags & JUST_CONTEXT) { selinux_or_die(); - if (argc - optind == 1) { - bb_error_msg_and_die("user name can't be passed with -Z"); - } - - if (getcon(&scontext)) { - bb_error_msg_and_die("can't get process context"); - } - printf("%s\n", scontext); - } -#endif + if (argc - optind == 1) { + bb_error_msg_and_die("user name can't be passed with -Z"); + } + + if (getcon(&scontext)) { + bb_error_msg_and_die("can't get process context"); + } + printf("%s\n", scontext); + } +#endif /* exit */ fflush_stdout_and_exit(EXIT_SUCCESS); } diff --git a/coreutils/install.c b/coreutils/install.c index a58a23b6e..c80be01ff 100644 --- a/coreutils/install.c +++ b/coreutils/install.c @@ -41,7 +41,7 @@ static void setdefaultfilecon(const char *path) { if (!is_selinux_enabled()) { return; - } + } if (lstat(path, &s) != 0) { return; } @@ -101,7 +101,7 @@ int install_main(int argc, char **argv) /* -c exists for backwards compatibility, it's needed */ flags = getopt32(argc, argv, "cdpsg:m:o:" USE_SELINUX("Z:"), &gid_str, &mode_str, &uid_str USE_SELINUX(, &scontext)); - + #if ENABLE_SELINUX if (flags & OPT_PRESERVE_SECURITY_CONTEXT) { use_default_selinux_context = 0; diff --git a/coreutils/ls.c b/coreutils/ls.c index 2e68eb848..34836ee29 100644 --- a/coreutils/ls.c +++ b/coreutils/ls.c @@ -770,7 +770,7 @@ static const unsigned opt_flags[] = { #if ENABLE_FEATURE_AUTOWIDTH 0, 0, /* T, w - ignored */ #endif -#if ENABLE_SELINUX +#if ENABLE_SELINUX LIST_MODEBITS|LIST_ID_NAME|LIST_CONTEXT, /* Z */ #endif (1U<<31) diff --git a/coreutils/mv.c b/coreutils/mv.c index 64cae965b..c08d2327c 100644 --- a/coreutils/mv.c +++ b/coreutils/mv.c @@ -118,7 +118,7 @@ DO_MOVE: copy_flag = FILEUTILS_RECUR | FILEUTILS_PRESERVE_STATUS; #if ENABLE_SELINUX copy_flag |= FILEUTILS_PRESERVE_SECURITY_CONTEXT; -#endif +#endif if ((copy_file(*argv, dest, copy_flag) >= 0) && (remove_file(*argv, FILEUTILS_RECUR | FILEUTILS_FORCE) >= 0)) { goto RET_0; diff --git a/coreutils/stat.c b/coreutils/stat.c index 37a924057..a2cdbfb29 100644 --- a/coreutils/stat.c +++ b/coreutils/stat.c @@ -416,7 +416,7 @@ static int do_statfs(char const *filename, char const *format) format = (flags & OPT_TERSE ? (flags & OPT_SELINUX ? "%n %i %l %t %s %b %f %a %c %d %C\n": "%n %i %l %t %s %b %f %a %c %d\n") - : (flags & OPT_SELINUX ? + : (flags & OPT_SELINUX ? " File: \"%n\"\n" " ID: %-8i Namelen: %-7l Type: %T\n" "Block size: %-10s\n" @@ -531,7 +531,7 @@ static int do_stat(char const *filename, char const *format) } #else if (flags & OPT_TERSE) { - format = (flags & OPT_SELINUX ? + format = (flags & OPT_SELINUX ? "%n %s %b %f %u %g %D %i %h %t %T %X %Y %Z %o %C\n": "%n %s %b %f %u %g %D %i %h %t %T %X %Y %Z %o\n"); } else { |