lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
Code Activity

linux: Allow adjtime with NULL argument [BZ #26833]

Browse Source 
The adjtime interface allows return the amount of time remaining
from any previous adjustment that has not yet been completed by
passing a NULL as first argument.  This was introduced with y2038
support 0308077e3a.

Checked on i686-linux-gnu.

Reviewed-by: Lukasz Majewski <lukma@denx.de>
This commit is contained in:
Adhemerval Zanella
2020-11-02 16:18:29 -03:00
parent 5edf3d9fd6
commit 75a193b761
3 changed files with 54 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sysdeps/unix/sysv/linux/adjtime.c
View File

@ -68,11 +68,16 @@ libc_hidden_def (__adjtime64)
int int
__adjtime (const struct timeval *itv, struct timeval *otv) __adjtime (const struct timeval *itv, struct timeval *otv)
{ {
struct __timeval64 itv64, otv64; struct __timeval64 itv64, *pitv64 = NULL;
struct __timeval64 otv64;
int retval; int retval;
if (itv != NULL)
{
itv64 = valid_timeval_to_timeval64 (*itv); itv64 = valid_timeval_to_timeval64 (*itv);
retval = __adjtime64 (&itv64, otv != NULL ? &otv64 : NULL); pitv64 = &itv64;
}
retval = __adjtime64 (pitv64, otv != NULL ? &otv64 : NULL);
if (otv != NULL) if (otv != NULL)
*otv = valid_timeval64_to_timeval (otv64); *otv = valid_timeval64_to_timeval (otv64);

3
time/Makefile
View File

@ -47,7 +47,8 @@ tests := test_time clocktest tst-posixtz tst-strptime tst_wcsftime \
tst-mktime3 tst-strptime2 bug-asctime bug-asctime_r bug-mktime1 \ tst-mktime3 tst-strptime2 bug-asctime bug-asctime_r bug-mktime1 \
tst-strptime3 bug-getdate1 tst-strptime-whitespace tst-ftime \ tst-strptime3 bug-getdate1 tst-strptime-whitespace tst-ftime \
tst-tzname tst-y2039 bug-mktime4 tst-strftime2 tst-strftime3 \ tst-tzname tst-y2039 bug-mktime4 tst-strftime2 tst-strftime3 \
tst-clock tst-clock2 tst-clock_nanosleep tst-cpuclock1 tst-clock tst-clock2 tst-clock_nanosleep tst-cpuclock1 \
tst-adjtime
include ../Rules include ../Rules

44
time/tst-adjtime.c Normal file
View File

@ -0,0 +1,44 @@
/* Basic tests for adjtime.
Copyright (C) 2020 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library 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
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
#include <sys/time.h>
#include <stdlib.h>
#include <errno.h>
#include <support/check.h>
static int
do_test (void)
{
/* Check if the interface allows getting the amount of time remaining
from any previous adjustment that has not yet been completed. This
is a non-privileged function of adjtime. */
struct timeval tv;
int r = adjtime (NULL, &tv);
if (r == -1)
{
if (errno == ENOSYS)
FAIL_UNSUPPORTED ("adjtime unsupported");
FAIL_EXIT1 ("adjtime (NULL, ...) failed: %m");
}
return 0;
}
#include <support/test-driver.c>