sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

unar, uwsgi: Fix bug in sys_time.c

Browse Source 
The first argument of `timespec_from_timeval()` must be a pointer.
This commit is contained in:
Tee KOBAYASHI 2022-01-21 02:57:03 +09:00 committed by Henrik Grimler
parent f7ea450830
commit 8a9be0408f
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/unar/build.sh
View File

@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Command line tools for archive and file unarchiving and
TERMUX_PKG_LICENSE="LGPL-2.1"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=()
TERMUX_PKG_REVISION=1
TERMUX_PKG_VERSION+=(1.10.7)
TERMUX_PKG_VERSION+=(1.1)
TERMUX_PKG_SRCURL=(https://github.com/MacPaw/XADMaster/archive/v${TERMUX_PKG_VERSION}/XADMaster-${TERMUX_PKG_VERSION}.tar.gz

8
packages/unar/sys_time.c
View File

@ -34,21 +34,21 @@
#pragma GCC visibility push(hidden)
int timespec_from_timeval(struct timespec ts, const struct timeval tv) {
int timespec_from_timeval(struct timespec* ts, const struct timeval tv) {
// Whole seconds can just be copied.
ts.tv_sec = tv.tv_sec;
ts->tv_sec = tv.tv_sec;
// But we might overflow when converting microseconds to nanoseconds.
if (tv.tv_usec >= 1000000 || tv.tv_usec < 0) {
return 0;
}
ts.tv_nsec = tv.tv_usec * 1000;
ts->tv_nsec = tv.tv_usec * 1000;
return 1;
}
static int futimesat(int fd, const char* path, const struct timeval tv[2], int flags) {
struct timespec ts[2];
if (tv && (!timespec_from_timeval(ts[0], tv[0]) || !timespec_from_timeval(ts[1], tv[1]))) {
if (tv && (!timespec_from_timeval(&ts[0], tv[0]) || !timespec_from_timeval(&ts[1], tv[1]))) {
errno = EINVAL;
return -1;
}

1
packages/uwsgi/build.sh
View File

@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="uWSGI application server container"
TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=2.0.19.1
TERMUX_PKG_REVISION=1
TERMUX_PKG_SRCURL=https://github.com/unbit/uwsgi/archive/${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=bf17cdbb9bd8bcb7c1633e34d9d7308cb4cc19eb0ff2d61057f840c1ba1fc41b
TERMUX_PKG_DEPENDS="libandroid-glob, libcap, libcrypt, libjansson, libuuid, libxml2, openssl, pcre, python"

8
packages/uwsgi/sys_time.c
View File

@ -34,21 +34,21 @@
#pragma GCC visibility push(hidden)
int timespec_from_timeval(struct timespec ts, const struct timeval tv) {
int timespec_from_timeval(struct timespec* ts, const struct timeval tv) {
// Whole seconds can just be copied.
ts.tv_sec = tv.tv_sec;
ts->tv_sec = tv.tv_sec;
// But we might overflow when converting microseconds to nanoseconds.
if (tv.tv_usec >= 1000000 || tv.tv_usec < 0) {
return 0;
}
ts.tv_nsec = tv.tv_usec * 1000;
ts->tv_nsec = tv.tv_usec * 1000;
return 1;
}
int futimes(int fd, const struct timeval tv[2]) {
struct timespec ts[2];
if (tv && (!timespec_from_timeval(ts[0], tv[0]) || !timespec_from_timeval(ts[1], tv[1]))) {
if (tv && (!timespec_from_timeval(&ts[0], tv[0]) || !timespec_from_timeval(&ts[1], tv[1]))) {
errno = EINVAL;
return -1;
}