aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Spiro <jasonspiro@users.noreply.github.com>2019-02-15 00:08:25 -0500
committerRob Landley <rob@landley.net>2019-02-15 09:19:27 -0600
commit86cf62c69e9a1869054141ddaee5087e4c9fc417 (patch)
tree6791768e6bd601344df3a9ffb0f17b1e531d7bc1
parentb31192fd73b382358b1deb33dc6c4cf4ce9c613f (diff)
downloadtoybox-86cf62c69e9a1869054141ddaee5087e4c9fc417.tar.gz
Fix typos: e.g. change "cannonical" to "canonical".
-rw-r--r--lib/xwrap.c2
-rw-r--r--toys/other/readlink.c4
-rw-r--r--toys/posix/pwd.c2
-rwxr-xr-xwww/news.html2
4 files changed, 5 insertions, 5 deletions
diff --git a/lib/xwrap.c b/lib/xwrap.c
index 08b814f1..12016a21 100644
--- a/lib/xwrap.c
+++ b/lib/xwrap.c
@@ -504,7 +504,7 @@ void xstat(char *path, struct stat *st)
if(stat(path, st)) perror_exit("Can't stat %s", path);
}
-// Cannonicalize path, even to file with one or more missing components at end.
+// Canonicalize path, even to file with one or more missing components at end.
// if exact, require last path component to exist
char *xabspath(char *path, int exact)
{
diff --git a/toys/other/readlink.c b/toys/other/readlink.c
index 6a1a7443..beef92b0 100644
--- a/toys/other/readlink.c
+++ b/toys/other/readlink.c
@@ -12,7 +12,7 @@ config READLINK
With no options, show what symlink points to, return error if not symlink.
- Options for producing cannonical paths (all symlinks/./.. resolved):
+ Options for producing canonical paths (all symlinks/./.. resolved):
-e Canonical path to existing entry (fail if missing)
-f Full path (fail if directory missing)
@@ -28,7 +28,7 @@ void readlink_main(void)
{
char *s;
- // Calculating full cannonical path?
+ // Calculating full canonical path?
// Take advantage of flag positions to calculate m = -1, f = 0, e = 1
if (toys.optflags & (FLAG_f|FLAG_e|FLAG_m))
s = xabspath(*toys.optargs, (toys.optflags&(FLAG_f|FLAG_e))-1);
diff --git a/toys/posix/pwd.c b/toys/posix/pwd.c
index 08f39bf6..4c6ae99b 100644
--- a/toys/posix/pwd.c
+++ b/toys/posix/pwd.c
@@ -15,7 +15,7 @@ config PWD
Print working (current) directory.
-L Use shell's path from $PWD (when applicable)
- -P Print cannonical absolute path
+ -P Print canonical absolute path
*/
#define FOR_pwd
diff --git a/www/news.html b/www/news.html
index 600b298d..d010faa2 100755
--- a/www/news.html
+++ b/www/news.html
@@ -42,7 +42,7 @@ arguments, <b>cmp</b> accepts --quiet and --silent as synonyms for -s, <b>hostna
added -sfd, <b>head</b> added --bytes as a synonym for -c and --lines as a synonym
for -n, <b>mktemp</b> added -t and fixed -u, <b>sed</b> added -z and -iEXT to keep backup files,
<b>md5sum</b> and sha1sum added --status and --check as synonyms -s and -c,
-<b>readlink</b> added --cannonicalize as a synonym for -f, <b>sort</b> grew -V,
+<b>readlink</b> added --canonicalize as a synonym for -f, <b>sort</b> grew -V,
<b>patch</b> added -s its synonym --quiet, <b>stat</b> added --format as
a synonym for -c, <b>xargs</b> added -p -t -r,
Eduardas Meile asked