From: Ville Skyttä Date: Tue, 4 Jun 2024 20:44:40 +0000 (+0300) Subject: *: spelling and grammar fixes X-Git-Tag: v2.42-start~303^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1a02c7a7a9257b597eabd0bc26e9a01697c23db7;p=thirdparty%2Futil-linux.git *: spelling and grammar fixes Signed-off-by: Ville Skyttä --- diff --git a/configure.ac b/configure.ac index b360e448ea..b452ae248e 100644 --- a/configure.ac +++ b/configure.ac @@ -120,7 +120,7 @@ AS_CASE([$libdir], ) AC_SUBST([usrlib_execdir]) -# static configuration maintaned by packages (e.g. /usr/lib) +# static configuration maintained by packages (e.g. /usr/lib) AC_ARG_VAR([SYSCONFSTATICDIR], [Path to static system configuration, default ${prefix}/lib]) AS_IF([test "x$SYSCONFSTATICDIR" = x], diff --git a/disk-utils/fdisk.8.adoc b/disk-utils/fdisk.8.adoc index d7b863f2d2..cb72b4a3ea 100644 --- a/disk-utils/fdisk.8.adoc +++ b/disk-utils/fdisk.8.adoc @@ -33,7 +33,7 @@ Block devices can be divided into one or more logical disks called _partitions_. //TRANSLATORS: Keep {plus} untranslated. All partitioning is driven by device I/O limits (the topology) by default. *fdisk* is able to optimize the disk layout for a 4K-sector size and use an alignment offset on modern devices for MBR and GPT. It is always a good idea to follow *fdisk*'s defaults as the default values (e.g., first and last partition sectors) and partition sizes specified by the {plus}/-{M,G,...} notation are always aligned according to the device properties. -CHS (Cylinder-Head-Sector) addressing is deprecated and not used by default. Please, do not follow old articles and recommendations with *fdisk -S -H * advices for SSD or 4K-sector devices. +CHS (Cylinder-Head-Sector) addressing is deprecated and not used by default. Please, do not follow old articles and recommendations with *fdisk -S -H * advice for SSD or 4K-sector devices. Note that *partx*(8) provides a rich interface for scripts to print disk layouts, *fdisk* is mostly designed for humans. Backward compatibility in the output of *fdisk* is not guaranteed. The input (the commands) should always be backward compatible. diff --git a/disk-utils/sfdisk.c b/disk-utils/sfdisk.c index d8dd8d296a..0575373dca 100644 --- a/disk-utils/sfdisk.c +++ b/disk-utils/sfdisk.c @@ -119,7 +119,7 @@ struct sfdisk { json : 1, /* JSON dump */ movedata: 1, /* move data after resize */ movefsync: 1, /* use fsync() after each write() */ - notell : 1, /* don't tell kernel aout new PT */ + notell : 1, /* don't tell kernel about new PT */ noact : 1; /* do not write to device */ }; diff --git a/include/xxhash.h b/include/xxhash.h index 9451967d45..bfb1a95941 100644 --- a/include/xxhash.h +++ b/include/xxhash.h @@ -766,7 +766,7 @@ XXH_PUBLIC_API XXH64_hash_t XXH64_hashFromCanonical(const XXH64_canonical_t* src * * XXH3 implementation is portable: * it has a generic C90 formulation that can be compiled on any platform, - * all implementations generage exactly the same hash value on all platforms. + * all implementations generate exactly the same hash value on all platforms. * Starting from v0.8.0, it's also labelled "stable", meaning that * any future version will also generate the same hash value. * @@ -2843,7 +2843,7 @@ enum XXH_VECTOR_TYPE /* fake enum */ { * @ingroup tuning * @brief Selects the minimum alignment for XXH3's accumulators. * - * When using SIMD, this should match the alignment reqired for said vector + * When using SIMD, this should match the alignment required for said vector * type, so, for example, 32 for AVX2. * * Default: Auto detected. diff --git a/lib/fileeq.c b/lib/fileeq.c index 2a74af8a79..d596191612 100644 --- a/lib/fileeq.c +++ b/lib/fileeq.c @@ -22,7 +22,7 @@ * * * Linux crypto API: zero-copy method based on sendfile(), data blocks are * send to the kernel hash functions (sha1, ...), and only hash digest is read - * and cached in usersapce. Fast for large set of (large) files. + * and cached in userspace. Fast for large set of (large) files. * * * No copyright is claimed. This code is in the public domain; do with @@ -345,7 +345,7 @@ static void memcmp_reset(struct ul_fileeq *eq, struct ul_fileeq_data *data) /* only intro[] is cached */ if (data->nblocks) data->nblocks = 1; - /* reset file possition */ + /* reset file position */ if (data->fd >= 0) lseek(data->fd, get_cached_offset(eq, data), SEEK_SET); data->is_eof = 0; @@ -535,7 +535,7 @@ int ul_fileeq(struct ul_fileeq *eq, if (cmp == 0) { if (!a->is_eof || !b->is_eof) - goto done; /* filesize chnaged? */ + goto done; /* filesize changed? */ DBG(EQ, ul_debugobj(eq, "<-- MATCH")); return 1; diff --git a/libblkid/src/blkid.h.in b/libblkid/src/blkid.h.in index 8f6ec97d1a..91fc3b0be3 100644 --- a/libblkid/src/blkid.h.in +++ b/libblkid/src/blkid.h.in @@ -423,7 +423,7 @@ extern int blkid_do_fullprobe(blkid_probe pr) /** * BLKID_PROBE_OK: * - * probing return value; superblock (RAID, partiton table, ...) succesfully detected + * probing return value; superblock (RAID, partition table, ...) successfully detected */ #define BLKID_PROBE_OK 0 /** @@ -442,7 +442,7 @@ extern int blkid_do_fullprobe(blkid_probe pr) * BLKID_PROBE_AMBIGUOUS: * * probing return value; more than one probing result, in this case, it's not - * safe to use the device automaticaly and user intervention is recommended + * safe to use the device automatically and user intervention is recommended */ #define BLKID_PROBE_AMBIGUOUS -2 diff --git a/libblkid/src/devname.c b/libblkid/src/devname.c index 3f48032327..27059c3bbc 100644 --- a/libblkid/src/devname.c +++ b/libblkid/src/devname.c @@ -544,7 +544,7 @@ static int probe_all(blkid_cache cache, int only_if_new, int update_interval) rc = sysfs_probe_all(cache, only_if_new, 0); - /* Don't mark the change as "probed" if /sys not avalable */ + /* Don't mark the change as "probed" if /sys not available */ if (update_interval && rc == 0) { cache->bic_time = time(NULL); cache->bic_flags |= BLKID_BIC_FL_PROBED; diff --git a/libblkid/src/superblocks/ext.c b/libblkid/src/superblocks/ext.c index 885fec270a..a5f34810f9 100644 --- a/libblkid/src/superblocks/ext.c +++ b/libblkid/src/superblocks/ext.c @@ -209,9 +209,9 @@ static void ext_get_info(blkid_probe pr, int ver, struct ext2_super_block *es) (uint64_t) le32_to_cpu(es->s_blocks_count_hi) << 32 : 0); blkid_probe_set_fslastblock(pr, fslastblock); - /* The total number of blocks is taken without substraction of overhead + /* The total number of blocks is taken without subtraction of overhead * (journal, metadata). The ext4 has non-trivial overhead calculation - * viz. ext4_calculate_overhead(). Thefore, the FSSIZE would show number + * viz. ext4_calculate_overhead(). Therefore, the FSSIZE would show number * slightly higher than the real value (for example, calculated via * statfs()). */ diff --git a/libfdisk/samples/mkpart.c b/libfdisk/samples/mkpart.c index 766e7517e4..482593045d 100644 --- a/libfdisk/samples/mkpart.c +++ b/libfdisk/samples/mkpart.c @@ -19,7 +19,7 @@ * labels (e.g. GPT). * * The Ask-API does not use anything else than warning/info. The - * partitionning has to be done non-interactive. + * partitioning has to be done non-interactive. */ #include #include diff --git a/liblastlog2/man/ll2_read_all.3.adoc b/liblastlog2/man/ll2_read_all.3.adoc index fbe589d3e1..8f1a120a93 100644 --- a/liblastlog2/man/ll2_read_all.3.adoc +++ b/liblastlog2/man/ll2_read_all.3.adoc @@ -22,7 +22,7 @@ ll2_read_all - Reads all entries from database and calls the callback function == DESCRIPTION -Reads all entries from database, defined in _context_, and calls callback fuction _callback_ for each entry. +Reads all entries from database, defined in _context_, and calls callback function _callback_ for each entry. If _context_ is NULL, the default database, defined in _LL2_DEFAULT_DATABASE_, will be taken. -------------------------------------- diff --git a/libmount/src/context.c b/libmount/src/context.c index c91b0148e1..d38e3671f6 100644 --- a/libmount/src/context.c +++ b/libmount/src/context.c @@ -1695,7 +1695,7 @@ struct libmnt_lock *mnt_context_get_lock(struct libmnt_context *cxt) * * Be careful if use MS_REC flag -- this is flags is generic for * all mask. In this case is better to use options string where - * mount options are independent and nothign is applied to all options. + * mount options are independent and nothing is applied to all options. * * Returns: 0 on success, negative number in case of error. */ @@ -2150,7 +2150,7 @@ int mnt_context_merge_mflags(struct libmnt_context *cxt) return -ENOMEM; /* TODO: optlist returns always flags as merged, so - * MNT_FL_MOUNTFLAGS_MERGED is unncessary anymore + * MNT_FL_MOUNTFLAGS_MERGED is unnecessary anymore */ cxt->flags |= MNT_FL_MOUNTFLAGS_MERGED; return mnt_optlist_merge_opts(ls); diff --git a/libmount/src/context_mount.c b/libmount/src/context_mount.c index 6762877330..a685acc161 100644 --- a/libmount/src/context_mount.c +++ b/libmount/src/context_mount.c @@ -1119,7 +1119,7 @@ int mnt_context_next_mount(struct libmnt_context *cxt, if (!cxt || !fs || !itr) return -EINVAL; - /* ingore --onlyonce, it's default behavior for --all */ + /* ignore --onlyonce, it's default behavior for --all */ mnt_context_enable_onlyonce(cxt, 0); rc = mnt_context_get_fstab(cxt, &fstab); diff --git a/libmount/src/context_umount.c b/libmount/src/context_umount.c index adfaf7fa6b..c22ffbd80b 100644 --- a/libmount/src/context_umount.c +++ b/libmount/src/context_umount.c @@ -347,7 +347,7 @@ static int lookup_umount_fs_by_mountinfo(struct libmnt_context *cxt, const char return 0; } -/* This function searchs for FS according to cxt->fs->target, +/* This function searches for FS according to cxt->fs->target, * apply result to cxt->fs and it's umount replacement to * mnt_context_apply_fstab(), use mnt_context_tab_applied() * to check result. diff --git a/libmount/src/hook_mount.c b/libmount/src/hook_mount.c index cd57bdbcbc..995de61444 100644 --- a/libmount/src/hook_mount.c +++ b/libmount/src/hook_mount.c @@ -603,7 +603,7 @@ static int init_sysapi(struct libmnt_context *cxt, /* C) FS based operation * - * Note, fstype is optinal and may be specified later if mount by + * Note, fstype is optional and may be specified later if mount by * list of FS types (mount -t foo,bar,ext4). In this case fsopen() * is called later in hook_create_mount(). */ } else { @@ -698,7 +698,7 @@ static int hook_prepare(struct libmnt_context *cxt, if (!ol) return -ENOMEM; - /* classic MS_* flags (include oprations like MS_REMOUNT, etc) */ + /* classic MS_* flags (include operations like MS_REMOUNT, etc) */ rc = mnt_optlist_get_flags(ol, &flags, cxt->map_linux, 0); /* MOUNT_ATTR_* flags for mount_setattr() */ diff --git a/libmount/src/hook_mount_legacy.c b/libmount/src/hook_mount_legacy.c index df3a691e0d..18b7a00663 100644 --- a/libmount/src/hook_mount_legacy.c +++ b/libmount/src/hook_mount_legacy.c @@ -261,7 +261,7 @@ static int hook_prepare(struct libmnt_context *cxt, assert(hs == &hookset_mount_legacy); #ifdef USE_LIBMOUNT_MOUNTFD_SUPPORT - /* do nothing when a new __mount succesfully registred */ + /* do nothing when a new __mount successfully registered */ if (mnt_context_has_hook(cxt, &hookset_mount, 0, NULL)) return 0; #endif diff --git a/libmount/src/hook_selinux.c b/libmount/src/hook_selinux.c index d6bae95c94..11d950c44e 100644 --- a/libmount/src/hook_selinux.c +++ b/libmount/src/hook_selinux.c @@ -157,7 +157,7 @@ static int hook_prepare_options( char *raw = NULL; /* @target placeholder is replaced later when target - * is already avalable. The mountpoint does not have to exist + * is already available. The mountpoint does not have to exist * yet (for example "-o X-mount.mkdir=" or --target-prefix). */ if (strcmp(opt_name, "rootcontext") == 0 && diff --git a/libmount/src/hook_subdir.c b/libmount/src/hook_subdir.c index 99c30e1738..1ccf7b520c 100644 --- a/libmount/src/hook_subdir.c +++ b/libmount/src/hook_subdir.c @@ -208,7 +208,7 @@ static int do_mount_subdir( if (!rc) { /* Note that the original parental namespace could be * private, in this case, it will not see our final mount, - * so we need to move the the orignal namespace. + * so we need to move the the original namespace. */ setns(hsd->old_ns_fd, CLONE_NEWNS); diff --git a/libmount/src/hook_veritydev.c b/libmount/src/hook_veritydev.c index 6a9e64469a..5bb58d0903 100644 --- a/libmount/src/hook_veritydev.c +++ b/libmount/src/hook_veritydev.c @@ -26,7 +26,7 @@ #ifdef CRYPTSETUP_VIA_DLOPEN # include -/* Pointers to libcryptsetup functions (initiliazed by dlsym()) */ +/* Pointers to libcryptsetup functions (initialized by dlsym()) */ struct verity_opers { void (*crypt_set_debug_level)(int); void (*crypt_set_log_callback)(struct crypt_device *, void (*log)(int, const char *, void *), void *); diff --git a/libmount/src/hooks.c b/libmount/src/hooks.c index dcfe69fa4d..85c7475d37 100644 --- a/libmount/src/hooks.c +++ b/libmount/src/hooks.c @@ -23,7 +23,7 @@ * hooksets with more callbacks in more stages. Usually implemented by * locally defined 'struct hookset_data' in hook_*.c. * - * - per-hook data; acessible for specific callback + * - per-hook data; accessible for specific callback * Usually implemented by locally defined 'struct hook_data' in hook_*.c. */ #include "mountP.h" diff --git a/libmount/src/lock.c b/libmount/src/lock.c index 8aca8a7768..b336a3b5da 100644 --- a/libmount/src/lock.c +++ b/libmount/src/lock.c @@ -15,7 +15,7 @@ * @title: Locking * @short_description: locking methods for utab or another libmount files * - * Since v2.39 libmount does nto support classic mtab locking. Now all is based + * Since v2.39 libmount does not support classic mtab locking. Now all is based * on flock only. * */ diff --git a/libmount/src/mountP.h b/libmount/src/mountP.h index b855a90b39..ed5f2ec29f 100644 --- a/libmount/src/mountP.h +++ b/libmount/src/mountP.h @@ -413,7 +413,7 @@ struct libmnt_context const struct libmnt_optmap *map_linux; /* system options map */ const struct libmnt_optmap *map_userspace; /* userspace options map */ - const char *mountinfo_path; /* usualy /proc/self/moutinfo */ + const char *mountinfo_path; /* usually /proc/self/moutinfo */ const char *utab_path; /* path to utab */ int utab_writable; /* is utab writable */ diff --git a/libmount/src/optlist.c b/libmount/src/optlist.c index e324896273..317d7a39d2 100644 --- a/libmount/src/optlist.c +++ b/libmount/src/optlist.c @@ -139,7 +139,7 @@ int mnt_optlist_register_map(struct libmnt_optlist *ls, const struct libmnt_optm for (i = 0; i < ls->nmaps; i++) { if (ls->maps[i] == map) - return 0; /* already registred, ignore */ + return 0; /* already registered, ignore */ } if (ls->nmaps + 1 >= MNT_OL_MAXMAPS) return -ERANGE; @@ -849,7 +849,7 @@ int mnt_optlist_get_attrs(struct libmnt_optlist *ls, uint64_t *set, uint64_t *cl * specified (except atime stuff). For backward compatibility we need * to emulate this semantic by mount_setattr(). The new * mount_setattr() has simple set/unset sematinc and nothing is - * internally in kernel reseted. + * reset internally in kernel. */ if (mnt_optlist_is_remount(ls) && !mnt_optlist_is_bind(ls) @@ -946,7 +946,7 @@ int mnt_optlist_strdup_optstr(struct libmnt_optlist *ls, char **optstr, *optstr = NULL; - /* For generic options srings ro/rw is expected at the begining */ + /* For generic options strings ro/rw are expected at the beginning */ if ((!map || map == ls->linux_map) && (what == MNT_OL_FLTR_DFLT || what == MNT_OL_FLTR_ALL || diff --git a/libmount/src/optstr.c b/libmount/src/optstr.c index 7ebc29555b..30cd1af616 100644 --- a/libmount/src/optstr.c +++ b/libmount/src/optstr.c @@ -582,7 +582,7 @@ int mnt_optstr_get_options(const char *optstr, char **subset, * @wanted: options expected in @optstr * @missing: returns options from @wanted which missing in @optstr (optional) * - * Retursn: <0 on error, 0 on missing options, 1 if nothing is missing + * Returns: <0 on error, 0 on missing options, 1 if nothing is missing */ int mnt_optstr_get_missing(const char *optstr, const char *wanted, char **missing) { diff --git a/libmount/src/tab_update.c b/libmount/src/tab_update.c index d44d190bc9..fa07dc0d9f 100644 --- a/libmount/src/tab_update.c +++ b/libmount/src/tab_update.c @@ -939,7 +939,7 @@ int mnt_update_table(struct libmnt_update *upd, struct libmnt_lock *lc) else if (upd->mountflags & MS_REMOUNT) rc = update_modify_options(upd); /* remount */ else if (upd->fs && upd->missing_options) - rc = update_add_options(upd); /* mount by externel helper */ + rc = update_add_options(upd); /* mount by external helper */ else if (upd->fs) rc = update_add_entry(upd); /* mount */ @@ -977,7 +977,7 @@ int mnt_update_already_done(struct libmnt_update *upd) DBG(UPDATE, ul_debugobj(upd, "%s: found %s %s", upd->filename, src, tgt)); - /* Check if utab entry (probably writen by /sbin/mount. + /* Check if utab entry (probably written by /sbin/mount. * helper) contains all options expected by this update */ if (mnt_optstr_get_missing(fs->user_optstr, upd->fs->user_optstr, NULL) == 0) { upd->missing_options = 1; @@ -1052,7 +1052,7 @@ int mnt_update_start(struct libmnt_update *upd) asprintf(&upd->act_filename, "%s.act", upd->filename) <= 0) return -ENOMEM; - /* Use exclusive lock to avoid some other proces will remove the the + /* Use exclusive lock to avoid some other process will remove the the * file before it's marked as used by LOCK_SH (below) */ rc = update_init_lock(upd, NULL); if (rc) diff --git a/libsmartcols/samples/continuous.c b/libsmartcols/samples/continuous.c index 432b027bf9..fb089c365a 100644 --- a/libsmartcols/samples/continuous.c +++ b/libsmartcols/samples/continuous.c @@ -112,7 +112,7 @@ int main(void) /* Note that libsmartcols don't print \n for last line * in the table, but if you print a line somewhere in - * the midle of the table you need + * the middle of the table you need * * scols_table_enable_nolinesep(tb, !done); * diff --git a/libsmartcols/scols-filter.5.adoc b/libsmartcols/scols-filter.5.adoc index 5dccbb9255..939da7733a 100644 --- a/libsmartcols/scols-filter.5.adoc +++ b/libsmartcols/scols-filter.5.adoc @@ -78,7 +78,7 @@ used without quotes. Before evaluation, application map column names in the given expression to the output table columns and assign column data type to the holder. The default type is "string". -The `param` is for representing a value directly. The currenly supported data +The `param` is for representing a value directly. The currently supported data types are integer, float, string and boolean. An operator works with one or two operand(s). An operator has an expectation diff --git a/libsmartcols/src/calculate.c b/libsmartcols/src/calculate.c index 41daf74b3c..93261ba4d7 100644 --- a/libsmartcols/src/calculate.c +++ b/libsmartcols/src/calculate.c @@ -523,7 +523,7 @@ int __scols_calculate(struct libscols_table *tb, struct ul_buffer *buf) /* enlarge */ if (width < tb->termwidth) { - DBG(TAB, ul_debugobj(tb, " enlarge (extreme, avalable %zu)", + DBG(TAB, ul_debugobj(tb, " enlarge (extreme, available %zu)", tb->termwidth - width)); if (ignore_extremes) { if (!sorted) { @@ -560,7 +560,7 @@ int __scols_calculate(struct libscols_table *tb, struct ul_buffer *buf) } if (width < tb->termwidth && scols_table_is_maxout(tb)) { - DBG(TAB, ul_debugobj(tb, " enlarge (max-out, avalable %zu)", + DBG(TAB, ul_debugobj(tb, " enlarge (max-out, available %zu)", tb->termwidth - width)); /* try enlarging all columns */ @@ -579,7 +579,7 @@ int __scols_calculate(struct libscols_table *tb, struct ul_buffer *buf) } } else if (width < tb->termwidth) { /* enlarge the last column */ - DBG(TAB, ul_debugobj(tb, " enlarge (last column, avalable %zu)", + DBG(TAB, ul_debugobj(tb, " enlarge (last column, available %zu)", tb->termwidth - width)); if (!scols_column_is_right(last_cl)) { diff --git a/libsmartcols/src/column.c b/libsmartcols/src/column.c index 586a485abe..27988c2702 100644 --- a/libsmartcols/src/column.c +++ b/libsmartcols/src/column.c @@ -637,7 +637,7 @@ int scols_column_get_wrap_data(const struct libscols_column *cl, * * The table always keep data in strings in form that is printed on output, but * for some internal operations (like filters or counters) it needs to convert - * the strings to usable data format. If this converion is not possible then + * the strings to usable data format. If this conversion is not possible then * application can define datafunc() callback to provide data for filters and counters. * The callback needs to return the data as pointer to void, and the data type @@ -834,7 +834,7 @@ int scols_column_is_customwrap(const struct libscols_column *cl) * @cl: a pointer to a struct libscols_column instance * @opts: options string * - * Set properties from string, the string is comma seprated list, like + * Set properties from string, the string is comma separated list, like * "trunc,right,json=number", ... * * Returns: 0 on success, <0 on error diff --git a/libsmartcols/src/filter-expr.c b/libsmartcols/src/filter-expr.c index 7e559c408a..f24fc76648 100644 --- a/libsmartcols/src/filter-expr.c +++ b/libsmartcols/src/filter-expr.c @@ -153,7 +153,7 @@ static int guess_expr_datatype(struct filter_expr *n) else { bool l_holder, r_holder; - /* for expression like "FOO > 5.5" preffer type defined by a real param + /* for expression like "FOO > 5.5" prefer type defined by a real param * rather than by holder (FOO) */ l_holder = is_filter_holder_node(n->left); r_holder = is_filter_holder_node(n->right); diff --git a/libsmartcols/src/filter-param.c b/libsmartcols/src/filter-param.c index f7d243d426..8b8218d738 100644 --- a/libsmartcols/src/filter-param.c +++ b/libsmartcols/src/filter-param.c @@ -807,7 +807,7 @@ int filter_next_param(struct libscols_filter *fltr, * @name: holder name * @col: column * - * Assign @col to filter parametr. The parametr is addressed by @itr or by + * Assign @col to filter parameter. The parameter is addressed by @itr or by * @name. See scols_filter_next_holder(). * * Returns: 0, a negative value in case of an error. @@ -843,7 +843,7 @@ int scols_filter_assign_column(struct libscols_filter *fltr, if (n->col) scols_unref_column(n->col); - DBG(FPARAM, ul_debugobj(n, "assing %s to column %s", name, + DBG(FPARAM, ul_debugobj(n, "assign %s to column %s", name, scols_column_get_name(col))); n->col = col; scols_ref_column(col); diff --git a/libsmartcols/src/filter-parser.y b/libsmartcols/src/filter-parser.y index 5104227370..a7d41408ef 100644 --- a/libsmartcols/src/filter-parser.y +++ b/libsmartcols/src/filter-parser.y @@ -113,7 +113,7 @@ param: $$ = filter_new_param(fltr, SCOLS_DATA_BOOLEAN, 0, (void *) &x); } | T_INVALID_NUMBER { /* YYerror token is unsupported in old Bisons */ - ignore_result( $$ ); /* supress "unset value" warning */ + ignore_result( $$ ); /* suppress "unset value" warning */ YYERROR; /* yyerror() already called by lex() */ } ; diff --git a/libsmartcols/src/filter.c b/libsmartcols/src/filter.c index e0c1c7ae0b..ed05ad4b3c 100644 --- a/libsmartcols/src/filter.c +++ b/libsmartcols/src/filter.c @@ -216,7 +216,7 @@ int scols_filter_parse_string(struct libscols_filter *fltr, const char *str) * @out: output stream * * Dumps internal filter nodes in JSON format. This function is mostly designed - * for debugging purpose. The fileds in the output are subject to change. + * for debugging purpose. The fields in the output are subject to change. * * Returns: 0, a negative number in case of an error. * @@ -365,7 +365,7 @@ int scols_filter_set_filler_cb(struct libscols_filter *fltr, * scols_filter_new_counter: * @fltr: filter instance * - * Alocates a new counter instance into the filter. + * Allocates a new counter instance into the filter. * * Returns: new counter or NULL in case of an error. * @@ -398,7 +398,7 @@ struct libscols_counter *scols_filter_new_counter(struct libscols_filter *fltr) * @name: something for humans * * The name is not use by library, it's just description usable for application - * when prints results from countes. + * when prints results from counters. * * Returns: 0, a negative number in case of an error. * diff --git a/libsmartcols/src/smartcolsP.h b/libsmartcols/src/smartcolsP.h index 75fb7ffa37..23fc824c2a 100644 --- a/libsmartcols/src/smartcolsP.h +++ b/libsmartcols/src/smartcolsP.h @@ -147,7 +147,7 @@ struct libscols_column { void *datafunc_data; struct libscols_cell header; /* column name with color etc. */ - char *shellvar; /* raw colum name in shell compatible format */ + char *shellvar; /* raw column name in shell compatible format */ struct list_head cl_columns; /* member of table->tb_columns */ @@ -501,7 +501,7 @@ enum filter_ntype { F_NODE_EXPR }; -/* expresion types */ +/* expression types */ enum filter_etype { F_EXPR_AND, F_EXPR_OR, diff --git a/libuuid/src/predefined.c b/libuuid/src/predefined.c index fec17739b8..94c9c1f180 100644 --- a/libuuid/src/predefined.c +++ b/libuuid/src/predefined.c @@ -37,7 +37,7 @@ /* * These are time-based UUIDs that are well-known in that they've - * been canonized as part of RFC-4122, Appendex C. They are to + * been canonicalized as part of RFC-4122, Appendix C. They are to * be used as the namespace (ns) argument to the uuid_generate_md5() * and uuid_generate_sha1() functions. * diff --git a/login-utils/su-common.c b/login-utils/su-common.c index 3dda84e532..5365575353 100644 --- a/login-utils/su-common.c +++ b/login-utils/su-common.c @@ -748,7 +748,7 @@ static void modify_environment(struct su_context *su, const char *shell) /* Note that original su(1) has allocated environ[] by malloc * to the number of expected variables. This seems unnecessary * optimization as libc later re-alloc(current_size+2) and for - * empty environ[] the curren_size is zero. It seems better to + * empty environ[] the current_size is zero. It seems better to * keep all logic around environment in glibc's hands. * --kzak [Aug 2018] */ diff --git a/lsfd-cmd/cdev.c b/lsfd-cmd/cdev.c index cbb2d051bb..2bb7b74657 100644 --- a/lsfd-cmd/cdev.c +++ b/lsfd-cmd/cdev.c @@ -367,7 +367,7 @@ static struct cdev_ops cdev_misc_ops = { }; /* - * tun devcie driver + * tun device driver */ static bool cdev_tun_probe(struct cdev *cdev) { diff --git a/lsfd-cmd/file.c b/lsfd-cmd/file.c index b4629fdc39..91c8d87a46 100644 --- a/lsfd-cmd/file.c +++ b/lsfd-cmd/file.c @@ -523,7 +523,7 @@ static unsigned int parse_lock_line(const char *line) { char mode[6] = {0}; - /* Exapmles of lines: + /* Examples of lines: ---------------------------------------------------- 1: FLOCK ADVISORY READ 2283292 fd:03:26219728 0 EOF 1: FLOCK ADVISORY WRITE 2283321 fd:03:26219728 0 EOF diff --git a/lsfd-cmd/lsfd.c b/lsfd-cmd/lsfd.c index 6c99dcd4b1..a54b085509 100644 --- a/lsfd-cmd/lsfd.c +++ b/lsfd-cmd/lsfd.c @@ -859,7 +859,7 @@ static struct file *collect_file_symlink(struct path_cxt *pc, if (sockets_only /* A nsfs file is not a socket but the nsfs file can * be used as a entry point to collect information from - * other network namespaces. Besed on the information, + * other network namespaces. Based on the information, * various columns of sockets can be filled. */ && (class != &sock_class) && (class != &nsfs_file_class)) @@ -1060,7 +1060,7 @@ static void collect_namespace_files_tophalf(struct path_cxt *pc, struct proc *pr [ASSOC_NS_MNT] = "ns/mnt", }; collect_outofbox_files(pc, proc, assocs, names, ARRAY_SIZE(assocs), - /* Namespace information is alwasys needed. */ + /* Namespace information is always needed. */ false); } @@ -1085,7 +1085,7 @@ static void collect_namespace_files_bottomhalf(struct path_cxt *pc, struct proc [ASSOC_NS_UTS] = "ns/uts", }; collect_outofbox_files(pc, proc, assocs, names, ARRAY_SIZE(assocs), - /* Namespace information is alwasys needed. */ + /* Namespace information is always needed. */ false); } diff --git a/lsfd-cmd/sock.h b/lsfd-cmd/sock.h index 50360b7035..5641eb84f9 100644 --- a/lsfd-cmd/sock.h +++ b/lsfd-cmd/sock.h @@ -30,7 +30,7 @@ #include "libsmartcols.h" /* - * xinfo: eXtra inforation about sockets + * xinfo: eXtra information about sockets */ struct sock_xinfo { ino_t inode; /* inode in sockfs */ diff --git a/meson.build b/meson.build index 3df8918c46..883e79ad60 100644 --- a/meson.build +++ b/meson.build @@ -10,7 +10,7 @@ project('util-linux', 'c', fs = import('fs') pkgconfig = import('pkgconfig') -# soname versions; This never change because we use symbols versioing. There is also +# soname versions; This never change because we use symbol versioning. There is also # API version (LIB*_VERSION macros) and it follow package version. libblkid_version = '1.1.0' libblkid_date = '01-Jun-2021' diff --git a/misc-utils/findmnt-verify.c b/misc-utils/findmnt-verify.c index 7281c8df51..4fa5d0839b 100644 --- a/misc-utils/findmnt-verify.c +++ b/misc-utils/findmnt-verify.c @@ -430,7 +430,7 @@ static int verify_fstype(struct verify_context *vfy) if (none && mnt_fs_get_option(vfy->fs, "bind", NULL, NULL) == 1 && mnt_fs_get_option(vfy->fs, "move", NULL, NULL) == 1) { - verify_warn(vfy, _("\"none\" FS type is recommended for bind or move oprations only")); + verify_warn(vfy, _("\"none\" FS type is recommended for bind or move operations only")); goto done; } diff --git a/misc-utils/findmnt.c b/misc-utils/findmnt.c index f40b13726a..f81cc433aa 100644 --- a/misc-utils/findmnt.c +++ b/misc-utils/findmnt.c @@ -558,7 +558,7 @@ static char *get_data_col_sources(struct libmnt_fs *fs, int evaluate, size_t *da blkid_dev dev; struct ul_buffer buf = UL_INIT_BUFFER; - /* get TAG from libmount if avalable (e.g. fstab) */ + /* get TAG from libmount if available (e.g. fstab) */ if (mnt_fs_get_tag(fs, &tag, &p) == 0) { /* if device is in the form 'UUID=..' or 'LABEL=..' and evaluate==0 diff --git a/misc-utils/hardlink.c b/misc-utils/hardlink.c index a2a46b9042..07e193878f 100644 --- a/misc-utils/hardlink.c +++ b/misc-utils/hardlink.c @@ -1440,7 +1440,7 @@ int main(int argc, char *argv[]) if (rc < 0) err(EXIT_FAILURE, _("failed to initialize files comparior")); - /* defautl I/O size */ + /* default I/O size */ if (!opts.io_size) { if (strcmp(opts.method, "memcmp") == 0) opts.io_size = 8*1024; diff --git a/misc-utils/lastlog2.8.adoc b/misc-utils/lastlog2.8.adoc index c0d3ecf4b2..99e322be33 100644 --- a/misc-utils/lastlog2.8.adoc +++ b/misc-utils/lastlog2.8.adoc @@ -51,7 +51,7 @@ database will be overwritten. *-r*, *--rename* _NEWNAME_:: This option can only be used together with *-u* (*--user*). -*-s*, *--servive* _num_:: +*-s*, *--service* _num_:: Display PAM service used to login in the last column. *-S*, *--set*:: diff --git a/misc-utils/lastlog2.c b/misc-utils/lastlog2.c index 7e511b036b..2a68c2580d 100644 --- a/misc-utils/lastlog2.c +++ b/misc-utils/lastlog2.c @@ -230,7 +230,7 @@ int main(int argc, char **argv) } if (Cflg || Sflg || rflg) { - /* udpating, inserting and removing entries */ + /* updating, inserting and removing entries */ if (!uflg || strlen(user) == 0) { warnx(_("Options -C, -r and -S require option -u to specify the user")); goto err; diff --git a/misc-utils/lsblk-devtree.c b/misc-utils/lsblk-devtree.c index 5e4ff4c3eb..07f67b4da7 100644 --- a/misc-utils/lsblk-devtree.c +++ b/misc-utils/lsblk-devtree.c @@ -9,9 +9,9 @@ * reference counting here due to complexity and it's unnecessary. * * Note that the same device maybe have more parents and more children. The - * device is allocated only once and shared within the tree. The dependence + * device is allocated only once and shared within the tree. The dependency * (devdep struct) contains reference to child as well as to parent and the - * dependence is reference by ls_childs from parent device and by ls_parents + * dependency is referenced by ls_childs from parent device and by ls_parents * from child. (Yes, "childs" is used for children ;-) * * Copyright (C) 2018 Karel Zak diff --git a/misc-utils/lsblk-mnt.c b/misc-utils/lsblk-mnt.c index f4ce67642e..81ded5ea23 100644 --- a/misc-utils/lsblk-mnt.c +++ b/misc-utils/lsblk-mnt.c @@ -101,7 +101,7 @@ struct libmnt_fs **lsblk_device_get_filesystems(struct lsblk_device *dev, size_t devno = makedev(dev->maj, dev->min); - /* All mounpoint where is used devno or device name + /* All mountpoint where is used devno or device name */ itr = mnt_new_iter(MNT_ITER_BACKWARD); while (mnt_table_next_fs(mtab, itr, &fs) == 0) { @@ -131,7 +131,7 @@ done: return dev->fss; } -/* Returns mounpoint where the device is mounted. If the device is used for +/* Returns mountpoint where the device is mounted. If the device is used for * more filesystems (subvolumes, ...) than returns the "best" one. */ const char *lsblk_device_get_mountpoint(struct lsblk_device *dev) diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c index 2df7752670..44279605c3 100644 --- a/misc-utils/lsblk.c +++ b/misc-utils/lsblk.c @@ -346,7 +346,7 @@ static int column_name_to_id(const char *name, size_t namesz) { size_t i; - /* name as diplayed for users */ + /* name as displayed for users */ for (i = 0; i < ARRAY_SIZE(infos); i++) { const char *cn = infos[i].name; diff --git a/misc-utils/test_uuidd.c b/misc-utils/test_uuidd.c index f012a2cf7b..865c50405f 100644 --- a/misc-utils/test_uuidd.c +++ b/misc-utils/test_uuidd.c @@ -53,7 +53,7 @@ typedef struct processentry process_t; struct threadentry { process_t *proc; - pthread_t tid; /* pthread_self() / phtread_create() */ + pthread_t tid; /* pthread_self() / pthread_create() */ pthread_attr_t thread_attr; size_t index; /* index in object[] */ int retval; /* pthread exit() */ diff --git a/misc-utils/uuidd.8.adoc b/misc-utils/uuidd.8.adoc index 16b4e906e8..7a2f6ae54f 100644 --- a/misc-utils/uuidd.8.adoc +++ b/misc-utils/uuidd.8.adoc @@ -25,7 +25,7 @@ The *uuidd* daemon is used by the UUID library to generate universally unique id == OPTIONS *-C*, *--cont-clock*[=_time_]:: -Activate continuous clock handling for time based UUIDs. *uuidd* could use all possible clock values, beginning with the daemon's start time. The optional argument can be used to set a value for the max_clock_offset. This gurantees, that a clock value of a UUID will always be within the range of the max_clock_offset. +Activate continuous clock handling for time based UUIDs. *uuidd* could use all possible clock values, beginning with the daemon's start time. The optional argument can be used to set a value for the max_clock_offset. This guarantees, that a clock value of a UUID will always be within the range of the max_clock_offset. + The option *-C* or *--cont-clock* enables the feature with a default max_clock_offset of 2 hours. + diff --git a/pam_lastlog2/man/pam_lastlog2.8.adoc b/pam_lastlog2/man/pam_lastlog2.8.adoc index 1ed5ba641b..7c900b58a8 100644 --- a/pam_lastlog2/man/pam_lastlog2.8.adoc +++ b/pam_lastlog2/man/pam_lastlog2.8.adoc @@ -17,7 +17,7 @@ pam_lastlog2 - PAM module to display date of last login == DESCRIPTION -pam_lastlog2 is a PAM module to display a line of information about the last login of the user. The module uses the /var/lib/lastlog/lastlog2.db database file to store all informations. +pam_lastlog2 is a PAM module to display a line of information about the last login of the user. The module uses the /var/lib/lastlog/lastlog2.db database file to store all information. Compared to pam_lastlog this PAM module is Y2038 safe and uses sqlite3 to store the information. diff --git a/po-man/Makefile.am b/po-man/Makefile.am index fed933f163..dbfd100ac7 100644 --- a/po-man/Makefile.am +++ b/po-man/Makefile.am @@ -21,7 +21,7 @@ po4a-gen.stamp: $(PO_FILES) # We need to call po4a --force only on 'make dist', otherwise .po and .pot # files has to be unmodified. This update has to be done before 'make' copies # sources to the $distdir. $EXTRA_DIST (where is util-linux-man.pot) is used as -# a dependence for 'distdir' automake target, so it's trigered by "make dist*" +# a dependence for 'distdir' automake target, so it's triggered by "make dist*" # only. util-linux-man.pot: @echo 'po4a: force pot-update' diff --git a/po-man/util-linux-man.pot b/po-man/util-linux-man.pot index 1d1e12c26e..b177ab4e7d 100644 --- a/po-man/util-linux-man.pot +++ b/po-man/util-linux-man.pot @@ -1844,7 +1844,7 @@ msgstr "" msgid "" "CHS (Cylinder-Head-Sector) addressing is deprecated and not used by " "default. Please, do not follow old articles and recommendations with *fdisk " -"-S -H * advices for SSD or 4K-sector devices." +"-S -H * advice for SSD or 4K-sector devices." msgstr "" #. type: Plain text @@ -19799,7 +19799,7 @@ msgid "" "Activate continuous clock handling for time based UUIDs. *uuidd* could use " "all possible clock values, beginning with the daemon's start time. The " "optional argument can be used to set a value for the max_clock_offset. This " -"gurantees, that a clock value of a UUID will always be within the range of " +"guarantees, that a clock value of a UUID will always be within the range of " "the max_clock_offset." msgstr "" diff --git a/po/util-linux.pot b/po/util-linux.pot index df76e408a4..cfd8afe481 100644 --- a/po/util-linux.pot +++ b/po/util-linux.pot @@ -10800,7 +10800,7 @@ msgid "do not check %s FS type (pseudo/net)" msgstr "" #: misc-utils/findmnt-verify.c:433 -msgid "\"none\" FS type is recommended for bind or move oprations only" +msgid "\"none\" FS type is recommended for bind or move operations only" msgstr "" #: misc-utils/findmnt-verify.c:445 diff --git a/sys-utils/lscpu.h b/sys-utils/lscpu.h index 2c6a1d1c4f..cf1147d60f 100644 --- a/sys-utils/lscpu.h +++ b/sys-utils/lscpu.h @@ -82,8 +82,8 @@ struct lscpu_cputype { char *flags; char *mtid; /* maximum thread id (s390) */ char *addrsz; /* address sizes */ - int dispatching; /* -1 if not evailable, DIST_* */ - int freqboost; /* -1 if not evailable */ + int dispatching; /* -1 if not available, DIST_* */ + int freqboost; /* -1 if not available */ size_t physsockets; /* Physical sockets (modules) */ size_t physchips; /* Physical chips */ diff --git a/sys-utils/lsipc.c b/sys-utils/lsipc.c index c8702229ff..179adbccfb 100644 --- a/sys-utils/lsipc.c +++ b/sys-utils/lsipc.c @@ -129,7 +129,7 @@ struct lsipc_control { int outmode; unsigned int noheadings : 1, /* don't print header line */ notrunc : 1, /* don't truncate columns */ - shellvar : 1, /* use shell compatible colum names */ + shellvar : 1, /* use shell compatible column names */ bytes : 1, /* SIZE in bytes */ numperms : 1, /* numeric permissions */ time_mode : 2; diff --git a/sys-utils/unshare.c b/sys-utils/unshare.c index ccb0834420..57f3b8744f 100644 --- a/sys-utils/unshare.c +++ b/sys-utils/unshare.c @@ -680,7 +680,7 @@ static void map_ids_internal(const char *type, int ppid, struct map_range *chain * @groupmap: The range of GIDs to map (or %NULL) * * fork_and_wait() for our parent to call sync_with_child() on @fd. Upon - * recieving the go-ahead, use newuidmap and newgidmap to set the uid/gid map + * receiving the go-ahead, use newuidmap and newgidmap to set the uid/gid map * for our parent's PID. * * Return: The pid of the child. diff --git a/sys-utils/wdctl.c b/sys-utils/wdctl.c index 86119248aa..8c7dcad555 100644 --- a/sys-utils/wdctl.c +++ b/sys-utils/wdctl.c @@ -198,7 +198,7 @@ static const struct colinfo *get_column_info(unsigned num) return &infos[ get_column_id(num) ]; } -/* We preffer cdev /dev/watchdog0 as this device has node in +/* We prefer cdev /dev/watchdog0 as this device has node in * /sys/class/watchdog/. The old miscdev /dev/watchdog is fallback for old * systemds only. */ diff --git a/term-utils/agetty.c b/term-utils/agetty.c index 94b7756245..275c593629 100644 --- a/term-utils/agetty.c +++ b/term-utils/agetty.c @@ -1939,7 +1939,7 @@ static void eval_issue_file(struct issue *ie, goto done; /* * The custom issue file or directory list specified by: - * agetty --isue-file + * agetty --issue-file * Note that nothing is printed if the file/dir does not exist. */ if (op->issue) { diff --git a/tools/all_errnos b/tools/all_errnos index a009cfc0ef..36dee1c547 100755 --- a/tools/all_errnos +++ b/tools/all_errnos @@ -1,6 +1,6 @@ #!/bin/bash -# Derrived from all_syscalls. +# Derived from all_syscalls. set -e set -o pipefail diff --git a/tools/checkconfig.sh b/tools/checkconfig.sh index 5f2063ad49..7a17cd69e9 100755 --- a/tools/checkconfig.sh +++ b/tools/checkconfig.sh @@ -44,7 +44,7 @@ while [ "$#" -ne 0 ]; do # Note that we use HAVE_ macros since util-linux-ng-2.14. The # previous version also have used ENABLE_ too. # - # ENABLE_ and HAVE_ macros shouldn't be used for any other pupose that + # ENABLE_ and HAVE_ macros shouldn't be used for any other purpose than # for config/build options. # DEFINES=$(sed -n -e 's/.*[ \t(]\+\(HAVE_[[:alnum:]]\+[^ \t);]*\).*/\1/p' \