Merge branch 'asciidoctor-tracker' of https://github.com/t-8ch/util-linux

* 'asciidoctor-tracker' of https://github.com/t-8ch/util-linux:
  build: track dependencies of manpage generation

diff --git a/.github/workflows/cibuild.yml b/.github/workflows/cibuild.yml
index 3df2ca8b051e6fe9b0abf9c15d633d542891329f..4c4a7dafacf116e475bd6a466b99f718dbe267c0 100644 (file)
--- a/.github/workflows/cibuild.yml
+++ b/.github/workflows/cibuild.yml
@@ -24,8 +24,8 @@ jobs:
       fail-fast: false
       matrix:
         env:
-          - { COMPILER: "gcc",   COMPILER_VERSION: "10", SANITIZE: "yes"  }
-          - { COMPILER: "gcc",   COMPILER_VERSION: "10", SANITIZE: "no"   }
+          - { COMPILER: "gcc",   COMPILER_VERSION: "12", SANITIZE: "yes"  }
+          - { COMPILER: "gcc",   COMPILER_VERSION: "12", SANITIZE: "no"   }
           - { COMPILER: "clang", COMPILER_VERSION: "15", SANITIZE: "yes"  }
           - { COMPILER: "clang", COMPILER_VERSION: "15", SANITIZE: "no"   }
     env: ${{ matrix.env }}

diff --git a/lib/strutils.c b/lib/strutils.c
index 830abc976db3dfd345ece3c57f5955f675daf051..6d863b85f65556c6fe31ef772a7b9abe2aaec0ac 100644 (file)
--- a/lib/strutils.c
+++ b/lib/strutils.c
@@ -1322,6 +1322,9 @@ static int test_strutils_cstrcasecmp(int argc, char *argv[])
        a = argv[1];
        b = argv[2];
 
+       if (!a || !b)
+               return EXIT_FAILURE;
+
        printf("cmp    '%s' '%s' = %d\n", a, b, strcasecmp(a, b));
        printf("c_cmp  '%s' '%s' = %d\n", a, b, c_strcasecmp(a, b));
        printf("c_ncmp '%s' '%s' = %d\n", a, b, c_strncasecmp(a, b, strlen(a)));

diff --git a/sys-utils/renice.1.adoc b/sys-utils/renice.1.adoc
index c0d41ff15742a287a6263b447071859018fce4af..e50e1e918f730f1d21be90130314d9e73d114008 100644 (file)
--- a/sys-utils/renice.1.adoc
+++ b/sys-utils/renice.1.adoc
@@ -57,13 +57,13 @@ If no *-n*, *--priority* or *--relative* option is used, then the priority is se
 == OPTIONS
 
 *-n* _priority_::
-Specify the *absolute* or *relative* (depending on environment variable POSIXLY_CORRECT) scheduling _priority_ to be used for the process, process group, or user. Use of the option *-n* is optional, but when used it must be the first argument. See *NOTES* for more information.
+Specify the *absolute* or *relative* (depending on environment variable POSIXLY_CORRECT) scheduling _priority_ to be used for the process, process group, or user. Use of the option *-n* is optional, but when used, it must be the first argument. See *NOTES* for more information.
 
 *--priority* _priority_::
 Specify an *absolute* scheduling _priority_. _Priority_ is set to the given value. This is the default, when no option is specified.
 
 *--relative* _priority_::
-Specify a *relative* scheduling _priority_. Same a the standard POSIX *-n* option. _Priority_ gets _incremented/decremented_ by the given value.
+Specify a *relative* scheduling _priority_. Same as the standard POSIX *-n* option. _Priority_ gets _incremented/decremented_ by the given value.
 
 *-g*, *--pgrp*::
 Interpret the succeeding arguments as process group IDs.
@@ -87,7 +87,7 @@ Users other than the superuser may only alter the priority of processes they own
 
 The superuser may alter the priority of any process and set the priority to any value in the range -20 to 19. Useful priorities are: 19 (the affected processes will run only when nothing else in the system wants to), 0 (the "base" scheduling priority), anything negative (to make things go very fast).
 
-For historical reasons in this implementation, the *-n* option did not follow the POSIX specification, therefore instead of setting a *relative* priority it sets an *absolute* priority by default. As this may not be desirable, this behavior can be controlled by setting the environment variable POSIXLY_CORRECT to be fully POSIX compliant. See *-n* option for details. See *--relative* and *--priority* for options that don't change behavior depending on environment variables.
+For historical reasons in this implementation, the *-n* option did not follow the POSIX specification. Therefore, instead of setting a *relative* priority, it sets an *absolute* priority by default. As this may not be desirable, this behavior can be controlled by setting the environment variable POSIXLY_CORRECT to be fully POSIX compliant. See the *-n* option for details. See *--relative* and *--priority* for options that do not change behavior depending on environment variables.
 
 == HISTORY