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

whitespace and comment fixes, no code changes

Browse Source
This commit is contained in:
Denis Vlasenko 2008-06-16 04:09:25 +00:00
parent 57c899e4c2
commit f45c4f41b7
9 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/busybox.net/news.html
View File

@ -191,7 +191,7 @@ iproute_list_or_flush 3680 readhere 2308
<li>tail: fix "tail -c 20 /dev/huge_disk" (was taking ages) <li>tail: fix "tail -c 20 /dev/huge_disk" (was taking ages)
<li>tar: compat: handle tarballs with only one zero block at the end <li>tar: compat: handle tarballs with only one zero block at the end
<li>tar: autodetection of gz/bz2 compressed tarballs. Closes bug 992 <li>tar: autodetection of gz/bz2 compressed tarballs. Closes bug 992
<li>tar: real support for -p. By Natanael Copa &lt;natanael.copa at gmail.com&gt; <li>tar: real support for -p. By Natanael Copa &lt;natanael.copa at gmail.com&gt;
<li>tcpudp: narrow down time window where we have no wildcard socket <li>tcpudp: narrow down time window where we have no wildcard socket
<li>telnetd: use login always, not "sometimes login, sometimes shell" <li>telnetd: use login always, not "sometimes login, sometimes shell"
<li>test: fix mishandling of "test ! arg1 op arg2 more args" <li>test: fix mishandling of "test ! arg1 op arg2 more args"

4
libbb/pw_encrypt.c
View File

@ -14,10 +14,6 @@
/* /*
* DES and MD5 crypt implementations are taken from uclibc. * DES and MD5 crypt implementations are taken from uclibc.
* They were modified to not use static buffers. * They were modified to not use static buffers.
* Comparison with uclibc (before uclibc had 70k staic buffers reinstated):
* text data bss dec hex filename
* 759909 604 6684 767197 bb4dd busybox_old
* 759579 604 6684 766867 bb393 busybox_unstripped
*/ */
/* Common for them */ /* Common for them */
static const uint8_t ascii64[] = "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; static const uint8_t ascii64[] = "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";

6
libbb/pw_encrypt_des.c
View File

@ -201,7 +201,7 @@ static const uint32_t bits32[32] =
static const uint8_t bits8[8] = { 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01 }; static const uint8_t bits8[8] = { 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01 };
static int static int
ascii_to_bin(char ch) ascii_to_bin(char ch)
{ {
if (ch > 'z') if (ch > 'z')
@ -220,8 +220,8 @@ ascii_to_bin(char ch)
} }
/* Static stuff that stays resident and doesn't change after /* Static stuff that stays resident and doesn't change after
* being initialized, and therefore doesn't need to be made * being initialized, and therefore doesn't need to be made
* reentrant. */ * reentrant. */
struct const_des_ctx { struct const_des_ctx {
#if USE_ip_mask #if USE_ip_mask

4
loginutils/Config.in
View File

@ -71,8 +71,8 @@ config USE_BB_CRYPT
DES encryption/decryption. DES encryption/decryption.
For busybox, having large static buffers is undesirable, For busybox, having large static buffers is undesirable,
especially on NOMMU machines. Busybox also doesn't especially on NOMMU machines. Busybox also doesn't need
need DES encryption/decryption and can do with smaller code. DES encryption/decryption and can do with smaller code.
If you enable this option, it will add about 4.8k of code If you enable this option, it will add about 4.8k of code
if you are building dynamically linked executable. if you are building dynamically linked executable.

8
modutils/Config.in
View File

@ -153,10 +153,10 @@ config FEATURE_MODPROBE_BLACKLIST
default n default n
depends on MODPROBE && FEATURE_2_6_MODULES depends on MODPROBE && FEATURE_2_6_MODULES
help help
Say 'y' here to enable support for the 'blacklist' command in Say 'y' here to enable support for the 'blacklist' command in
modprobe.conf. This prevents the alias resolver to resolve modprobe.conf. This prevents the alias resolver to resolve
blacklisted modules. This is useful if you want to prevent your blacklisted modules. This is useful if you want to prevent your
hardware autodetection scripts to load modules like evdev, frame hardware autodetection scripts to load modules like evdev, frame
buffer drivers etc. buffer drivers etc.
comment "Options common to multiple modutils" comment "Options common to multiple modutils"

2
modutils/depmod.c
View File

@ -181,7 +181,7 @@ int depmod_main(int ATTRIBUTE_UNUSED argc, char **argv)
char *shortname = llist_pop(&old_deps); char *shortname = llist_pop(&old_deps);
while (all) { while (all) {
char *nam = char *nam =
xstrdup(bb_get_last_path_component_nostrip(all->name)); xstrdup(bb_get_last_path_component_nostrip(all->name));
char *tmp = strrstr(nam, ".ko"); char *tmp = strrstr(nam, ".ko");

6
modutils/modprobe.c
View File

@ -232,10 +232,10 @@ static char *parse_command_string(char *src, char **dst)
#endif /* ENABLE_FEATURE_MODPROBE_MULTIPLE_OPTIONS */ #endif /* ENABLE_FEATURE_MODPROBE_MULTIPLE_OPTIONS */
static int is_conf_command(char *buffer, const char *command) static int is_conf_command(char *buffer, const char *command)
{ {
int len = strlen(command); int len = strlen(command);
return ((strstr(buffer, command) == buffer) && return ((strstr(buffer, command) == buffer) &&
isspace(buffer[len])); isspace(buffer[len]));
} }
/* /*
@ -325,7 +325,7 @@ static void include_conf(struct dep_t **first, struct dep_t **current, char *buf
include_conf(first, current, buffer, buflen, fdi); include_conf(first, current, buffer, buflen, fdi);
close(fdi); close(fdi);
} }
} else if (ENABLE_FEATURE_MODPROBE_BLACKLIST && } else if (ENABLE_FEATURE_MODPROBE_BLACKLIST &&
(is_conf_command(buffer, "blacklist"))) { (is_conf_command(buffer, "blacklist"))) {
char *mod; char *mod;
struct dep_t *dt; struct dep_t *dt;

2
networking/arp.c
View File

@ -314,7 +314,7 @@ arp_disp(const char *name, char *ip, int type, int arp_flags,
char *hwa, char *mask, char *dev) char *hwa, char *mask, char *dev)
{ {
static const int arp_masks[] = { static const int arp_masks[] = {
ATF_PERM, ATF_PUBL, ATF_PERM, ATF_PUBL,
#ifdef HAVE_ATF_MAGIC #ifdef HAVE_ATF_MAGIC
ATF_MAGIC, ATF_MAGIC,
#endif #endif

2
util-linux/fdisk_osf.c
View File

@ -516,7 +516,7 @@ xbsd_print_disklabel(int show_all)
printf("disk: %.*s\n", (int) sizeof(lp->d_typename), lp->d_typename); printf("disk: %.*s\n", (int) sizeof(lp->d_typename), lp->d_typename);
printf("label: %.*s\n", (int) sizeof(lp->d_packname), lp->d_packname); printf("label: %.*s\n", (int) sizeof(lp->d_packname), lp->d_packname);
printf("flags: "); printf("flags: ");
print_flags_separated(d_masks, "removable\0""ecc\0""badsect\0", lp->d_flags, " "); print_flags_separated(d_masks, "removable\0""ecc\0""badsect\0", lp->d_flags, " ");
bb_putchar('\n'); bb_putchar('\n');
/* On various machines the fields of *lp are short/int/long */ /* On various machines the fields of *lp are short/int/long */
/* In order to avoid problems, we cast them all to long. */ /* In order to avoid problems, we cast them all to long. */