Merge branch 'whitespace' of https://github.com/eworm-de/util-linux

build-sys: update util-linux-man.pot on 'make dist'

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

fix whitespace issue in ducumentation

This removes trailing whitespaces and fixes minor issues.

build-sys: release++ (v2.37-rc2)

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

docs: update v2.37-ReleaseNotes

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

docs: update AUTHORS file

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

po: merge changes

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

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

tests: update build tests

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

build-sys: fix libblkid dependence

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

column: add placeholder '0' to specify all columns

Fixes: https://github.com/karelzak/util-linux/issues/1306
Signed-off-by: Karel Zak <kzak@redhat.com>

blkdiscard: fix compilation without libblkid

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

mkswap: remove unused variable when compile without libblkid

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

docs: add #1266 to TODO file

References: https://github.com/karelzak/util-linux/issues/1266
Signed-off-by: Karel Zak <kzak@redhat.com>

unshare: Fix error message when setting proc mount propagation

The mount() command associated with this error message is not about
unmounting the proc fs, but rather about changing the propagation
of mount events for the proc fs. Rewrite the error message to
reflect this.

rfkill: make RFKILL_EVENT_SIZE_V1 use more portable

The old linux/rfkill.h uses "int", new versions use sizeof() for the
macro ...

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

tests: update libfdisk JSON outputs

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

libfdisk: (script) print bootable flag only when set

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

rfkill: fix compiler warning [-Wsign-compare]

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

lib/jsonwrt: don't use ctype.h for ASCII chars

tolower() does not work "as expected" for tr_TR.UTF-8 (Turkish).
Fortunately, we need to convert only objects and variables names in
JSON output, and this is always old good ASCII.

Anyway, for more details:

$ cat a.c
#include <ctype.h>
#include <stdio.h>
#include <locale.h>

int main(void)
{
int in, out;

setlocale(LC_ALL, "");

in ='I';
out = tolower(in);

printf("%1$c [%1$d] --> %2$c [%2$d]\n", in, out);
return 0;
}

$ make a
cc     a.c   -o a

$ LANG=en_US.utf8 ./a
I [73] --> i [105]

$ LANG=tr_TR.UTF-8 ./a
I [73] --> I [73]

Fixes: https://github.com/karelzak/util-linux/issues/1302
Signed-off-by: Karel Zak <kzak@redhat.com>

lib/jsonwrt: remove fputs_quoted_json_* functions from include/carefulputc.h

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

lib/jsonwrt: remove 'islast' from API

The code should be able to keep track about previous content and print
JSON objects separator automatically.

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

libfdisk: use lib/jsonwrt.s for JSON formatting

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

rfkill: fix compiler warning [-Wformat=]

* `RFKILL_EVENT_SIZE_V1` is defined as sizeof(struct rfkill_event), so let's use %zu

* cast `len` to size_t to make it usable with %zu

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

lib/fileutils: close fd if fdopen is failed

Signed-off-by: Masatake YAMATO <yamato@redhat.com>

hwclock: follow timespec and use long int for nsec

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

script: fix time_t=long assumptions

References: http://github.com/karelzak/util-linux/commit/ce3355cc54d97711bc240783324f7ab51fd6e371
Signed-off-by: Karel Zak <kzak@redhat.com>

rtcwake: fix time_t=long assumptions

References: http://github.com/karelzak/util-linux/commit/ce3355cc54d97711bc240783324f7ab51fd6e371
Signed-off-by: Karel Zak <kzak@redhat.com>

lib/strutils: assume 64-bit time_t

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

hardlink: fix time_t=long assumptions

References: http://github.com/karelzak/util-linux/commit/ce3355cc54d97711bc240783324f7ab51fd6e371
Signed-off-by: Karel Zak <kzak@redhat.com>

test_uuid_parser: fix time_t=long assumptions

References: http://github.com/karelzak/util-linux/commit/ce3355cc54d97711bc240783324f7ab51fd6e371
Signed-off-by: Karel Zak <kzak@redhat.com>

fsck: fix time_t=long assumptions

References: http://github.com/karelzak/util-linux/commit/ce3355cc54d97711bc240783324f7ab51fd6e371
Signed-off-by: Karel Zak <kzak@redhat.com>

scriptplay: fix time_t=long assumptions

Fixes: https://github.com/karelzak/util-linux/issues/1069
References: http://github.com/karelzak/util-linux/commit/ce3355cc54d97711bc240783324f7ab51fd6e371
Signed-off-by: Karel Zak <kzak@redhat.com>

lib/pty-session: fix time_t=long assumptions

Fixes: https://github.com/karelzak/util-linux/issues/1069
References: http://github.com/karelzak/util-linux/commit/ce3355cc54d97711bc240783324f7ab51fd6e371
Signed-off-by: Karel Zak <kzak@redhat.com>

flock: fix time_t=long assumptions

This also fixes flock for archs (e.g. sparc64) where suseconds_t is not long.

Fixes: https://github.com/karelzak/util-linux/issues/1069
References: http://github.com/karelzak/util-linux/commit/ce3355cc54d97711bc240783324f7ab51fd6e371
Signed-off-by: Karel Zak <kzak@redhat.com>

