last: clean up the begin of the file

 .. and improve last(1) stuff in configure script.

Signed-off-by: Karel Zak <kzak@redhat.com>

3 files changed, 25 insertions, 33 deletions

diff --git a/AUTHORS b/AUTHORS
index 5e3c44ba..789d65e7 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -27,6 +27,8 @@ AUTHORS (merged projects & commands):
       getopt:          Frodo Looijaard <frodol@dds.nl>
       hwclock:         Bryan Henderson <bryanh@giraffe-data.com>
       ipcmk:           Hayden James <hayden.james@gmail.com>
+      last/lastb:      [merged from sysvinit]
+                       Miquel van Smoorenburg <miquels@cistron.nl>
       ldattach:        Tilman Schmidt <tilman@imap.cc>
       libblkid:        [merged from e2fsprogs]
                        Theodore Ts'o <tytso@mit.edu>
diff --git a/configure.ac b/configure.ac
index d0c54247..87cffadd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1066,15 +1066,15 @@ AC_ARG_ENABLE([deprecated-last],
   [], [enable_deprecated_last=no]
 )
 UL_BUILD_INIT([deprecated_last])
-UL_CONFLICTS_BUILD([last], [deprecated_last], [old deprecated last version])
 AM_CONDITIONAL([BUILD_DEPRECATED_LAST], [test "x$build_deprecated_last" = xyes])
 
 
 AC_ARG_ENABLE([last],
   AS_HELP_STRING([--disable-last], [do not build last]),
-  [], [enable_last=yes]
+  [], [enable_last=check]
 )
 UL_BUILD_INIT([last])
+UL_CONFLICTS_BUILD([last], [deprecated_last], [old deprecated last version])
 AM_CONDITIONAL([BUILD_LAST], [test "x$build_last" = xyes])
 
 
diff --git a/login-utils/last.c b/login-utils/last.c
index 06017df1..fb786f41 100644
--- a/login-utils/last.c
+++ b/login-utils/last.c
@@ -1,36 +1,28 @@
 /*
- * last.c	Re-implementation of the 'last' command, this time
- *		for Linux. Yes I know there is BSD last, but I
- *		just felt like writing this. No thanks :-).
- *		Also, this version gives lots more info (especially with -x)
+ * last(1) from sysvinit project, merged into util-linux in Aug 2013.
  *
- * Author:	Miquel van Smoorenburg, miquels@cistron.nl
+ * Copyright (C) 1991-2004 Miquel van Smoorenburg.
+ * Copyright (C) 2013      Ondrej Oprala <ooprala@redhat.com>
  *
- * Version:	@(#)last  2.85  30-Jul-2004  miquels@cistron.nl
+ * Re-implementation of the 'last' command, this time for Linux. Yes I know
+ * there is BSD last, but I just felt like writing this. No thanks :-).  Also,
+ * this version gives lots more info (especially with -x)
  *
- *		This file is part of the sysvinit suite,
- *		Copyright (C) 1991-2004 Miquel van Smoorenburg.
  *
- *		This program is free software; you can redistribute it and/or modify
- *		it under the terms of the GNU General Public License as published by
- *		the Free Software Foundation; either version 2 of the License, or
- *		(at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
- *		This program is distributed in the hope that it will be useful,
- *		but WITHOUT ANY WARRANTY; without even the implied warranty of
- *		MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *		GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *		You should have received a copy of the GNU General Public License
- *		along with this program; if not, write to the Free Software
- *		Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
-
-/*              Deleting the -o option as well as any related code (utmp libc5 support),
- *              declaring functions static and fixing a few warnings(sighandlers)
- *              06-Aug-2013 Ondrej Oprala <ooprala@redhat.com>
- */
-
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/fcntl.h>
@@ -50,19 +42,17 @@
 #include <arpa/inet.h>
 
 #ifndef SHUTDOWN_TIME
-#  define SHUTDOWN_TIME 254
+# define SHUTDOWN_TIME 254
 #endif
 
-char *Version = "@(#) last 2.85 31-Apr-2004 miquels";
-
 #define CHOP_DOMAIN	0	/* Define to chop off local domainname. */
 #define UCHUNKSIZE	16384	/* How much we read at once. */
 
 /* Double linked list of struct utmp's */
 struct utmplist {
-  struct utmp ut;
-  struct utmplist *next;
-  struct utmplist *prev;
+	struct utmp ut;
+	struct utmplist *next;
+	struct utmplist *prev;
 };
 struct utmplist *utmplist = NULL;