closefrom(int lowfd)
{
long fd, maxfd;
-#if defined(HAVE_DIRFD) && defined(HAVE_PROC_PID)
+#if defined(HAVE_PROC_PID)
char fdpath[PATH_MAX], *endp;
struct dirent *dent;
DIR *dirp;
* SUCH DAMAGE.
*/
+#include "includes.h"
+
#include <err.h>
#include <stdarg.h>
-#include "openbsd.h"
-
__dead void
errc(int eval, int code, const char *fmt, ...)
{
-/* $OpenBSD: exec.c,v 1.20 2013/01/08 02:26:09 deraadt Exp $ */
+/* $OpenBSD: exec.c,v 1.23 2016/03/13 18:34:20 guenther Exp $ */
/*-
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
* SUCH DAMAGE.
*/
+#include "includes.h"
+
#include <sys/types.h>
#include <sys/uio.h>
#include <string.h>
#include <unistd.h>
-#include "includes.h"
-
int
execvpe(const char *name, char *const *argv, char *const *envp)
{
#include <stdarg.h>
#include <sys/types.h>
-#include "readpassphrase.h"
-
/* API definitions lifted from OpenBSD src/include */
/* pwd.h */
+++ /dev/null
-#include "openbsd.h"
-
-int
-pledge(__UNUSED const char *promises, __UNUSED const char *paths[])
-{
- return 0;
-}
* SUCH DAMAGE.
*/
+#include "includes.h"
+
#include <err.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdarg.h>
-#include "openbsd.h"
-
__dead void
verrc(int eval, int code, const char *fmt, va_list ap)
{