libbsd: Branch 'master' - 3 commits

[Guillem Jover]

 man/queue.3bsd   |    2 +-
 src/flopen.c     |    1 +
 src/nlist.c      |    1 +
 test/.gitignore  |    1 +
 test/Makefile.am |    1 +
 test/md5.c       |   47 +++++++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 52 insertions(+), 1 deletion(-)

New commits:
commit cbfe0ebca92ee6dd68fa3a6c02021c10bffed7ac
Author: Szabolcs Nagy <nsz at port70.net>
Date:   Sun Mar 27 12:37:09 2016 +0200

    Add missing <fcntl.h> includes
    
    These are required due to the O_* macro usage, but have passed
    undetected on glibc-based systems due to implicit inclusions.
    
    Signed-off-by: Guillem Jover <guillem at hadrons.org>

diff --git a/src/flopen.c b/src/flopen.c
index f5f7338..b221988 100644
--- a/src/flopen.c
+++ b/src/flopen.c
@@ -32,6 +32,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/stat.h>
 
 #include <errno.h>
+#include <fcntl.h>
 #include <stdarg.h>
 #include <unistd.h>
 #include <libutil.h>
diff --git a/src/nlist.c b/src/nlist.c
index 3f2c0f8..0cffe55 100644
--- a/src/nlist.c
+++ b/src/nlist.c
@@ -39,6 +39,7 @@ static char sccsid[] = "@(#)nlist.c	8.1 (Berkeley) 6/4/93";
 #include <arpa/inet.h>
 
 #include <errno.h>
+#include <fcntl.h>
 #include <a.out.h>
 #include <stdio.h>
 #include <string.h>
commit f3b566bd7c56cddcc5df909828eac48e74805bcb
Author: Guillem Jover <guillem at hadrons.org>
Date:   Sun Mar 27 12:31:58 2016 +0200

    test: Add a unit test for md5

diff --git a/test/.gitignore b/test/.gitignore
index f15b476..e14f634 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -8,6 +8,7 @@ fparseln
 fpurge
 headers-gen.c
 humanize
+md5
 overlay
 proctitle-init
 proctitle
diff --git a/test/Makefile.am b/test/Makefile.am
index 9b79f06..a75c8ff 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -39,6 +39,7 @@ check_PROGRAMS = \
 	funopen \
 	fparseln \
 	fpurge \
+	md5 \
 	proctitle-init \
 	strmode \
 	$(nil)
diff --git a/test/md5.c b/test/md5.c
new file mode 100644
index 0000000..d421ab8
--- /dev/null
+++ b/test/md5.c
@@ -0,0 +1,47 @@
+/*
+ * Copyright © 2016 Guillem Jover <guillem at hadrons.org>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
+ * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <assert.h>
+#include <md5.h>
+#include <string.h>
+
+void
+test_md5(const char *digest, const char *string)
+{
+	char result[MD5_DIGEST_STRING_LENGTH];
+
+	assert(strcmp(digest, MD5Data((uint8_t *)string, strlen(string), result)) == 0);
+}
+
+int
+main()
+{
+	test_md5("d41d8cd98f00b204e9800998ecf8427e", "");
+	test_md5("900150983cd24fb0d6963f7d28e17f72", "abc");
+	test_md5("827ccb0eea8a706c4c34a16891f84e7b", "12345");
+
+	return 0;
+}
commit e86c1b5f4393f1d65fb855d16d4c056fbe39ffd4
Author: Guillem Jover <guillem at hadrons.org>
Date:   Sun Feb 14 09:00:57 2016 +0100

    man: Fix ungrammatical construct
    
    Warned-by: lintian

diff --git a/man/queue.3bsd b/man/queue.3bsd
index 62623b7..bea33d0 100644
--- a/man/queue.3bsd
+++ b/man/queue.3bsd
@@ -1059,7 +1059,7 @@ However, unlike their unsafe counterparts,
 .Nm TAILQ_FOREACH
 and
 .Nm TAILQ_FOREACH_REVERSE
-permit to both remove
+make it possible to both remove
 .Fa var
 as well as free it from within the loop safely without interfering with the
 traversal.