generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am a3056591: Merge "Switch to NetBSD utmp.c."

Browse Source 
* commit 'a3056591960f9d9f646135ee20804cc1a9e41106':
  Switch to NetBSD utmp.c.
This commit is contained in:
Elliott Hughes 2014-03-10 23:42:50 +00:00 committed by Android Git Automerger
commit 2f80b7a86a
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libc/Android.mk
View File

@ -82,7 +82,6 @@ libc_common_src_files := \
bionic/time64.c \ bionic/time64.c \
bionic/umount.c \ bionic/umount.c \
bionic/unlockpt.c \ bionic/unlockpt.c \
bionic/utmp.c \
stdio/asprintf.c \ stdio/asprintf.c \
stdio/findfp.c \ stdio/findfp.c \
stdio/fprintf.c \ stdio/fprintf.c \
@ -279,6 +278,7 @@ libc_upstream_netbsd_src_files := \
upstream-netbsd/lib/libc/gen/psignal.c \ upstream-netbsd/lib/libc/gen/psignal.c \
upstream-netbsd/lib/libc/gen/setjmperr.c \ upstream-netbsd/lib/libc/gen/setjmperr.c \
upstream-netbsd/lib/libc/gen/utime.c \ upstream-netbsd/lib/libc/gen/utime.c \
upstream-netbsd/lib/libc/gen/utmp.c \
upstream-netbsd/lib/libc/inet/inet_ntoa.c \ upstream-netbsd/lib/libc/inet/inet_ntoa.c \
upstream-netbsd/lib/libc/inet/inet_ntop.c \ upstream-netbsd/lib/libc/inet/inet_ntop.c \
upstream-netbsd/lib/libc/inet/inet_pton.c \ upstream-netbsd/lib/libc/inet/inet_pton.c \

29
libc/bionic/utmp.c → libc/upstream-netbsd/lib/libc/gen/utmp.c
View File

@ -1,3 +1,5 @@
/* $NetBSD: utmp.c,v 1.10 2011/10/15 23:00:02 christos Exp $ */
/*- /*-
* Copyright (c) 2002 The NetBSD Foundation, Inc. * Copyright (c) 2002 The NetBSD Foundation, Inc.
* All rights reserved. * All rights reserved.
@ -13,13 +15,6 @@
* 2. Redistributions in binary form must reproduce the above copyright * 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * 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 NetBSD
* Foundation, Inc. and its contributors.
* 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@ -35,12 +30,18 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: utmp.c,v 1.10 2011/10/15 23:00:02 christos Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
#include <sys/types.h> #include <sys/types.h>
#include <sys/param.h> #include <sys/param.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <time.h> #include <time.h>
#include <utmp.h> #include <utmp.h>
#include <sys/stat.h>
static struct utmp utmp; static struct utmp utmp;
static FILE *ut; static FILE *ut;
@ -58,11 +59,23 @@ struct utmp *
getutent(void) getutent(void)
{ {
if (ut == NULL) { if (ut == NULL) {
if ((ut = fopen(utfile, "r")) == NULL) struct stat st;
off_t numentries;
if ((ut = fopen(utfile, "re")) == NULL)
return NULL; return NULL;
if (fstat(fileno(ut), &st) == -1)
goto out;
/*
* If we have a an old version utmp file bail.
*/
numentries = st.st_size / sizeof(utmp);
if ((off_t)(numentries * sizeof(utmp)) != st.st_size)
goto out;
} }
if (fread(&utmp, sizeof(utmp), 1, ut) == 1) if (fread(&utmp, sizeof(utmp), 1, ut) == 1)
return &utmp; return &utmp;
out:
(void)fclose(ut);
return NULL; return NULL;
} }