aboutsummaryrefslogtreecommitdiff
path: root/coreutils
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2013-01-14 15:57:44 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2013-01-14 15:57:44 +0100
commit60cb48ca50fcff24aa6c3927f51e4a508fa118f4 (patch)
tree493e30821f3d484b7395ce9d9e4be39ec9a43126 /coreutils
parentb8173b603f57dcf918a67f1ec00763ab5f4e1cf8 (diff)
downloadbusybox-w32-60cb48ca50fcff24aa6c3927f51e4a508fa118f4.tar.gz
busybox-w32-60cb48ca50fcff24aa6c3927f51e4a508fa118f4.tar.bz2
busybox-w32-60cb48ca50fcff24aa6c3927f51e4a508fa118f4.zip
whitespace cleanup. no code changes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'coreutils')
-rw-r--r--coreutils/cal.c7
-rw-r--r--coreutils/mknod.c2
-rw-r--r--coreutils/od_bloaty.c4
-rw-r--r--coreutils/stat.c58
-rw-r--r--coreutils/stty.c2
-rw-r--r--coreutils/test.c2
6 files changed, 41 insertions, 34 deletions
diff --git a/coreutils/cal.c b/coreutils/cal.c
index 158b23fbc..0b2307349 100644
--- a/coreutils/cal.c
+++ b/coreutils/cal.c
@@ -181,10 +181,11 @@ int cal_main(int argc UNUSED_PARAM, char **argv)
181 181
182 sprintf(lineout, "%u", year); 182 sprintf(lineout, "%u", year);
183 center(lineout, 183 center(lineout,
184 (WEEK_LEN * 3 + HEAD_SEP * 2) 184 (WEEK_LEN * 3 + HEAD_SEP * 2)
185 + julian * (J_WEEK_LEN * 2 + HEAD_SEP 185 + julian * (J_WEEK_LEN * 2 + HEAD_SEP
186 - (WEEK_LEN * 3 + HEAD_SEP * 2)), 186 - (WEEK_LEN * 3 + HEAD_SEP * 2)),
187 0); 187 0
188 );
188 puts("\n"); /* two \n's */ 189 puts("\n"); /* two \n's */
189 for (i = 0; i < 12; i++) { 190 for (i = 0; i < 12; i++) {
190 day_array(i + 1, year, days[i]); 191 day_array(i + 1, year, days[i]);
diff --git a/coreutils/mknod.c b/coreutils/mknod.c
index 32d3659ac..aa0450481 100644
--- a/coreutils/mknod.c
+++ b/coreutils/mknod.c
@@ -59,7 +59,7 @@ int mknod_main(int argc, char **argv)
59 /* Autodetect what the system supports; these macros should 59 /* Autodetect what the system supports; these macros should
60 * optimize out to two constants. */ 60 * optimize out to two constants. */
61 dev = makedev(xatoul_range(argv[2], 0, major(UINT_MAX)), 61 dev = makedev(xatoul_range(argv[2], 0, major(UINT_MAX)),
62 xatoul_range(argv[3], 0, minor(UINT_MAX))); 62 xatoul_range(argv[3], 0, minor(UINT_MAX)));
63 } 63 }
64 } 64 }
65 65
diff --git a/coreutils/od_bloaty.c b/coreutils/od_bloaty.c
index 2f6650153..b408a8477 100644
--- a/coreutils/od_bloaty.c
+++ b/coreutils/od_bloaty.c
@@ -1021,12 +1021,12 @@ dump(off_t current_offset, off_t end_offset)
1021 l_c_m = get_lcm(); 1021 l_c_m = get_lcm();
1022 1022
1023 /* Make bytes_to_write the smallest multiple of l_c_m that 1023 /* Make bytes_to_write the smallest multiple of l_c_m that
1024 is at least as large as n_bytes_read. */ 1024 is at least as large as n_bytes_read. */
1025 bytes_to_write = l_c_m * ((n_bytes_read + l_c_m - 1) / l_c_m); 1025 bytes_to_write = l_c_m * ((n_bytes_read + l_c_m - 1) / l_c_m);
1026 1026
1027 memset(block[idx] + n_bytes_read, 0, bytes_to_write - n_bytes_read); 1027 memset(block[idx] + n_bytes_read, 0, bytes_to_write - n_bytes_read);
1028 write_block(current_offset, bytes_to_write, 1028 write_block(current_offset, bytes_to_write,
1029 block[idx ^ 1], block[idx]); 1029 block[idx ^ 1], block[idx]);
1030 current_offset += n_bytes_read; 1030 current_offset += n_bytes_read;
1031 } 1031 }
1032 1032
diff --git a/coreutils/stat.c b/coreutils/stat.c
index e38c8f6b0..c8677ebaa 100644
--- a/coreutils/stat.c
+++ b/coreutils/stat.c
@@ -591,37 +591,43 @@ static bool do_stat(const char *filename, const char *format)
591# else 591# else
592 if (option_mask32 & OPT_TERSE) { 592 if (option_mask32 & OPT_TERSE) {
593 format = (option_mask32 & OPT_SELINUX ? 593 format = (option_mask32 & OPT_SELINUX ?
594 "%n %s %b %f %u %g %D %i %h %t %T %X %Y %Z %o %C\n": 594 "%n %s %b %f %u %g %D %i %h %t %T %X %Y %Z %o %C\n"
595 "%n %s %b %f %u %g %D %i %h %t %T %X %Y %Z %o\n"); 595 :
596 "%n %s %b %f %u %g %D %i %h %t %T %X %Y %Z %o\n"
597 );
596 } else { 598 } else {
597 if (S_ISBLK(statbuf.st_mode) || S_ISCHR(statbuf.st_mode)) { 599 if (S_ISBLK(statbuf.st_mode) || S_ISCHR(statbuf.st_mode)) {
598 format = (option_mask32 & OPT_SELINUX ? 600 format = (option_mask32 & OPT_SELINUX ?
599 " File: %N\n" 601 " File: %N\n"
600 " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" 602 " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
601 "Device: %Dh/%dd\tInode: %-10i Links: %-5h" 603 "Device: %Dh/%dd\tInode: %-10i Links: %-5h"
602 " Device type: %t,%T\n" 604 " Device type: %t,%T\n"
603 "Access: (%04a/%10.10A) Uid: (%5u/%8U) Gid: (%5g/%8G)\n" 605 "Access: (%04a/%10.10A) Uid: (%5u/%8U) Gid: (%5g/%8G)\n"
604 " S_Context: %C\n" 606 " S_Context: %C\n"
605 "Access: %x\n" "Modify: %y\n" "Change: %z\n": 607 "Access: %x\n" "Modify: %y\n" "Change: %z\n"
606 " File: %N\n" 608 :
607 " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" 609 " File: %N\n"
608 "Device: %Dh/%dd\tInode: %-10i Links: %-5h" 610 " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
609 " Device type: %t,%T\n" 611 "Device: %Dh/%dd\tInode: %-10i Links: %-5h"
610 "Access: (%04a/%10.10A) Uid: (%5u/%8U) Gid: (%5g/%8G)\n" 612 " Device type: %t,%T\n"
611 "Access: %x\n" "Modify: %y\n" "Change: %z\n"); 613 "Access: (%04a/%10.10A) Uid: (%5u/%8U) Gid: (%5g/%8G)\n"
614 "Access: %x\n" "Modify: %y\n" "Change: %z\n"
615 );
612 } else { 616 } else {
613 format = (option_mask32 & OPT_SELINUX ? 617 format = (option_mask32 & OPT_SELINUX ?
614 " File: %N\n" 618 " File: %N\n"
615 " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" 619 " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
616 "Device: %Dh/%dd\tInode: %-10i Links: %h\n" 620 "Device: %Dh/%dd\tInode: %-10i Links: %h\n"
617 "Access: (%04a/%10.10A) Uid: (%5u/%8U) Gid: (%5g/%8G)\n" 621 "Access: (%04a/%10.10A) Uid: (%5u/%8U) Gid: (%5g/%8G)\n"
618 "S_Context: %C\n" 622 "S_Context: %C\n"
619 "Access: %x\n" "Modify: %y\n" "Change: %z\n": 623 "Access: %x\n" "Modify: %y\n" "Change: %z\n"
620 " File: %N\n" 624 :
621 " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n" 625 " File: %N\n"
622 "Device: %Dh/%dd\tInode: %-10i Links: %h\n" 626 " Size: %-10s\tBlocks: %-10b IO Block: %-6o %F\n"
623 "Access: (%04a/%10.10A) Uid: (%5u/%8U) Gid: (%5g/%8G)\n" 627 "Device: %Dh/%dd\tInode: %-10i Links: %h\n"
624 "Access: %x\n" "Modify: %y\n" "Change: %z\n"); 628 "Access: (%04a/%10.10A) Uid: (%5u/%8U) Gid: (%5g/%8G)\n"
629 "Access: %x\n" "Modify: %y\n" "Change: %z\n"
630 );
625 } 631 }
626 } 632 }
627# endif 633# endif
diff --git a/coreutils/stty.c b/coreutils/stty.c
index 0668cf7be..96754dd84 100644
--- a/coreutils/stty.c
+++ b/coreutils/stty.c
@@ -1056,7 +1056,7 @@ static void do_display(const struct termios *mode, int all)
1056 } 1056 }
1057#endif 1057#endif
1058 wrapf("%s = %s;", nth_string(control_name, i), 1058 wrapf("%s = %s;", nth_string(control_name, i),
1059 visible(mode->c_cc[control_info[i].offset])); 1059 visible(mode->c_cc[control_info[i].offset]));
1060 } 1060 }
1061#if VEOF == VMIN 1061#if VEOF == VMIN
1062 if ((mode->c_lflag & ICANON) == 0) 1062 if ((mode->c_lflag & ICANON) == 0)
diff --git a/coreutils/test.c b/coreutils/test.c
index 0bc008e7c..4df505a05 100644
--- a/coreutils/test.c
+++ b/coreutils/test.c
@@ -610,7 +610,7 @@ static int test_eaccess(char *path, int mode)
610 return 0; 610 return 0;
611 611
612 /* Root can execute any file that has any one of the execute 612 /* Root can execute any file that has any one of the execute
613 bits set. */ 613 * bits set. */
614 if (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)) 614 if (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH))
615 return 0; 615 return 0;
616 } 616 }
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-08-15 02:31:14 +0000