libmount: avoid calling memset() unnecessarily

This is primarily to satisfy static analyzers, as memset() is defined
as a non-null function (although it does nothing when bufsiz=0).

Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit 9e96e6ed9cce4cbaf3b9ca6e61d0b0ee070685e9)

libblkid: befs: fix underflow

Fix segfault caused by underflow while parsing a corrupted metadata.

Found by OSS-Fuzz by cryptsetup project fuzzers (issue 411003898).

Signed-off-by: Milan Broz <gmazyland@gmail.com>
(cherry picked from commit 588eed1a1de13150750e8a50d855001b27e07357)

Do not use strerror on shared libraries

Using strerror is not safe in shared libraries as it is unknown
what the calling apps may do with the storage behind the scenes.
Using %m is ok, except in contexts that need to be as-safe.

(cherry picked from commit c5850c36e14085cddf8db9e19d447d928fa153d0)

mount: (man) add missing word

Signed-off-by: Jakub Wilk <jwilk@jwilk.net>
(cherry picked from commit 1f106f63c5c9ab6779621f42c280d1f23792f898)

include/mount-api-utils: include linux/unistd.h

If SYS_statmount/SYS_listmount is not provided by the libc,
util-linux will fall back to __NR_statmount/__NR_listmount from the
kernel UAPI headers.
However it is not guaranteed that these symbols are actually visible in
mount-api-utils.

Include linux/unistd.h which provides syscall numbers.
While this header is specific to Linux, the code is already using
linux/mount.h.

Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
(cherry picked from commit 0033f97482a7979e0de71de0a16b583e8d74dbdc)

meson: add feature for translated documentation

Translating the documentation is slow.
Add a feature which can be used to disable this step.

Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
(cherry picked from commit 188f3af3e8f3c7effbdb4b91994f1b16db4874b5)

meson: remove tinfo dependency from 'more'

The more utility does not need libtinfo and it is not
specified in autotools either.

Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
(cherry picked from commit 363e48da01956321fb9337c59d78865c97c711a2)

libuuid: fix uuid_time on macOS without attribute((alias))

Weak aliases are not supported by clang on Darwin.
Instead this fix uses inline asm to make `_uuid_time` an alias to
`___uuid_time`

It appears that on macOS the time API is purely 32 or 64 bit depending
on the build type. There is no ABI issue on that platform and `uuid_time`
can be unconditionally aliased to `_uuid_time`. This is all conjectural,
however, since I have no ability to make 32-bit builds for macOS - the
Apple toolchain doesn't support this since 2019.

Fixes util-linux/util-linux#2873

(cherry picked from commit e47c6f751a7ef87640c61316ada774e8e9cc6b07)

findmnt: fix -k option parsing regression

It's a really bad idea to change any existing short option to support
optional arguments.

Fixes: https://github.com/util-linux/util-linux/issues/3512
References: 841d15e5d13dd0cc56e450c8dcc592211d66be27
Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit 0ecaef693ea60aab709e79dd4a8eb2865ec08967)

treewide: fix optional arguments usage

In some parts of the code, the optional argument handling is missing
for cases where the argument starts with '='. This is particularly
important for short options with optional arguments, as suggested by
our man pages. The libc getopt_long() handles this for long options,
but for short options, it's our responsibility.

Note that some argument parsing functions (mostly colormode_or_err())
already implement this, as they are usually used with optional
arguments.

Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit c4a24f5301ec9779a0492dd110824c2ce813f3eb)

namespace.h: fix compilation on Linux < 4.10

sys-utils/lsns.c: In function ‘add_namespace_from_sock’:
sys-utils/lsns.c:580:19: error: ‘SIOCGSKNS’ undeclared (first use in this function)
  nsfd = ioctl(sk, SIOCGSKNS);
                   ^~~~~~~~~

SIOCGSKNS was added in https://github.com/torvalds/linux/commit/c62cce2caee558e18aa05c01c2fd3b40f07174f2.

Fixes: https://github.com/util-linux/util-linux/issues/3502
Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
(cherry picked from commit 10ee66ed1b08586bde42582e34355418eef33ef5)

fdisk: fix possible memory leak

Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit 71719680968c86a09ad0ba76339447f18996610b)

