forked from pool/systemd
b8b836245b
- Add systemctl-options.patch: handle SYSTEMCTL_OPTIONS internaly (bnc#798620). - Update crypt-loop-file.patch to correctly detect crypto loop files (bnc#799514). - Add journalctl-remove-leftover-message.patch: remove debug message in systemctl. - Add job-avoid-recursion-when-cancelling.patch: prevent potential recursion when cancelling a service. - Add sysctl-parse-all-keys.patch: ensure sysctl file is fully parsed. - Add journal-fix-cutoff-max-date.patch: fix computation of cutoff max date for journal. - Add reword-rescue-mode-hints.patch: reword rescue prompt. - Add improve-overflow-checks.patch: improve time overflow checks. - Add fix-swap-behaviour-with-symlinks.patch: fix swap behaviour with symlinks. - Add hostnamectl-fix-set-hostname-with-no-argument.patch: ensure hostnamectl requires an argument when called with set-hostname option. - Add agetty-overrides-term.patch: pass correctly terminal type to agetty. - Add check-for-empty-strings-in-strto-conversions.patch: better check for empty strings in strto* conversions. - Add strv-cleanup-error-path-loops.patch: cleanup strv on error path. - Add cryptsetup-handle-plain.patch: correctly handle "plain" option in cryptsetup. - Add fstab-generator-improve-error-message.patch: improve error message in fstab-generator. - Add delta-accept-t-option.patch: accept -t option in OBS-URL: https://build.opensuse.org/request/show/149703 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=331
38 lines
1.0 KiB
Diff
38 lines
1.0 KiB
Diff
From 7009eec20823add711e0aa452bdf9dfdd677fa4f Mon Sep 17 00:00:00 2001
|
|
From: Anders Olofsson <anders.olofsson@axis.com>
|
|
Date: Mon, 19 Nov 2012 15:25:36 +0100
|
|
Subject: [PATCH] shared/utils: systemd-cgls shows 'n/a' when piping output
|
|
|
|
-1 was used to signal failure, but the type was unsigned.
|
|
|
|
https://bugs.freedesktop.org/show_bug.cgi?id=56644
|
|
---
|
|
src/shared/util.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/shared/util.c b/src/shared/util.c
|
|
index 4cf928f..d771d32 100644
|
|
--- a/src/shared/util.c
|
|
+++ b/src/shared/util.c
|
|
@@ -3803,7 +3803,7 @@ int fd_columns(int fd) {
|
|
|
|
unsigned columns(void) {
|
|
const char *e;
|
|
- unsigned c;
|
|
+ int c;
|
|
|
|
if (_likely_(cached_columns > 0))
|
|
return cached_columns;
|
|
@@ -3811,7 +3811,7 @@ unsigned columns(void) {
|
|
c = 0;
|
|
e = getenv("COLUMNS");
|
|
if (e)
|
|
- safe_atou(e, &c);
|
|
+ safe_atoi(e, &c);
|
|
|
|
if (c <= 0)
|
|
c = fd_columns(STDOUT_FILENO);
|
|
--
|
|
1.7.10.4
|
|
|