diff options
| author | Karel Zak | 2019-05-20 12:35:38 +0200 |
|---|---|---|
| committer | Karel Zak | 2019-05-20 12:35:38 +0200 |
| commit | 002931c485dd66c23b63750a7d9d09637e9bc1ef (patch) | |
| tree | f4209fc28f52b9aa6159af0afb43b43f07b4326f /lib | |
| parent | Merge branch 'lscpu_midr_updates' of https://github.com/jlinton/util-linux (diff) | |
| parent | lib/colors: remove redundant if statement (diff) | |
| download | kernel-qcow2-util-linux-002931c485dd66c23b63750a7d9d09637e9bc1ef.tar.gz kernel-qcow2-util-linux-002931c485dd66c23b63750a7d9d09637e9bc1ef.tar.xz kernel-qcow2-util-linux-002931c485dd66c23b63750a7d9d09637e9bc1ef.zip | |
Merge branch '2019wk19' of https://github.com/kerolasa/util-linux
* '2019wk19' of https://github.com/kerolasa/util-linux:
lib/colors: remove redundant if statement
wipefs: fix variable / function shadowing [cppcheck]
sulogin: fix variable / function shadowing [cppcheck]
lscpu: remove redundant condition check [cppcheck]
libmount: avoid possible null pointer dereference [cppcheck]
lib/mangle: fix possible null pointer dereference [cppcheck]
sfdisk: remove unnecessary size check [cppcheck]
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/colors.c | 4 | ||||
| -rw-r--r-- | lib/mangle.c | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/lib/colors.c b/lib/colors.c index ecec0ac30..26f3c81f7 100644 --- a/lib/colors.c +++ b/lib/colors.c @@ -662,11 +662,9 @@ static int colors_terminal_is_ready(void) if (setupterm(NULL, STDOUT_FILENO, &ret) != 0 || ret != 1) goto none; ncolors = tigetnum("colors"); - if (ncolors <= 2) - goto none; } #endif - if (ncolors != -1) { + if (1 < ncolors) { DBG(CONF, ul_debug("terminal is ready (supports %d colors)", ncolors)); return 1; } diff --git a/lib/mangle.c b/lib/mangle.c index b514cd8d3..87802fbda 100644 --- a/lib/mangle.c +++ b/lib/mangle.c @@ -155,9 +155,9 @@ int main(int argc, char *argv[]) } x = strdup(argv[2]); - unmangle_to_buffer(x, x, strlen(x) + 1); - if (x) { + unmangle_to_buffer(x, x, strlen(x) + 1); + printf("self-unmangled: '%s'\n", x); free(x); } |