Commit6e2e78c

committed

parse tablespace_map correctly

1 parent0e6e9a4 commit6e2e78cCopy full SHA for 6e2e78c

File tree

-1

lines changed

-1

lines changed

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1153,7 +1153,7 @@ read_tablespace_map(parray links, const char backup_dir)`
`1153`	`1153`	`path[MAXPGPATH];`
`1154`	`1154`	`pgFile*file;`
`1155`	`1155`
`1156`		`-if (sscanf(buf,"%1023s %1023s",link_name,path)!=2)`
	`1156`	`+if (sscanf(buf,"%s %n",link_name,path)!=2)`
`1157`	`1157`	`elog(ERROR,"invalid format found in \"%s\"",map_path);`
`1158`	`1158`
`1159`	`1159`	`file=pgut_new(pgFile);`
`@@ -1279,13 +1279,19 @@ check_tablespace_mapping(pgBackup *backup, bool incremental, bool force, bool pg`
`1279`	`1279`	`TablespaceListCell*cell;`
`1280`	`1280`	`boolremapped= false;`
`1281`	`1281`
	`1282`	`+elog(INFO,"Linked path: \"%s\"",linked_path);`
	`1283`	`+`
`1282`	`1284`	`for (cell=tablespace_dirs.head;cell;cell=cell->next)`
	`1285`	`+{`
	`1286`	`+elog(INFO,"Remap dir: \"%s\"",cell->old_dir);`
	`1287`	`+`
`1283`	`1288`	`if (strcmp(link->linked,cell->old_dir)==0)`
`1284`	`1289`	`{`
`1285`	`1290`	`linked_path=cell->new_dir;`
`1286`	`1291`	`remapped= true;`
`1287`	`1292`	`break;`
`1288`	`1293`	`}`
	`1294`	`+}`
`1289`	`1295`
`1290`	`1296`	`if (!is_absolute_path(linked_path))`
`1291`	`1297`	`elog(ERROR,"Tablespace directory path must be an absolute path: %s\n",`

Comments

(0)