sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update screen 4.0.3 --> 4.2.1.

Browse source 
Put final touches onto screen-legacy.
This commit is contained in:
Cy Schubert 2014-04-30 04:22:34 +00:00
parent 0d968e414c
commit b55f1ca0fb
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=352669
18 changed files with 144 additions and 260 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
sysutils/Makefile
View file

@ -840,6 +840,7 @@
SUBDIR += schedutils
SUBDIR += scprotect
SUBDIR += screen
SUBDIR += screen-legacy
SUBDIR += screenfetch
SUBDIR += screenie
SUBDIR += scterc

1
sysutils/screen-legacy/Makefile
View file

@ -14,6 +14,7 @@ MASTER_SITES= http://ftp.gnu.org/gnu/screen/ \
http://komquats.com/distfiles/ \
http://people.freebsd.org/~cy/distfiles/ \
GNU
PKGNAMESUFFIX= -legacy
MAINTAINER= cy@FreeBSD.org
COMMENT= Multi-screen window manager

12
sysutils/screen/Makefile
View file

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= screen
PORTVERSION= 4.0.3
PORTREVISION= 14
PORTVERSION= 4.2.1
CATEGORIES= sysutils
MASTER_SITES= http://ftp.gnu.org/gnu/screen/ \
ftp://ftp.gnu.org/gnu/screen/ \
@ -30,18 +29,23 @@ SHOWENC_DESC= Show encoding on the status line
OPTIONS_SUB=
USES= gmake
.include <bsd.port.options.mk>
GNU_CONFIGURE= yes
.if ${PORT_OPTIONS:MMAN}
MAKE_ARGS+= -DWITH_MAN
MAKE_ARGS+= WITH_MAN=1
PLIST_SUB+= MAN=""
.else
PLIST_SUB+= MAN="@comment"
.endif
.if ${PORT_OPTIONS:MINFO}
.if !exists(/usr/bin/install-info)
RUN_DEPENDS+= install-info:${PORTSDIR}/print/texinfo
.endif
INFO= screen
MAKE_ARGS+= -DWITH_INFO
MAKE_ARGS+= WITH_INFO=1
.endif
# Enables support for 256 colour xterm. Note that you may need to

4
sysutils/screen/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (screen-4.0.3.tar.gz) = 78f0d5b1496084a5902586304d4a73954b2bfe33ea13edceecf21615c39e6c77
SIZE (screen-4.0.3.tar.gz) = 840602
SHA256 (screen-4.2.1.tar.gz) = 5468545047e301d2b3579f9d9ce00466d14a7eec95ce806e3834a3d6b0b9b080
SIZE (screen-4.2.1.tar.gz) = 1062485

20
sysutils/screen/files/patch-Makefile.in
View file

@ -1,20 +0,0 @@
--- Makefile.in.orig 2007-07-30 12:38:38.000000000 +0200
+++ Makefile.in 2007-07-30 12:39:34.000000000 +0200
@@ -77,7 +77,7 @@
###############################################################################
install: installdirs install_bin
- cd doc ; $(MAKE) install
+ cd doc ; $(MAKE) $(MAKE_ARGS) install
-if [ -d /usr/lib/terminfo ]; then \
PATH="$$PATH:/usr/5bin" tic ${srcdir}/terminfo/screeninfo.src; \
chmod 644 /usr/lib/terminfo/s/screen*; \
@@ -90,7 +90,7 @@
installdirs:
# Path leading to ETCSCREENRC and Socketdirectory not checked.
$(srcdir)/etc/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(SCREENENCODINGS)
- cd doc ; $(MAKE) installdirs
+ cd doc ; $(MAKE) $(MAKE_ARGS) installdirs
uninstall: .version
rm -f $(DESTDIR)$(bindir)/$(SCREEN)

25
sysutils/screen/files/patch-aa
View file

