diff options
| -rw-r--r-- | Config.in | 2 | ||||
| -rw-r--r-- | lib/lib.c | 6 | ||||
| -rw-r--r-- | lib/lib.h | 6 | ||||
| -rw-r--r-- | lib/net.c | 2 | ||||
| -rw-r--r-- | lib/tty.c | 14 | ||||
| -rw-r--r-- | toys/net/netcat.c | 2 | ||||
| -rw-r--r-- | toys/other/losetup.c | 2 | ||||
| -rw-r--r-- | toys/other/taskset.c | 2 | ||||
| -rw-r--r-- | toys/pending/dhcp.c | 2 | ||||
| -rw-r--r-- | toys/pending/dhcp6.c | 4 | ||||
| -rw-r--r-- | toys/pending/fsck.c | 6 | ||||
| -rw-r--r-- | toys/pending/host.c | 2 | ||||
| -rw-r--r-- | toys/pending/more.c | 4 | ||||
| -rw-r--r-- | toys/pending/traceroute.c | 8 | ||||
| -rw-r--r-- | toys/posix/expand.c | 2 | ||||
| -rw-r--r-- | toys/posix/od.c | 2 | ||||
| -rw-r--r-- | toys/posix/sed.c | 2 | ||||
| -rwxr-xr-x | www/news.html | 2 |
18 files changed, 35 insertions, 35 deletions
@@ -76,7 +76,7 @@ config TOYBOX_LIBCRYPTO bool "Use libcrypto (OpenSSL/BoringSSL)" default n help - Use faster hash functions out of exteral -lcrypto library. + Use faster hash functions out of external -lcrypto library. config TOYBOX_LIBZ bool "Use libz (zlib)" @@ -542,12 +542,12 @@ char *readfile(char *name, char *ibuf, off_t len) } // Sleep for this many thousandths of a second -void msleep(long miliseconds) +void msleep(long milliseconds) { struct timespec ts; - ts.tv_sec = miliseconds/1000; - ts.tv_nsec = (miliseconds%1000)*1000000; + ts.tv_sec = milliseconds/1000; + ts.tv_nsec = (milliseconds%1000)*1000000; nanosleep(&ts, &ts); } @@ -204,7 +204,7 @@ int mkpath(char *dir); struct string_list **splitpath(char *path, struct string_list **list); char *readfileat(int dirfd, char *name, char *buf, off_t *len); char *readfile(char *name, char *buf, off_t len); -void msleep(long miliseconds); +void msleep(long milliseconds); void nanomove(struct timespec *ts, long long offset); long long nanodiff(struct timespec *old, struct timespec *new); int highest_bit(unsigned long l); @@ -292,10 +292,10 @@ int draw_trim(char *str, int padto, int width); int tty_fd(void); int terminal_size(unsigned *xx, unsigned *yy); int terminal_probesize(unsigned *xx, unsigned *yy); -int scan_key_getsize(char *scratch, int miliwait, unsigned *xx, unsigned *yy); +int scan_key_getsize(char *scratch, int timeout_ms, unsigned *xx, unsigned *yy); int set_terminal(int fd, int raw, int speed, struct termios *old); void xset_terminal(int fd, int raw, int speed, struct termios *old); -int scan_key(char *scratch, int miliwait); +int scan_key(char *scratch, int timeout_ms); void tty_esc(char *s); void tty_jump(int x, int y); void tty_reset(void); @@ -84,7 +84,7 @@ int xpoll(struct pollfd *fds, int nfds, int timeout) } // Loop forwarding data from in1 to out1 and in2 to out2, handling -// half-connection shutdown. timeouts return if no data for X miliseconds. +// half-connection shutdown. timeouts return if no data for X ms. // Returns 0: both closed, 1 shutdown_timeout, 2 timeout int pollinate(int in1, int in2, int out1, int out2, int timeout, int shutdown_timeout) { @@ -63,11 +63,11 @@ int terminal_probesize(unsigned *xx, unsigned *yy) // Wrapper that parses results from ANSI probe to update screensize. // Otherwise acts like scan_key() -int scan_key_getsize(char *scratch, int miliwait, unsigned *xx, unsigned *yy) +int scan_key_getsize(char *scratch, int timeout_ms, unsigned *xx, unsigned *yy) { int key; - if (512&(key = scan_key(scratch, miliwait))) { + if (512&(key = scan_key(scratch, timeout_ms))) { if (key>0) { if (xx) *xx = (key>>10)&1023; if (yy) *yy = (key>>20)&1023; @@ -157,13 +157,13 @@ struct scan_key_list { ); // Scan stdin for a keypress, parsing known escape sequences -// Blocks for miliwait miliseconds, none 0, forever if -1 +// Blocks for timeout_ms milliseconds, none 0, forever if -1 // Returns: 0-255=literal, -1=EOF, -2=TIMEOUT, 256-...=index into scan_key_list // >512 is x<<9+y<<21 // scratch space is necessary because last char of !seq could start new seq // Zero out first byte of scratch before first call to scan_key // block=0 allows fetching multiple characters before updating display -int scan_key(char *scratch, int miliwait) +int scan_key(char *scratch, int timeout_ms) { struct pollfd pfd; int maybe, i, j; @@ -210,9 +210,9 @@ int scan_key(char *scratch, int miliwait) // Need more data to decide - // 30 miliseconds is about the gap between characters at 300 baud - if (maybe || miliwait != -1) - if (!xpoll(&pfd, 1, maybe ? 30 : miliwait)) break; + // 30ms is about the gap between characters at 300 baud + if (maybe || timeout_ms != -1) + if (!xpoll(&pfd, 1, maybe ? 30 : timeout_ms)) break; // Read 1 byte so we don't overshoot sequence match. (We can deviate // and fail to match, but match consumes entire buffer.) diff --git a/toys/net/netcat.c b/toys/net/netcat.c index e98f12b2..673d5d19 100644 --- a/toys/net/netcat.c +++ b/toys/net/netcat.c @@ -74,7 +74,7 @@ void netcat_main(void) int family = AF_UNSPEC, type = SOCK_STREAM; pid_t child; - // Addjust idle and quit_delay to miliseconds or -1 for no timeout + // Addjust idle and quit_delay to ms or -1 for no timeout TT.W = TT.W ? TT.W*1000 : -1; TT.q = TT.q ? TT.q*1000 : -1; diff --git a/toys/other/losetup.c b/toys/other/losetup.c index f4ab752c..d77a9500 100644 --- a/toys/other/losetup.c +++ b/toys/other/losetup.c @@ -26,7 +26,7 @@ config LOSETUP new: -s Show device name (alias --show) - -o Start assocation at OFFSET into FILE + -o Start association at OFFSET into FILE -r Read only -S Limit SIZE of loopback association (alias --sizelimit) */ diff --git a/toys/other/taskset.c b/toys/other/taskset.c index 89fd5283..6a9de77f 100644 --- a/toys/other/taskset.c +++ b/toys/other/taskset.c @@ -22,7 +22,7 @@ config TASKSET usage: taskset [-ap] [mask] [PID | cmd [args...]] Launch a new task which may only run on certain processors, or change - the processor affinity of an exisitng PID. + the processor affinity of an existing PID. Mask is a hex string where each bit represents a processor the process is allowed to run on. PID without a mask displays existing affinity. diff --git a/toys/pending/dhcp.c b/toys/pending/dhcp.c index d1f8e801..2dd392dc 100644 --- a/toys/pending/dhcp.c +++ b/toys/pending/dhcp.c @@ -13,7 +13,7 @@ config DHCP usage: dhcp [-fbnqvoCRB] [-i IFACE] [-r IP] [-s PROG] [-p PIDFILE] [-H HOSTNAME] [-V VENDOR] [-x OPT:VAL] [-O OPT] - Configure network dynamicaly using DHCP. + Configure network dynamically using DHCP. -i Interface to use (default eth0) -p Create pidfile diff --git a/toys/pending/dhcp6.c b/toys/pending/dhcp6.c index 18aee8a3..c69c4aed 100644 --- a/toys/pending/dhcp6.c +++ b/toys/pending/dhcp6.c @@ -11,11 +11,11 @@ config DHCP6 help usage: dhcp6 [-fbnqvR] [-i IFACE] [-r IP] [-s PROG] [-p PIDFILE] - Configure network dynamicaly using DHCP. + Configure network dynamically using DHCP. -i Interface to use (default eth0) -p Create pidfile - -s Run PROG at DHCP events + -s Run PROG at DHCP events -t Send up to N Solicit packets -T Pause between packets (default 3 seconds) -A Wait N seconds after failure (default 20) diff --git a/toys/pending/fsck.c b/toys/pending/fsck.c index ac00bff7..ea7c59cd 100644 --- a/toys/pending/fsck.c +++ b/toys/pending/fsck.c @@ -9,8 +9,8 @@ config FSCK bool "fsck" default n help - usage: fsck [-ANPRTV] [-C FD] [-t FSTYPE] [FS_OPTS] [BLOCKDEV]... - + usage: fsck [-ANPRTV] [-C FD] [-t FSTYPE] [FS_OPTS] [BLOCKDEV]... + Check and repair filesystems -A Walk /etc/fstab and check all filesystems @@ -19,7 +19,7 @@ config FSCK -R With -A, skip the root filesystem -T Don't show title on startup -V Verbose - -C n Write status information to specified filedescriptor + -C n Write status information to specified file descriptor -t TYPE List of filesystem types to check */ diff --git a/toys/pending/host.c b/toys/pending/host.c index 5e3edd87..dea97b13 100644 --- a/toys/pending/host.c +++ b/toys/pending/host.c @@ -13,7 +13,7 @@ config HOST usage: host [-av] [-t TYPE] NAME [SERVER] Perform DNS lookup on NAME, which can be a domain name to lookup, - or an ipv4 dotted or ipv6 colon seprated address to reverse lookup. + or an IPv4 dotted or IPv6 colon-seperated address to reverse lookup. SERVER (if present) is the DNS server to use. -a no idea diff --git a/toys/pending/more.c b/toys/pending/more.c index fa96d40e..79bb7bf9 100644 --- a/toys/pending/more.c +++ b/toys/pending/more.c @@ -1,4 +1,4 @@ -/* more.c - View FILE (or stdin) one screenful at a time. +/* more.c - View FILE (or stdin) one screenfull at a time. * * Copyright 2013 Bilal Qureshi <bilal.jmi@gmail.com> * @@ -12,7 +12,7 @@ config MORE help usage: more [FILE...] - View FILE(s) (or stdin) one screenful at a time. + View FILE(s) (or stdin) one screenfull at a time. */ #define FOR_more diff --git a/toys/pending/traceroute.c b/toys/pending/traceroute.c index 9a818eb4..d5ead9e2 100644 --- a/toys/pending/traceroute.c +++ b/toys/pending/traceroute.c @@ -15,13 +15,13 @@ config TRACEROUTE help usage: traceroute [-46FUIldnvr] [-f 1ST_TTL] [-m MAXTTL] [-p PORT] [-q PROBES] [-s SRC_IP] [-t TOS] [-w WAIT_SEC] [-g GATEWAY] [-i IFACE] [-z PAUSE_MSEC] HOST [BYTES] - - traceroute6 [-dnrv] [-m MAXTTL] [-p PORT] [-q PROBES][-s SRC_IP] [-t TOS] [-w WAIT_SEC] + + traceroute6 [-dnrv] [-m MAXTTL] [-p PORT] [-q PROBES][-s SRC_IP] [-t TOS] [-w WAIT_SEC] [-i IFACE] HOST [BYTES] Trace the route to HOST - -4,-6 Force IP or IPv6 name resolution + -4,-6 Force IP or IPv6 name resolution -F Set the don't fragment bit (supports IPV4 only) -U Use UDP datagrams instead of ICMP ECHO (supports IPV4 only) -I Use ICMP ECHO instead of UDP datagrams (supports IPV4 only) @@ -37,7 +37,7 @@ config TRACEROUTE -t Type-of-service in probe packets (default 0)(RANGE 0 to 255) -w Time in seconds to wait for a response (default 3)(RANGE 0 to 86400) -g Loose source route gateway (8 max) (supports IPV4 only) - -z Pause Time in milisec (default 0)(RANGE 0 to 86400) (supports IPV4 only) + -z Pause Time in ms (default 0)(RANGE 0 to 86400) (supports IPV4 only) -f Start from the 1ST_TTL hop (instead from 1)(RANGE 1 to 255) (supports IPV4 only) -i Specify a network interface to operate with */ diff --git a/toys/posix/expand.c b/toys/posix/expand.c index 301d361e..f1fd8d33 100644 --- a/toys/posix/expand.c +++ b/toys/posix/expand.c @@ -18,7 +18,7 @@ config EXPAND Specify tab stops, either a single number instead of the default 8, or a comma separated list of increasing numbers representing tabstop - positions (absolute, not increments) with each additional tab beyound + positions (absolute, not increments) with each additional tab beyond that becoming one space. */ diff --git a/toys/posix/od.c b/toys/posix/od.c index c9c5c486..f45c8654 100644 --- a/toys/posix/od.c +++ b/toys/posix/od.c @@ -13,7 +13,7 @@ config OD help usage: od [-bcdosxv] [-j #] [-N #] [-w #] [-A doxn] [-t acdfoux[#]] - -A Address base (decimal, octal, hexdecimal, none) + -A Address base (decimal, octal, hexadecimal, none) -j Skip this many bytes of input -N Stop dumping after this many bytes -t Output type a(scii) c(har) d(ecimal) f(loat) o(ctal) u(nsigned) (he)x diff --git a/toys/posix/sed.c b/toys/posix/sed.c index 5e516249..0c31d2af 100644 --- a/toys/posix/sed.c +++ b/toys/posix/sed.c @@ -56,7 +56,7 @@ config SED Backslashes may be used to escape the delimiter if it occurs in the regex, and for the usual printf escapes (\abcefnrtv and octal, hex, and unicode). An empty regex repeats the previous one. ADDRESS regexes - (above) require the first delimeter to be escaped with a backslash when + (above) require the first delimiter to be escaped with a backslash when it isn't a forward slash (to distinguish it from the COMMANDs below). Sed mostly operates on individual lines one at a time. It reads each line, diff --git a/www/news.html b/www/news.html index d010faa2..08191ea3 100755 --- a/www/news.html +++ b/www/news.html @@ -1081,7 +1081,7 @@ for arrays of structures starting with a name string.</p></li> and so on), and for tracking multiple lines of text (vi, less, shell history) that need wordwrapping and scrolling up/down.</p></li> <li><p>Upgrades to lib/interestingtimes.c: scan_key() now has a timeout -in miliseconds and recognizes more sequences including ANSI +in milliseconds and recognizes more sequences including ANSI window size probes. New utf8 test files in tests/files/utf8 including sequence reversing, stacked combining chars, and all three types of unprintable sequences (low ascii <32 ala ^X, invalid utf8 sequences ala |