fdformat: use size_t and ssize_t

Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit 310806a25f1da9e1e6819c57d2e358bb439ed56d)

cfdisk: fix memory leak and possible NULL dereference [gcc-analyzer]

Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit 33ca468b67d34dead8fb8b41dc9f328971e5fe70)

more: fix broken ':!command' command key

Addresses: #3509
Signed-off-by: Christian Goeschel Ndjomouo <cgoesc2@wgu.edu>
(cherry picked from commit 3f3bb6f9103daaf7a8f47ebe57cbe90bac852e6e)

more: fix implicit previous shell_line execution #3508

run_shell() will implicitly execute the previous ctl->shell_line
not only if the function was indirectly invoked by the '.' command
but also by a subsequent '!' command.

Addresses: #3508
Signed-off-by: Christian Goeschel Ndjomouo <cgoesc2@wgu.edu>
(cherry picked from commit b6f9362988dbe5427d52b31ac3add37a7ddb6b12)

treewide: avoid strcasecmp() for ASCII-only strings

Use cctype.h for locale-independent string comparison and to avoid
tricky string conversions like in tr_TR locales.

Fixes: https://github.com/util-linux/util-linux/issues/3490
Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit 107293a68206f24e531fd906e8114b578911bb7a)

fdisk,partx: avoid strcasecmp() for ASCII-only strings

Use cctype.h for locale-independent string comparison and to avoid
tricky string conversions like in tr_TR locales.

Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit 7efdcd75f041fa1cb9a7c05e22dea3567d48bf9e)

libmount: avoid strcasecmp() for ASCII-only strings

Use cctype.h for locale-independent string comparison and to avoid
tricky string conversions like in tr_TR locales.

Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit ea694f8b91b82474c018dac2250b03cb00685b26)

lsblk: avoid strcasecmp() for ASCII-only strings

Use cctype.h for locale-independent string comparison and to avoid
tricky string conversions like in tr_TR locales.

Fixes: https://github.com/util-linux/util-linux/issues/3490
Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit b5ae9e8d0234738f381c56aa797aeba81a05d587)

libfdisk: avoid strcasecmp() for ASCII-only strings

Use cctype.h for locale-independent string comparison and to avoid
tricky string conversions like in tr_TR locales.

Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit 8ec0c305e9f6ab904119201a13873faedb30da57)

libblkid: avoid strcasecmp() for ASCII-only strings

Use cctype.h for locale-independent string comparison and to avoid
tricky string conversions like in tr_TR locales.

Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit 7eb663503c77d739f2cc80d78ee9d380b11b6eb9)

include/cctype: fix string comparison

Reimplement c_strcasecmp() and c_strncasecmp() to be libc compatible
and fix c_strncasecmp() to avoid \0 misinterpretation. The original
implementation was pretty stupid (sorry).

Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit 259157b0c1a00806ff75188325e40ba10adf12ce)

lsfd: (bug fix) scan the protocol field of /proc/net/packet as a hex number

Signed-off-by: Masatake YAMATO <yamato@redhat.com>
(cherry picked from commit 0da7e8201aa7b9b2c5d0e901c0ccfd6f3bdc54d3)

tests: (test_mkfds::mapped-packet-socket) add a new parameter, protocol

Signed-off-by: Masatake YAMATO <yamato@redhat.com>
(cherry picked from commit a6584a456835bbef703d7aae1f51d4e07177f8cb)

lsfd: fix the description for PACKET.PROTOCOL column

Signed-off-by: Masatake YAMATO <yamato@redhat.com>
(cherry picked from commit df3b38fab56001537364302479b33cb104ef7411)

Fix typo in blkdiscard docs

(cherry picked from commit 7d181e8f1ecdeca764b62f1daf0bb13cec349e7e)

lsns: enhance compilation without USE_NS_GET_API

- Move add_namespace_for_nsfd() declaration to the #ifdef block
(based on c62ed3d58602fd29fe12085f7caf03761ed91b81)

References: 2ced43400f35f7bd45b29364e04166a63a06e16a
Signed-off-by: Karel Zak <kzak@redhat.com>

lsns: fix undefined reference to add_namespace_for_nsfd #3483

Fixes:

