Avoid bzero/bcopy/bcmp/strlcpy() to not depend on libbsd

Author: liweitianux

GNUmakefile

@@ -20,8 +20,6 @@ ifeq ($(OS),FreeBSD)
 CFLAGS+=	-D_ST_FLAGS_PRESENT_
 else ifeq ($(OS),Linux)
 CFLAGS+=	-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
-CFLAGS+=	$(shell pkg-config --cflags libbsd-overlay)
-LIBS+=		$(shell pkg-config --libs   libbsd-overlay)
 endif
 
 PREFIX?=	/usr/local

README.md

@@ -40,14 +40,13 @@ Installation
     * `make` (GNU make)
     * `gcc`
     * `pkg-config`
-    * `libbsd-dev` (Required only on Linux)
     * `libssl-dev` (OpenSSL >= 1.0.2 or LibreSSL)
 
-    Arch Linux: `pacman -S pkgconf libbsd openssl`
+    Arch Linux: `pacman -S pkgconf openssl`
 
-    CentOS: `yum install pkgconfig libbsd-devel openssl-devel`
+    CentOS: `yum install pkgconfig openssl-devel`
 
-    Debian: `apt install pkg-config libbsd-dev libssl-dev`
+    Debian: `apt install pkg-config libssl-dev`
 
     DragonFly BSD / FreeBSD: `pkg install gmake pkgconf libressl`
 

linux/PKGBUILD

@@ -7,7 +7,7 @@ pkgdesc="Filesystem mirroring utility from DragonFly BSD"
 url="https://github.com/DragonFlyBSD/cpdup"
 license=('BSD')
 arch=('i686' 'x86_64')