build-sys: keep adoc files in dist_noinst_DATA

* rename MANPAGES_EXTRA= to ADOCFILES_COMMON=

* keep track about individual adoc files by dist_noinst_DATA=
  This variable is not effected by automake conditions, so the files
  are always distributed.

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

tests: update sparc lscpu tests

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

lscpu: assume L1d, L1i, L2, L3 for sparc

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

lscpu: read Sparc caches files

Fixes: https://github.com/karelzak/util-linux/issues/1296
Signed-off-by: Karel Zak <kzak@redhat.com>

meson: fix systemd dependence

Fixes: https://github.com/karelzak/util-linux/issues/1301
Signed-off-by: Karel Zak <kzak@redhat.com>

Merge branch 'master' of https://github.com/arbego/util-linux

* 'master' of https://github.com/arbego/util-linux:
  Fixed wrongful time_t=long assumptions in hwclock.c and timeutils.c
  Changed int64_t casts to long long int casts
  Fixed format strings and type casts in hwclock to work with 64-bit time_t on 32-bit linux

Fixed wrongful time_t=long assumptions in hwclock.c and timeutils.c

build-sys: add configure options to disable individual utils

lscpu: fix "caches" header

It's possible that lscpu does not print any caches if full caches size
is zero. In this case we do not need the header.

Addresses: https://github.com/karelzak/util-linux/issues/1207
Signed-off-by: Karel Zak <kzak@redhat.com>

docs/TODO: Minor update and fix typo

Changed int64_t casts to long long int casts

Fixed format strings and type casts in hwclock to work with 64-bit time_t on 32-bit linux

zramctl: (man) fix streams default number

References: https://www.kernel.org/doc/html/latest/admin-guide/blockdev/zram.html#set-max-number-of-compression-streams
References: https://github.com/torvalds/linux/commit/da9556a2367cf2261ab4d3e100693c82fb1ddb26
Fixes: https://github.com/karelzak/util-linux/issues/1283
Signed-off-by: Karel Zak <kzak@redhat.com>

scriptlive: (man) add missing parenthesis

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

Merge branch 'fix-misspellings' of https://github.com/rffontenelle/util-linux

Merge branch 'master' of https://github.com/mariobl/util-linux

* 'master' of https://github.com/mariobl/util-linux:
  po-man: Fix typos in de.po and po4a.cfg
  hardlink: fix typo

docs: update TODO

Addresses: https://github.com/karelzak/util-linux/issues/1291
Signed-off-by: Karel Zak <kzak@redhat.com>

build-sys: add .stamp to gitignore

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

build-sys: fix typo

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

Fix misspellings

po-man: Fix typos in de.po and po4a.cfg

Merge remote-tracking branch 'upstream/master'

build-sys: disable po-man by default, cleanup summary

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

build-sys: add uninstall to po-man

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

build-sys: add targets to generated translated man pages

* add --enable-poman (disabled by default)
* add po-man/Makefile.am for "make all" and "make install"
* install man pages to $mandir/$lang/man{1,3,5,8}

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

Merge branch 'topic/po4a' of https://github.com/mariobl/util-linux

* 'topic/po4a' of https://github.com/mariobl/util-linux:
  mount.a.adoc: Fix markup
  Asciidoc: Add missing macro definition in uclampset.1
  Asciidoc: Fix markup in example man page
  Asciidoc: Fix markup
  Asciidoc: Remove artifact from merge conflict
  Asciidoc: Convert man-common/README to Markdown
  po-man: Fix the example man page
  po-man: Fix typos in po-man/README.md
  po-man: Update the example man page
  po-man: Add po-man/README.md
  po-man: Add (incomplete) de.po for testing purposes
  po-man: Add (incomplete) de.po for testing purposes
  po-man: Adjust paths in po4a.cfg and update .pot file
  po-man: Move Po4a config file and translation template to po-man

build-sys: cleanup Makefiles

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

build-sys: fix test_loopdev build

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

lib/loopdev: fix is_loopdev() to be usable with partitions

The current implementation of the function does not care if the device
is whole-disk device or partition, all is loopdev. This is regression
as the original is_loopdev() version was based on whole-disk devices
major numbers only.

Fixes: https://github.com/karelzak/util-linux/issues/1202
Signed-off-by: Karel Zak <kzak@redhat.com>

hardlink: fix typo again

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

libfdisk: do not reset default if undefined by script

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

hardlink: fix typo

Reported-by: Mario Blättermann <mario.blaettermann@gmail.com>
Signed-off-by: Karel Zak <kzak@redhat.com>

Merge branch 'fix-swapon-summary-heading-alignment' of https://github.com/sebras/util-linux

* 'fix-swapon-summary-heading-alignment' of https://github.com/sebras/util-linux:
  swapon: Keep headings and fields aligned in summary output.

Merge branch 'fix-typo' of https://github.com/sebras/util-linux

* 'fix-typo' of https://github.com/sebras/util-linux:
  Fix typo in help message.

