shuf-2.7

I'm not sure I did unveil correctly, and not sure it's necessary.

Author: ibara

configure

@@ -185,21 +185,6 @@ EOF
   fi
 }
 
-unveilcheck() {
-  cat << EOF > conftest.c
-#include <unistd.h>
-int main(void){unveil(NULL,NULL);return 0;}
-EOF
-  $cc $cflags $ldflags -o conftest conftest.c > /dev/null 2>&1
-  if [ $? -eq 0 ] ; then
-    rm -f conftest conftest.o conftest.c
-    return 0
-  else
-    rm -f conftest conftest.o conftest.c
-    return 1
-  fi
-}
-
 prefix="/usr/local"
 libs=""
 libbsd=0
@@ -308,15 +293,6 @@ else
   echo "no"
 fi
 
-printf "checking for unveil... "
-unveilcheck
-if [ $? -eq 0 ] ; then
-  cflags="$cflags -DHAVE_UNVEIL"
-  echo "yes"
-else
-  echo "no"
-fi
-
 if [ $libbsd -eq 1 ] ; then
   printf "checking for libbsd... "
   libbsdcheck

shuf.c

@@ -184,7 +184,7 @@ static void __dead
 version(void)
 {
 
-	fputs("shuf 2.6\n"
+	fputs("shuf 2.7\n"
 	      "Copyright (c) 2017-2019 Brian Callahan <[email protected]>\n"
 	      "\nPermission to use, copy, modify, and distribute this software"
 	      " for any\npurpose with or without fee is hereby granted, "
@@ -213,11 +213,7 @@ main(int argc, char *argv[])
 	size_t 		buflen = 0, bufsize = 8192, nbufsize;
 
 #ifdef HAVE_PLEDGE
-#ifdef HAVE_UNVEIL
-	if (pledge("stdio rpath wpath cpath unveil", NULL) == -1)
-#else
 	if (pledge("stdio rpath wpath cpath", NULL) == -1)
-#endif
 		errx(1, "pledge");
 #endif
 
@@ -265,19 +261,9 @@ main(int argc, char *argv[])
 			if (oflag++)
 				errx(1, "cannot have multiple -o");
 
-#ifdef HAVE_UNVEIL
-			if (unveil(optarg, "wc") == -1)
-				err(1, "unveil");
-#endif
-
 			if ((ofile = fopen(optarg, "w")) == NULL)
 				err(1, "couldn't open output file %s", optarg);
 
-#ifdef HAVE_UNVEIL
-			if (unveil(NULL, NULL) == -1)
-				err(1, "unveil");
-#endif
-
 			break;
 		case 'r':
 			rflag = 1;