Blame

Date:
Message:
use capsicum on FreeBSD Thanks to the design of Got, the libexec helpers don't need any resource (in fact they run under pledge "stdio recvfd" on OpenBSD) and so using cap_enter(2) on FreeBSD is dead-easy. While the main process can't be sandboxed on FreeBSD (needs to exec the helpers), all the tough work is done by these small libexec helpers which is also the biggest attack surface. tested by naddy, ok thomas
Actions:
History | Blob | Raw File
  1 dd038bc6 2021-09-21 thomas.ad #ifndef _GOT_COMPAT_H

  2 dd038bc6 2021-09-21 thomas.ad #define _GOT_COMPAT_H

  3 dd038bc6 2021-09-21 thomas.ad 

  4 dd038bc6 2021-09-21 thomas.ad #include <sys/types.h>

  5 dd038bc6 2021-09-21 thomas.ad #include <sys/ioctl.h>

  6 dd038bc6 2021-09-21 thomas.ad #include <sys/uio.h>

  7 92a9e85d 2021-09-24 thomas #if defined(__FreeBSD__)

  8 92a9e85d 2021-09-24 thomas #include <sys/endian.h>

  9 d24ddaa6 2022-02-26 thomas #elif defined(__APPLE__)

 10 d24ddaa6 2022-02-26 thomas #include <machine/endian.h>

 11 d24ddaa6 2022-02-26 thomas #include <libkern/OSByteOrder.h>

 12 d24ddaa6 2022-02-26 thomas #include "compat/bsd-poll.h"

 13 d24ddaa6 2022-02-26 thomas 

 14 d24ddaa6 2022-02-26 thomas #define FMT_SCALED_STRSIZE	7  /* minus sign, 4 digits, suffix, null byte */

 15 d24ddaa6 2022-02-26 thomas 

 16 d24ddaa6 2022-02-26 thomas #define htobe16(x) OSSwapHostToBigInt16(x)

 17 d24ddaa6 2022-02-26 thomas #define htole16(x) OSSwapHostToLittleInt16(x)

 18 d24ddaa6 2022-02-26 thomas #define be16toh(x) OSSwapBigToHostInt16(x)

 19 d24ddaa6 2022-02-26 thomas #define le16toh(x) OSSwapLittleToHostInt16(x)

 20 d24ddaa6 2022-02-26 thomas 

 21 d24ddaa6 2022-02-26 thomas #define htobe32(x) OSSwapHostToBigInt32(x)

 22 d24ddaa6 2022-02-26 thomas #define htole32(x) OSSwapHostToLittleInt32(x)

 23 d24ddaa6 2022-02-26 thomas #define be32toh(x) OSSwapBigToHostInt32(x)

 24 d24ddaa6 2022-02-26 thomas #define le32toh(x) OSSwapLittleToHostInt32(x)

 25 d24ddaa6 2022-02-26 thomas 

 26 d24ddaa6 2022-02-26 thomas #define htobe64(x) OSSwapHostToBigInt64(x)

 27 d24ddaa6 2022-02-26 thomas #define htole64(x) OSSwapHostToLittleInt64(x)

 28 d24ddaa6 2022-02-26 thomas #define be64toh(x) OSSwapBigToHostInt64(x)

 29 d24ddaa6 2022-02-26 thomas #define le64toh(x) OSSwapLittleToHostInt64(x)

 30 d24ddaa6 2022-02-26 thomas 

 31 d24ddaa6 2022-02-26 thomas #define st_atim st_atimespec

 32 d24ddaa6 2022-02-26 thomas #define st_ctim st_ctimespec

 33 d24ddaa6 2022-02-26 thomas #define st_mtim st_mtimespec

 34 d24ddaa6 2022-02-26 thomas 

 35 d24ddaa6 2022-02-26 thomas #else /* Linux, etc... */

 36 92a9e85d 2021-09-24 thomas #include <endian.h>

 37 92a9e85d 2021-09-24 thomas #endif

 38 dd038bc6 2021-09-21 thomas.ad 

 39 dd038bc6 2021-09-21 thomas.ad #include <fnmatch.h>

 40 dd038bc6 2021-09-21 thomas.ad #include <limits.h>

 41 dd038bc6 2021-09-21 thomas.ad #include <stdio.h>

 42 dd038bc6 2021-09-21 thomas.ad #include <stdint.h>

 43 dd038bc6 2021-09-21 thomas.ad 

 44 dd038bc6 2021-09-21 thomas.ad /*

 45 dd038bc6 2021-09-21 thomas.ad #include <termios.h>

 46 dd038bc6 2021-09-21 thomas.ad #include <wchar.h>

 47 dd038bc6 2021-09-21 thomas.ad */

 48 dd038bc6 2021-09-21 thomas.ad 

 49 dd038bc6 2021-09-21 thomas.ad /* For flock. */

 50 dd038bc6 2021-09-21 thomas.ad #ifndef O_EXLOCK

 51 dd038bc6 2021-09-21 thomas.ad #define O_EXLOCK 0

 52 dd038bc6 2021-09-21 thomas.ad #endif

 53 dd038bc6 2021-09-21 thomas.ad 

 54 dd038bc6 2021-09-21 thomas.ad #ifndef HAVE_FLOCK

 55 dd038bc6 2021-09-21 thomas.ad #define LOCK_SH 0

 56 dd038bc6 2021-09-21 thomas.ad #define LOCK_EX 0

 57 dd038bc6 2021-09-21 thomas.ad #define LOCK_NB 0

 58 dd038bc6 2021-09-21 thomas.ad #define flock(fd, op) (0)

 59 dd038bc6 2021-09-21 thomas.ad #else

 60 dd038bc6 2021-09-21 thomas.ad #include <sys/file.h>

 61 dd038bc6 2021-09-21 thomas.ad #endif

 62 dd038bc6 2021-09-21 thomas.ad 

 63 dd038bc6 2021-09-21 thomas.ad #ifndef __dead

 64 dd038bc6 2021-09-21 thomas.ad #define __dead __attribute__ ((__noreturn__))

 65 dd038bc6 2021-09-21 thomas.ad #endif

 66 dd038bc6 2021-09-21 thomas.ad 

 67 dd038bc6 2021-09-21 thomas.ad #ifndef __OpenBSD__

 68 dd038bc6 2021-09-21 thomas.ad #define pledge(s, p) (0)

 69 dd038bc6 2021-09-21 thomas.ad #define unveil(s, p) (0)

 70 5d120ea8 2022-06-23 op #endif

 71 5d120ea8 2022-06-23 op 

 72 5d120ea8 2022-06-23 op #ifdef __FreeBSD__

 73 5d120ea8 2022-06-23 op #include <sys/capsicum.h>

 74 5d120ea8 2022-06-23 op #else

 75 5d120ea8 2022-06-23 op #define cap_enter() (0)

 76 97799ccd 2022-02-06 thomas #endif

 77 97799ccd 2022-02-06 thomas 

 78 97799ccd 2022-02-06 thomas #ifndef HAVE_LINUX_LANDLOCK_H

 79 97799ccd 2022-02-06 thomas #define landlock_no_fs() (0)

 80 97799ccd 2022-02-06 thomas #else

 81 97799ccd 2022-02-06 thomas int	landlock_no_fs(void);

 82 dd038bc6 2021-09-21 thomas.ad #endif

 83 dd038bc6 2021-09-21 thomas.ad 

 84 dd038bc6 2021-09-21 thomas.ad #ifndef INFTIM

 85 dd038bc6 2021-09-21 thomas.ad #define INFTIM -1

 86 dd038bc6 2021-09-21 thomas.ad #endif

 87 dd038bc6 2021-09-21 thomas.ad 

 88 dd038bc6 2021-09-21 thomas.ad #ifndef HAVE_BSD_UUID

 89 dd038bc6 2021-09-21 thomas.ad #include <uuid/uuid.h>

 90 dd038bc6 2021-09-21 thomas.ad #define uuid_s_ok 0

 91 dd038bc6 2021-09-21 thomas.ad #define uuid_s_bad_version  1

 92 dd038bc6 2021-09-21 thomas.ad #define uuid_s_invalid_string_uuid 2

 93 dd038bc6 2021-09-21 thomas.ad #define uuid_s_no_memory  3

 94 dd038bc6 2021-09-21 thomas.ad 

 95 dd038bc6 2021-09-21 thomas.ad /* Length of a node address (an IEEE 802 address). */

 96 dd038bc6 2021-09-21 thomas.ad #define _UUID_NODE_LEN  6

 97 dd038bc6 2021-09-21 thomas.ad 

 98 dd038bc6 2021-09-21 thomas.ad struct uuid {

 99 dd038bc6 2021-09-21 thomas.ad 	uint32_t time_low;

100 dd038bc6 2021-09-21 thomas.ad 	uint16_t time_mid;

101 dd038bc6 2021-09-21 thomas.ad 	uint16_t time_hi_and_version;

102 dd038bc6 2021-09-21 thomas.ad 	uint8_t  clock_seq_hi_and_reserved;

103 dd038bc6 2021-09-21 thomas.ad 	uint8_t  clock_seq_low;

104 dd038bc6 2021-09-21 thomas.ad 	uint8_t  node[_UUID_NODE_LEN];

105 dd038bc6 2021-09-21 thomas.ad };

