Re: [ANNOUNCE] util-linux v2.23-rc1

[Samuel Thibault]

Hello,

Karel Zak, le Fri 22 Mar 2013 13:56:21 +0100, a écrit :
> The util-linux release v2.23-rc1 is available at
>  
>    ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.23
>     
> Feedback and bug reports, as always, are welcomed.

Here is a couple of obvious fixes for non-linux systems.

Samuel
diff --git a/login-utils/sulogin.c b/login-utils/sulogin.c
index db5f41e..621df1e 100644
--- a/login-utils/sulogin.c
+++ b/login-utils/sulogin.c
@@ -118,7 +118,9 @@ static void tcinit(struct console *con)
 		cfsetispeed(tio, ispeed);
 		cfsetospeed(tio, ospeed);
 
+#ifdef HAVE_STRUCT_TERMIOS_C_LINE
 		tio->c_line         = 0;
+#endif
 		tio->c_cc[VTIME]    = 0;
 		tio->c_cc[VMIN]     = 1;
 
@@ -198,7 +200,7 @@ static void tcfinal(struct console *con)
 	tio->c_cc[VEOF]     = CEOF;
 #ifdef VSWTC
 	tio->c_cc[VSWTC]    = _POSIX_VDISABLE;
-#else
+#elif defined(VSWTCH)
 	tio->c_cc[VSWTCH]   = _POSIX_VDISABLE;
 #endif
 	tio->c_cc[VSTART]   = CSTART;