svn commit: r191579 - head/lib/libarchive

[Tim Kientzle]

Author: kientzle
Date: Mon Apr 27 18:35:03 2009
New Revision: 191579
URL: http://svn.freebsd.org/changeset/base/191579

Log:
  Merge r1021 from libarchive.googlecode.com:
  If we know it's a socket, say so.

Modified:
  head/lib/libarchive/archive_write_set_format_pax.c
  head/lib/libarchive/archive_write_set_format_ustar.c

Modified: head/lib/libarchive/archive_write_set_format_pax.c
==============================================================================
--- head/lib/libarchive/archive_write_set_format_pax.c	Mon Apr 27 18:33:08 2009	(r191578)
+++ head/lib/libarchive/archive_write_set_format_pax.c	Mon Apr 27 18:35:03 2009	(r191579)
@@ -452,8 +452,14 @@ archive_write_pax_header(struct archive_
 				free(t);
 			}
 			break;
+		case AE_IFSOCK:
+			archive_set_error(&a->archive,
+			    ARCHIVE_ERRNO_FILE_FORMAT,
+			    "tar format cannot archive socket");
+			return (ARCHIVE_WARN);
 		default:
-			archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
+			archive_set_error(&a->archive,
+			    ARCHIVE_ERRNO_FILE_FORMAT,
 			    "tar format cannot archive this (type=0%lo)",
 			    (unsigned long)archive_entry_filetype(entry_original));
 			return (ARCHIVE_WARN);

Modified: head/lib/libarchive/archive_write_set_format_ustar.c
==============================================================================
--- head/lib/libarchive/archive_write_set_format_ustar.c	Mon Apr 27 18:33:08 2009	(r191578)
+++ head/lib/libarchive/archive_write_set_format_ustar.c	Mon Apr 27 18:35:03 2009	(r191579)
@@ -414,8 +414,14 @@ __archive_write_format_header_ustar(stru
 		case AE_IFBLK: h[USTAR_typeflag_offset] = '4' ; break;
 		case AE_IFDIR: h[USTAR_typeflag_offset] = '5' ; break;
 		case AE_IFIFO: h[USTAR_typeflag_offset] = '6' ; break;
+		case AE_IFSOCK:
+			archive_set_error(&a->archive,
+			    ARCHIVE_ERRNO_FILE_FORMAT,
+			    "tar format cannot archive socket");
+			return (ARCHIVE_FAILED);
 		default:
-			archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,
+			archive_set_error(&a->archive,
+			    ARCHIVE_ERRNO_FILE_FORMAT,
 			    "tar format cannot archive this (mode=0%lo)",
 			    (unsigned long)archive_entry_mode(entry));
 			ret = ARCHIVE_FAILED;