106 dd038bc6 2021-09-21 thomas.ad 

107 dd038bc6 2021-09-21 thomas.ad int32_t uuid_equal(struct uuid *, struct uuid *, uint32_t *);

108 dd038bc6 2021-09-21 thomas.ad int32_t uuid_is_nil(struct uuid *, uint32_t *);

109 dd038bc6 2021-09-21 thomas.ad void uuid_create(uuid_t *, uint32_t *);

110 dd038bc6 2021-09-21 thomas.ad void uuid_create_nil(struct uuid *, uint32_t *);

111 dd038bc6 2021-09-21 thomas.ad void uuid_from_string(const char *, uuid_t *, uint32_t *);

112 dd038bc6 2021-09-21 thomas.ad void uuid_to_string(uuid_t *, char **, uint32_t *);

113 9d70a0bf 2022-02-26 thomas #else

114 9d70a0bf 2022-02-26 thomas #include <uuid.h>

115 dd038bc6 2021-09-21 thomas.ad #endif

116 dd038bc6 2021-09-21 thomas.ad 

117 dd038bc6 2021-09-21 thomas.ad #ifdef HAVE_STDINT_H

118 dd038bc6 2021-09-21 thomas.ad #include <stdint.h>

119 dd038bc6 2021-09-21 thomas.ad #else

