get_cwd_relative(): do not misinterpret root path

pclouds · gitster · commit fbbb4e19bee8 · 2010-11-23T16:15:16.000-08:00
Commit 490544b (get_cwd_relative(): do not misinterpret suffix as subdirectory) handles case where: dir = "/path/work"; cwd = "/path/work-xyz"; When it comes to the end of get_cwd_relative(), dir is at '\0' and cwd is at '-'. The rest of cwd, "-xyz", clearly cannot be the relative path from dir to cwd. However there is another case where: dir = "/"; /* or even "c:/" */ cwd = "/path/to/here"; In this special case, while *cwd == 'p', which is not a path separator, the rest of cwd, "path/to/here", can be returned as a relative path from dir to cwd. Handle this case and make t1509 pass again. Reported-by: Albert Strasheim <fullung@gmail.com> Reported-by: Matthijs Kooijman <matthijs@stdin.nl> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/dir.c b/dir.c
@@ -964,6 +964,12 @@ char *get_relative_cwd(char *buffer, int size, const char *dir)
 	case '/':
 		return cwd + 1;
 	default:
+		/*
+		 * dir can end with a path separator when it's root
+		 * directory. Return proper prefix in that case.
+		 */
+		if (dir[-1] == '/')
+			return cwd;
 		return NULL;
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -964,6 +964,12 @@ char get_relative_cwd(char buffer, int size, const char *dir)`
`964`	`964`	`case '/':`
`965`	`965`	`return cwd + 1;`
`966`	`966`	`default:`
	`967`	`+ /*`
	`968`	`+ * dir can end with a path separator when it's root`
	`969`	`+ * directory. Return proper prefix in that case.`
	`970`	`+ */`
	`971`	`+ if (dir[-1] == '/')`
	`972`	`+ return cwd;`
`967`	`973`	`return NULL;`
`968`	`974`	`}`
`969`	`975`	`}`