Merge branch 'fix-first-lba' of https://github.com/samueldr/util-linux

* 'fix-first-lba' of https://github.com/samueldr/util-linux:
  libfdisk: Include table-length in first-lba checks

Merge branch 'lsblk-E-completion' of https://github.com/scop/util-linux

* 'lsblk-E-completion' of https://github.com/scop/util-linux:
  bash-completion: (lsblk) fix -E/-M arg (non-)completion

Merge branch 'update-lsns-man-page' of https://github.com/masatake/util-linux

* 'update-lsns-man-page' of https://github.com/masatake/util-linux:
  man: add ioctl_ns(2) to SEE ALSO of lsns(2)

mount.a.adoc: Fix markup

hardlink: fix typo

swapon: Keep headings and fields aligned in summary output.

Because the headings are aligned with tabs the fields must
always be a multiple of 8 characters. Moreover if the field
values are shorter than 8 characters, extra tabs must be
inserted before the succeding field to keep alignment.

swapon parses /proc/swaps, generated by the Linux kernel in
mm/swapfile.c. Its function swap_show() and its recent fix in
commit 6f7939405f61de7d0da7f6c90182e96c4f5ff6c1 were used as
inspiration for this commit.

Additionally inform the translators about the requirements of
formatting and relationship between the heading and entry strings.

libfdisk: Include table-length in first-lba checks

Otherwise, sfdisk would error out on its own dump, as first-lba would be
earlier than "plausible" assuming the default table size.

This is because it did not look for `table-length` when using an sfdisk
script. This means that using `--dump` on a valid image, could not be
unserialized back into a valid image.

This is helpful in exotic situations, where a partition has to be
created earlier than the conventional "first-lba" (2048). For example,
on Allwinner A64 boards, where a firmware is stored at LBA16. With this
it is possible to ask for `first-lba` at or earlier than 16, by reducing
the number of entries to e.g. 48.

Fix typo in help message.

bash-completion: (lsblk) fix -E/-M arg (non-)completion

Signed-off-by: Ville Skyttä <ville.skytta@iki.fi>

man: add ioctl_ns(2) to SEE ALSO of lsns(2)

Signed-off-by: Masatake YAMATO <yamato@redhat.com>

libfdisk: use open(O_EXCL) to detect if device is used

It's seems detection by BLKRRPART is broken in recent kernels
(probably regression), and it's also overkill to force kernel re-read
all and generate all the events. It seems more elegant to use O_EXCL.

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

fdisk: warn if disk in use

Fixes: https://github.com/karelzak/util-linux/issues/1278
Signed-off-by: Karel Zak <kzak@redhat.com>

cfdisk: warn if disk on use

Fixes: https://github.com/karelzak/util-linux/issues/1278
Signed-off-by: Karel Zak <kzak@redhat.com>

docs: add kernel version and commit to info about mountinfo workaround

Fixes: https://github.com/karelzak/util-linux/issues/1280
Signed-off-by: Karel Zak <kzak@redhat.com>

libsmartcols: make buffers append function more robust

Fixes: https://github.com/karelzak/util-linux/issues/1279
Signed-off-by: Karel Zak <kzak@redhat.com>

prlimit: make code more robust

The prlimit description are always defined as static strings, but it
seems better to make the code more readable and robust for static
analyzers and readers.

Fix also missing gettext() call for description help.

Fixes: https://github.com/karelzak/util-linux/issues/1277
Signed-off-by: Karel Zak <kzak@redhat.com>

tests: small change to the lsns/ioctl_ns

* make description short
* chmod a+x to make script executable

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

Merge branch 'ioctl_ns' of https://github.com/masatake/util-linux

* 'ioctl_ns' of https://github.com/masatake/util-linux:
  lsns: add columns for parent namespaces and owner namespaces

po: use msgmerge --previous

Reported-by: Mario Blättermann <mario.blaettermann@gmail.com>
Signed-off-by: Karel Zak <kzak@redhat.com>

hexdump: add "hd" program name to man page

Signed-off-by: Chris Hofstaedtler <zeha@debian.org>
Bug-Debian: https://bugs.debian.org/978977

lsns: add columns for parent namespaces and owner namespaces

See ioctl_ns(2) about parent and owner namespaces.

Signed-off-by: Masatake YAMATO <yamato@redhat.com>

chrt: non-Linux fix

Reported-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Signed-off-by: Karel Zak <kzak@redhat.com>

lslogins: non-Linux fix

Reported-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Signed-off-by: Karel Zak <kzak@redhat.com>

build-sys: fix typo

s/Aug/Apr/ ... move back in time ;-)

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

build-sys: release++ (v2.37-rc1)

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

po: update

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

docs: fix typo

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

mesg: use only stat() to get the current terminal status

open()+stat() does not work for example after su(1) (from root to
non-root). It seems better to use only stat() to get the current
terminal status.

Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=1906157
Signed-off-by: Karel Zak <kzak@redhat.com>

Asciidoc: Add missing macro definition in uclampset.1

docs: update v2.37-ReleaseNotes

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

findmnt: add --shadowed to the man page

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