120 dd038bc6 2021-09-21 thomas.ad #include <inttypes.h>

121 dd038bc6 2021-09-21 thomas.ad #endif

122 dd038bc6 2021-09-21 thomas.ad 

123 dd038bc6 2021-09-21 thomas.ad #ifdef HAVE_QUEUE_H

124 dd038bc6 2021-09-21 thomas.ad #include <sys/queue.h>

125 dd038bc6 2021-09-21 thomas.ad #else

126 dd038bc6 2021-09-21 thomas.ad #include "compat/queue.h"

127 dd038bc6 2021-09-21 thomas.ad #endif

128 dd038bc6 2021-09-21 thomas.ad 

129 dd038bc6 2021-09-21 thomas.ad #ifdef HAVE_TREE_H

130 dd038bc6 2021-09-21 thomas.ad #include <sys/tree.h>

131 dd038bc6 2021-09-21 thomas.ad #else

132 dd038bc6 2021-09-21 thomas.ad #include "compat/tree.h"

133 dd038bc6 2021-09-21 thomas.ad #endif

134 dd038bc6 2021-09-21 thomas.ad 

135 dd038bc6 2021-09-21 thomas.ad #ifdef HAVE_UTIL_H

136 dd038bc6 2021-09-21 thomas.ad #include <util.h>

