Add strlcpy()

diff --git a/Makefile b/Makefile
index c2cdcad14242730ec0f2f685618f9fdc8659a618..19b52d367c622d7a8f8a6e6b8403d5cc4c83c72d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,19 @@
 #CPPFLAGS += -DDEBUG
 #CFLAGS += -g
 LDLIBS = -lncursesw
-#LDLIBS += -lbsd
+OBJ = noice.o strlcpy.o
 BIN = noice
 
 all: $(BIN)
 
+$(BIN): $(OBJ)
+       $(CC) -o $@ $(OBJ) $(LDLIBS)
+
+noice.o: noice.c queue.h util.h
+       $(CC) -c noice.c
+
+strlcpy.o: strlcpy.c util.h
+       $(CC) -c strlcpy.c
+
 clean:
-       rm -f $(BIN)
+       rm -f $(BIN) $(OBJ)

diff --git a/strlcpy.c b/strlcpy.c
new file mode 100644 (file)
index 0000000..7df8aa2
--- /dev/null
+++ b/strlcpy.c
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 1998 Todd C. Miller <Todd.Miller@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 <sys/types.h>
+#include <string.h>
+#include "util.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.h b/util.h
new file mode 100644 (file)
index 0000000..4da3885
--- /dev/null
+++ b/util.h
@@ -0,0 +1,2 @@
+#undef strlcpy
+size_t strlcpy(char *, const char *, size_t);