From: Samuel Thibault <samuel.thibault@ens-lyon.org>
To: Karel Zak <kzak@redhat.com>
Cc: util-linux@vger.kernel.org
Subject: Re: [ANNOUNCE] util-linux v2.33
Date: Tue, 6 Nov 2018 13:34:02 +0100 [thread overview]
Message-ID: <20181106123402.cy52t2ql4yvfqme6@function> (raw)
In-Reply-To: <20181106113306.hd2qcvbde22cxur6@ws.net.home>
[-- Attachment #1: Type: text/plain, Size: 318 bytes --]
Hello,
Karel Zak, le mar. 06 nov. 2018 12:33:06 +0100, a ecrit:
> The util-linux release v2.33 is available at
>
> http://www.kernel.org/pub/linux/utils/util-linux/v2.33
>
> Feedback and bug reports, as always, are welcomed.
It seems new portability issues came in since the rc I tested :)
Fix attached.
Samuel
[-- Attachment #2: fix --]
[-- Type: text/plain, Size: 1255 bytes --]
Index: util-linux-2.33/term-utils/agetty.c
===================================================================
--- util-linux-2.33.orig/term-utils/agetty.c
+++ util-linux-2.33/term-utils/agetty.c
@@ -1768,6 +1768,7 @@ static void eval_issue_file(struct issue
}
#else /* ISSUE_SUPPORT */
+#ifdef AGETTY_RELOAD
static int issue_is_changed(struct issue *ie)
{
if (ie->mem_old && ie->mem
@@ -1780,6 +1781,7 @@ static int issue_is_changed(struct issue
return 1;
}
+#endif
static void print_issue_file(struct issue *ie,
struct options *op,
@@ -2066,8 +2068,8 @@ static char *get_logname(struct issue *i
/* Write issue file and prompt */
do_prompt(ie, op, tp);
-#ifdef AGETTY_RELOAD
no_reload:
+#ifdef AGETTY_RELOAD
if (!wait_for_term_input(STDIN_FILENO)) {
/* refresh prompt -- discard input data, clear terminal
* and call do_prompt() again
@@ -2731,6 +2733,7 @@ static void output_special_char(struct i
fprintf (ie->output, "%d ", users);
break;
}
+#if defined(RTMGRP_IPV4_IFADDR) && defined(RTMGRP_IPV6_IFADDR)
case '4':
case '6':
{
@@ -2754,6 +2757,7 @@ static void output_special_char(struct i
netlink_groups |= RTMGRP_IPV6_IFADDR;
break;
}
+#endif
default:
putchar(c);
break;
next prev parent reply other threads:[~2018-11-06 12:34 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-06 11:33 [ANNOUNCE] util-linux v2.33 Karel Zak
2018-11-06 12:34 ` Samuel Thibault [this message]
2018-11-07 1:20 ` Carlos Santos
2018-11-07 9:49 ` Karel Zak
2018-11-07 10:02 ` Samuel Thibault
2018-11-12 10:39 ` Karel Zak
2018-11-07 12:42 ` Christian Hesse
2018-11-07 12:55 ` [PATCH 1/1] agetty: fix output of escaped characters Christian Hesse
2018-11-07 13:19 ` Karel Zak
2018-11-12 10:39 ` Karel Zak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181106123402.cy52t2ql4yvfqme6@function \
--to=samuel.thibault@ens-lyon.org \
--cc=kzak@redhat.com \
--cc=util-linux@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).