sys-utils/lsns-lsns.o: In function `read_process':
lsns.c:(.text+0x9e8): undefined reference to `add_namespace_for_nsfd'
collect2: error: ld returned 1 exit status

Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
(cherry picked from commit 2ced43400f35f7bd45b29364e04166a63a06e16a)

libmount: fix --no-canonicalize regression

Fixes: https://github.com/util-linux/util-linux/issues/3474
Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit 7dbfe31a83f45d5aef2b508697e9511c569ffbc8)

meson: fix manadocs for libsmartcols and libblkid

Fixes: https://github.com/util-linux/util-linux/issues/3475
Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit 531b2afd4ef3016b14fff41eef208ead5213138e)

meson: fix po-man installation

* in po-man/meson.build use already defined mandir
* make sure $DESTDIR is used in the install script

Addresses: https://github.com/util-linux/util-linux/pull/3378
Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit 56b97db03a56d90f0480885a35b0383afabc2e18)

misc: never include wchar.h

We have a portable "widechar.h" that follows --disable-widechar and
provides portability. It is a bug to directly include libc's wchar.h
or wctype.h.

Fixes: https://github.com/util-linux/util-linux/issues/3470
Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit 5c0888dde3cc296d06b8243dcc78248ff90526e5)

autotools: don't use wide-character ncurses if --disable-widechar

Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit 23aa09d7baec72cf6bac9d32c844a5bd2a6ef609)

column: fix compiler warning for non-widechar compilation

text-utils/column.c: In function ‘ansi_esc_width’:
text-utils/column.c:212:17: warning: case label value exceeds maximum value for type [-Wswitch-outside-range]

Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit 0e28ab361375036f62dbba9d589576d38f43f157)

lib/fileeq.c Fix a typo in message.

This patch fixes a spelling typo in a command message.

Signed-off-by: Masanari Iida <standby24x7@gmail.com>
(cherry picked from commit ccda6b9abde4425c03bf9c8da967fa02a64d0887)

irqtop,lsirq: use scols debug

Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit b7f5e6bba0b77c50eff53d5a9079403cde4cfc18)

build-sys: update release dates

Signed-off-by: Karel Zak <kzak@redhat.com>

docs: update v2.41-ReleaseNotes

Signed-off-by: Karel Zak <kzak@redhat.com>

po: update uk.po (from translationproject.org)

po: update ro.po (from translationproject.org)

po: update pl.po (from translationproject.org)

po: update nl.po (from translationproject.org)

po: update ko.po (from translationproject.org)

po: update hr.po (from translationproject.org)

po: update fr.po (from translationproject.org)

po-man: merge changes

po-man: add pl.po (from translationproject.org)

po-man: update uk.po (from translationproject.org)

po-man: update ro.po (from translationproject.org)

po-man: update fr.po (from translationproject.org)

po-man: fix typos in configuration

Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit 126ef957f7c5d42a4ef51353d521eee6e22b8015)

terminal-colors.d: support NO_COLOR

We already provide the ability to easily disable output colorization,
but there is also the https://no-color.org initiative based on the
NO_COLOR environment variable. Let's support this method to disable
colors. Let's be friendly :-)

Addresses: https://github.com/util-linux/util-linux/issues/3463
Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit 61bd162fa1246a1d296cf943d12f7c01c8053b10)

su: (man) fix duplicate asterisk

Signed-off-by: Gaël PORTAY <gael.portay@rtone.fr>
Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit 1b317ef942bf007d2c765a390d2087a79a6de766)

include: use public domain for colors.{c,h} and xalloc.h

The LGPL makes it difficult to use the code in the old BSD tools we
have in util-linux. After obtaining agreement from the major
contributors to the files, we are changing it to "Public Domain".

Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit 549a5178574364a2bd219ad1ed028f4f4ea71c3d)

unshare: fix typo in --map-groups=subids map name [coverity scan]

Addresses: https://github.com/util-linux/util-linux/pull/3121
Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit 9dd140220c6d6c53383405191001c7372488d264)

Use ipc_stat::cgid for the column COL_CGID.

(cherry picked from commit c64c64b7683695828a6fef044c7193cfa0461be9)

lsfd: (man) fix a typo

(cherry picked from commit d6cdde2d6b9482c1cb790bd17c84fc31a2fad410)

