D38369.id116387.diff
No OneTemporary
Actions

Size

863 B

Referenced Files

None

Subscribers

None

D38369.id116387.diff
View Options

	diff --git a/bin/cp/cp.c b/bin/cp/cp.c
	--- a/bin/cp/cp.c
	+++ b/bin/cp/cp.c
	@@ -311,8 +311,7 @@
	recurse_path = NULL;
	if ((ftsp = fts_open(argv, fts_options, NULL)) == NULL)
	err(1, "fts_open");
	- for (badcp = rval = 0; errno = 0, (curr = fts_read(ftsp)) != NULL;
	- badcp = 0) {
	+ for (badcp = rval = 0; (curr = fts_read(ftsp)) != NULL; badcp = 0) {
	switch (curr->fts_info) {
	case FTS_NS:
	case FTS_DNR:
	diff --git a/bin/cp/utils.c b/bin/cp/utils.c
	--- a/bin/cp/utils.c
	+++ b/bin/cp/utils.c
	@@ -37,9 +37,8 @@
	#include <sys/cdefs.h>
	__FBSDID("$FreeBSD$");

	-#include <sys/types.h>
	-#include <sys/acl.h>
	#include <sys/param.h>
	+#include <sys/acl.h>
	#include <sys/stat.h>

	#include <err.h>
	@@ -241,7 +240,7 @@
	int
	copy_link(const FTSENT *p, int exists)
	{
	- int len;
	+ ssize_t len;
	char llink[PATH_MAX];

	if (exists && nflag) {