137 dd038bc6 2021-09-21 thomas.ad #endif

138 dd038bc6 2021-09-21 thomas.ad 

139 dd038bc6 2021-09-21 thomas.ad #ifdef HAVE_LIBUTIL_H

140 dd038bc6 2021-09-21 thomas.ad #include <libutil.h>

141 dd038bc6 2021-09-21 thomas.ad #endif

142 dd038bc6 2021-09-21 thomas.ad 

143 dd038bc6 2021-09-21 thomas.ad #ifdef HAVE_IMSG

144 dd038bc6 2021-09-21 thomas.ad #else

145 dd038bc6 2021-09-21 thomas.ad #include "compat/imsg.h"

146 ddd12270 2022-04-22 thomas #endif

147 ddd12270 2022-04-22 thomas 

148 ddd12270 2022-04-22 thomas #ifdef HAVE_SIPHASH

149 ddd12270 2022-04-22 thomas #include <siphash.h>

150 ddd12270 2022-04-22 thomas #else

151 ddd12270 2022-04-22 thomas #include "compat/siphash.h"

152 dd038bc6 2021-09-21 thomas.ad #endif

153 dd038bc6 2021-09-21 thomas.ad 

154 81e077a6 2022-03-08 thomas /* Include Apple-specific headers.  Mostly for crypto.*/

155 81e077a6 2022-03-08 thomas #if defined(__APPLE__)

156 d24ddaa6 2022-02-26 thomas #define COMMON_DIGEST_FOR_OPENSSL

157 d24ddaa6 2022-02-26 thomas #include <CommonCrypto/CommonDigest.h>

158 d24ddaa6 2022-02-26 thomas #endif

159 d24ddaa6 2022-02-26 thomas 

160 b26177ad 2022-03-03 thomas #if defined(HAVE_LIBCRYPTO) && !defined(__APPLE__) && !defined(__DragonFly__)

161 92a9e85d 2021-09-24 thomas #include <sha1.h>

162 b26177ad 2022-03-03 thomas #elif !defined(__APPLE__) && !defined(__DragonFly__)

163 92a9e85d 2021-09-24 thomas #include <sha.h>

164 b26177ad 2022-03-03 thomas #elif defined(__DragonFly__)

165 b26177ad 2022-03-03 thomas #include <openssl/sha.h>

166 d24ddaa6 2022-02-26 thomas #endif

167 92a9e85d 2021-09-24 thomas 

168 b26177ad 2022-03-03 thomas #if !defined(HAVE_LIBCRYPTO) || defined(__APPLE__) || defined(__DragonFly__)

169 92a9e85d 2021-09-24 thomas #define SHA1_DIGEST_LENGTH		SHA_DIGEST_LENGTH

170 92a9e85d 2021-09-24 thomas #define SHA1_DIGEST_STRING_LENGTH	(SHA1_DIGEST_LENGTH * 2 + 1)

171 92a9e85d 2021-09-24 thomas 

172 92a9e85d 2021-09-24 thomas #define SHA1_CTX	SHA_CTX

173 92a9e85d 2021-09-24 thomas #define SHA1Init	SHA1_Init

174 92a9e85d 2021-09-24 thomas #define SHA1Update	SHA1_Update

175 92a9e85d 2021-09-24 thomas #define SHA1Final	SHA1_Final

176 92a9e85d 2021-09-24 thomas #endif

177 92a9e85d 2021-09-24 thomas 

178 dd038bc6 2021-09-21 thomas.ad #ifndef HAVE_ASPRINTF

179 dd038bc6 2021-09-21 thomas.ad /* asprintf.c */

180 dd038bc6 2021-09-21 thomas.ad int		 asprintf(char **, const char *, ...);

181 dd038bc6 2021-09-21 thomas.ad int		 vasprintf(char **, const char *, va_list);

