diff --git a/configure.ac b/configure.ac index 75afba80d..4daab0d8f 100644 --- a/configure.ac +++ b/configure.ac @@ -790,7 +790,7 @@ AC_CHECK_DECLS([CPU_ALLOC], [], [], [[ ]]) # on Solaris, you can't mix and match standards, since we use c99 -# aparently at this stage, XOPEN_SOURCE will conflict. As workaround, +# apparently at this stage, XOPEN_SOURCE will conflict. As workaround, # check for crypt.h and use that without XOPEN_SOURCE. have_crypt=no AC_CHECK_HEADERS([crypt.h]) diff --git a/include/c.h b/include/c.h index 02e9e59fa..94b0c3681 100644 --- a/include/c.h +++ b/include/c.h @@ -64,7 +64,7 @@ /* * It evaluates to 1 if the attribute/feature is supported by the current - * compilation targed. Fallback for old compilers. + * compilation target. Fallback for old compilers. */ #ifndef __has_attribute #define __has_attribute(x) 0 diff --git a/lib/colors.c b/lib/colors.c index 77d16d08d..e31751912 100644 --- a/lib/colors.c +++ b/lib/colors.c @@ -36,7 +36,7 @@ #include "debug.h" /* - * Default behavior, may be overriden by terminal-colors.d/{enable,disable}. + * Default behavior, may be overridden by terminal-colors.d/{enable,disable}. */ #ifdef USE_COLORS_BY_DEFAULT # define UL_COLORMODE_DEFAULT UL_COLORMODE_AUTO /* check isatty() */ diff --git a/lib/sysfs.c b/lib/sysfs.c index 74d75897d..ce944001f 100644 --- a/lib/sysfs.c +++ b/lib/sysfs.c @@ -861,7 +861,7 @@ dev_t __sysfs_devname_to_devno(const char *prefix, const char *name, const char dev = st.st_rdev; goto done; } - name += 5; /* unaccesible, or not node in /dev */ + name += 5; /* unaccessible, or not node in /dev */ } _name = strdup(name); diff --git a/libblkid/src/partitions/aix.c b/libblkid/src/partitions/aix.c index 4efdfa33d..03a311a44 100644 --- a/libblkid/src/partitions/aix.c +++ b/libblkid/src/partitions/aix.c @@ -39,7 +39,7 @@ static int probe_aix_pt(blkid_probe pr, * We know nothing about AIX on-disk structures. Everything what we know is the * magic number at begin of the disk. * - * Note, Linux kernel is tring to be smart and AIX signature is ignored when + * Note, Linux kernel is trying to be smart and AIX signature is ignored when * there is a valid DOS partitions table. We don't support such behavior. All * fdisk-like programs has to properly wipe the fist sector. Everything other * is a bug. diff --git a/libblkid/src/partitions/dos.c b/libblkid/src/partitions/dos.c index f8b0ee50d..6e758ecaa 100644 --- a/libblkid/src/partitions/dos.c +++ b/libblkid/src/partitions/dos.c @@ -223,7 +223,7 @@ static int probe_dos_pt(blkid_probe pr, goto nothing; } - /* Another false possitive is NTFS */ + /* Another false positive is NTFS */ if (blkid_probe_is_ntfs(pr) == 1) { DBG(LOWPROBE, ul_debug("probably NTFS -- ignore")); goto nothing; diff --git a/libsmartcols/src/calculate.c b/libsmartcols/src/calculate.c index 9426ebb05..a0c0dc4b9 100644 --- a/libsmartcols/src/calculate.c +++ b/libsmartcols/src/calculate.c @@ -136,7 +136,7 @@ static int count_column_width(struct libscols_table *tb, if (scols_column_is_tree(cl) && has_groups(tb)) { /* We don't fill buffer with groups tree ascii art during width - * calcualtion. The print function only enlarge grpset[] and we + * calculation. The print function only enlarge grpset[] and we * calculate final width from grpset_size. */ size_t gprwidth = tb->grpset_size + 1; diff --git a/login-utils/login.c b/login-utils/login.c index 6b9d27e3e..d213e4784 100644 --- a/login-utils/login.c +++ b/login-utils/login.c @@ -24,7 +24,7 @@ * from this software without specific prior written permission. * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED - * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ #include #include diff --git a/m4/ul.m4 b/m4/ul.m4 index e32af44a3..0be8a91e6 100644 --- a/m4/ul.m4 +++ b/m4/ul.m4 @@ -155,7 +155,7 @@ dnl UL_REQUIRES_LINUX(NAME, [VARSUFFIX = $1]) dnl dnl Modifies $build_ variable according to $enable_ and OS type. The dnl $enable_ could be "yes", "no" and "check". If build_ is "no" then -dnl all checks are skiped. +dnl all checks are skipped. dnl dnl The default for $build_ and $enable_ could be overwrited by option $2. dnl @@ -184,7 +184,7 @@ dnl UL_EXCLUDE_ARCH(NAME, ARCH, [VARSUFFIX = $1]) dnl dnl Modifies $build_ variable according to $enable_ and $host. The dnl $enable_ could be "yes", "no" and "check". If build_ is "no" then -dnl all checks are skiped. +dnl all checks are skipped. dnl dnl The default for $build_ and $enable_ could be overwrited by option $3. dnl @@ -214,7 +214,7 @@ dnl UL_REQUIRES_ARCH(NAME, ARCH, [VARSUFFIX = $1]) dnl dnl Modifies $build_ variable according to $enable_ and $host. The dnl $enable_ could be "yes", "no" and "check". If build_ is "no" then -dnl all checks are skiped. +dnl all checks are skipped. dnl dnl The maybe a list, then at least one of the patterns in the list dnl have to match. @@ -386,7 +386,7 @@ dnl UL_REQUIRES_SYSCALL_CHECK(NAME, SYSCALL-TEST, [SYSCALLNAME=$1], [VARSUFFIX=$ dnl dnl Modifies $build_ variable according to $enable_ and SYSCALL-TEST dnl result. The $enable_ variable could be "yes", "no" and "check". If build_ -dnl is "no" then all checks are skiped. +dnl is "no" then all checks are skipped. dnl dnl Note that SYSCALL-TEST has to define $ul_cv_syscall_ variable, see dnl also UL_CHECK_SYSCALL(). diff --git a/sys-utils/mountpoint.1 b/sys-utils/mountpoint.1 index 6669b13eb..23e4536fc 100644 --- a/sys-utils/mountpoint.1 +++ b/sys-utils/mountpoint.1 @@ -29,7 +29,7 @@ directory. Be quiet - don't print anything. .TP .B "\-\-nofollow" -Do not follow symbolic link if it the last elemnt of the +Do not follow symbolic link if it the last element of the .I directory path. .TP diff --git a/tests/ts/blkid/md-raid1-part b/tests/ts/blkid/md-raid1-part index e4ec58e9e..2d2b47908 100755 --- a/tests/ts/blkid/md-raid1-part +++ b/tests/ts/blkid/md-raid1-part @@ -85,7 +85,7 @@ udevadm settle ts_unlock "md" ts_fdisk_clean $TS_DEVICE -# substitue UUIDs and major/minor number before comparison +# substitute UUIDs and major/minor number before comparison sed -i \ -e 's/^\(ID_FS_UUID\)=.*/\1=__ts_uuid__/' \ -e 's/^\(ID_FS_UUID_ENC\)=.*/\1=__ts_uuid_enc__/' \ diff --git a/tests/ts/mount/fstab-symlink b/tests/ts/mount/fstab-symlink index c791f3127..34934734e 100755 --- a/tests/ts/mount/fstab-symlink +++ b/tests/ts/mount/fstab-symlink @@ -50,7 +50,7 @@ $TS_CMD_MOUNT $LINKNAME >> $TS_OUTPUT 2>> $TS_ERRLOG ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts" $TS_CMD_UMOUNT $LINKNAME || ts_die "A) Cannot umount $LINKNAME" -# varian B) -- disabled, the $TS_CMD_MOUNT is usually not a real program, but +# variant B) -- disabled, the $TS_CMD_MOUNT is usually not a real program, but # libtool wrapper and the real mount is exec()ed with # LD_LIBRARY_PATH. This all is bad for suid programs... diff --git a/tests/ts/mount/fstab-uuid b/tests/ts/mount/fstab-uuid index fa6ddff3f..6f4ec1f0d 100755 --- a/tests/ts/mount/fstab-uuid +++ b/tests/ts/mount/fstab-uuid @@ -39,17 +39,17 @@ UUID=$(ts_uuid_by_devname "$DEVICE") || ts_die "Cannot find UUID on $DEVICE" ts_fstab_add "UUID=$UUID" ts_udevadm_settle "$DEVICE" "UUID" -# varian A) +# variant A) $TS_CMD_MOUNT $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts" $TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE" -# varian B) +# variant B) $TS_CMD_MOUNT -U $UUID >> $TS_OUTPUT 2>> $TS_ERRLOG ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts" $TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE" -# varian C) +# variant C) $TS_CMD_MOUNT UUID=$UUID >> $TS_OUTPUT 2>> $TS_ERRLOG ts_is_mounted $DEVICE || ts_die "C) Cannot find $DEVICE in /proc/mounts" $TS_CMD_UMOUNT $DEVICE || ts_die "C) Cannot umount $DEVICE" diff --git a/text-utils/more.c b/text-utils/more.c index 6e1ca569c..0d9d62571 100644 --- a/text-utils/more.c +++ b/text-utils/more.c @@ -12,7 +12,7 @@ * from this software without specific prior written permission. * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED - * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ /* more.c - General purpose tty output filter and file perusal program diff --git a/tools/checkdecl.sh b/tools/checkdecl.sh index bd9ee6975..4ff4a10da 100755 --- a/tools/checkdecl.sh +++ b/tools/checkdecl.sh @@ -1,7 +1,7 @@ #!/bin/sh # -# This script checkd for #ifdef HAVE_DECL_SYMBOL in code. +# This script checks for #ifdef HAVE_DECL_SYMBOL in code. # # Autoconf docs: #