various: (man) list --help and --version last among the options

Almost all util-linux man pages mention -h/--help and -V/--version
last in the list of options.  Make the few deviant pages conform.

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
(cherry picked from commit 77b01d90dad212e57fa801e2eccda9724d102c0b)

more: remove a duplicate call of setlocale()

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
(cherry picked from commit 361718387dc19334d060b5f303cd9fe1c19af01e)

lslogins: fix typo

Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit ede1561d2071e0da859cbdd36bee8cf07807caf4)

hwclock: avoid dereferencing a pointer [coverity scan]

Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit 16c1d8734847bdeac0e6650a7364e33fb881bfc6)

lsfd: initialize struct stat [coverity scan]

It's probably unnecessary, but for a complicated function, it's
probably better just to keep the static analyzer happy.

Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit e05e2b4f89a00fadc1032ad7720fefdd99dca029)

unshare: make strings more robust

Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit ad591f1a8e5917cd41d91de18626494e072414f8)

liblastlog2: (test) fix memory leak in failed test [coverity scan]

This is just a cosmetic change to satisfy the static analyzer. The
free-before-exit is unnecessary, but in this case (library test), it's
better.

Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit 2e6cc76741a580b9338ab679cf96375eb1084e92)

libmount: remove possible leak in mnt_context_guess_srcpath_fstype() [coverity scan]

Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit 6e2127384ba267119311437b233e413e16ef8721)

test_sysinfo: remove memory lea [coverity scan]

Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit 87c1ea68155b88ccdc07069c267a3121468d72c8)

lslogins: remove possible memory leaks [coverity scan]

The column can be specified more than once. In this case, the code
will gather the column data multiple times, resulting in a memory
leak.

Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit 52a6e45bfe5ddee1fed20f2f4f7542cac6bf13c9)

more: fix repeat command

The function more_key_command() may modify the current command setting.
We need to remember the original unmodified version, as specified by
the user, as the previous command; otherwise, the output will be affected
by unexpected cmd.number settings.

Simple reproducer:

 $ more -c /etc/passwd

 - Press <enter> to jump to the next line.
 - Press '.' to repeat the last command.

Old version:
 - It clears the screen and prints only one line (like the "1 <enter>" command).
Fixed version:
 - It jumps to the next line (like the "<enter>" command).

Reported-by: Benno Schulenberg <bensberg@telfort.nl>
Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit 5be4bdf81a8e89b98b12db275deb6154f87feb4b)

swapon: remove unnecessary variable usage

Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit 7dd72369680323a1c01dd7226e1158741cc8d55d)

irqtop,lsirq: set up locale path, so messages get actually translated

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
(cherry picked from commit 7a912b98f99131049f91c1a3f53c4f51075ac348)

swapon: make options --help and --version override --summary

When -h or --help is among the given options, most utilities
print a help text, ignoring all other options and arguments.
Make `swapon --summary --help` conform to this general pattern.

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
(cherry picked from commit ad9b9058721a7322f702d5c9beea6e77cd923377)

lsfd: (man) fix a typo

Signed-off-by: Masatake YAMATO <yamato@redhat.com>
(cherry picked from commit beaa7dd93ed336c7e486f1200feeaaec50bb8e52)

tools/poman-translate: fix to work outside on source dir

* Let's check only the adoc file name if defined in po4a.cfg, not the
  complete path.

 cd ..
 meson setup build-dir util-linux
 ninja -C build-dir

* Exclude manpage-stub.adoc (it's just an example)

Addresses: https://github.com/util-linux/util-linux/pull/3378
Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit 95833d8e5e32dea9781873cbbd4e8b01e02d8bad)

meson: bring hexdump in line with others

Before it was different, and the executable was not installed.

(cherry picked from commit ecd8d1e56ca5aeef0b47f3a2b855b83e121359b8)

autotools: add missing meson.build files

Fixes: https://github.com/util-linux/util-linux/issues/3460
Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit b8d8e3c7a03e36e3e4ef1c31416f7ef1e36a3e58)

tools: add SPDX-License-Identifier

Add an SPDX label to the newly added scripts.

Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit f4c71fbb24a0a47e1c9e9d834bc05f4c02bdc4c7)

sys-utils/chmem: fix typo.

