- (dtucker) [defines.h loginrec.c] Define UT_LINESIZE if not defined and

   simplify loginrec.c.  ok tim@

diff --git a/ChangeLog b/ChangeLog
index 1a2477357f3239b368609d2a2f8aafdc2c3e602d..2218364303a720bfbd9861ca3d0812909e35ee0b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
    pty name on Linux 2.6.x systems.  Patch from jpe at eisenmenger.org.
  - (bal) [monitor.c monitor_wrap.c] Second try.  Put the zlib.h headers
    back and #undef TARGET_OS_MAC instead.  (Bug report pending with Apple)
+ - (dtucker) [defines.h loginrec.c] Define UT_LINESIZE if not defined and
+   simplify loginrec.c.  ok tim@
 
 20040407
  - (dtucker) [session.c] Flush stdout after displaying loginmsg.  From

diff --git a/defines.h b/defines.h
index 6e539079b0b0975db2d68cd3bbdbbb4e11efe7c6..4ae40dac537ecfc7242cc1d6ab0f952c1d93a237 100644 (file)
--- a/defines.h
+++ b/defines.h
@@ -615,6 +615,10 @@ struct winsize {
 
 #endif
 
+#ifndef UT_LINESIZE
+# define UT_LINESIZE 8
+#endif
+
 /* I hope that the presence of LASTLOG_FILE is enough to detect this */
 #if defined(LASTLOG_FILE) && !defined(DISABLE_LASTLOG)
 #  define USE_LASTLOG

diff --git a/loginrec.c b/loginrec.c
index aa8f5b6c3f8b96a96264668abdadb5f8b32b8511..897921c633d5c00e45a764a427189cffde8ac913 100644 (file)
--- a/loginrec.c
+++ b/loginrec.c
@@ -1354,11 +1354,7 @@ static int
 syslogin_perform_logout(struct logininfo *li)
 {
 # ifdef HAVE_LOGOUT
-# ifdef UT_LINESIZE
        char line[UT_LINESIZE];
-# else
-       char line[8];
-# endif
 
        (void)line_stripname(line, li->line, sizeof(line));