aboutsummaryrefslogtreecommitdiff
path: root/coreutils
diff options
context:
space:
mode:
Diffstat (limited to 'coreutils')
-rw-r--r--coreutils/env.c6
-rw-r--r--coreutils/md5_sha1_sum.c6
-rw-r--r--coreutils/mkfifo.c2
-rw-r--r--coreutils/od.c28
-rw-r--r--coreutils/rmdir.c2
-rw-r--r--coreutils/stat.c4
-rw-r--r--coreutils/stty.c6
-rw-r--r--coreutils/touch.c2
-rw-r--r--coreutils/tty.c4
-rw-r--r--coreutils/uniq.c2
10 files changed, 31 insertions, 31 deletions
diff --git a/coreutils/env.c b/coreutils/env.c
index f50ee7869..d64a71439 100644
--- a/coreutils/env.c
+++ b/coreutils/env.c
@@ -3,7 +3,7 @@
3 * env implementation for busybox 3 * env implementation for busybox
4 * 4 *
5 * Copyright (c) 1988, 1993, 1994 5 * Copyright (c) 1988, 1993, 1994
6 * The Regents of the University of California. All rights reserved. 6 * The Regents of the University of California. All rights reserved.
7 * 7 *
8 * Licensed under GPLv2 or later, see file LICENSE in this source tree. 8 * Licensed under GPLv2 or later, see file LICENSE in this source tree.
9 * 9 *
@@ -103,8 +103,8 @@ int env_main(int argc UNUSED_PARAM, char **argv)
103 * notice, this list of conditions and the following disclaimer in the 103 * notice, this list of conditions and the following disclaimer in the
104 * documentation and/or other materials provided with the distribution. 104 * documentation and/or other materials provided with the distribution.
105 * 105 *
106 * 3. <BSD Advertising Clause omitted per the July 22, 1999 licensing change 106 * 3. BSD Advertising Clause omitted per the July 22, 1999 licensing change
107 * ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change> 107 * ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change
108 * 108 *
109 * 4. Neither the name of the University nor the names of its contributors 109 * 4. Neither the name of the University nor the names of its contributors
110 * may be used to endorse or promote products derived from this software 110 * may be used to endorse or promote products derived from this software
diff --git a/coreutils/md5_sha1_sum.c b/coreutils/md5_sha1_sum.c
index d3d294de9..3b897c18f 100644
--- a/coreutils/md5_sha1_sum.c
+++ b/coreutils/md5_sha1_sum.c
@@ -18,9 +18,9 @@ enum {
18 HASH_SHA512 = '5', 18 HASH_SHA512 = '5',
19}; 19};
20 20
21#define FLAG_SILENT 1 21#define FLAG_SILENT 1
22#define FLAG_CHECK 2 22#define FLAG_CHECK 2
23#define FLAG_WARN 4 23#define FLAG_WARN 4
24 24
25/* This might be useful elsewhere */ 25/* This might be useful elsewhere */
26static unsigned char *hash_bin_to_hex(unsigned char *hash_value, 26static unsigned char *hash_bin_to_hex(unsigned char *hash_value,
diff --git a/coreutils/mkfifo.c b/coreutils/mkfifo.c
index 4388ccaa3..d908ce45e 100644
--- a/coreutils/mkfifo.c
+++ b/coreutils/mkfifo.c
@@ -30,7 +30,7 @@ int mkfifo_main(int argc UNUSED_PARAM, char **argv)
30 30
31 do { 31 do {
32 if (mkfifo(*argv, mode) < 0) { 32 if (mkfifo(*argv, mode) < 0) {
33 bb_simple_perror_msg(*argv); /* Avoid multibyte problems. */ 33 bb_simple_perror_msg(*argv); /* Avoid multibyte problems. */
34 retval = EXIT_FAILURE; 34 retval = EXIT_FAILURE;
35 } 35 }
36 } while (*++argv); 36 } while (*++argv);
diff --git a/coreutils/od.c b/coreutils/od.c
index 30b5bd676..dcd693446 100644
--- a/coreutils/od.c
+++ b/coreutils/od.c
@@ -110,7 +110,7 @@ odoffset(dumper_t *dumper, int argc, char ***argvp)
110 * the offset is changed as well. This isn't pretty, 110 * the offset is changed as well. This isn't pretty,
111 * but it's easy. 111 * but it's easy.
112 */ 112 */
113#define TYPE_OFFSET 7 113#define TYPE_OFFSET 7
114 { 114 {
115 char x_or_d; 115 char x_or_d;
116 if (base == 16) { 116 if (base == 16) {
@@ -130,19 +130,19 @@ odoffset(dumper_t *dumper, int argc, char ***argvp)
130} 130}
131 131
132static const char *const add_strings[] = { 132static const char *const add_strings[] = {
133 "16/1 \"%3_u \" \"\\n\"", /* a */ 133 "16/1 \"%3_u \" \"\\n\"", /* a */
134 "8/2 \" %06o \" \"\\n\"", /* B, o */ 134 "8/2 \" %06o \" \"\\n\"", /* B, o */
135 "16/1 \"%03o \" \"\\n\"", /* b */ 135 "16/1 \"%03o \" \"\\n\"", /* b */
136 "16/1 \"%3_c \" \"\\n\"", /* c */ 136 "16/1 \"%3_c \" \"\\n\"", /* c */
137 "8/2 \" %05u \" \"\\n\"", /* d */ 137 "8/2 \" %05u \" \"\\n\"", /* d */
138 "4/4 \" %010u \" \"\\n\"", /* D */ 138 "4/4 \" %010u \" \"\\n\"", /* D */
139 "2/8 \" %21.14e \" \"\\n\"", /* e (undocumented in od), F */ 139 "2/8 \" %21.14e \" \"\\n\"", /* e (undocumented in od), F */
140 "4/4 \" %14.7e \" \"\\n\"", /* f */ 140 "4/4 \" %14.7e \" \"\\n\"", /* f */
141 "4/4 \" %08x \" \"\\n\"", /* H, X */ 141 "4/4 \" %08x \" \"\\n\"", /* H, X */
142 "8/2 \" %04x \" \"\\n\"", /* h, x */ 142 "8/2 \" %04x \" \"\\n\"", /* h, x */
143 "4/4 \" %11d \" \"\\n\"", /* I, L, l */ 143 "4/4 \" %11d \" \"\\n\"", /* I, L, l */
144 "8/2 \" %6d \" \"\\n\"", /* i */ 144 "8/2 \" %6d \" \"\\n\"", /* i */
145 "4/4 \" %011o \" \"\\n\"", /* O */ 145 "4/4 \" %011o \" \"\\n\"", /* O */
146}; 146};
147 147
148static const char od_opts[] ALIGN1 = "aBbcDdeFfHhIiLlOoXxv"; 148static const char od_opts[] ALIGN1 = "aBbcDdeFfHhIiLlOoXxv";
diff --git a/coreutils/rmdir.c b/coreutils/rmdir.c
index 75bfc2813..231793ce0 100644
--- a/coreutils/rmdir.c
+++ b/coreutils/rmdir.c
@@ -50,7 +50,7 @@ int rmdir_main(int argc UNUSED_PARAM, char **argv)
50 if ((flags & IGNORE_NON_EMPTY) && errno == ENOTEMPTY) 50 if ((flags & IGNORE_NON_EMPTY) && errno == ENOTEMPTY)
51 break; 51 break;
52#endif 52#endif
53 bb_perror_msg("'%s'", path); /* Match gnu rmdir msg. */ 53 bb_perror_msg("'%s'", path); /* Match gnu rmdir msg. */
54 status = EXIT_FAILURE; 54 status = EXIT_FAILURE;
55 } else if (flags & PARENTS) { 55 } else if (flags & PARENTS) {
56 /* Note: path was not "" since rmdir succeeded. */ 56 /* Note: path was not "" since rmdir succeeded. */
diff --git a/coreutils/stat.c b/coreutils/stat.c
index d176d07ea..b4e6f10fd 100644
--- a/coreutils/stat.c
+++ b/coreutils/stat.c
@@ -469,7 +469,7 @@ static bool do_statfs(const char *filename, const char *format)
469 if (scontext) 469 if (scontext)
470 freecon(scontext); 470 freecon(scontext);
471# endif 471# endif
472#endif /* FEATURE_STAT_FORMAT */ 472#endif /* FEATURE_STAT_FORMAT */
473 return 1; 473 return 1;
474} 474}
475 475
@@ -635,7 +635,7 @@ static bool do_stat(const char *filename, const char *format)
635 human_time(statbuf.st_mtime), 635 human_time(statbuf.st_mtime),
636 human_time(statbuf.st_ctime)); 636 human_time(statbuf.st_ctime));
637 } 637 }
638#endif /* FEATURE_STAT_FORMAT */ 638#endif /* FEATURE_STAT_FORMAT */
639 return 1; 639 return 1;
640} 640}
641 641
diff --git a/coreutils/stty.c b/coreutils/stty.c
index 0cb4fb234..e28e15c97 100644
--- a/coreutils/stty.c
+++ b/coreutils/stty.c
@@ -1110,16 +1110,16 @@ static void set_mode(const struct mode_info *info, int reversed,
1110 if (reversed) 1110 if (reversed)
1111 mode->c_cflag = (mode->c_cflag & ~PARENB & ~CSIZE) | CS8; 1111 mode->c_cflag = (mode->c_cflag & ~PARENB & ~CSIZE) | CS8;
1112 else 1112 else
1113 mode->c_cflag = (mode->c_cflag & ~PARODD & ~CSIZE) | PARENB | CS7; 1113 mode->c_cflag = (mode->c_cflag & ~PARODD & ~CSIZE) | PARENB | CS7;
1114 } else if (info == &mode_info[IDX_oddp]) { 1114 } else if (info == &mode_info[IDX_oddp]) {
1115 if (reversed) 1115 if (reversed)
1116 mode->c_cflag = (mode->c_cflag & ~PARENB & ~CSIZE) | CS8; 1116 mode->c_cflag = (mode->c_cflag & ~PARENB & ~CSIZE) | CS8;
1117 else 1117 else
1118 mode->c_cflag = (mode->c_cflag & ~CSIZE) | CS7 | PARODD | PARENB; 1118 mode->c_cflag = (mode->c_cflag & ~CSIZE) | CS7 | PARODD | PARENB;
1119 } else if (info == &mode_info[IDX_nl]) { 1119 } else if (info == &mode_info[IDX_nl]) {
1120 if (reversed) { 1120 if (reversed) {
1121 mode->c_iflag = (mode->c_iflag | ICRNL) & ~INLCR & ~IGNCR; 1121 mode->c_iflag = (mode->c_iflag | ICRNL) & ~INLCR & ~IGNCR;
1122 mode->c_oflag = (mode->c_oflag | ONLCR) & ~OCRNL & ~ONLRET; 1122 mode->c_oflag = (mode->c_oflag | ONLCR) & ~OCRNL & ~ONLRET;
1123 } else { 1123 } else {
1124 mode->c_iflag = mode->c_iflag & ~ICRNL; 1124 mode->c_iflag = mode->c_iflag & ~ICRNL;
1125 if (ONLCR) mode->c_oflag = mode->c_oflag & ~ONLCR; 1125 if (ONLCR) mode->c_oflag = mode->c_oflag & ~ONLCR;
diff --git a/coreutils/touch.c b/coreutils/touch.c
index 03aac3aa2..afff36b4d 100644
--- a/coreutils/touch.c
+++ b/coreutils/touch.c
@@ -97,7 +97,7 @@ int touch_main(int argc UNUSED_PARAM, char **argv)
97 parse_datestr(date_str, &tm_time); 97 parse_datestr(date_str, &tm_time);
98 98
99 /* Correct any day of week and day of year etc. fields */ 99 /* Correct any day of week and day of year etc. fields */
100 tm_time.tm_isdst = -1; /* Be sure to recheck dst */ 100 tm_time.tm_isdst = -1; /* Be sure to recheck dst */
101 t = validate_tm_time(date_str, &tm_time); 101 t = validate_tm_time(date_str, &tm_time);
102 102
103 timebuf[1].tv_sec = timebuf[0].tv_sec = t; 103 timebuf[1].tv_sec = timebuf[0].tv_sec = t;
diff --git a/coreutils/tty.c b/coreutils/tty.c
index 489181319..282d9680f 100644
--- a/coreutils/tty.c
+++ b/coreutils/tty.c
@@ -16,10 +16,10 @@ int tty_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
16int tty_main(int argc UNUSED_PARAM, char **argv) 16int tty_main(int argc UNUSED_PARAM, char **argv)
17{ 17{
18 const char *s; 18 const char *s;
19 IF_INCLUDE_SUSv2(int silent;) /* Note: No longer relevant in SUSv3. */ 19 IF_INCLUDE_SUSv2(int silent;) /* Note: No longer relevant in SUSv3. */
20 int retval; 20 int retval;
21 21
22 xfunc_error_retval = 2; /* SUSv3 requires > 1 for error. */ 22 xfunc_error_retval = 2; /* SUSv3 requires > 1 for error. */
23 23
24 IF_INCLUDE_SUSv2(silent = getopt32(argv, "s");) 24 IF_INCLUDE_SUSv2(silent = getopt32(argv, "s");)
25 IF_INCLUDE_SUSv2(argv += optind;) 25 IF_INCLUDE_SUSv2(argv += optind;)
diff --git a/coreutils/uniq.c b/coreutils/uniq.c
index 358de7894..decf7e4f8 100644
--- a/coreutils/uniq.c
+++ b/coreutils/uniq.c
@@ -86,7 +86,7 @@ int uniq_main(int argc UNUSED_PARAM, char **argv)
86 } 86 }
87 87
88 free(cur_line); 88 free(cur_line);
89 ++dups; /* testing for overflow seems excessive */ 89 ++dups; /* testing for overflow seems excessive */
90 } 90 }
91 91
92 if (old_line) { 92 if (old_line) {