Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 4eb062b
hardlinks: deduplicate code
Baptiste Daroussin committed 3 years ago
commit 4eb062b41f42b929ddc66edcbdb7b152735244cd
parent 209f1dd
2 files changed +3 -9
modified libpkg/pkg_add.c
@@ -50,13 +50,6 @@
#include "private/pkg.h"

#include "private/pkgdb.h"
- 
struct store_hardlinks {
- 
	ino_t ino;
- 
	dev_t dev;
- 
	const char *path;
- 
};
- 
typedef tll(struct store_hardlinks *) hls;
- 


#if defined(UF_NOUNLINK)

#define NOCHANGESFLAGS	(UF_IMMUTABLE | UF_APPEND | UF_NOUNLINK | SF_IMMUTABLE | SF_APPEND | SF_NOUNLINK)

#else
@@ -1412,7 +1405,7 @@ pkg_add_fromdir(struct pkg *pkg, const char *src)
	struct group *gr, grent;

	int err, fd, fromfd;

	int retcode;
- 
	hls hardlinks = tll_init();
+ 
	hardlinks_t hardlinks = tll_init();

	const char *path;

	char buffer[1024];

	size_t link_len;
@@ -1577,7 +1570,7 @@ pkg_add_fromdir(struct pkg *pkg, const char *src)
					retcode = EPKG_FATAL;

					goto cleanup;

				}
- 
				struct store_hardlinks *h = xcalloc(1, sizeof(*h));
+ 
				struct hardlink *h = xcalloc(1, sizeof(*h));

				h->ino = st.st_ino;

				h->dev = st.st_dev;

				h->path = f->path;
modified libpkg/private/utils.h
@@ -53,6 +53,7 @@ typedef tll(struct hardlink *) hardlinks_t;
struct hardlink {

	ino_t ino;

	dev_t dev;
+ 
	const char *path;

};



struct tempdir {