Clean up some consistent confusion between "dev" and "rdev."

Mostly, these were being used correctly even though a lot of
variables and function names were mis-named.

In the process, I found and fixed a couple of latent bugs and
added a guard against adding an archive to itself.

1 files changed, 7 insertions, 0 deletions

diff --git a/lib/libarchive/archive_write.c b/lib/libarchive/archive_write.c
index 6f872f1..f910f14 100644
--- a/lib/libarchive/archive_write.c
+++ b/lib/libarchive/archive_write.c
@@ -46,6 +46,7 @@ __FBSDID("$FreeBSD$");
 #include <unistd.h>
 
 #include "archive.h"
+#include "archive_entry.h"
 #include "archive_private.h"
 
 extern char		**environ;
@@ -186,6 +187,12 @@ archive_write_header(struct archive *a, struct archive_entry *entry)
 	if (a->state & ARCHIVE_STATE_DATA)
 		((a->format_finish_entry)(a));
 
+	if (archive_entry_dev(entry) == a->skip_file_dev &&
+	    archive_entry_ino(entry) == a->skip_file_ino) {
+		archive_set_error(a, 0, "Can't add archive to itself.");
+		return (ARCHIVE_WARN);
+	}
+
 	/* Format and write header. */
 	ret = ((a->format_write_header)(a, entry));