@ -1,7 +1,7 @@
--- Makefile.in.orig Thu Feb 14 22:36:33 2002
+++ Makefile.in Tue Feb 19 13:18:38 2002
@@ -71,14 +71,8 @@
$(CC) -c -I. -I$(srcdir) $(M_CFLAGS) $(DEFS) $(OPTIONS) $(CFLAGS) $<
--- Makefile.in.orig 2014-04-26 03:58:35.000000000 -0700
+++ Makefile.in 2014-04-29 18:55:12.050906602 -0700
@@ -83,19 +83,13 @@
$(OPTIONS) $(CFLAGS) $<
install_bin: .version screen
- -if [ -f $(DESTDIR)$(bindir)/$(SCREEN) ] && [ ! -f $(DESTDIR)$(bindir)/$(SCREEN).old ]; \
@ -11,9 +11,24 @@
-# This doesn't work if $(bindir)/screen is a symlink
- -if [ -f $(DESTDIR)$(bindir)/screen ] && [ ! -f $(DESTDIR)$(bindir)/screen.old ]; then mv $(DESTDIR)$(bindir)/screen $(DESTDIR)$(bindir)/screen.old; fi
- rm -f $(DESTDIR)$(bindir)/screen
- (cd $(DESTDIR)$(bindir) && ln -sf $(SCREEN) screen)
- (cd $(DESTDIR)$(bindir) && ln -f -s $(SCREEN) screen)
+ $(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/screen
+ -chown root:wheel $(DESTDIR)$(bindir)/screen && chmod 4755 $(DESTDIR)$(bindir)/screen
cp $(srcdir)/utf8encodings/?? $(DESTDIR)$(SCREENENCODINGS)
###############################################################################
install: installdirs install_bin
- cd doc ; $(MAKE) install
+ cd doc ; $(MAKE) $(MAKE_ARGS) install
-if [ -d /usr/lib/terminfo ]; then \
PATH="$$PATH:/usr/5bin" tic ${srcdir}/terminfo/screeninfo.src; \
chmod 644 /usr/lib/terminfo/s/screen*; \
@@ -108,7 +102,7 @@
installdirs:
# Path leading to ETCSCREENRC and Socketdirectory not checked.
$(srcdir)/etc/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(SCREENENCODINGS)
- cd doc ; $(MAKE) installdirs
+ cd doc ; $(MAKE) $(MAKE_ARGS) installdirs
uninstall: .version
rm -f $(DESTDIR)$(bindir)/$(SCREEN)

40
sysutils/screen/files/patch-ab
View file

@ -1,20 +1,34 @@
--- doc/Makefile.in.orig Fri May 25 18:50:55 2001
+++ doc/Makefile.in Mon Jun 25 08:42:08 2001
@@ -27,7 +27,7 @@
info screen.info: screen.texinfo
@rm -f screen.info*
- $(MAKEINFO) $(srcdir)/screen.texinfo -o screen.info
+ $(MAKEINFO) --no-split $(srcdir)/screen.texinfo -o screen.info
--- doc/Makefile.in.orig 2014-04-29 20:26:42.618832001 -0700
+++ doc/Makefile.in 2014-04-29 20:29:26.379384101 -0700
@@ -31,7 +31,10 @@
$(MAKEINFO) --no-split $(srcdir)/screen.texinfo -o screen.info
install: installdirs
+ifeq (${WITH_MAN},1)
$(INSTALL_DATA) $(srcdir)/screen.1 $(DESTDIR)$(mandir)/man1/screen.1
@@ -36,7 +36,7 @@
+endif
+ifeq (${WITH_INFO},1)
-$(MAKE) screen.info
-if test -f screen.info; then d=.; else d=$(srcdir); fi; \
if test -f $$d/screen.info; then \
for f in $$d/screen.info*; do $(INSTALL_DATA) $$f $(DESTDIR)$(infodir);done; \
if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
- install-info --info-dir=$(DESTDIR)$(infodir) $$d/screen.info; \
+ install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/screen.info; \
@@ -40,13 +43,19 @@
install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/screen.info; \
else true; fi; \
fi
+endif
uninstall:
rm -f $(DESTDIR)$(mandir)/man1/screen.1
rm -f $(DESTDIR)$(infodir)/screen.info*
installdirs:
- $(srcdir)/../etc/mkinstalldirs $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(infodir)
+ifeq (${WITH_MAN},1)
+ $(srcdir)/../etc/mkinstalldirs $(DESTDIR)$(mandir)/man1
+endif
+ifeq (${WITH_INFO},1)
+ $(srcdir)/../etc/mkinstalldirs $(DESTDIR)$(infodir)
+endif
mostlyclean:
-rm -f *.cp *.cps *.fn *.fns *.ky *.kys *.pg *.tp *.vr

108
sysutils/screen/files/patch-ad
View file

@ -1,18 +1,13 @@
--- configure.orig Fri Dec 5 15:46:53 2003
+++ configure Sat Mar 4 10:18:24 2006
@@ -4746,48 +4746,6 @@
sed 's/^/| /' conftest.$ac_ext >&5
--- configure.orig 2014-04-26 03:58:46.000000000 -0700
+++ configure 2014-04-29 19:47:03.900706999 -0700
@@ -4857,46 +4857,6 @@
olibs="$LIBS"
else
olibs="$LIBS"
-LIBS="-lcurses $olibs"
-{ echo "$as_me:$LINENO: checking libcurses..." >&5
-echo "$as_me: checking libcurses..." >&6;}
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libcurses..." >&5
-$as_echo "$as_me: checking libcurses..." >&6;}
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
@ -29,36 +24,43 @@
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- :
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-if ac_fn_c_try_link "$LINENO"; then :
-
LIBS="-ltermcap $olibs"
{ echo "$as_me:$LINENO: checking libtermcap..." >&5
echo "$as_me: checking libtermcap..." >&6;}
@@ -4907,8 +4865,6 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-else
- LIBS="-ltermcap $olibs"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libtermcap..." >&5
-$as_echo "$as_me: checking libtermcap..." >&6;}
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-tgetent((char *)0, (char *)0);
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-
-else
LIBS="-ltermlib $olibs"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libtermlib..." >&5
$as_echo "$as_me: checking libtermlib..." >&6;}
@@ -5001,12 +4961,6 @@
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
if test "$cross_compiling" = yes; then
{ { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
@@ -4927,7 +4883,8 @@
if test "$cross_compiling" = yes; then :
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
@@ -5019,7 +4973,8 @@
main()
{
@ -67,8 +69,17 @@
+ exit(strcmp(tgoto("%d%d", 0, 1), "1") ? 0 : 1);
}
_ACEOF
rm -f conftest$ac_exeext
@@ -5314,19 +5271,16 @@
if ac_fn_c_try_run "$LINENO"; then :
@@ -5066,7 +5021,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SVR4 ptys..." >&5
$as_echo "$as_me: checking for SVR4 ptys..." >&6;}
sysvr4ptys=
-if test -c /dev/ptmx ; then
+if test -c /nonexistent ; then
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -5177,19 +5132,16 @@
fi
rm -f conftest*
@ -90,9 +101,9 @@
-fi
-
# Check whether --with-pty-mode or --without-pty-mode was given.
if test "${with_pty_mode+set}" = set; then
@@ -5575,6 +5529,8 @@
# Check whether --with-pty-mode was given.
if test "${with_pty_mode+set}" = set; then :
@@ -5416,6 +5368,8 @@
#if defined(SVR4) && !defined(DGUX)
#include <utmpx.h>
#define utmp utmpx
@ -101,19 +112,12 @@
#else
#include <utmp.h>
#endif
@@ -5627,6 +5583,8 @@
@@ -5484,6 +5438,10 @@
#if defined(SVR4) && !defined(DGUX)
#include <utmpx.h>
#define utmp utmpx
+#define pututline pututxline
+#define getutent getutxent
#else
#include <utmp.h>
#endif
@@ -5683,6 +5641,8 @@
#if defined(SVR4) && !defined(DGUX)
#include <utmpx.h>
#define utmp utmpx
+#define pututline pututxline
+#define getutent getutxent
#else

21
sysutils/screen/files/patch-ansi.c
View file

@ -1,11 +1,10 @@
--- ansi.c.orig Mon Sep 8 07:24:44 2003
+++ ansi.c Mon Dec 1 17:17:17 2003
@@ -559,7 +559,7 @@
{
case '0': case '1': case '2': case '3': case '4':
case '5': case '6': case '7': case '8': case '9':
- if (curr->w_NumArgs < MAXARGS)
+ if (curr->w_NumArgs >= 0 && curr->w_NumArgs < MAXARGS)
{
if (curr->w_args[curr->w_NumArgs] < 100000000)
curr->w_args[curr->w_NumArgs] =
--- ansi.c.orig 2014-04-26 04:32:54.000000000 -0700
+++ ansi.c 2014-04-29 19:08:26.631287189 -0700
@@ -569,6 +569,7 @@
case '0': case '1': case '2': case '3': case '4':
case '5': case '6': case '7': case '8': case '9':
if (curr->w_NumArgs < MAXARGS)
+ if (curr->w_NumArgs >= 0 && curr->w_NumArgs < MAXARGS)
{
if (curr->w_args[curr->w_NumArgs] < 100000000)
curr->w_args[curr->w_NumArgs] =

11
sysutils/screen/files/patch-display.h
View file

@ -1,11 +0,0 @@
--- display.h.orig 2003-07-01 07:01:42.000000000 -0700
+++ display.h 2011-11-07 11:54:32.842183150 -0800
@@ -85,7 +85,7 @@
struct win *d_other; /* pointer to other window */
int d_nonblock; /* -1 don't block if obufmax reached */
/* >0: block after nonblock secs */
- char d_termname[20 + 1]; /* $TERM */
+ char d_termname[63 + 1]; /* $TERM */
char *d_tentry; /* buffer for tgetstr */
char d_tcinited; /* termcap inited flag */
int d_width, d_height; /* width/height of the screen */

34
sysutils/screen/files/patch-doc_Makefile.in
View file

@ -1,34 +0,0 @@
--- doc/Makefile.in.orig 2007-10-29 13:08:52.000000000 -0700
+++ doc/Makefile.in 2007-10-29 13:11:09.000000000 -0700
@@ -30,7 +30,10 @@
$(MAKEINFO) --no-split $(srcdir)/screen.texinfo -o screen.info
install: installdirs
+.if defined(WITH_MAN)
$(INSTALL_DATA) $(srcdir)/screen.1 $(DESTDIR)$(mandir)/man1/screen.1
+.endif
+.if defined(WITH_INFO)
-$(MAKE) screen.info
-if test -f screen.info; then d=.; else d=$(srcdir); fi; \
if test -f $$d/screen.info; then \
@@ -39,13 +42,19 @@
install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/screen.info; \
else true; fi; \
fi
+.endif
uninstall:
rm -f $(DESTDIR)$(mandir)/man1/screen.1
rm -f $(DESTDIR)$(infodir)/screen.info*
installdirs:
- $(srcdir)/../etc/mkinstalldirs $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(infodir)
+.if defined(WITH_MAN)
+ $(srcdir)/../etc/mkinstalldirs $(DESTDIR)$(mandir)/man1
+.endif
+.if defined(WITH_INFO)
+ $(srcdir)/../etc/mkinstalldirs $(DESTDIR)$(infodir)
+.endif
mostlyclean:
-rm -f *.cp *.cps *.fn *.fns *.ky *.kys *.pg *.tp *.vr

25
sysutils/screen/files/patch-os.h
View file

@ -1,15 +1,6 @@
--- os.h.orig Tue Jan 8 07:42:33 2002
+++ os.h Tue Sep 9 17:39:58 2003
@@ -161,7 +161,7 @@
# define setregid(rgid, egid) setresgid(rgid, egid, -1)
#endif
-#if defined(HAVE_SETEUID) || defined(HAVE_SETREUID)
+#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && __FreeBSD_version < 500000
# define USE_SETEUID
#endif
@@ -262,7 +262,11 @@
--- os.h.orig 2014-04-26 03:58:35.000000000 -0700
+++ os.h 2014-04-29 19:16:31.730773575 -0700
@@ -252,7 +252,11 @@
#if defined(UTMPOK) || defined(BUGGYGETLOGIN)
# if defined(SVR4) && !defined(DGUX) && !defined(__hpux) && !defined(linux)
# include <utmpx.h>
@ -22,7 +13,7 @@
# define utmp utmpx
# define getutent getutxent
# define getutid getutxid
@@ -270,7 +274,7 @@
@@ -260,7 +264,7 @@
# define pututline pututxline
# define setutent setutxent
# define endutent endutxent
@ -31,3 +22,11 @@
# else /* SVR4 */
# include <utmp.h>
# endif /* SVR4 */
@@ -524,6 +528,6 @@
/* Changing those you won't be able to attach to your old sessions
* when changing those values in official tree don't forget to bump
* MSG_VERSION */
-#define MAXTERMLEN 32
+#define MAXTERMLEN 63
#define MAXLOGINLEN 256

11
sysutils/screen/files/patch-process.c
View file

@ -1,11 +0,0 @@
--- process.c
+++ process.c
@@ -37,7 +37,7 @@
#include "config.h"
/* for solaris 2.1, Unixware (SVR4.2) and possibly others: */
-#ifdef SVR4
+#if defined(SVR4) && !defined(__FreeBSD__)
# include <sys/stropts.h>
#endif

15
sysutils/screen/files/patch-pty.c
View file

@ -1,15 +0,0 @@
--- pty.c.orig Mon Feb 6 18:54:37 2006
+++ pty.c Mon Feb 6 18:56:50 2006
@@ -33,10 +33,12 @@
# include <sys/ioctl.h>
#endif
+#ifndef __FreeBSD__
/* for solaris 2.1, Unixware (SVR4.2) and possibly others */
#ifdef HAVE_SVR4_PTYS
# include <sys/stropts.h>
#endif
+#endif
#if defined(sun) && defined(LOCKPTY) && !defined(TIOCEXCL)
# include <sys/ttold.h>

11
sysutils/screen/files/patch-screen.c
View file

@ -1,11 +0,0 @@
--- screen.c
+++ screen.c
@@ -50,7 +50,7 @@
#include "config.h"
-#ifdef SVR4
+#if defined(SVR4) && !defined(__FreeBSD__)
# include <sys/stropts.h>
#endif

20
sysutils/screen/files/patch-screen.h
View file

@ -1,20 +0,0 @@
--- screen.h.orig 2003-08-22 05:28:43.000000000 -0700
+++ screen.h 2011-11-07 11:53:41.739890820 -0800
@@ -22,6 +22,8 @@
* $Id: screen.h,v 1.12 1994/05/31 12:32:54 mlschroe Exp $ FAU
*/
+#include <string.h>
+
#include "os.h"
#if defined(__STDC__)
@@ -202,7 +204,7 @@
char preselect[20];
int esc; /* his new escape character unless -1 */
int meta_esc; /* his new meta esc character unless -1 */
- char envterm[20 + 1]; /* terminal type */
+ char envterm[63 + 1]; /* terminal type */
int encoding; /* encoding of display */
}
attach;

22
sysutils/screen/files/patch-tty.sh
View file

@ -1,22 +0,0 @@
--- tty.sh
+++ tty.sh
@@ -76,7 +76,7 @@
#endif
#include "config.h"
-#ifdef SVR4
+#if defined(SVR4) && !defined(__FreeBSD__)
#include <sys/stropts.h> /* for I_POP */
#endif
@@ -562,7 +562,9 @@
XIF{VLNEXT} np->tio.c_cc[VLNEXT] = VDISABLE;
XIF{VSTATUS} np->tio.c_cc[VSTATUS] = VDISABLE;
XIF{VSUSP} np->tio.c_cc[VSUSP] = VDISABLE;
-XIF{VERASE} np->tio.c_cc[VERASE] = VDISABLE;
+ /* Set VERASE to DEL, rather than VDISABLE, to avoid libvte
+ "autodetect" issues. */
+XIF{VERASE} np->tio.c_cc[VERASE] = 0x7f;
XIF{VKILL} np->tio.c_cc[VKILL] = VDISABLE;
# ifdef HPUX_LTCHARS_HACK
np->m_ltchars.t_suspc = VDISABLE;

23
sysutils/screen/files/patch-utmp.c
View file

@ -1,6 +1,6 @@
--- utmp.c
+++ utmp.c
@@ -404,12 +404,6 @@
--- utmp.c.orig 2014-04-26 09:22:09.000000000 -0700
+++ utmp.c 2014-04-29 19:42:22.660642853 -0700
@@ -409,12 +409,6 @@
register slot_t slot;
struct utmp u;
int saved_ut;
@ -13,7 +13,7 @@
wi->w_slot = (slot_t)0;
if (!utmpok || wi->w_type != W_TYPE_PTY)
@@ -430,51 +424,12 @@
@@ -435,51 +429,12 @@
makeuser(&u, stripdev(wi->w_tty), LoginName, wi->w_pid);
#ifdef UTHOST
@ -67,21 +67,12 @@
{
Msg(errno,"Could not write %s", UtmpName);
UT_CLOSE;
@@ -589,7 +544,7 @@
@@ -598,7 +553,7 @@
struct utmp *u;
{
u->ut_type = DEAD_PROCESS;
-#if !defined(linux) || defined(EMPTY)
+#if (!defined(linux) || defined(EMPTY)) && !defined(__FreeBSD__)
-#if (!defined(linux) || defined(EMPTY)) && !defined(__CYGWIN__)
+#if (!defined(linux) || defined(EMPTY)) && !defined(__CYGWIN__) && !defined(__FreeBSD__)
u->ut_exit.e_termination = 0;
u->ut_exit.e_exit = 0;
#endif
@@ -728,7 +683,7 @@
{
strncpy(u->ut_line, line, sizeof(u->ut_line));
strncpy(u->ut_name, user, sizeof(u->ut_name));
- (void)time((time_t *)&u->ut_time);
+ u->ut_time = time(NULL);
}
static slot_t