diff options
Diffstat (limited to 'coreutils')
-rw-r--r-- | coreutils/env.c | 6 | ||||
-rw-r--r-- | coreutils/md5_sha1_sum.c | 6 | ||||
-rw-r--r-- | coreutils/mkfifo.c | 2 | ||||
-rw-r--r-- | coreutils/od.c | 28 | ||||
-rw-r--r-- | coreutils/rmdir.c | 2 | ||||
-rw-r--r-- | coreutils/stat.c | 4 | ||||
-rw-r--r-- | coreutils/stty.c | 6 | ||||
-rw-r--r-- | coreutils/touch.c | 2 | ||||
-rw-r--r-- | coreutils/tty.c | 4 | ||||
-rw-r--r-- | coreutils/uniq.c | 2 |
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 @@ * env implementation for busybox * * Copyright (c) 1988, 1993, 1994 - * The Regents of the University of California. All rights reserved. + * The Regents of the University of California. All rights reserved. * * Licensed under GPLv2 or later, see file LICENSE in this source tree. * @@ -103,8 +103,8 @@ int env_main(int argc UNUSED_PARAM, char **argv) * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * 3. <BSD Advertising Clause omitted per the July 22, 1999 licensing change - * ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change> + * 3. BSD Advertising Clause omitted per the July 22, 1999 licensing change + * ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change * * 4. Neither the name of the University nor the names of its contributors * 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 { HASH_SHA512 = '5', }; -#define FLAG_SILENT 1 -#define FLAG_CHECK 2 -#define FLAG_WARN 4 +#define FLAG_SILENT 1 +#define FLAG_CHECK 2 +#define FLAG_WARN 4 /* This might be useful elsewhere */ static 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) do { if (mkfifo(*argv, mode) < 0) { - bb_simple_perror_msg(*argv); /* Avoid multibyte problems. */ + bb_simple_perror_msg(*argv); /* Avoid multibyte problems. */ retval = EXIT_FAILURE; } } 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) * the offset is changed as well. This isn't pretty, * but it's easy. */ -#define TYPE_OFFSET 7 +#define TYPE_OFFSET 7 { char x_or_d; if (base == 16) { @@ -130,19 +130,19 @@ odoffset(dumper_t *dumper, int argc, char ***argvp) } static const char *const add_strings[] = { - "16/1 \"%3_u \" \"\\n\"", /* a */ - "8/2 \" %06o \" \"\\n\"", /* B, o */ - "16/1 \"%03o \" \"\\n\"", /* b */ - "16/1 \"%3_c \" \"\\n\"", /* c */ - "8/2 \" %05u \" \"\\n\"", /* d */ - "4/4 \" %010u \" \"\\n\"", /* D */ - "2/8 \" %21.14e \" \"\\n\"", /* e (undocumented in od), F */ - "4/4 \" %14.7e \" \"\\n\"", /* f */ - "4/4 \" %08x \" \"\\n\"", /* H, X */ - "8/2 \" %04x \" \"\\n\"", /* h, x */ - "4/4 \" %11d \" \"\\n\"", /* I, L, l */ - "8/2 \" %6d \" \"\\n\"", /* i */ - "4/4 \" %011o \" \"\\n\"", /* O */ + "16/1 \"%3_u \" \"\\n\"", /* a */ + "8/2 \" %06o \" \"\\n\"", /* B, o */ + "16/1 \"%03o \" \"\\n\"", /* b */ + "16/1 \"%3_c \" \"\\n\"", /* c */ + "8/2 \" %05u \" \"\\n\"", /* d */ + "4/4 \" %010u \" \"\\n\"", /* D */ + "2/8 \" %21.14e \" \"\\n\"", /* e (undocumented in od), F */ + "4/4 \" %14.7e \" \"\\n\"", /* f */ + "4/4 \" %08x \" \"\\n\"", /* H, X */ + "8/2 \" %04x \" \"\\n\"", /* h, x */ + "4/4 \" %11d \" \"\\n\"", /* I, L, l */ + "8/2 \" %6d \" \"\\n\"", /* i */ + "4/4 \" %011o \" \"\\n\"", /* O */ }; static 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) if ((flags & IGNORE_NON_EMPTY) && errno == ENOTEMPTY) break; #endif - bb_perror_msg("'%s'", path); /* Match gnu rmdir msg. */ + bb_perror_msg("'%s'", path); /* Match gnu rmdir msg. */ status = EXIT_FAILURE; } else if (flags & PARENTS) { /* 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) if (scontext) freecon(scontext); # endif -#endif /* FEATURE_STAT_FORMAT */ +#endif /* FEATURE_STAT_FORMAT */ return 1; } @@ -635,7 +635,7 @@ static bool do_stat(const char *filename, const char *format) human_time(statbuf.st_mtime), human_time(statbuf.st_ctime)); } -#endif /* FEATURE_STAT_FORMAT */ +#endif /* FEATURE_STAT_FORMAT */ return 1; } 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, if (reversed) mode->c_cflag = (mode->c_cflag & ~PARENB & ~CSIZE) | CS8; else - mode->c_cflag = (mode->c_cflag & ~PARODD & ~CSIZE) | PARENB | CS7; + mode->c_cflag = (mode->c_cflag & ~PARODD & ~CSIZE) | PARENB | CS7; } else if (info == &mode_info[IDX_oddp]) { if (reversed) mode->c_cflag = (mode->c_cflag & ~PARENB & ~CSIZE) | CS8; else - mode->c_cflag = (mode->c_cflag & ~CSIZE) | CS7 | PARODD | PARENB; + mode->c_cflag = (mode->c_cflag & ~CSIZE) | CS7 | PARODD | PARENB; } else if (info == &mode_info[IDX_nl]) { if (reversed) { mode->c_iflag = (mode->c_iflag | ICRNL) & ~INLCR & ~IGNCR; - mode->c_oflag = (mode->c_oflag | ONLCR) & ~OCRNL & ~ONLRET; + mode->c_oflag = (mode->c_oflag | ONLCR) & ~OCRNL & ~ONLRET; } else { mode->c_iflag = mode->c_iflag & ~ICRNL; 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) parse_datestr(date_str, &tm_time); /* Correct any day of week and day of year etc. fields */ - tm_time.tm_isdst = -1; /* Be sure to recheck dst */ + tm_time.tm_isdst = -1; /* Be sure to recheck dst */ t = validate_tm_time(date_str, &tm_time); 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; int tty_main(int argc UNUSED_PARAM, char **argv) { const char *s; - IF_INCLUDE_SUSv2(int silent;) /* Note: No longer relevant in SUSv3. */ + IF_INCLUDE_SUSv2(int silent;) /* Note: No longer relevant in SUSv3. */ int retval; - xfunc_error_retval = 2; /* SUSv3 requires > 1 for error. */ + xfunc_error_retval = 2; /* SUSv3 requires > 1 for error. */ IF_INCLUDE_SUSv2(silent = getopt32(argv, "s");) 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) } free(cur_line); - ++dups; /* testing for overflow seems excessive */ + ++dups; /* testing for overflow seems excessive */ } if (old_line) { |