(cherry picked from commit 43d88060d368c17c7ca572f13ced42c255c540ab)

lscpu: New Arm part numbers

Arm has announced the Cortex-A320 and published the TRM here:
https://developer.arm.com/documentation/109551

The Cortex-A520AE with a TRM here:
https://developer.arm.com/documentation/107726

The Cortex-A720AE with a TRM here:
https://developer.arm.com/documentation/102828

The Neoverse-V3AE with a TRM here:
https://developer.arm.com/documentation/101595

Signed-off-by: Jeremy Linton <jeremy.linton@arm.com>
(cherry picked from commit be77fa82ad491f38537030c329c2a8e0612506a5)

exch: cosmetic code changes

* Remove unnecessary dirfd (use AT_FDCWD directly)
* Remove unnecessary 'rc' variable

Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit 6bef160562189a72c6f5c779cb7e06e72a0fe6bc)

exch: fix compile error if renameat2 is not present

https://www.man7.org/linux/man-pages/man2/rename.2.html
Available since Linux 3.15 or glibc 2.28,
add a fallback for older systems.

My initial implementation did the exchange using a swap
file if both HAVE_RENAMEAT2 and SYS_renameat2 were absent.
But that is not really what is desired since exch is supposed
to be atomic. So simply return -1 renameat2 is available.

Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
(cherry picked from commit 72a99516f7bdf72411501d0a04cc8f8a7e562d10)

{configure.ac,meson.build}: conditionally build {enosys,setpriv} if seccomp is present #3280

misc-utils/enosys.c:25:27: fatal error: linux/seccomp.h: No such file or directory
 #include <linux/seccomp.h>

Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
(cherry picked from commit 8de1ec203b0fbf86ae67b1ac18ba094d36b6a34a)

build-sys: update release dates

Signed-off-by: Karel Zak <kzak@redhat.com>

tests: update lsmem outputs

Addresses: 68c9f5578230b8a715204d7f05b52b65f97f808a
Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit 0e08b4300efac2230d65bdbc737985e399b168d7)

tools/git-version-bump: add from master branch

Signed-off-by: Karel Zak <kzak@redhat.com>

docs: update v2.41-rc2-ReleaseNotes

Signed-off-by: Karel Zak <kzak@redhat.com>

tools/git-grouped-log: sort output

Signed-off-by: Karel Zak <kzak@redhat.com>

tools/git-grouped-log: add from master branch

Signed-off-by: Karel Zak <kzak@redhat.com>

tools/git-tp-sync: update also po-man

Signed-off-by: Karel Zak <kzak@redhat.com>

po-man: merge changes

tools/git-tp-sync: fix checkout -f use

Signed-off-by: Karel Zak <kzak@redhat.com>

po: merge changes

po: update nl.po (from translationproject.org)

po: update es.po (from translationproject.org)

hardlink: replace a strange word in an error message

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
(cherry picked from commit bd83387e25fca9e3fbeb6787b421b24673d7ac8c)

lsmem: increase the available width for the summary text labels

This allows the subsequent numbers to get vertically aligned for
most translations too.

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
(cherry picked from commit 68c9f5578230b8a715204d7f05b52b65f97f808a)

tests: (lsns/nsfs) consider the cases that lsns returns multiple paths

Fixes #3442

If a target directory is bind-mount'ed, lsns returns multiple paths
as the value for NSFS column. This change considers this case.

Signed-off-by: Masatake YAMATO <yamato@redhat.com>
(cherry picked from commit dc5c86e91aa9a8fa386896865e069383c5bc4cac)

tests: (lsns/nsfs) check test_sysinfo helper

This check was missed though the command was used in
the test case.

Signed-off-by: Masatake YAMATO <yamato@redhat.com>
(cherry picked from commit f39d142bfea2471ea94cb17de884642e8fcbc880)

tests: improve test_sysinfo to check for NS_GET_NSTYPE usability

Now the test checks if the kernel supports the NS_GET_NSTYPE ioctl,
but it seems that on some platforms it's implemented but does not work
as expected and returns ENOTTY.

Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit 4391638806a40b71383646a33ed022476f4c9dea)

tests: check for ns-get*-ok

Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit 4f6135531ceb808e721f36937c0a11c865bb4bd8)