Commit Diff


commit - d422a067833463b4738cff19b161fe6cf18c4682
commit + bec5bf9a24caf551debfd954b5f713b4243e9c45
blob - 343ef4bad293ee4c2924bd3d989327cfe3bc6cf2
blob + 9fb7432d876bea5c923c2930e72957eb68c752ae
--- Makefile
+++ Makefile
@@ -20,7 +20,7 @@ SRC_STEST	= dmenu/stest.c
 HDR_STEST	= dmenu/arg.h
 
 SRC_SLOCK	= slock/slock.c
-HDR_SLOCK	= slock/arg.h slock/config.h slock/util.h
+HDR_SLOCK	= slock/arg.h slock/config.h
 
 SRC_PD2 =	pinentry-dmenu2.sh
 
blob - 3e33ca85b83b2bb5059da992e900d680730acf47 (mode 644)
blob + /dev/null
--- slock/explicit_bzero.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/*	$OpenBSD: explicit_bzero.c,v 1.3 2014/06/21 02:34:26 matthew Exp $ */
-/*
- * Public domain.
- * Written by Matthew Dempsky.
- */
-
-#include <string.h>
-
-__attribute__((weak)) void
-__explicit_bzero_hook(void *buf, size_t len)
-{
-}
-
-void
-explicit_bzero(void *buf, size_t len)
-{
-	memset(buf, 0, len);
-	__explicit_bzero_hook(buf, len);
-}
blob - f6d31201c7ec07d757d1e353ae697a94f48a1a8f
blob + 7128e4a90889b606e8f538e19f35fba71006e16e
--- slock/slock.c
+++ slock/slock.c
@@ -1,4 +1,8 @@
 /* See LICENSE file for license details. */
+#ifdef __FreeBSD__
+# define __BSD_VISIBLE 1
+#endif
+
 #define _XOPEN_SOURCE 500
 #if HAVE_SHADOW_H
 #include <shadow.h>
@@ -30,7 +34,6 @@
 #include <time.h>
 
 #include "arg.h"
-#include "util.h"
 
 char *argv0;
 
blob - 6f748b890ddd21240f87a02940888ec5bfa5247a (mode 644)
blob + /dev/null
--- slock/util.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#undef explicit_bzero
-void explicit_bzero(void *, size_t);