Fix make mkdir.sh if tablespace path have root path.

stalkerg · stalkerg · commit 3e49dd17c5c1 · 2016-11-02T20:19:37.000+03:00
diff --git a/dir.c b/dir.c
@@ -440,11 +440,13 @@ dir_print_mkdirs_sh(FILE *out, const parray *files, const char *root)
 		pgFile *file = (pgFile *) parray_get(files, i);
 		if (S_ISDIR(file->mode))
 		{
-			if (strstr(file->path, root) == file->path) {
-				fprintf(out, "mkdir -m 700 -p %s\n", file->path + strlen(root)
-					+ 1);
+			if (strstr(file->path, root) == file->path &&
+				*(file->path + strlen(root)) == '/')
+			{
+				fprintf(out, "mkdir -m 700 -p %s\n", file->path + strlen(root) + 1);
 			}
-			else {
+			else
+			{
 				fprintf(out, "mkdir -m 700 -p %s\n", file->path);
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -440,11 +440,13 @@ dir_print_mkdirs_sh(FILE out, const parray files, const char *root)`
`440`	`440`	`pgFile file = (pgFile ) parray_get(files, i);`
`441`	`441`	`if (S_ISDIR(file->mode))`
`442`	`442`	`{`
`443`		`- if (strstr(file->path, root) == file->path) {`
`444`		`- fprintf(out, "mkdir -m 700 -p %s\n", file->path + strlen(root)`
`445`		`- + 1);`
	`443`	`+ if (strstr(file->path, root) == file->path &&`
	`444`	`+ *(file->path + strlen(root)) == '/')`
	`445`	`+ {`
	`446`	`+ fprintf(out, "mkdir -m 700 -p %s\n", file->path + strlen(root) + 1);`
`446`	`447`	`}`
`447`		`- else {`
	`448`	`+ else`
	`449`	`+ {`
`448`	`450`	`fprintf(out, "mkdir -m 700 -p %s\n", file->path);`
`449`	`451`	`}`
`450`	`452`	`}`