182 dd038bc6 2021-09-21 thomas.ad #endif

183 dd038bc6 2021-09-21 thomas.ad 

184 dd038bc6 2021-09-21 thomas.ad #ifndef HAVE_EXPLICIT_BZERO

185 dd038bc6 2021-09-21 thomas.ad /* explicit_bzero.c */

186 dd038bc6 2021-09-21 thomas.ad void		 explicit_bzero(void *, size_t);

187 dd038bc6 2021-09-21 thomas.ad #endif

188 dd038bc6 2021-09-21 thomas.ad 

189 dd038bc6 2021-09-21 thomas.ad #ifndef HAVE_GETDTABLECOUNT

190 dd038bc6 2021-09-21 thomas.ad /* getdtablecount.c */

191 dd038bc6 2021-09-21 thomas.ad int		 getdtablecount(void);

192 dd038bc6 2021-09-21 thomas.ad #endif

193 dd038bc6 2021-09-21 thomas.ad 

194 dd038bc6 2021-09-21 thomas.ad #ifndef HAVE_CLOSEFROM

195 dd038bc6 2021-09-21 thomas.ad /* closefrom.c */

196 d24ddaa6 2022-02-26 thomas void		 closefrom(int);

197 dd038bc6 2021-09-21 thomas.ad #endif

198 dd038bc6 2021-09-21 thomas.ad 

199 92a9e85d 2021-09-24 thomas #if defined (__FreeBSD__)

200 92a9e85d 2021-09-24 thomas #define closefrom(fd) (closefrom(fd), 0)

201 92a9e85d 2021-09-24 thomas #endif

202 92a9e85d 2021-09-24 thomas 

203 dd038bc6 2021-09-21 thomas.ad #ifndef HAVE_STRSEP

204 dd038bc6 2021-09-21 thomas.ad /* strsep.c */

205 dd038bc6 2021-09-21 thomas.ad char		*strsep(char **, const char *);

206 dd038bc6 2021-09-21 thomas.ad #endif

207 dd038bc6 2021-09-21 thomas.ad 

208 dd038bc6 2021-09-21 thomas.ad #ifndef HAVE_STRTONUM

209 dd038bc6 2021-09-21 thomas.ad /* strtonum.c */

210 dd038bc6 2021-09-21 thomas.ad long long	 strtonum(const char *, long long, long long, const char **);

211 dd038bc6 2021-09-21 thomas.ad #endif

212 dd038bc6 2021-09-21 thomas.ad 

213 dd038bc6 2021-09-21 thomas.ad #ifndef HAVE_STRLCPY

214 dd038bc6 2021-09-21 thomas.ad /* strlcpy.c */

215 dd038bc6 2021-09-21 thomas.ad size_t	 	 strlcpy(char *, const char *, size_t);

216 dd038bc6 2021-09-21 thomas.ad #endif

217 dd038bc6 2021-09-21 thomas.ad 

218 dd038bc6 2021-09-21 thomas.ad #ifndef HAVE_STRLCAT

219 dd038bc6 2021-09-21 thomas.ad /* strlcat.c */

220 dd038bc6 2021-09-21 thomas.ad size_t	 	 strlcat(char *, const char *, size_t);

221 dd038bc6 2021-09-21 thomas.ad #endif

222 dd038bc6 2021-09-21 thomas.ad 

223 dd038bc6 2021-09-21 thomas.ad #ifndef HAVE_STRNLEN

224 dd038bc6 2021-09-21 thomas.ad /* strnlen.c */

225 dd038bc6 2021-09-21 thomas.ad size_t		 strnlen(const char *, size_t);

226 dd038bc6 2021-09-21 thomas.ad #endif

227 dd038bc6 2021-09-21 thomas.ad 

228 dd038bc6 2021-09-21 thomas.ad #ifndef HAVE_STRNDUP

229 dd038bc6 2021-09-21 thomas.ad /* strndup.c */

