aboutsummaryrefslogtreecommitdiff
path: root/coreutils
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2013-01-14 01:34:48 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2013-01-14 01:34:48 +0100
commit6967578728a3eef43b7b2be4080dafc1b87f528d (patch)
tree76b79c4c81ce8e5ad4e57df5119efecef810e673 /coreutils
parent52185155088d0910d29c7f4fdf5cb3eecaac8965 (diff)
downloadbusybox-w32-6967578728a3eef43b7b2be4080dafc1b87f528d.tar.gz
busybox-w32-6967578728a3eef43b7b2be4080dafc1b87f528d.tar.bz2
busybox-w32-6967578728a3eef43b7b2be4080dafc1b87f528d.zip
whitespace fixes. no code changes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'coreutils')
-rw-r--r--coreutils/cal.c4
-rw-r--r--coreutils/cut.c2
-rw-r--r--coreutils/df.c4
-rw-r--r--coreutils/id.c2
-rw-r--r--coreutils/ls.c4
-rw-r--r--coreutils/md5_sha1_sum.c2
6 files changed, 9 insertions, 9 deletions
diff --git a/coreutils/cal.c b/coreutils/cal.c
index b470ad968..158b23fbc 100644
--- a/coreutils/cal.c
+++ b/coreutils/cal.c
@@ -167,8 +167,8 @@ int cal_main(int argc UNUSED_PARAM, char **argv)
167 day_array(month, year, dp); 167 day_array(month, year, dp);
168 len = sprintf(lineout, "%s %d", month_names[month - 1], year); 168 len = sprintf(lineout, "%s %d", month_names[month - 1], year);
169 printf("%*s%s\n%s\n", 169 printf("%*s%s\n%s\n",
170 ((7*julian + WEEK_LEN) - len) / 2, "", 170 ((7*julian + WEEK_LEN) - len) / 2, "",
171 lineout, day_headings); 171 lineout, day_headings);
172 for (row = 0; row < 6; row++) { 172 for (row = 0; row < 6; row++) {
173 build_row(lineout, dp)[0] = '\0'; 173 build_row(lineout, dp)[0] = '\0';
174 dp += 7; 174 dp += 7;
diff --git a/coreutils/cut.c b/coreutils/cut.c
index 2c27b704f..84449c775 100644
--- a/coreutils/cut.c
+++ b/coreutils/cut.c
@@ -212,7 +212,7 @@ int cut_main(int argc UNUSED_PARAM, char **argv)
212 if (opt & CUT_OPT_SUPPRESS_FLGS) { 212 if (opt & CUT_OPT_SUPPRESS_FLGS) {
213 bb_error_msg_and_die 213 bb_error_msg_and_die
214 ("suppressing non-delimited lines makes sense%s", 214 ("suppressing non-delimited lines makes sense%s",
215 _op_on_field); 215 _op_on_field);
216 } 216 }
217 if (delim != '\t') { 217 if (delim != '\t') {
218 bb_error_msg_and_die 218 bb_error_msg_and_die
diff --git a/coreutils/df.c b/coreutils/df.c
index 63dbd61bd..2c72e82a4 100644
--- a/coreutils/df.c
+++ b/coreutils/df.c
@@ -112,7 +112,7 @@ int df_main(int argc UNUSED_PARAM, char **argv)
112 /* From the manpage of df from coreutils-6.10: 112 /* From the manpage of df from coreutils-6.10:
113 Disk space is shown in 1K blocks by default, unless the environment 113 Disk space is shown in 1K blocks by default, unless the environment
114 variable POSIXLY_CORRECT is set, in which case 512-byte blocks are used. 114 variable POSIXLY_CORRECT is set, in which case 512-byte blocks are used.
115 */ 115 */
116 if (getenv("POSIXLY_CORRECT")) /* TODO - a new libbb function? */ 116 if (getenv("POSIXLY_CORRECT")) /* TODO - a new libbb function? */
117 df_disp_hr = 512; 117 df_disp_hr = 512;
118 118
@@ -221,7 +221,7 @@ int df_main(int argc UNUSED_PARAM, char **argv)
221 } 221 }
222#else 222#else
223 if (printf("\n%-20s" + 1, device) > 20 && !(opt & OPT_POSIX)) 223 if (printf("\n%-20s" + 1, device) > 20 && !(opt & OPT_POSIX))
224 printf("\n%-20s", ""); 224 printf("\n%-20s", "");
225#endif 225#endif
226 226
227#if ENABLE_FEATURE_HUMAN_READABLE 227#if ENABLE_FEATURE_HUMAN_READABLE
diff --git a/coreutils/id.c b/coreutils/id.c
index 399d25e34..1f20b755e 100644
--- a/coreutils/id.c
+++ b/coreutils/id.c
@@ -174,7 +174,7 @@ int id_main(int argc UNUSED_PARAM, char **argv)
174 /* Don't allow -n -r -nr -ug -rug -nug -rnug -uZ -gZ -GZ*/ 174 /* Don't allow -n -r -nr -ug -rug -nug -rnug -uZ -gZ -GZ*/
175 /* Don't allow more than one username */ 175 /* Don't allow more than one username */
176 opt_complementary = "?1:u--g:g--u:G--u:u--G:g--G:G--g:r?ugG:n?ugG" 176 opt_complementary = "?1:u--g:g--u:G--u:u--G:g--G:G--g:r?ugG:n?ugG"
177 IF_SELINUX(":u--Z:Z--u:g--Z:Z--g:G--Z:Z--G"); 177 IF_SELINUX(":u--Z:Z--u:g--Z:Z--g:G--Z:Z--G");
178 opt = getopt32(argv, "rnugG" IF_SELINUX("Z")); 178 opt = getopt32(argv, "rnugG" IF_SELINUX("Z"));
179 } 179 }
180 180
diff --git a/coreutils/ls.c b/coreutils/ls.c
index d5b25ee70..166473d4d 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -260,7 +260,7 @@ enum {
260 260
261/* TODO: simple toggles may be stored as OPT_xxx bits instead */ 261/* TODO: simple toggles may be stored as OPT_xxx bits instead */
262static const uint32_t opt_flags[] = { 262static const uint32_t opt_flags[] = {
263 STYLE_COLUMNAR, /* C */ 263 STYLE_COLUMNAR, /* C */
264 DISP_HIDDEN | DISP_DOT, /* a */ 264 DISP_HIDDEN | DISP_DOT, /* a */
265 DISP_NOLIST, /* d */ 265 DISP_NOLIST, /* d */
266 LIST_INO, /* i */ 266 LIST_INO, /* i */
@@ -720,7 +720,7 @@ static struct dnode *my_stat(const char *fullname, const char *name, int force_f
720 if ((option_mask32 & OPT_L) || force_follow) { 720 if ((option_mask32 & OPT_L) || force_follow) {
721#if ENABLE_SELINUX 721#if ENABLE_SELINUX
722 if (is_selinux_enabled()) { 722 if (is_selinux_enabled()) {
723 getfilecon(fullname, &cur->sid); 723 getfilecon(fullname, &cur->sid);
724 } 724 }
725#endif 725#endif
726 if (stat(fullname, &statbuf)) { 726 if (stat(fullname, &statbuf)) {
diff --git a/coreutils/md5_sha1_sum.c b/coreutils/md5_sha1_sum.c
index 2cb6dd43c..59b520fce 100644
--- a/coreutils/md5_sha1_sum.c
+++ b/coreutils/md5_sha1_sum.c
@@ -223,7 +223,7 @@ int md5_sha1_sum_main(int argc UNUSED_PARAM, char **argv)
223 } 223 }
224 if (count_failed && !(flags & FLAG_SILENT)) { 224 if (count_failed && !(flags & FLAG_SILENT)) {
225 bb_error_msg("WARNING: %d of %d computed checksums did NOT match", 225 bb_error_msg("WARNING: %d of %d computed checksums did NOT match",
226 count_failed, count_total); 226 count_failed, count_total);
227 } 227 }
228 fclose_if_not_stdin(pre_computed_stream); 228 fclose_if_not_stdin(pre_computed_stream);
229 } else { 229 } else {