emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

*: whitespace fixes

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2010-10-28 18:57:19 +02:00
parent 7765095441
commit e4dcba1c10
82 changed files with 185 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
coreutils/env.c
View File

@@ -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

6
coreutils/md5_sha1_sum.c
View File

@@ -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,

2
coreutils/mkfifo.c
View File

@@ -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);

28
coreutils/od.c
View File

@@ -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";

2
coreutils/rmdir.c
View File

@@ -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. */

4
coreutils/stat.c
View File

@@ -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;
}

6
coreutils/stty.c
View File

@@ -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;

2
coreutils/touch.c
View File

@@ -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;

4
coreutils/tty.c
View File

@@ -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;)

2
coreutils/uniq.c
View File

@@ -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) {