Skip to content

Commit f72322f

Browse files
authored
Merge pull request #524 from k-okada/fix-localtime-arm32
On arm32, localtime_r in LOCALTIME in unixcall.c returns NULL in some situation.
2 parents 01fc357 + ae1e052 commit f72322f

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

.travis.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ if [[ "$QEMU" != "" ]]; then
9595
export GIT_SSL_NO_VERIFY=1
9696
git clone http://salsa.debian.org/science-team/euslisp /tmp/euslisp-dfsg
9797
for file in $(cat /tmp/euslisp-dfsg/debian/patches/series); do
98-
# skip patches already applied by https://github.com/euslisp/EusLisp/pull/482, https://github.com/euslisp/EusLisp/pull/511, https://github.com/euslisp/EusLisp/pull/523, https://github.com/euslisp/EusLisp/pull/525
99-
[[ $file =~ use-rtld-global-loadelf.patch|fix-arm-ldflags.patch|fix-library-not-linked-against-libc.patch|fix-manpage-has-bad-whatis-entry-on-man-pages.patch|fix-jpegmemcd-compile-error.patch|install-bin-lib-man-to-destdir.patch|install-eusjpeg-lib.patch|fix-lintian-typo.patch|fix-makefile-linux-MACHINE.patch|fix-makefile-generic1-version.patch|fix-ppc64el-test.patch|fix-for-blhc.patch ]] && continue;
98+
# skip patches already applied by https://github.com/euslisp/EusLisp/pull/482, https://github.com/euslisp/EusLisp/pull/511, https://github.com/euslisp/EusLisp/pull/523, https://github.com/euslisp/EusLisp/pull/524, https://github.com/euslisp/EusLisp/pull/525
99+
[[ $file =~ use-rtld-global-loadelf.patch|fix-arm-ldflags.patch|fix-library-not-linked-against-libc.patch|fix-manpage-has-bad-whatis-entry-on-man-pages.patch|fix-jpegmemcd-compile-error.patch|install-bin-lib-man-to-destdir.patch|install-eusjpeg-lib.patch|fix-lintian-typo.patch|fix-makefile-linux-MACHINE.patch|fix-makefile-generic1-version.patch|fix-localtime-arm32.patch|fix-ppc64el-test.patch|fix-for-blhc.patch ]] && continue;
100100
# skip patch already applied by https://github.com/euslisp/EusLisp/pull/441, https://github.com/euslisp/EusLisp/pull/509, https://github.com/euslisp/EusLisp/pull/512, https://github.com/euslisp/EusLisp/pull/514, https://github.com/euslisp/EusLisp/pull/517
101101
if [[ $file =~ fix-for-reprotest.patch ]]; then
102102
filterdiff -p1 -x 'lisp/image/jpeg/makefile' -x 'lisp/comp/comp.l' < /tmp/euslisp-dfsg/debian/patches/$file > /tmp/euslisp-dfsg/debian/patches/$file-fix

lisp/c/unixcall.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ pointer argv[];
142142
if (n==1) clock=coerceintval(argv[0]);
143143
else clock=time(0);
144144
tms=localtime_r((time_t *)&clock,&res); /* localtime-->localtime_r */
145+
if (tms == NULL) tms = &res;
145146
timevec=makevector(C_VECTOR,10);
146147
vpush(timevec);
147148

0 commit comments

Comments
 (0)