Commit8829524

committed

copydir() and rmtree() need to use lstat, not stat, to behave as expected

with symlinks. Noted while trying to use rmtree in new C-code pg_regress.

1 parent11b7aec commit8829524Copy full SHA for 8829524

File tree

-4

lines changed

-4

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`*as a service.`
`12`	`12`	`*`
`13`	`13`	`* IDENTIFICATION`
`14`		`- * $PostgreSQL: pgsql/src/port/copydir.c,v 1.17 2006/03/05 15:59:10 momjian Exp $`
	`14`	`+ * $PostgreSQL: pgsql/src/port/copydir.c,v 1.18 2006/07/18 22:36:46 tgl Exp $`
`15`	`15`	`*`
`16`	`16`	`*-------------------------------------------------------------------------`
`17`	`17`	`*/`
`@@ -75,7 +75,7 @@ copydir(char fromdir, char todir, bool recurse)`
`75`	`75`	`snprintf(fromfile,MAXPGPATH,"%s/%s",fromdir,xlde->d_name);`
`76`	`76`	`snprintf(tofile,MAXPGPATH,"%s/%s",todir,xlde->d_name);`
`77`	`77`
`78`		`-if (stat(fromfile,&fst)<0)`
	`78`	`+if (lstat(fromfile,&fst)<0)`
`79`	`79`	`ereport(ERROR,`
`80`	`80`	`(errcode_for_file_access(),`
`81`	`81`	`errmsg("could not stat file \"%s\": %m",fromfile)));`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`*Win32 (NT, Win2k, XP).replace() doesn't work on Win95/98/Me.`
`11`	`11`	`*`
`12`	`12`	`* IDENTIFICATION`
`13`		`- * $PostgreSQL: pgsql/src/port/dirmod.c,v 1.42 2006/03/05 15:59:10 momjian Exp $`
	`13`	`+ * $PostgreSQL: pgsql/src/port/dirmod.c,v 1.43 2006/07/18 22:36:46 tgl Exp $`
`14`	`14`	`*`
`15`	`15`	`*-------------------------------------------------------------------------`
`16`	`16`	`*/`
`@@ -434,7 +434,7 @@ rmtree(char *path, bool rmtopdir)`
`434`	`434`	`{`
`435`	`435`	`snprintf(filepath,MAXPGPATH,"%s/%s",path,*filename);`
`436`	`436`
`437`		`-if (stat(filepath,&statbuf)!=0)`
	`437`	`+if (lstat(filepath,&statbuf)!=0)`
`438`	`438`	`gotoreport_and_fail;`
`439`	`439`
`440`	`440`	`if (S_ISDIR(statbuf.st_mode))`

Comments

(0)