Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › add6bd6
The mtree is dead since pkg 1.3, remove now useless code
Baptiste Daroussin committed 11 years ago
commit add6bd6a781288126e66c65110c1f964db02b98b
parent 606a3ce
1 file changed +0 -40
modified libpkg/pkg.c
@@ -1526,21 +1526,8 @@ pkg_open2(struct pkg **pkg_p, struct archive **a, struct archive_entry **ae,
	int		 ret;

	const char	*fpath;

	bool		 manifest = false;
- 
	const void	*buf;
- 
	size_t		 size;
- 
	off_t		 offset = 0;
- 
	struct sbuf	*sbuf;
- 
	int		 i, r;

	bool		 read_from_stdin = 0;
- 
	struct {
- 
		const char *name;
- 
		pkg_attr attr;
- 
	} files[] = {
- 
		{ "+MTREE_DIRS", PKG_MTREE },
- 
		{ NULL, 0 }
- 
	};
- 


	*a = archive_read_new();

	archive_read_support_filter_all(*a);

	archive_read_support_format_tar(*a);
@@ -1624,33 +1611,6 @@ pkg_open2(struct pkg **pkg_p, struct archive **a, struct archive_entry **ae,
			if (flags & PKG_OPEN_MANIFEST_ONLY)

				break;

		}
-
- 
		for (i = 0; files[i].name != NULL; i++) {
- 
			if (strcmp(fpath, files[i].name) == 0) {
- 
				sbuf = sbuf_new_auto();
- 
				offset = 0;
- 
				for (;;) {
- 
					if ((r = archive_read_data_block(*a, &buf,
- 
							&size, &offset)) == 0) {
- 
						sbuf_bcat(sbuf, buf, size);
- 
					}
- 
					else {
- 
						if (r == ARCHIVE_FATAL) {
- 
							retcode = EPKG_FATAL;
- 
							if ((flags & PKG_OPEN_TRY) == 0)
- 
								pkg_emit_error("%s is not a valid package: "
- 
									"%s is corrupted: %s", path, fpath,
- 
										archive_error_string(*a));
-
- 
							goto cleanup;
- 
						}
- 
						else if (r == ARCHIVE_EOF)
- 
							break;
- 
					}
- 
				}
- 
				sbuf_delete(sbuf);
- 
			}
- 
		}

	}



	if (ret != ARCHIVE_OK && ret != ARCHIVE_EOF) {