BSD 4_4 release

[unix-history] / usr / src / lib / libutil / logout.c

diff --git a/usr/src/lib/libutil/logout.c b/usr/src/lib/libutil/logout.c
index 50c55e4..11da24f 100644 (file)
--- a/usr/src/lib/libutil/logout.c
+++ b/usr/src/lib/libutil/logout.c
@@ -1,53 +1,70 @@
 /*
 /*

- * Copyright (c) 1988 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that: (1) source distributions retain this entire copyright
- * notice and comment, and (2) distributions including binaries display
- * the following acknowledgement:  ``This product includes software
- * developed by the University of California, Berkeley and its contributors''
- * in the documentation or other materials provided with the distribution
- * and in all advertising materials mentioning features or use of this
- * software. Neither the name of the University nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)

-static char sccsid[] = "@(#)logout.c   5.5 (Berkeley) 6/1/90";
+static char sccsid[] = "@(#)logout.c   8.1 (Berkeley) 6/4/93";

 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>

-#include <sys/file.h>

 #include <sys/time.h>
 #include <sys/time.h>

+
+#include <fcntl.h>

 #include <utmp.h>
 #include <utmp.h>

+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>

 
 typedef struct utmp UTMP;
 
 
 typedef struct utmp UTMP;
 

+int

 logout(line)
        register char *line;
 {
        register int fd;
        UTMP ut;
        int rval;
 logout(line)
        register char *line;
 {
        register int fd;
        UTMP ut;
        int rval;

-       off_t lseek();
-       time_t time();

 
 

-       if ((fd = open(_PATH_UTMP, O_RDWR)) < 0)
+       if ((fd = open(_PATH_UTMP, O_RDWR, 0)) < 0)

                return(0);
        rval = 0;
                return(0);
        rval = 0;

-       while (read(fd, (char *)&ut, sizeof(UTMP)) == sizeof(UTMP)) {
+       while (read(fd, &ut, sizeof(UTMP)) == sizeof(UTMP)) {

                if (!ut.ut_name[0] || strncmp(ut.ut_line, line, UT_LINESIZE))
                        continue;
                bzero(ut.ut_name, UT_NAMESIZE);
                bzero(ut.ut_host, UT_HOSTSIZE);
                (void)time(&ut.ut_time);
                if (!ut.ut_name[0] || strncmp(ut.ut_line, line, UT_LINESIZE))
                        continue;
                bzero(ut.ut_name, UT_NAMESIZE);
                bzero(ut.ut_host, UT_HOSTSIZE);
                (void)time(&ut.ut_time);

-               (void)lseek(fd, -(long)sizeof(UTMP), L_INCR);
-               (void)write(fd, (char *)&ut, sizeof(UTMP));
+               (void)lseek(fd, -(off_t)sizeof(UTMP), L_INCR);
+               (void)write(fd, &ut, sizeof(UTMP));

                rval = 1;
        }
        (void)close(fd);
                rval = 1;
        }
        (void)close(fd);