rugged 0.27.10 → 0.27.10.1

data/vendor/libgit2/src/filebuf.h

@@ -9,7 +9,7 @@
 
 #include "common.h"
 
-#include "futils.h"
+#include "fileops.h"
 #include "hash.h"
 #include <zlib.h>
 
@@ -19,7 +19,7 @@
 
 #define GIT_FILEBUF_HASH_CONTENTS		(1 << 0)
 #define GIT_FILEBUF_APPEND				(1 << 2)
-#define GIT_FILEBUF_CREATE_LEADING_DIRS	(1 << 3)
+#define GIT_FILEBUF_FORCE				(1 << 3)
 #define GIT_FILEBUF_TEMPORARY			(1 << 4)
 #define GIT_FILEBUF_DO_NOT_BUFFER		(1 << 5)
 #define GIT_FILEBUF_FSYNC				(1 << 6)

data/vendor/libgit2/src/{futils.c → fileops.c}

@@ -5,7 +5,7 @@
  * a Linking Exception. For full terms see the included COPYING file.
  */
 
-#include "futils.h"
+#include "fileops.h"
 
 #include "global.h"
 #include "strmap.h"
@@ -35,13 +35,13 @@ int git_futils_mktmp(git_buf *path_out, const char *filename, mode_t mode)
 		return -1;
 
 	if ((fd = p_mkstemp(path_out->ptr)) < 0) {
-		git_error_set(GIT_ERROR_OS,
+		giterr_set(GITERR_OS,
 			"failed to create temporary file '%s'", path_out->ptr);
 		return -1;
 	}
 
 	if (p_chmod(path_out->ptr, (mode & ~mask))) {
-		git_error_set(GIT_ERROR_OS,
+		giterr_set(GITERR_OS,
 			"failed to set permissions on file '%s'", path_out->ptr);
 		return -1;
 	}
@@ -58,7 +58,7 @@ int git_futils_creat_withpath(const char *path, const mode_t dirmode, const mode
 
 	fd = p_creat(path, mode);
 	if (fd < 0) {
-		git_error_set(GIT_ERROR_OS, "failed to create file '%s'", path);
+		giterr_set(GITERR_OS, "failed to create file '%s'", path);
 		return -1;
 	}
 
@@ -72,7 +72,7 @@ int git_futils_creat_locked(const char *path, const mode_t mode)
 
 	if (fd < 0) {
 		int error = errno;
-		git_error_set(GIT_ERROR_OS, "failed to create locked file '%s'", path);
+		giterr_set(GITERR_OS, "failed to create locked file '%s'", path);
 		switch (error) {
 		case EEXIST:
 			return GIT_ELOCKED;
@@ -112,22 +112,16 @@ int git_futils_truncate(const char *path, int mode)
 	return 0;
 }
 
-int git_futils_filesize(uint64_t *out, git_file fd)
+git_off_t git_futils_filesize(git_file fd)
 {
 	struct stat sb;
 
 	if (p_fstat(fd, &sb)) {
-		git_error_set(GIT_ERROR_OS, "failed to stat file descriptor");
+		giterr_set(GITERR_OS, "failed to stat file descriptor");
 		return -1;
 	}
 
-	if (sb.st_size < 0) {
-		git_error_set(GIT_ERROR_INVALID, "invalid file size");
-		return -1;
-	}
-
-	*out = sb.st_size;
-	return 0;
+	return sb.st_size;
 }
 
 mode_t git_futils_canonical_mode(mode_t raw_mode)
@@ -152,11 +146,11 @@ int git_futils_readbuffer_fd(git_buf *buf, git_file fd, size_t len)
 	git_buf_clear(buf);
 
 	if (!git__is_ssizet(len)) {
-		git_error_set(GIT_ERROR_INVALID, "read too large");
+		giterr_set(GITERR_INVALID, "read too large");
 		return -1;
 	}
 
-	GIT_ERROR_CHECK_ALLOC_ADD(&alloc_len, len, 1);
+	GITERR_CHECK_ALLOC_ADD(&alloc_len, len, 1);
 	if (git_buf_grow(buf, alloc_len) < 0)
 		return -1;
 
@@ -164,8 +158,8 @@ int git_futils_readbuffer_fd(git_buf *buf, git_file fd, size_t len)
 	read_size = p_read(fd, buf->ptr, len);
 
 	if (read_size != (ssize_t)len) {
-		git_error_set(GIT_ERROR_OS, "failed to read descriptor");
-		git_buf_dispose(buf);
+		giterr_set(GITERR_OS, "failed to read descriptor");
+		git_buf_free(buf);
 		return -1;
 	}
 
@@ -194,12 +188,12 @@ int git_futils_readbuffer_updated(
 
 
 	if (S_ISDIR(st.st_mode)) {
-		git_error_set(GIT_ERROR_INVALID, "requested file is a directory");
+		giterr_set(GITERR_INVALID, "requested file is a directory");
 		return GIT_ENOTFOUND;
 	}
 
 	if (!git__is_sizet(st.st_size+1)) {
-		git_error_set(GIT_ERROR_OS, "invalid regular file stat for '%s'", path);
+		giterr_set(GITERR_OS, "invalid regular file stat for '%s'", path);
 		return -1;
 	}
 
@@ -215,7 +209,7 @@ int git_futils_readbuffer_updated(
 
 	if (checksum) {
 		if ((error = git_hash_buf(&checksum_new, buf.ptr, buf.size)) < 0) {
-			git_buf_dispose(&buf);
+			git_buf_free(&buf);
 			return error;
 		}
 
@@ -223,7 +217,7 @@ int git_futils_readbuffer_updated(
 		 * If we were given a checksum, we only want to use it if it's different
 		 */
 		if (!git_oid__cmp(checksum, &checksum_new)) {
-			git_buf_dispose(&buf);
+			git_buf_free(&buf);
 			if (updated)
 				*updated = 0;
 
@@ -240,7 +234,7 @@ int git_futils_readbuffer_updated(
 		*updated = 1;
 
 	git_buf_swap(out, &buf);
-	git_buf_dispose(&buf);
+	git_buf_free(&buf);
 
 	return 0;
 }
@@ -267,24 +261,24 @@ int git_futils_writebuffer(
 		mode = GIT_FILEMODE_BLOB;
 
 	if ((fd = p_open(path, flags, mode)) < 0) {
-		git_error_set(GIT_ERROR_OS, "could not open '%s' for writing", path);
+		giterr_set(GITERR_OS, "could not open '%s' for writing", path);
 		return fd;
 	}
 
 	if ((error = p_write(fd, git_buf_cstr(buf), git_buf_len(buf))) < 0) {
-		git_error_set(GIT_ERROR_OS, "could not write to '%s'", path);
+		giterr_set(GITERR_OS, "could not write to '%s'", path);
 		(void)p_close(fd);
 		return error;
 	}
 
 	if (do_fsync && (error = p_fsync(fd)) < 0) {
-		git_error_set(GIT_ERROR_OS, "could not fsync '%s'", path);
+		giterr_set(GITERR_OS, "could not fsync '%s'", path);
 		p_close(fd);
 		return error;
 	}
 
 	if ((error = p_close(fd)) < 0) {
-		git_error_set(GIT_ERROR_OS, "error while closing '%s'", path);
+		giterr_set(GITERR_OS, "error while closing '%s'", path);
 		return error;
 	}
 
@@ -300,14 +294,14 @@ int git_futils_mv_withpath(const char *from, const char *to, const mode_t dirmod
 		return -1;
 
 	if (p_rename(from, to) < 0) {
-		git_error_set(GIT_ERROR_OS, "failed to rename '%s' to '%s'", from, to);
+		giterr_set(GITERR_OS, "failed to rename '%s' to '%s'", from, to);
 		return -1;
 	}
 
 	return 0;
 }
 
-int git_futils_mmap_ro(git_map *out, git_file fd, off64_t begin, size_t len)
+int git_futils_mmap_ro(git_map *out, git_file fd, git_off_t begin, size_t len)
 {
 	return p_mmap(out, len, GIT_PROT_READ, GIT_MAP_SHARED, fd, begin);
 }
@@ -315,17 +309,19 @@ int git_futils_mmap_ro(git_map *out, git_file fd, off64_t begin, size_t len)
 int git_futils_mmap_ro_file(git_map *out, const char *path)
 {
 	git_file fd = git_futils_open_ro(path);
-	uint64_t len;
+	git_off_t len;
 	int result;
 
 	if (fd < 0)
 		return fd;
 
-	if ((result = git_futils_filesize(&len, fd)) < 0)
+	if ((len = git_futils_filesize(fd)) < 0) {
+		result = -1;
 		goto out;
+	}
 
 	if (!git__is_sizet(len)) {
-		git_error_set(GIT_ERROR_OS, "file `%s` too large to mmap", path);
+		giterr_set(GITERR_OS, "file `%s` too large to mmap", path);
 		result = -1;
 		goto out;
 	}
@@ -350,7 +346,7 @@ GIT_INLINE(int) mkdir_validate_dir(
 {
 	/* with exclusive create, existing dir is an error */
 	if ((flags & GIT_MKDIR_EXCL) != 0) {
-		git_error_set(GIT_ERROR_FILESYSTEM,
+		giterr_set(GITERR_FILESYSTEM,
 			"failed to make directory '%s': directory exists", path);
 		return GIT_EEXISTS;
 	}
@@ -358,7 +354,7 @@ GIT_INLINE(int) mkdir_validate_dir(
 	if ((S_ISREG(st->st_mode) && (flags & GIT_MKDIR_REMOVE_FILES)) ||
 		(S_ISLNK(st->st_mode) && (flags & GIT_MKDIR_REMOVE_SYMLINKS))) {
 		if (p_unlink(path) < 0) {
-			git_error_set(GIT_ERROR_OS, "failed to remove %s '%s'",
+			giterr_set(GITERR_OS, "failed to remove %s '%s'",
 				S_ISLNK(st->st_mode) ? "symlink" : "file", path);
 			return GIT_EEXISTS;
 		}
@@ -366,7 +362,7 @@ GIT_INLINE(int) mkdir_validate_dir(
 		opts->perfdata.mkdir_calls++;
 
 		if (p_mkdir(path, mode) < 0) {
-			git_error_set(GIT_ERROR_OS, "failed to make directory '%s'", path);
+			giterr_set(GITERR_OS, "failed to make directory '%s'", path);
 			return GIT_EEXISTS;
 		}
 	}
@@ -376,13 +372,13 @@ GIT_INLINE(int) mkdir_validate_dir(
 		opts->perfdata.stat_calls++;
 
 		if (p_stat(path, st) < 0) {
-			git_error_set(GIT_ERROR_OS, "failed to make directory '%s'", path);
+			giterr_set(GITERR_OS, "failed to make directory '%s'", path);
 			return GIT_EEXISTS;
 		}
 	}
 
 	else if (!S_ISDIR(st->st_mode)) {
-		git_error_set(GIT_ERROR_FILESYSTEM,
+		giterr_set(GITERR_FILESYSTEM,
 			"failed to make directory '%s': directory exists", path);
 		return GIT_EEXISTS;
 	}
@@ -404,7 +400,7 @@ GIT_INLINE(int) mkdir_validate_mode(
 		opts->perfdata.chmod_calls++;
 
 		if (p_chmod(path, mode) < 0) {
-			git_error_set(GIT_ERROR_OS, "failed to set permissions on '%s'", path);
+			giterr_set(GITERR_OS, "failed to set permissions on '%s'", path);
 			return -1;
 		}
 	}
@@ -419,7 +415,7 @@ GIT_INLINE(int) mkdir_canonicalize(
 	ssize_t root_len;
 
 	if (path->size == 0) {
-		git_error_set(GIT_ERROR_OS, "attempt to create empty path");
+		giterr_set(GITERR_OS, "attempt to create empty path");
 		return -1;
 	}
 
@@ -479,8 +475,7 @@ int git_futils_mkdir(
 		if (error == 0) {
 			break;
 		} else if (errno != ENOENT) {
-			git_error_set(GIT_ERROR_OS, "failed to stat '%s'", parent_path.ptr);
-			error = -1;
+			giterr_set(GITERR_OS, "failed to stat '%s'", parent_path.ptr);
 			goto done;
 		}
 
@@ -494,15 +489,10 @@ int git_futils_mkdir(
 
 		assert(len);
 
-		/*
-		 * We've walked all the given path's parents and it's either relative
-		 * (the parent is simply '.') or rooted (the length is less than or
-		 * equal to length of the root path).  The path may be less than the
-		 * root path length on Windows, where `C:` == `C:/`.
+		/* we've walked all the given path's parents and it's either relative
+		 * or rooted.  either way, give up and make the entire path.
 		 */
-		if ((len == 1 && parent_path.ptr[0] == '.') ||
-		    (len == 1 && parent_path.ptr[0] == '/') ||
-		    len <= root_len) {
+		if ((len == 1 && parent_path.ptr[0] == '.') || len == root_len+1) {
 			relative = make_path.ptr;
 			break;
 		}
@@ -536,8 +526,8 @@ int git_futils_mkdir(
 		parent_path.size ? parent_path.ptr : NULL, mode, flags, &opts);
 
 done:
-	git_buf_dispose(&make_path);
-	git_buf_dispose(&parent_path);
+	git_buf_free(&make_path);
+	git_buf_free(&parent_path);
 	return error;
 }
 
@@ -612,18 +602,18 @@ int git_futils_mkdir_relative(
 retry_lstat:
 		if (p_lstat(make_path.ptr, &st) < 0) {
 			if (mkdir_attempted || errno != ENOENT) {
-				git_error_set(GIT_ERROR_OS, "cannot access component in path '%s'", make_path.ptr);
+				giterr_set(GITERR_OS, "cannot access component in path '%s'", make_path.ptr);
 				error = -1;
 				goto done;
 			}
 
-			git_error_clear();
+			giterr_clear();
 			opts->perfdata.mkdir_calls++;
 			mkdir_attempted = true;
 			if (p_mkdir(make_path.ptr, mode) < 0) {
 				if (errno == EEXIST)
 					goto retry_lstat;
-				git_error_set(GIT_ERROR_OS, "failed to make directory '%s'", make_path.ptr);
+				giterr_set(GITERR_OS, "failed to make directory '%s'", make_path.ptr);
 				error = -1;
 				goto done;
 			}
@@ -642,13 +632,16 @@ retry_lstat:
 			char *cache_path;
 			size_t alloc_size;
 
-			GIT_ERROR_CHECK_ALLOC_ADD(&alloc_size, make_path.size, 1);
-			cache_path = git_pool_malloc(opts->pool, alloc_size);
-			GIT_ERROR_CHECK_ALLOC(cache_path);
+			GITERR_CHECK_ALLOC_ADD(&alloc_size, make_path.size, 1);
+			if (!git__is_uint32(alloc_size))
+				return -1;
+			cache_path = git_pool_malloc(opts->pool, (uint32_t)alloc_size);
+			GITERR_CHECK_ALLOC(cache_path);
 
 			memcpy(cache_path, make_path.ptr, make_path.size + 1);
 
-			if ((error = git_strmap_set(opts->dir_map, cache_path, cache_path)) < 0)
+			git_strmap_insert(opts->dir_map, cache_path, cache_path, &error);
+			if (error < 0)
 				goto done;
 		}
 	}
@@ -661,14 +654,14 @@ retry_lstat:
 		opts->perfdata.stat_calls++;
 
 		if (p_stat(make_path.ptr, &st) < 0 || !S_ISDIR(st.st_mode)) {
-			git_error_set(GIT_ERROR_OS, "path is not a directory '%s'",
+			giterr_set(GITERR_OS, "path is not a directory '%s'",
 				make_path.ptr);
 			error = GIT_ENOTFOUND;
 		}
 	}
 
 done:
-	git_buf_dispose(&make_path);
+	git_buf_free(&make_path);
 	return error;
 }
 
@@ -684,10 +677,10 @@ typedef struct {
 static int futils__error_cannot_rmdir(const char *path, const char *filemsg)
 {
 	if (filemsg)
-		git_error_set(GIT_ERROR_OS, "could not remove directory '%s': %s",
+		giterr_set(GITERR_OS, "could not remove directory '%s': %s",
 				   path, filemsg);
 	else
-		git_error_set(GIT_ERROR_OS, "could not remove directory '%s'", path);
+		giterr_set(GITERR_OS, "could not remove directory '%s'", path);
 
 	return -1;
 }
@@ -825,11 +818,11 @@ int git_futils_rmdir_r(
 			&fullpath, base, futils__rmdir_empty_parent, &data);
 
 	if (error == GIT_ITEROVER) {
-		git_error_clear();
+		giterr_clear();
 		error = 0;
 	}
 
-	git_buf_dispose(&fullpath);
+	git_buf_free(&fullpath);
 
 	return error;
 }
@@ -858,12 +851,12 @@ static int cp_by_fd(int ifd, int ofd, bool close_fd_when_done)
 		error = p_write(ofd, buffer, len);
 
 	if (len < 0) {
-		git_error_set(GIT_ERROR_OS, "read error while copying file");
+		giterr_set(GITERR_OS, "read error while copying file");
 		error = (int)len;
 	}
 
 	if (error < 0)
-		git_error_set(GIT_ERROR_OS, "write error while copying file");
+		giterr_set(GITERR_OS, "write error while copying file");
 
 	if (close_fd_when_done) {
 		p_close(ifd);
@@ -908,20 +901,20 @@ static int cp_link(const char *from, const char *to, size_t link_size)
 	char *link_data;
 	size_t alloc_size;
 
-	GIT_ERROR_CHECK_ALLOC_ADD(&alloc_size, link_size, 1);
+	GITERR_CHECK_ALLOC_ADD(&alloc_size, link_size, 1);
 	link_data = git__malloc(alloc_size);
-	GIT_ERROR_CHECK_ALLOC(link_data);
+	GITERR_CHECK_ALLOC(link_data);
 
 	read_len = p_readlink(from, link_data, link_size);
 	if (read_len != (ssize_t)link_size) {
-		git_error_set(GIT_ERROR_OS, "failed to read symlink data for '%s'", from);
+		giterr_set(GITERR_OS, "failed to read symlink data for '%s'", from);
 		error = -1;
 	}
 	else {
 		link_data[read_len] = '\0';
 
 		if (p_symlink(link_data, to) < 0) {
-			git_error_set(GIT_ERROR_OS, "could not symlink '%s' as '%s'",
+			giterr_set(GITERR_OS, "could not symlink '%s' as '%s'",
 				link_data, to);
 			error = -1;
 		}
@@ -984,7 +977,7 @@ static int _cp_r_callback(void *ref, git_buf *from)
 	else if (error != GIT_ENOTFOUND)
 		return error;
 	else {
-		git_error_clear();
+		giterr_clear();
 		error = 0;
 	}
 
@@ -1017,7 +1010,7 @@ static int _cp_r_callback(void *ref, git_buf *from)
 			return 0;
 
 		if (p_unlink(info->to.ptr) < 0) {
-			git_error_set(GIT_ERROR_OS, "cannot overwrite existing file '%s'",
+			giterr_set(GITERR_OS, "cannot overwrite existing file '%s'",
 				info->to.ptr);
 			return GIT_EEXISTS;
 		}
@@ -1037,7 +1030,7 @@ static int _cp_r_callback(void *ref, git_buf *from)
 	/* make symlink or regular file */
 	if (info->flags & GIT_CPDIR_LINK_FILES) {
 		if ((error = p_link(from->ptr, info->to.ptr)) < 0)
-			git_error_set(GIT_ERROR_OS, "failed to link '%s'", from->ptr);
+			giterr_set(GITERR_OS, "failed to link '%s'", from->ptr);
 	} else if (S_ISLNK(from_st.st_mode)) {
 		error = cp_link(from->ptr, info->to.ptr, (size_t)from_st.st_size);
 	} else {
@@ -1088,8 +1081,8 @@ int git_futils_cp_r(
 
 	error = _cp_r_callback(&info, &path);
 
-	git_buf_dispose(&path);
-	git_buf_dispose(&info.to);
+	git_buf_free(&path);
+	git_buf_free(&info.to);
 
 	return error;
 }
@@ -1110,7 +1103,7 @@ int git_futils_filestamp_check(
 #if defined(GIT_USE_NSEC)
 		stamp->mtime.tv_nsec == st.st_mtime_nsec &&
 #endif
-		stamp->size  == (uint64_t)st.st_size   &&
+		stamp->size  == (git_off_t)st.st_size   &&
 		stamp->ino   == (unsigned int)st.st_ino)
 		return 0;
 
@@ -1118,7 +1111,7 @@ int git_futils_filestamp_check(
 #if defined(GIT_USE_NSEC)
 	stamp->mtime.tv_nsec = st.st_mtime_nsec;
 #endif
-	stamp->size  = (uint64_t)st.st_size;
+	stamp->size  = (git_off_t)st.st_size;
 	stamp->ino   = (unsigned int)st.st_ino;
 
 	return 1;
@@ -1146,7 +1139,7 @@ void git_futils_filestamp_set_from_stat(
 #else
 		stamp->mtime.tv_nsec = 0;
 #endif
-		stamp->size  = (uint64_t)st->st_size;
+		stamp->size  = (git_off_t)st->st_size;
 		stamp->ino   = (unsigned int)st->st_ino;
 	} else {
 		memset(stamp, 0, sizeof(*stamp));
@@ -1162,12 +1155,12 @@ int git_futils_fsync_dir(const char *path)
 	int fd, error = -1;
 
 	if ((fd = p_open(path, O_RDONLY)) < 0) {
-		git_error_set(GIT_ERROR_OS, "failed to open directory '%s' for fsync", path);
+		giterr_set(GITERR_OS, "failed to open directory '%s' for fsync", path);
 		return -1;
 	}
 
 	if ((error = p_fsync(fd)) < 0)
-		git_error_set(GIT_ERROR_OS, "failed to fsync directory '%s'", path);
+		giterr_set(GITERR_OS, "failed to fsync directory '%s'", path);
 
 	p_close(fd);
 	return error;