Including sys/select.h where needed. Changed wait3() to waitpid() for better portability. Thanks Jonas Sortie Termansen.
This commit is contained in:
parent
0b4c879509
commit
23ce0176b8
@ -97,9 +97,11 @@ AC_SUBST(LIBTOOL_DEPS)
|
|||||||
|
|
||||||
AC_PROG_INSTALL
|
AC_PROG_INSTALL
|
||||||
|
|
||||||
dnl GNU libtool checks them by default/unconditionally, but slibtool does not.
|
dnl GNU libtool checks stdint.h inttypes.h stdlib.h by default/unconditionally,
|
||||||
dnl So accept the ugly double check and -DHAVE_*_H arguments with GNU libtool.
|
dnl but slibtool does not. So accept the ugly double check and -DHAVE_*_H
|
||||||
AC_CHECK_HEADERS(stdint.h inttypes.h stdlib.h)
|
dnl arguments with GNU libtool.
|
||||||
|
dnl select.h seems to be ubiquitous, but was not used in libisoburn before 2025
|
||||||
|
AC_CHECK_HEADERS(stdint.h inttypes.h stdlib.h sys/select.h)
|
||||||
|
|
||||||
dnl Check for tm_gmtoff field in struct tm
|
dnl Check for tm_gmtoff field in struct tm
|
||||||
AC_CHECK_MEMBER([struct tm.tm_gmtoff],
|
AC_CHECK_MEMBER([struct tm.tm_gmtoff],
|
||||||
|
@ -84,9 +84,10 @@ dnl LIBTOOL="$LIBTOOL --silent"
|
|||||||
|
|
||||||
AC_PROG_INSTALL
|
AC_PROG_INSTALL
|
||||||
|
|
||||||
dnl GNU libtool checks them by default/unconditionally, but slibtool does not.
|
dnl GNU libtool checks stdint.h inttypes.h stdlib.h by default/unconditionally, dnl but slibtool does not. So accept the ugly double check and -DHAVE_*_H
|
||||||
dnl So accept the ugly double check and -DHAVE_*_H arguments with GNU libtool.
|
dnl arguments with GNU libtool.
|
||||||
AC_CHECK_HEADERS(stdint.h inttypes.h stdlib.h)
|
dnl select.h seems to be ubiquitous, but was not used in libisoburn before 2025
|
||||||
|
AC_CHECK_HEADERS(stdint.h inttypes.h stdlib.h sys/select.h)
|
||||||
|
|
||||||
AC_CHECK_MEMBER([struct tm.tm_gmtoff],
|
AC_CHECK_MEMBER([struct tm.tm_gmtoff],
|
||||||
[AC_DEFINE(HAVE_TM_GMTOFF, 1,
|
[AC_DEFINE(HAVE_TM_GMTOFF, 1,
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
/* xorriso - creates, loads, manipulates and burns ISO 9660 filesystem images.
|
/* xorriso - creates, loads, manipulates and burns ISO 9660 filesystem images.
|
||||||
|
|
||||||
Copyright 2007-2024 Thomas Schmitt, <scdbackup@gmx.net>
|
Copyright 2007-2025 Thomas Schmitt, <scdbackup@gmx.net>
|
||||||
|
|
||||||
Provided under GPL version 2 or later.
|
Provided under GPL version 2 or later.
|
||||||
|
|
||||||
@ -23,6 +23,9 @@
|
|||||||
#include <time.h>
|
#include <time.h>
|
||||||
#include <sys/utsname.h>
|
#include <sys/utsname.h>
|
||||||
|
|
||||||
|
#ifdef HAVE_SYS_SELECT_H
|
||||||
|
#include <sys/select.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "sfile.h"
|
#include "sfile.h"
|
||||||
#include "misc_funct.h"
|
#include "misc_funct.h"
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
/* xorriso - creates, loads, manipulates and burns ISO 9660 filesystem images.
|
/* xorriso - creates, loads, manipulates and burns ISO 9660 filesystem images.
|
||||||
|
|
||||||
Copyright 2007-2024 Thomas Schmitt, <scdbackup@gmx.net>
|
Copyright 2007-2025 Thomas Schmitt, <scdbackup@gmx.net>
|
||||||
|
|
||||||
Provided under GPL version 2 or later.
|
Provided under GPL version 2 or later.
|
||||||
|
|
||||||
@ -3079,7 +3079,7 @@ int Xorriso_execv(struct XorrisO *xorriso, char *cmd,
|
|||||||
|
|
||||||
Xorriso_alloc_meM(prog, char, 5 * SfileadrL);
|
Xorriso_alloc_meM(prog, char, 5 * SfileadrL);
|
||||||
|
|
||||||
wait3(NULL,WNOHANG,NULL); /* just to remove any old dead child */
|
waitpid(-1, NULL, WNOHANG); /* just to remove any old dead child */
|
||||||
|
|
||||||
if(flag & 2) {
|
if(flag & 2) {
|
||||||
ret= Xorriso_make_argv_with_null(xorriso, in_argc, in_argv,
|
ret= Xorriso_make_argv_with_null(xorriso, in_argc, in_argv,
|
||||||
|
@ -1 +1 @@
|
|||||||
#define Xorriso_timestamP "2025.04.07.074817"
|
#define Xorriso_timestamP "2025.04.08.211135"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user