database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-28 23:42:10 +03:00
Code Activity

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

Browse Source 
with symlinks.  Noted while trying to use rmtree in new C-code pg_regress.
This commit is contained in:
Tom Lane
2006-07-18 22:36:46 +00:00
parent 11b7aecbd4
commit 88295244be
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/port/copydir.c
View File

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

4
src/port/dirmod.c
View File

@ -10,7 +10,7 @@
* Win32 (NT, Win2k, XP). replace() doesn't work on Win95/98/Me. * Win32 (NT, Win2k, XP). replace() doesn't work on Win95/98/Me.
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/port/dirmod.c,v 1.42 2006/03/05 15:59:10 momjian Exp $ * $PostgreSQL: pgsql/src/port/dirmod.c,v 1.43 2006/07/18 22:36:46 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -434,7 +434,7 @@ rmtree(char *path, bool rmtopdir)
{ {
snprintf(filepath, MAXPGPATH, "%s/%s", path, *filename); snprintf(filepath, MAXPGPATH, "%s/%s", path, *filename);
if (stat(filepath, &statbuf) != 0) if (lstat(filepath, &statbuf) != 0)
goto report_and_fail; goto report_and_fail;
if (S_ISDIR(statbuf.st_mode)) if (S_ISDIR(statbuf.st_mode))