diff options
| author | Manuel Bentele | 2019-08-21 14:58:42 +0200 |
|---|---|---|
| committer | Manuel Bentele | 2019-08-21 14:58:42 +0200 |
| commit | 0692b963aa3cb846d8abab5ef5247c4dbb3fec96 (patch) | |
| tree | f13776d25da3e1adc1445aef22e7566ac98cbe84 /text-utils | |
| parent | losetup: added file format option to the man page (diff) | |
| parent | partx: document -d vs. --nr and fix test (diff) | |
| download | kernel-qcow2-util-linux-kernel-qcow2.tar.gz kernel-qcow2-util-linux-kernel-qcow2.tar.xz kernel-qcow2-util-linux-kernel-qcow2.zip | |
lib/losetup: merge remote-tracking branch 'util-linux/master'kernel-qcow2
Signed-off-by: Manuel Bentele <development@manuel-bentele.de>
Diffstat (limited to 'text-utils')
| -rw-r--r-- | text-utils/colrm.c | 2 | ||||
| -rw-r--r-- | text-utils/column.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/text-utils/colrm.c b/text-utils/colrm.c index d0ef2eb66..f9dfd5938 100644 --- a/text-utils/colrm.c +++ b/text-utils/colrm.c @@ -166,7 +166,7 @@ int main(int argc, char **argv) setlocale(LC_ALL, ""); bindtextdomain(PACKAGE, LOCALEDIR); textdomain(PACKAGE); - atexit(close_stdout); + close_stdout_atexit(); while ((opt = getopt_long(argc, argv, "bfhl:pxVH", longopts, diff --git a/text-utils/column.c b/text-utils/column.c index 13b39537e..9d56e514c 100644 --- a/text-utils/column.c +++ b/text-utils/column.c @@ -169,7 +169,7 @@ static wchar_t *local_wcstok(wchar_t *p, const wchar_t *separator, int greedy, w return strtok_r(p, separator, state); #endif if (!p) { - if (!*state || !**state) + if (!*state) return NULL; p = *state; } |