diff options
| -rw-r--r-- | lib/args.c | 6 | ||||
| -rw-r--r-- | lib/bunzip.c | 6 | ||||
| -rw-r--r-- | lib/dirtree.c | 2 | ||||
| -rw-r--r-- | lib/lib.c | 12 | ||||
| -rw-r--r-- | main.c | 2 | ||||
| -rw-r--r-- | scripts/test/testing.sh | 2 | ||||
| -rw-r--r-- | toys/df.c | 2 | ||||
| -rw-r--r-- | toys/echo.c | 4 | ||||
| -rw-r--r-- | toys/mdev.c | 28 | ||||
| -rw-r--r-- | toys/oneit.c | 2 | ||||
| -rw-r--r-- | toys/toysh.c | 10 | ||||
| -rw-r--r-- | www/design.html | 7 |
12 files changed, 42 insertions, 41 deletions
@@ -38,7 +38,7 @@ // -abc means -a -b -c /* This uses a getopt-like option string, but not getopt() itself. - * + * * Each option in options corresponds to a bit position in the return * value (last argument is (1<<0), the next to last is (1<<1) and so on). * If the option isn't seen in argv[] its bit is 0. @@ -57,7 +57,7 @@ * flags = 5, toy[0]=NULL, toy[1]="fruit"; */ -// +// struct opts { struct opts *next; char c; @@ -316,7 +316,7 @@ static int dofileargs(char ***files, int fd, int iswrite) for (;;) { // Are there no more files? - if (!*filename) + if (!*filename) return (fd == -1) ? iswrite : -1; // A filename of "-" means stdin. diff --git a/lib/bunzip.c b/lib/bunzip.c index b7996983..17c91a9b 100644 --- a/lib/bunzip.c +++ b/lib/bunzip.c @@ -212,7 +212,7 @@ int read_bunzip_data(bunzip_data *bd) * * permute[] is the lookup table for converting huffman coded symbols * into decoded symbols. It contains symbol values sorted by length. - * + * * base[] is the amount to subtract from the value of a huffman symbol * of a given length when using permute[]. * @@ -235,9 +235,9 @@ int read_bunzip_data(bunzip_data *bd) // Calculate permute[], and zero temp[] and limit[]. pp = 0; - for (i = minLen; i <= maxLen; i++) + for (i = minLen; i <= maxLen; i++) temp[i] = limit[i] = 0; - for (t = 0; t < symCount; t++) + for (t = 0; t < symCount; t++) if (length[t] == i) hufGroup->permute[pp++] = t; // Count symbols coded for at each bit length diff --git a/lib/dirtree.c b/lib/dirtree.c index b64dfaf5..d56a5dcb 100644 --- a/lib/dirtree.c +++ b/lib/dirtree.c @@ -14,7 +14,7 @@ struct dirtree *dirtree_add_node(char *path) char *name; // Find last chunk of name. - + for (;;) { name = strrchr(path, '/'); @@ -117,7 +117,7 @@ void *xstrndup(char *s, size_t n) { void *ret = xmalloc(++n); strlcpy(ret, s, n); - + return ret; } @@ -133,7 +133,7 @@ char *xmsprintf(char *format, ...) va_list va, va2; int len; char *ret; - + va_start(va, format); va_copy(va2, va); @@ -144,7 +144,7 @@ char *xmsprintf(char *format, ...) // Allocate and do the sprintf() ret = xmalloc(len); - vsnprintf(ret, len, format, va2); + vsnprintf(ret, len, format, va2); va_end(va2); return ret; @@ -299,7 +299,7 @@ char *xabspath(char *path) // Skip duplicate slashes. while (*from=='/') from++; - + // Start of a new filename. Handle . and .. while (*from=='.') { // Skip . @@ -505,7 +505,7 @@ char *readfile(char *name) int fd; char *buf; - fd = open(pidfile, O_RDONLY); + fd = open(name, O_RDONLY); if (fd == -1) return 0; len = fdlength(fd); buf = xmalloc(len+1); @@ -549,7 +549,7 @@ void xpidfile(char *name) // An else with more sanity checking might be nice here. } - + if (i == 3) error_exit("xpidfile %s", name); xwrite(fd, spid, sprintf(spid, "%ld\n", (long)getpid())); @@ -40,7 +40,7 @@ struct toy_list *toy_find(char *name) top = TOY_LIST_LEN-1; for (;;) { int result; - + middle = (top+bottom)/2; if (middle<bottom || middle>top) return NULL; result = strcmp(name,toy_list[middle].name); diff --git a/scripts/test/testing.sh b/scripts/test/testing.sh index 14c9493f..1531193c 100644 --- a/scripts/test/testing.sh +++ b/scripts/test/testing.sh @@ -1,4 +1,4 @@ -# Simple test harness infrastructurei for BusyBox +# Simple test harness infrastructure # # Copyright 2005 by Rob Landley @@ -4,7 +4,7 @@ * * Implemented roughly according to SUSv3: * http://www.opengroup.org/onlinepubs/009695399/utilities/df.html - * + * * usage: df [-k] [-P|-t] [file...] */ diff --git a/toys/echo.c b/toys/echo.c index 397c21a7..d8ee08f2 100644 --- a/toys/echo.c +++ b/toys/echo.c @@ -9,14 +9,14 @@ int echo_main(void) { int i = 0; char *arg, *from = "\\abfnrtv", *to = "\\\a\b\f\n\r\t\v"; - + for (;;) { arg = toys.optargs[i]; if (!arg) break; if (i++) xputc(' '); // Handle -e - + if (toys.optflags&2) { int c, j = 0; for (;;) { diff --git a/toys/mdev.c b/toys/mdev.c index 53be23e0..a4ddb0b7 100644 --- a/toys/mdev.c +++ b/toys/mdev.c @@ -1,7 +1,7 @@ /* vi:set ts=4: - * + * * mdev - Mini udev for busybox - * + * * Copyright 2005 Rob Landley <rob@landley.net> * Copyright 2005 Frank Sorenson <frank@tuxrocks.com> */ @@ -29,16 +29,16 @@ static void make_device(char *path) close(fd); if (len<1) return; temp[len] = 0; - + // Determine device name, type, major and minor - + device_name = strrchr(path, '/') + 1; type = path[5]=='c' ? S_IFCHR : S_IFBLK; major = minor = 0; sscanf(temp, "%u:%u", &major, &minor); // If we have a config file, look up permissions for this device - + if (CFG_MDEV_CONF) { char *conf, *pos, *end; @@ -53,7 +53,7 @@ static void make_device(char *path) for (pos = conf; pos-conf<len;) { int field; char *end2; - + line++; // find end of this line for(end = pos; end-conf<len && *end!='\n'; end++); @@ -78,7 +78,7 @@ static void make_device(char *path) xregcomp(&match, regex, REG_EXTENDED); result=regexec(&match, device_name, 1, &off, 0); regfree(&match); - + // If not this device, skip rest of line if (result || off.rm_so || off.rm_eo!=strlen(device_name)) @@ -159,7 +159,7 @@ static void find_dev(char *path) for (;;) { struct dirent *entry = readdir(dir); - + if (!entry) break; // Skip "." and ".." (also skips hidden files, which is ok) @@ -171,12 +171,12 @@ static void find_dev(char *path) find_dev(path); path[len] = 0; } - + // If there's a dev entry, mknod it - + if (strcmp(entry->d_name, "dev")) make_device(path); } - + closedir(dir); } @@ -188,9 +188,9 @@ int mdev_main(int argc, char *argv[]) strcpy(toybuf, "/sys/class"); find_dev(toybuf); return 0; - } - + } + // hotplug support goes here - + return 0; } diff --git a/toys/oneit.c b/toys/oneit.c index 1f87e5f2..3ac5db4f 100644 --- a/toys/oneit.c +++ b/toys/oneit.c @@ -30,7 +30,7 @@ int oneit_main(void) sync(); reboot(toys.optflags ? RB_POWER_OFF : RB_AUTOBOOT); } - + // Redirect stdio to /dev/tty0, with new session ID, so ctrl-c works. setsid(); for (i=0; i<3; i++) { diff --git a/toys/toysh.c b/toys/toysh.c index f7d86ab9..ced1145d 100644 --- a/toys/toysh.c +++ b/toys/toysh.c @@ -1,5 +1,5 @@ /* vi: set sw=4 ts=4: - * + * * toysh - toybox shell * * Copyright 2006 Rob Landley <rob@landley.net> @@ -80,11 +80,11 @@ static char *parse_pipeline(char *cmdline, struct pipeline *line) if (!cmdline) return 0; if (CFG_TOYSH_JOBCTL) line->cmdline = cmdline; - + // Parse command into argv[] for (;;) { char *end; - + // Skip leading whitespace and detect end of line. while (isspace(*start)) start++; if (!*start || *start=='#') { @@ -192,7 +192,7 @@ int cd_main(void) } int exit_main(void) -{ +{ exit(*toys.optargs ? atoi(*toys.optargs) : 0); } @@ -216,6 +216,6 @@ int toysh_main(void) free(command); } } - + return 1; } diff --git a/www/design.html b/www/design.html index 5380bd74..27e8af43 100644 --- a/www/design.html +++ b/www/design.html @@ -52,7 +52,7 @@ Technica: <a href=http://arstechnica.com/paedia/r/ram_guide/ram_guide.part3-1.html>part three</a>, plus this <a href=http://arstechnica.com/articles/paedia/cpu/caching.ars/1>article on -cacheing</a>, and this one on +cacheing</a>, and this one on <a href=http://arstechnica.com/articles/paedia/cpu/bandwidth-latency.ars>bandwidth and latency</a>. And there's <a href=http://arstechnica.com/paedia/index.html>more where that came from</a>.) @@ -72,7 +72,8 @@ memory returned by malloc() is only a virtual allocation, filled with lots of copy-on-write mappings of the zero page. Actual physical pages get allocated when the copy-on-write gets broken by writing to the virtual page. This is why checking the return value of malloc() isn't very useful anymore, it -only detects running out of virtual memory, not physical memory.)</p> +only detects running out of virtual memory, not physical memory. Unless +you're using a NOMMU system, where all bets are off.)</p> <p>Don't think that just because you don't have a swap file the system can't start swap thrashing: any file backed page (ala mmap) can be evicted, and @@ -123,7 +124,7 @@ get a good bang for the byte.</p> Your binary is the executable file on disk, your heap is where malloc() memory lives, and your stack is where local variables (and function call return addresses) live. Optimizing for binary size is generally good: executing -fewer instructions makes your program run faster (and fits more of it in +fewer instructions makes your program run faster (and fits more of it in cache). On embedded systems, binary size is especially precious because flash is expensive (and its successor, MRAM, even more so). Small stack size is important for nommu systems because they have to preallocate their stack |