thirdparty/util-linux
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

lib/strutils: assume 64-bit time_t

Browse source 
Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2021-05-06 11:06:45 +02:00
parent 634636301e
commit 35c84bf76a
2 changed files with 35 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

35
lib/strutils.c
View file

@ -459,6 +459,27 @@ err:
errx(STRTOXX_EXIT_CODE, "%s: '%s'", errmesg, str);
}
long double strtold_or_err(const char *str, const char *errmesg)
{
double num;
char *end = NULL;
errno = 0;
if (str == NULL || *str == '\0')
goto err;
num = strtold(str, &end);
if (errno || str == end || (end && *end))
goto err;
return num;
err:
if (errno == ERANGE)
err(STRTOXX_EXIT_CODE, "%s: '%s'", errmesg, str);
errx(STRTOXX_EXIT_CODE, "%s: '%s'", errmesg, str);
}
long strtol_or_err(const char *str, const char *errmesg)
{
long num;
@ -517,11 +538,19 @@ uintmax_t strtosize_or_err(const char *str, const char *errmesg)
void strtotimeval_or_err(const char *str, struct timeval *tv, const char *errmesg)
{
double user_input;
long double user_input;
user_input = strtod_or_err(str, errmesg);
user_input = strtold_or_err(str, errmesg);
tv->tv_sec = (time_t) user_input;
tv->tv_usec = (long)((user_input - tv->tv_sec) * 1000000);
tv->tv_usec = (suseconds_t)((user_input - tv->tv_sec) * 1000000);
}
time_t strtotime_or_err(const char *str, const char *errmesg)
{
int64_t user_input;
user_input = strtos64_or_err(str, errmesg);
return (time_t) user_input;
}
/*