Checkout: handle symlinks.

Includes unfinished win32 implementation.

src/checkout.c

@@ -32,7 +32,30 @@ typedef struct tree_walk_data
 } tree_walk_data;
 
 
-static int blob_contents_to_file(git_repository *repo, git_buf *fnbuf, const git_oid *id, int mode)
+static int blob_contents_to_link(git_repository *repo, git_buf *fnbuf,
+											const git_oid *id)
+{
+	int retcode = GIT_ERROR;
+	git_blob *blob;
+
+	/* Get the link target */
+	if (!(retcode = git_blob_lookup(&blob, repo, id))) {
+		git_buf linktarget = GIT_BUF_INIT;
+		if (!(retcode = git_blob__getbuf(&linktarget, blob))) {
+			/* Create the link */
+			retcode = p_symlink(git_buf_cstr(&linktarget),
+									  git_buf_cstr(fnbuf));
+		}
+		git_buf_free(&linktarget);
+		git_blob_free(blob);
+	}
+
+	return retcode;
+}
+
+
+static int blob_contents_to_file(git_repository *repo, git_buf *fnbuf,
+											const git_oid *id, int mode)
 {
 	int retcode = GIT_ERROR;
 
@@ -62,30 +85,33 @@ static int checkout_walker(const char *path, git_tree_entry *entry, void *payloa
 
 	/* TODO: handle submodules  */
 
-	if (S_ISLNK(attr)) {
-		printf("It's a link!\n'");
-	} else {
-		switch(git_tree_entry_type(entry)) {
-		case GIT_OBJ_TREE:
-			/* Nothing to do; the blob handling creates necessary directories. */
-			break;
-
-		case GIT_OBJ_BLOB:
-			{
-				git_buf fnbuf = GIT_BUF_INIT;
-				git_buf_join_n(&fnbuf, '/', 3,
-									git_repository_workdir(data->repo),
-									path,
-									git_tree_entry_name(entry));
-				retcode = blob_contents_to_file(data->repo, &fnbuf, git_tree_entry_id(entry), attr);
-				git_buf_free(&fnbuf);
+	switch(git_tree_entry_type(entry))
+	{
+	case GIT_OBJ_TREE:
+		/* Nothing to do; the blob handling creates necessary directories. */
+		break;
+
+	case GIT_OBJ_BLOB:
+		{
+			git_buf fnbuf = GIT_BUF_INIT;
+			git_buf_join_n(&fnbuf, '/', 3,
+								git_repository_workdir(data->repo),
+								path,
+								git_tree_entry_name(entry));
+			if (S_ISLNK(attr)) {
+				retcode = blob_contents_to_link(data->repo, &fnbuf,
+														  git_tree_entry_id(entry));
+			} else {
+				retcode = blob_contents_to_file(data->repo, &fnbuf,
+														  git_tree_entry_id(entry), attr);
 			}
-			break;
-
-		default:
-			retcode = -1;
-			break;
+			git_buf_free(&fnbuf);
 		}
+		break;
+
+	default:
+		retcode = -1;
+		break;
 	}
 
 	data->stats->processed++;

src/unix/posix.h

@@ -19,6 +19,7 @@
 #define p_lstat(p,b) lstat(p,b)
 #define p_readlink(a, b, c) readlink(a, b, c)
 #define p_link(o,n) link(o, n)
+#define p_symlink(o,n) symlink(o,n)
 #define p_unlink(p) unlink(p)
 #define p_mkdir(p,m) mkdir(p, m)
 #define p_fsync(fd) fsync(fd)

src/win32/posix.h

@@ -33,6 +33,7 @@ GIT_INLINE(int) p_mkdir(const char *path, mode_t mode)
 extern int p_unlink(const char *path);
 extern int p_lstat(const char *file_name, struct stat *buf);
 extern int p_readlink(const char *link, char *target, size_t target_len);
+extern int p_symlink(const char *old, const char *new);
 extern int p_hide_directory__w32(const char *path);
 extern char *p_realpath(const char *orig_path, char *buffer);
 extern int p_vsnprintf(char *buffer, size_t count, const char *format, va_list argptr);

src/win32/posix_w32.c

@@ -217,6 +217,12 @@ int p_readlink(const char *link, char *target, size_t target_len)
 	return dwRet;
 }
 
+int p_symlink(const char *old, const char *new)
+{
+	/* TODO */
+	return -1;
+}
+
 int p_open(const char *path, int flags, ...)
 {
 	int fd;

tests-clar/checkout/checkout.c

@@ -66,3 +66,16 @@ void test_checkout_checkout__stats(void)
 {
 	/* TODO */
 }
+
+void test_checkout_checkout__links(void)
+{
+	char link_data[1024];
+	size_t link_size = 1024;
+
+	cl_git_pass(git_checkout_force(g_repo, NULL));
+	link_size = p_readlink("./testrepo/link_to_new.txt", link_data, link_size);
+	cl_assert_equal_i(link_size, strlen("new.txt"));
+	link_data[link_size] = '\0';
+	cl_assert_equal_s(link_data, "new.txt");
+	test_file_contents("./testrepo/link_to_new.txt", "my new file\n");
+}

tests-clar/resources/testrepo/.gitted/refs/heads/master

-a65fedf39aefe402d3bb6e24df4d4f5fe4547750
+099fabac3a9ea935598528c27f866e34089c2eff