--- Libc/Libc-320/util/login.c
+++ Libc/Libc-498/util/login.c
@@ -1,9 +1,7 @@
 /*
- * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2005 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
  * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
@@ -57,28 +55,19 @@
 
 
 #include <sys/types.h>
-
-#include <fcntl.h>
-#include <unistd.h>
-#include <stdlib.h>
 #include <utmp.h>
-#include <stdio.h>
+#include <utmpx.h>
+#include <utmpx-darwin.h>
 
 void
-login(ut)
-	struct utmp *ut;
+login(struct utmp *ut)
 {
-	register int fd;
-	int tty;
+	struct utmpx ux;
 
-	tty = ttyslot();
-	if (tty > 0 && (fd = open(_PATH_UTMP, O_WRONLY|O_CREAT, 0644)) >= 0) {
-		(void)lseek(fd, (off_t)(tty * sizeof(struct utmp)), L_SET);
-		(void)write(fd, ut, sizeof(struct utmp));
-		(void)close(fd);
-	}
-	if ((fd = open(_PATH_WTMP, O_WRONLY|O_APPEND, 0)) >= 0) {
-		(void)write(fd, ut, sizeof(struct utmp));
-		(void)close(fd);
-	}
+	getutmpx(ut, &ux);
+	/* ut_id will automatically be calculated in the call to pututxline() */
+	ux.ut_type |= UTMPX_AUTOFILL_MASK;
+	setutxent();
+	pututxline(&ux);
+	endutxent();
 }