From owner-svn-src-user@FreeBSD.ORG  Wed Jan  6 19:29:19 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2DF8C106568F;
	Wed,  6 Jan 2010 19:29:19 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1DC3E8FC13;
	Wed,  6 Jan 2010 19:29:19 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o06JTJGv017507;
	Wed, 6 Jan 2010 19:29:19 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o06JTIW2017504;
	Wed, 6 Jan 2010 19:29:18 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <201001061929.o06JTIW2017504@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Wed, 6 Jan 2010 19:29:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r201660 - user/ed/utmpx/lib/libc/gen
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 06 Jan 2010 19:29:19 -0000

Author: ed
Date: Wed Jan  6 19:29:18 2010
New Revision: 201660
URL: http://svn.freebsd.org/changeset/base/201660

Log:
  Remove silly bugs from getutxent() and pututxline().
  
  - Unbreak getutxent() on UTXDB_LOG (wtmp) files by not always returning
    NULL instead of the proper entry.
  - Unbreak UTXDB_LOG writing of pututxline() of DEAD_PROCESS by properly
    breaking from the switch statement.

Modified:
  user/ed/utmpx/lib/libc/gen/getutxent.c
  user/ed/utmpx/lib/libc/gen/pututxline.c

Modified: user/ed/utmpx/lib/libc/gen/getutxent.c
==============================================================================
--- user/ed/utmpx/lib/libc/gen/getutxent.c	Wed Jan  6 18:21:22 2010	(r201659)
+++ user/ed/utmpx/lib/libc/gen/getutxent.c	Wed Jan  6 19:29:18 2010	(r201660)
@@ -157,7 +157,6 @@ getfutxent(void)
 			if (fread(&fu, len, 1, uf) != 1)
 				return (NULL);
 		}
-		return (NULL);
 	} else {
 		if (fread(&fu, sizeof fu, 1, uf) != 1)
 			return (NULL);

Modified: user/ed/utmpx/lib/libc/gen/pututxline.c
==============================================================================
--- user/ed/utmpx/lib/libc/gen/pututxline.c	Wed Jan  6 18:21:22 2010	(r201659)
+++ user/ed/utmpx/lib/libc/gen/pututxline.c	Wed Jan  6 19:29:18 2010	(r201660)
@@ -254,10 +254,12 @@ pututxline(const struct utmpx *utmpx)
 	case DEAD_PROCESS:
 		if (utx_active_remove(&fu) != 0)
 			return (NULL);
+		break;
 	default:
 		return (NULL);
 	}
 
 	utx_log_add(&fu);
+	/* XXX: return an entry on success! */
 	return (NULL);
 }