summaryrefslogtreecommitdiff
path: root/coreutils
diff options
context:
space:
mode:
authorDenis Vlasenko2007-03-20 11:30:28 +0000
committerDenis Vlasenko2007-03-20 11:30:28 +0000
commitc86e052b81210e762f8ca6b79cb46b8c4bdfbfe0 (patch)
tree90608280101218f60c7d9181b913e92ba895799d /coreutils
parente84aeb5bcb1a8398fce53aad9c0072ad73a8b5c9 (diff)
downloadbusybox-c86e052b81210e762f8ca6b79cb46b8c4bdfbfe0.zip
busybox-c86e052b81210e762f8ca6b79cb46b8c4bdfbfe0.tar.gz
fix accumulated whitespace and indentation damage
Diffstat (limited to 'coreutils')
-rw-r--r--coreutils/cp.c2
-rw-r--r--coreutils/id.c38
-rw-r--r--coreutils/install.c4
-rw-r--r--coreutils/ls.c2
-rw-r--r--coreutils/mv.c2
-rw-r--r--coreutils/stat.c4
6 files changed, 26 insertions, 26 deletions
diff --git a/coreutils/cp.c b/coreutils/cp.c
index 64cf637..a80e0d2 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 e183402..8a60419 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 a58a23b..c80be01 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 2e68eb8..34836ee 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 64cae96..c08d232 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 37a9240..a2cdbfb 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 {