230 dd038bc6 2021-09-21 thomas.ad char		*strndup(const char *, size_t);

231 dd038bc6 2021-09-21 thomas.ad #endif

232 dd038bc6 2021-09-21 thomas.ad 

233 dd038bc6 2021-09-21 thomas.ad #ifndef HAVE_GETPROGNAME

234 dd038bc6 2021-09-21 thomas.ad /* getprogname.c */

235 dd038bc6 2021-09-21 thomas.ad const char	*getprogname(void);

236 dd038bc6 2021-09-21 thomas.ad #endif

237 dd038bc6 2021-09-21 thomas.ad 

238 dd038bc6 2021-09-21 thomas.ad #ifndef HAVE_GETLINE

239 dd038bc6 2021-09-21 thomas.ad /* getline.c */

240 dd038bc6 2021-09-21 thomas.ad ssize_t		 getline(char **, size_t *, FILE *);

241 dd038bc6 2021-09-21 thomas.ad #endif

242 dd038bc6 2021-09-21 thomas.ad 

243 dd038bc6 2021-09-21 thomas.ad #ifndef HAVE_FREEZERO

244 dd038bc6 2021-09-21 thomas.ad /* freezero.c */

245 dd038bc6 2021-09-21 thomas.ad void		 freezero(void *, size_t);

246 dd038bc6 2021-09-21 thomas.ad #endif

247 dd038bc6 2021-09-21 thomas.ad 

248 dd038bc6 2021-09-21 thomas.ad #ifndef HAVE_GETDTABLECOUNT

249 dd038bc6 2021-09-21 thomas.ad /* getdtablecount.c */

250 dd038bc6 2021-09-21 thomas.ad int		 getdtablecount(void);

251 dd038bc6 2021-09-21 thomas.ad #endif

252 dd038bc6 2021-09-21 thomas.ad 

253 dd038bc6 2021-09-21 thomas.ad #ifndef HAVE_REALLOCARRAY

254 dd038bc6 2021-09-21 thomas.ad /* reallocarray.c */

255 dd038bc6 2021-09-21 thomas.ad void		*reallocarray(void *, size_t, size_t);

256 dd038bc6 2021-09-21 thomas.ad #endif

257 dd038bc6 2021-09-21 thomas.ad 

258 dd038bc6 2021-09-21 thomas.ad #ifndef HAVE_RECALLOCARRAY

259 dd038bc6 2021-09-21 thomas.ad /* recallocarray.c */

260 dd038bc6 2021-09-21 thomas.ad void		*recallocarray(void *, size_t, size_t, size_t);

261 dd038bc6 2021-09-21 thomas.ad #endif

262 dd038bc6 2021-09-21 thomas.ad 

263 dd038bc6 2021-09-21 thomas.ad #ifndef HAVE_FMT_SCALED

264 dd038bc6 2021-09-21 thomas.ad /* fmt_scaled.c */

265 dd038bc6 2021-09-21 thomas.ad int fmt_scaled(long long, char *);

266 dd038bc6 2021-09-21 thomas.ad int scan_scaled(char *, long long *);

267 dd038bc6 2021-09-21 thomas.ad #define FMT_SCALED_STRSIZE	7  /* minus sign, 4 digits, suffix, null byte */

268 dd038bc6 2021-09-21 thomas.ad #endif

269 dd038bc6 2021-09-21 thomas.ad 

270 dd038bc6 2021-09-21 thomas.ad #ifndef HAVE_LIBBSD

271 dd038bc6 2021-09-21 thomas.ad /* getopt.c */

272 dd038bc6 2021-09-21 thomas.ad extern int	BSDopterr;

273 dd038bc6 2021-09-21 thomas.ad extern int	BSDoptind;

274 dd038bc6 2021-09-21 thomas.ad extern int	BSDoptopt;

275 dd038bc6 2021-09-21 thomas.ad extern int	BSDoptreset;

276 dd038bc6 2021-09-21 thomas.ad extern char    *BSDoptarg;