-depends=('libbsd' 'openssl')
+depends=('openssl')
 makedepends=('pkg-config')
 
 build() {

linux/cpdup.spec

@@ -7,8 +7,8 @@ License:	BSD
 URL:		https://github.com/DragonFlyBSD/cpdup
 
 BuildRequires:	make, gcc, binutils
-BuildRequires:	pkgconfig, libbsd-devel, openssl-devel
-Requires:	libbsd, openssl
+BuildRequires:	pkgconfig, openssl-devel
+Requires:	openssl
 
 %description
 The "cpdup" utility makes an exact mirror copy of the source in the

linux/debian/control

@@ -3,7 +3,6 @@ Priority: optional
 Maintainer: Aaron LI <aly@aaronly.me>
 Build-Depends:
  debhelper-compat (= 13),
- libbsd-dev,
  libssl-dev,
  make,
  pkgconf | pkg-config

src/cpdup.c

@@ -363,7 +363,7 @@ main(int ac, char **av)
 	fprintf(stderr, "Group[%d] == %d\n", i, GroupList[i]);
 #endif
 
-    bzero(&info, sizeof(info));
+    memset(&info, 0, sizeof(info));
     if (dst) {
 	DstBaseLen = strlen(dst);
 	info.spath = src;
@@ -564,7 +564,7 @@ hltadd(struct stat *stp, const char *path)
     new->ino = stp->st_ino;
     new->dino = (ino_t)-1;
     new->refs = 1;
-    bcopy(path, new->name, plen + 1);
+    memcpy(new->name, path, plen + 1);
     new->nlinked = 1;
     new->prev = NULL;
     n = stp->st_ino & HLMASK;
@@ -677,7 +677,7 @@ validate_check(const char *spath, const char *dpath)
 		    CountTargetReadBytes += x;
 	    if (x != n)
 		break;
-	    if (bcmp(iobuf1, iobuf2, n) != 0)
+	    if (memcmp(iobuf1, iobuf2, n) != 0)
 		break;
 	}
 	free(iobuf1);
@@ -1054,7 +1054,7 @@ DoCopy(copy_info_t info, struct stat *stat1, int depth)
 		hc_chflags(&DstHost, dpath, stat1->st_flags);
 #endif
 	    if (ForceOpt || mtimecmp(stat1, &st2) != 0) {
-		bzero(tv, sizeof(tv));
+		memset(tv, 0, sizeof(tv));
 		tv[0].tv_sec = stat1->st_mtime;
 		tv[1].tv_sec = stat1->st_mtime;
 #if defined(st_mtime)  /* A macro, so very likely on modern POSIX */
@@ -1164,7 +1164,7 @@ DoCopy(copy_info_t info, struct stat *stat1, int depth)
 		if (n == 0) {
 		    struct timeval tv[2];
 
-		    bzero(tv, sizeof(tv));
+		    memset(tv, 0, sizeof(tv));
 		    tv[0].tv_sec = stat1->st_mtime;
 		    tv[1].tv_sec = stat1->st_mtime;
 #if defined(st_mtime)
@@ -1254,12 +1254,12 @@ DoCopy(copy_info_t info, struct stat *stat1, int depth)
 		n2 = -1;
 	}
 	if (n1 >= 0) {
-	    if (ForceOpt || n1 != n2 || bcmp(link1, link2, n1) != 0 ||
+	    if (ForceOpt || n1 != n2 || memcmp(link1, link2, n1) != 0 ||
 		(st2Valid && symlink_mfo_test(&DstHost, stat1, &st2))
 	    ) {
 		struct timeval tv[2];
 
-		bzero(tv, sizeof(tv));
+		memset(tv, 0, sizeof(tv));
 		tv[0].tv_sec = stat1->st_mtime;
 		tv[1].tv_sec = stat1->st_mtime;
 #if defined(st_mtime)
@@ -1433,7 +1433,7 @@ ScanDir(List *list, struct HostConf *host, const char *path,
 		    }
 		    bufused = strlen(next);
 		    if (bufused)
-			bcopy(next, buf, bufused);
+			memcpy(buf, next, bufused);
 		}
 		if (bufused) {
 		    /* last line has no trailing newline */
@@ -1572,7 +1572,7 @@ RemoveRecur(const char *dpath, dev_t devNo, struct stat *dstat)
 static void
 InitList(List *list)
 {
-    bzero(list, sizeof(List));
+    memset(list, 0, sizeof(List));
     list->li_Node.no_Next = &list->li_Node;
 }
 

src/cpdup.h

@@ -43,7 +43,6 @@
 #include <stddef.h>
 #include <stdint.h>
 #include <string.h>
-#include <strings.h>
 #include <errno.h>
 #include <unistd.h>
 #include <utime.h>

src/hclink.c

@@ -117,9 +117,9 @@ hcc_slave(int fdin, int fdout, struct HCDesc *descs, int count)
     int i;
     int r;
 
-    bzero(&hcslave, sizeof(hcslave));
-    bzero(&trans, sizeof(trans));
-    bzero(dispatch, sizeof(dispatch));
+    memset(&hcslave, 0, sizeof(hcslave));
+    memset(&trans, 0, sizeof(trans));
+    memset(dispatch, 0, sizeof(dispatch));
     for (i = 0; i < count; ++i) {
 	struct HCDesc *desc = &descs[i];
 	assert(desc->cmd >= 0 && desc->cmd < 256);
@@ -212,7 +212,7 @@ hcc_read_command(struct HostConf *hc, hctransaction_t trans)
     assert(tmp.bytes >= (int)sizeof(tmp) && tmp.bytes < HC_BUFSIZE);
 
     trans->swap = need_swap;
-    bcopy(&tmp, trans->rbuf, n);
+    memcpy(trans->rbuf, &tmp, n);
     aligned_bytes = HCC_ALIGN(tmp.bytes);
 
     while (n < aligned_bytes) {
@@ -358,7 +358,7 @@ hcc_leaf_string(hctransaction_t trans, int16_t leafid, const char *str)
     item->leafid = leafid;
     item->reserved = 0;
     item->bytes = sizeof(*item) + bytes;
-    bcopy(str, item + 1, bytes);
+    memcpy(item + 1, str, bytes);
     trans->windex = HCC_ALIGN(trans->windex + item->bytes);
 }
 
@@ -372,7 +372,7 @@ hcc_leaf_data(hctransaction_t trans, int16_t leafid, const void *ptr, int bytes)
     item->leafid = leafid;
     item->reserved = 0;
     item->bytes = sizeof(*item) + bytes;
-    bcopy(ptr, item + 1, bytes);
+    memcpy(item + 1, ptr, bytes);
     trans->windex = HCC_ALIGN(trans->windex + item->bytes);
 }
 

src/hcproto.c

@@ -171,7 +171,7 @@ hc_hello(struct HostConf *hc)
     char hostbuf[256];
     int error;
 
-    bzero(hostbuf, sizeof(hostbuf));
+    memset(hostbuf, 0, sizeof(hostbuf));
     if (gethostname(hostbuf, sizeof(hostbuf) - 1) < 0)
 	return(-1);
     if (hostbuf[0] == 0)
@@ -232,7 +232,7 @@ rc_hello(hctransaction_t trans, struct HCHead *head)
 	    UseCpFile = strdup(HCC_STRING(item));
     }
 
-    bzero(hostbuf, sizeof(hostbuf));
+    memset(hostbuf, 0, sizeof(hostbuf));
     if (gethostname(hostbuf, sizeof(hostbuf) - 1) < 0)
 	return(-1);
     if (hostbuf[0] == 0)
@@ -287,7 +287,7 @@ hc_decode_stat(hctransaction_t trans, struct stat *st, struct HCHead *head)
 {
     struct HCLeaf *item;
 
-    bzero(st, sizeof(*st));
+    memset(st, 0, sizeof(*st));
     FOR_EACH_ITEM(item, trans, head)
 	hc_decode_stat_item(st, item);
     return(0);
@@ -511,7 +511,8 @@ hc_readdir(struct HostConf *hc, DIR *dir, struct stat **statpp)
 
 	if ((sysden = readdir(dir)) == NULL)
 	    return (NULL);
-	strlcpy(denbuf.d_name, sysden->d_name, sizeof(denbuf.d_name));
+	strncpy(denbuf.d_name, sysden->d_name, sizeof(denbuf.d_name) - 1);
+	denbuf.d_name[sizeof(denbuf.d_name) - 1] = '\0';
 	return (&denbuf);
     }
 
@@ -530,8 +531,10 @@ hc_readdir(struct HostConf *hc, DIR *dir, struct stat **statpp)
 	    return (NULL);	/* XXX errno */
 	den->d_name[0] = 0;
 	FOR_EACH_ITEM(item, trans, head) {
-	    if (item->leafid == LC_PATH1)
-		strlcpy(den->d_name, HCC_STRING(item), sizeof(den->d_name));
+	    if (item->leafid == LC_PATH1) {
+		strncpy(den->d_name, HCC_STRING(item), sizeof(den->d_name) - 1);
+		den->d_name[sizeof(den->d_name) - 1] = '\0';
+	    }
 	}
 	return (den->d_name[0] ? den : NULL);
     }
@@ -540,10 +543,11 @@ hc_readdir(struct HostConf *hc, DIR *dir, struct stat **statpp)
     denbuf.d_name[0] = 0;
     head = (void *)dir;
     *statpp = malloc(sizeof(struct stat));
-    bzero(*statpp, sizeof(struct stat));
+    memset(*statpp, 0, sizeof(struct stat));
     while ((item = hcc_nextchaineditem(hc, head)) != NULL) {
 	if (item->leafid == LC_PATH1) {  /* this must be the last item */
-	    strlcpy(denbuf.d_name, HCC_STRING(item), sizeof(denbuf.d_name));
+	    strncpy(denbuf.d_name, HCC_STRING(item), sizeof(denbuf.d_name) - 1);
+	    denbuf.d_name[sizeof(denbuf.d_name) - 1] = '\0';
 	    break;
 	} else {
 	    stat_ok = 1;
@@ -917,7 +921,7 @@ hc_read(struct HostConf *hc, int fd, void *buf, size_t bytes)
 	    }
 	    else
 		head->magic = 0;  /* all bytes used up */
-	    bcopy((char *)HCC_BINARYDATA(item) + offset, buf, x);
+	    memcpy(buf, (char *)HCC_BINARYDATA(item) + offset, x);
 	    buf = (char *)buf + x;
 	    bytes -= (size_t)x;
 	    r += x;
@@ -943,7 +947,7 @@ hc_read(struct HostConf *hc, int fd, void *buf, size_t bytes)
 		    x = item->bytes - sizeof(*item);
 		    if (x > (int)bytes)
 			x = (int)bytes;
-		    bcopy(HCC_BINARYDATA(item), buf, x);
+		    memcpy(buf, HCC_BINARYDATA(item), x);
 		    buf = (char *)buf + x;
 		    bytes -= (size_t)x;
 		    r += x;
@@ -1695,7 +1699,7 @@ hc_readlink(struct HostConf *hc, const char *path, char *buf, int bufsiz)
 		r = 0;
 	    if (r > bufsiz)
 		r = bufsiz;
-	    bcopy(HCC_BINARYDATA(item), buf, r);
+	    memcpy(buf, HCC_BINARYDATA(item), r);
 	}
     }
     return(r);
@@ -1931,7 +1935,7 @@ rc_utimes(hctransaction_t trans, struct HCHead *head)
     struct timeval times[2];
     const char *path;
 
-    bzero(times, sizeof(times));
+    memset(times, 0, sizeof(times));
     path = NULL;
 
     FOR_EACH_ITEM(item, trans, head) {

src/md5.c

@@ -154,7 +154,7 @@ md5_lookup(const char *spath)
 	if ((node = malloc(sizeof(MD5Node))) == NULL)
 	    fatal("out of memory");
 
-	bzero(node, sizeof(MD5Node));
+	memset(node, 0, sizeof(MD5Node));
 	node->md_Name = strdup(sfile);
 	node->md_Next = MD5Base;
 	MD5Base = node;
@@ -183,7 +183,7 @@ md5_update(const char *spath)
 	r = 0;
 	if (strcmp(scode, node->md_Code) != 0) {
 	    r = 1;
-	    bcopy(scode, node->md_Code, sizeof(scode));
+	    memcpy(node->md_Code, scode, sizeof(scode));
 	    MD5SCacheDirty = 1;
 	}
     } else {
@@ -222,7 +222,7 @@ md5_check(const char *spath, const char *dpath)
 	     */
 	    if (md5_file(spath, scode, 0 /* is_target */) == 0) {
 		if (strcmp(node->md_Code, scode) != 0) {
-		    bcopy(scode, node->md_Code, sizeof(scode));
+		    memcpy(node->md_Code, scode, sizeof(scode));
 		    MD5SCacheDirty = 1;
 		    if (strcmp(node->md_Code, dcode) == 0)
 			r = 0;