On Sun, Aug 14, 2016 at 12:30:46AM +0200, Joerg Jung wrote:
> Hi,
>
> please find below a diff for sic to enable pledge() to be used on
> OpenBSD. This diff was originally submitted by Ali H. Fardan via
> po...@openbsd.org. While here, I enabled the usage of strlcpy()
> from libc on OpenBSD.
>
> Honestly, I'm not sure about how such portability goo should be
> handled the suckless way, but since I see similar #ifdef __linux__
> instances in slock, I guess the proposed way is okay?
>
> Thanks,
> Regards,
> Joerg
>
>
> diff --git a/sic.c b/sic.c
> index ce6d216..b22ea06 100644
> --- a/sic.c
> +++ b/sic.c
> @@ -182,6 +182,8 @@ main(int argc, char *argv[]) {
> setbuf(stdout, NULL);
> setbuf(srv, NULL);
> setbuf(stdin, NULL);
> + if (pledge("stdio", NULL) == -1)
> + eprint("error: pledge:");
> for(;;) { /* main loop */
> FD_ZERO(&rd);
> FD_SET(0, &rd);
> diff --git a/util.c b/util.c
> index 8afa58f..88ea06e 100644
> --- a/util.c
> +++ b/util.c
> @@ -40,12 +40,16 @@ dial(char *host, char *port) {
> return srv;
> }
>
> +#ifndef __OpenBSD__
> +#define pledge(promises, paths) 0
> +
> #define strlcpy _strlcpy
> static void
> strlcpy(char *to, const char *from, int l) {
> memccpy(to, from, '\0', l);
> to[l-1] = '\0';
> }
> +#endif
>
> static char *
> eat(char *s, int (*p)(int), int r) {
>
Hi,
In general we should try to avoid ifdefs asmuch as possible. But I would not
mind the pledge in the form:
#ifdef __OpenBSD__
if (pledge("stdio", NULL) == -1)
eprint("error: pledge:");
#endif
Also in my opinion we should just import the OpenBSD strlcpy() version or
rename the current one, it has not the same behaviour as strlcpy and is
confusing.
Attached is my proposed patch.
--
Kind regards,
Hiltjo
diff --git a/Makefile b/Makefile
index 7b85db6..bbea026 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ options:
@echo CC $<
@${CC} -c ${CFLAGS} $<
-${OBJ}: config.h config.mk util.c
+${OBJ}: config.h config.mk strlcpy.c util.c
config.h:
@echo creating $@ from config.def.h
@@ -34,7 +34,7 @@ clean:
dist: clean
@echo creating dist tarball
@mkdir -p sic-${VERSION}
- @cp -R LICENSE Makefile README arg.h config.def.h config.mk sic.1 sic.c
util.c sic-${VERSION}
+ @cp -R LICENSE Makefile README arg.h config.def.h config.mk sic.1 sic.c
util.c strlcpy.c sic-${VERSION}
@tar -cf sic-${VERSION}.tar sic-${VERSION}
@gzip sic-${VERSION}.tar
@rm -rf sic-${VERSION}
diff --git a/sic.c b/sic.c
index ce6d216..ecefaf2 100644
--- a/sic.c
+++ b/sic.c
@@ -22,6 +22,8 @@ static char channel[256];
static time_t trespond;
static FILE *srv;
+#undef strlcpy
+#include "strlcpy.c"
#include "util.c"
static void
@@ -182,6 +184,10 @@ main(int argc, char *argv[]) {
setbuf(stdout, NULL);
setbuf(srv, NULL);
setbuf(stdin, NULL);
+#ifdef __OpenBSD__
+ if (pledge("stdio", NULL) == -1)
+ eprint("error: pledge:");
+#endif
for(;;) { /* main loop */
FD_ZERO(&rd);
FD_SET(0, &rd);
diff --git a/strlcpy.c b/strlcpy.c
new file mode 100644
index 0000000..58f34e6
--- /dev/null
+++ b/strlcpy.c
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 1998 Todd C. Miller <todd.mil...@courtesan.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <string.h>
+#include <sys/types.h>
+
+/*
+ * Copy src to string dst of size siz. At most siz-1 characters
+ * will be copied. Always NUL terminates (unless siz == 0).
+ * Returns strlen(src); if retval >= siz, truncation occurred.
+ */
+size_t
+strlcpy(char *dst, const char *src, size_t siz)
+{
+ char *d = dst;
+ const char *s = src;
+ size_t n = siz;
+ /* Copy as many bytes as will fit */
+ if (n != 0) {
+ while (--n != 0) {
+ if ((*d++ = *s++) == '\0')
+ break;
+ }
+ }
+ /* Not enough room in dst, add NUL and traverse rest of src */
+ if (n == 0) {
+ if (siz != 0)
+ *d = '\0'; /* NUL-terminate dst */
+ while (*s++)
+ ;
+ }
+ return(s - src - 1); /* count does not include NUL */
+}
diff --git a/util.c b/util.c
index 8afa58f..bdba718 100644
--- a/util.c
+++ b/util.c
@@ -40,13 +40,6 @@ dial(char *host, char *port) {
return srv;
}
-#define strlcpy _strlcpy
-static void
-strlcpy(char *to, const char *from, int l) {
- memccpy(to, from, '\0', l);
- to[l-1] = '\0';
-}
-
static char *
eat(char *s, int (*p)(int), int r) {
while(*s != '\0' && p(*s) == r)