277 dd038bc6 2021-09-21 thomas.ad int	BSDgetopt(int, char *const *, const char *);

278 dd038bc6 2021-09-21 thomas.ad #define getopt(ac, av, o)  BSDgetopt(ac, av, o)

279 dd038bc6 2021-09-21 thomas.ad #define opterr             BSDopterr

280 dd038bc6 2021-09-21 thomas.ad #define optind             BSDoptind

281 dd038bc6 2021-09-21 thomas.ad #define optopt             BSDoptopt

282 dd038bc6 2021-09-21 thomas.ad #define optreset           BSDoptreset

283 dd038bc6 2021-09-21 thomas.ad #define optarg             BSDoptarg

284 dd038bc6 2021-09-21 thomas.ad #endif

285 dd038bc6 2021-09-21 thomas.ad #endif

286 dd038bc6 2021-09-21 thomas.ad 

287 de1dbfe9 2022-01-05 thomas /* Check for some of the non-portable timespec*() functions.

288 de1dbfe9 2022-01-05 thomas  * This should largely come from libbsd for systems which

289 de1dbfe9 2022-01-05 thomas  * aren't BSD, but this will depend on how old the library

290 de1dbfe9 2022-01-05 thomas  * is.

291 de1dbfe9 2022-01-05 thomas  */

292 de1dbfe9 2022-01-05 thomas #ifndef timespecisset

293 de1dbfe9 2022-01-05 thomas #define	timespecisset(tsp) \

294 de1dbfe9 2022-01-05 thomas 	((tsp)->tv_sec || (tsp)->tv_nsec)

295 de1dbfe9 2022-01-05 thomas #endif

296 de1dbfe9 2022-01-05 thomas 

297 de1dbfe9 2022-01-05 thomas #ifndef timespecsub

298 de1dbfe9 2022-01-05 thomas #define	timespecsub(tsp, usp, vsp)					\

299 de1dbfe9 2022-01-05 thomas 	do {								\

300 de1dbfe9 2022-01-05 thomas 		(vsp)->tv_sec = (tsp)->tv_sec - (usp)->tv_sec;		\

301 de1dbfe9 2022-01-05 thomas 		(vsp)->tv_nsec = (tsp)->tv_nsec - (usp)->tv_nsec;	\

302 de1dbfe9 2022-01-05 thomas 		if ((vsp)->tv_nsec < 0) {				\

303 de1dbfe9 2022-01-05 thomas 			(vsp)->tv_sec--;				\

304 de1dbfe9 2022-01-05 thomas 			(vsp)->tv_nsec += 1000000000L;			\

305 de1dbfe9 2022-01-05 thomas 		}							\

306 de1dbfe9 2022-01-05 thomas 	} while (0)

307 de1dbfe9 2022-01-05 thomas #endif

308 de1dbfe9 2022-01-05 thomas 

309 de1dbfe9 2022-01-05 thomas #ifndef timespeccmp

310 de1dbfe9 2022-01-05 thomas #define timespeccmp(tvp, uvp, cmp) 					\

311 de1dbfe9 2022-01-05 thomas (((tvp)->tv_sec == (uvp)->tv_sec) ? 					\

312 de1dbfe9 2022-01-05 thomas 	((tvp)->tv_nsec cmp (uvp)->tv_nsec) : 				\

313 de1dbfe9 2022-01-05 thomas 	((tvp)->tv_sec cmp (uvp)->tv_sec))

314 de1dbfe9 2022-01-05 thomas #endif

315 de1dbfe9 2022-01-05 thomas 

316 dd038bc6 2021-09-21 thomas.ad #ifndef HAVE_BSD_MERGESORT

317 dd038bc6 2021-09-21 thomas.ad /* mergesort.c */

318 dd038bc6 2021-09-21 thomas.ad int mergesort(void *, size_t, size_t, int (*)(const void *, const void *));

319 dd038bc6 2021-09-21 thomas.ad #endif