Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 14db099
Fix statfs bug when PKG_CACHEDIR does not exist.
jlaffaye committed 14 years ago
commit 14db09990c53f4b847ff88b5723314738329da1c
parent bd00a9f
2 files changed +12 -5
modified libpkg/pkg_jobs.c
@@ -2,6 +2,7 @@
#include <sys/mount.h>



#include <assert.h>
+ 
#include <errno.h>

#include <libutil.h>

#include <stdbool.h>

#include <stdlib.h>
@@ -140,9 +141,16 @@ pkg_jobs_install(struct pkg_jobs *j)
	while (pkg_jobs(j, &p) == EPKG_OK)

		dlsize += pkg_new_pkgsize(p);
- 
	if  (statfs(pkg_config("PKG_CACHEDIR"), &fs) == -1) {
- 
		pkg_emit_errno("statfs", pkg_config("PKG_CACHEDIR"));
- 
		return (EPKG_FATAL);
+ 
	cachedir = pkg_config("PKG_CACHEDIR");
+
+ 
	while (statfs(cachedir, &fs) == -1) {
+ 
		if (errno == ENOENT) {
+ 
			if (mkdirs(cachedir) != EPKG_OK)
+ 
				return (EPKG_FATAL);
+ 
		} else {
+ 
			pkg_emit_errno("statfs", cachedir);
+ 
			return (EPKG_FATAL);
+ 
		}

	}



	if (dlsize > ((int64_t)fs.f_bsize * (int64_t)fs.f_bfree)) {
@@ -159,7 +167,6 @@ pkg_jobs_install(struct pkg_jobs *j)
			return (EPKG_FATAL);

	}
- 
	cachedir = pkg_config("PKG_CACHEDIR");

	p = NULL;

	/* integrity checking */

	pkg_emit_integritycheck_begin();
modified libpkg/pkg_repo.c
@@ -92,7 +92,7 @@ pkg_repo_fetch(struct pkg *pkg)
		goto cleanup;

	}
- 
	if ((retcode = mkdirs(path)) != 0)
+ 
	if ((retcode = mkdirs(path)) != EPKG_OK)

		goto cleanup;



	/*