diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2017-10-15 23:20:53 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2017-10-15 23:20:53 -0400 |
| commit | 69ab815dbe7981902847dfefd4f4c2d2cc855ef3 (patch) | |
| tree | a118102004c8727be6a62ad08594216f3a85f01d /util | |
| parent | eec6f838ab03789659a05ac74aa0ba1b68de3be6 (diff) | |
| parent | 852dae6f602084e30e305143e61da35ac224338f (diff) | |
| download | e2fsprogs-69ab815dbe7981902847dfefd4f4c2d2cc855ef3.tar.gz | |
Merge branch 'maint' into next
Diffstat (limited to 'util')
| -rw-r--r-- | util/gen-tarball.in | 2 | ||||
| -rw-r--r-- | util/subst.c | 2 | ||||
| -rw-r--r-- | util/symlinks.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/util/gen-tarball.in b/util/gen-tarball.in index a3a02cef..6b90acb6 100644 --- a/util/gen-tarball.in +++ b/util/gen-tarball.in @@ -12,7 +12,7 @@ GZIP=gzip # # This hack is needed because texi2dvi blows up horribly if there are -# any '~' chracters in the directory pathname. So we kludge around it by +# any '~' characters in the directory pathname. So we kludge around it by # using a non-standard directory name for WIP releases. dpkg-source # complains, but life goes on. # diff --git a/util/subst.c b/util/subst.c index e745d863..b37633d2 100644 --- a/util/subst.c +++ b/util/subst.c @@ -1,7 +1,7 @@ /* * subst.c --- substitution program * - * Subst is used as a quicky program to do @ substitutions + * Subst is used as a quickie program to do @ substitutions * */ diff --git a/util/symlinks.c b/util/symlinks.c index 600effac..e9d2b011 100644 --- a/util/symlinks.c +++ b/util/symlinks.c @@ -126,7 +126,7 @@ static int shorten_path (char *path, char *abspath) /* get rid of unnecessary "../dir" sequences */ while (abspath && strlen(abspath) > 1 && (p = strstr(path,"../"))) { - /* find innermost occurance of "../dir", and save "dir" */ + /* find innermost occurrence of "../dir", and save "dir" */ int slashes = 2; char *a, *s, *d = dir; while ((s = strstr(p+3, "../"))) { |