NotificationsYou must be signed in to change notification settings
Fork4.9k
Star17.7k

Commit2c7c6c4

committed

More consistent behavior of GetDataDirectoryCreatePerm on Windows

On Windows, GetDataDirectoryCreatePerm() just did nothing. The waythe code in some callers is structured, this is the first functionthat tries to access the data directory. So it also ends up the placethat is responsible for reporting that a data directory does not existor similar. Therefore, on Windows, these scenarios end up onpotentially completely different code paths.To unify this, to make testing more consistent across platforms, haveGetDataDirectoryCreatePerm() run the stat() call on Windows as well,even though it won't do anything with the result. That way, filesystem errors are reporting to callers in the same way as onnon-Windows.Reviewed-by: Aleksander Alekseev <aleksander@timescale.com>Discussion:https://www.postgresql.org/message-id/15a59bca-0383-183c-9383-0446da9b87e1%40eisentraut.org

1 parent151ffcf commit2c7c6c4Copy full SHA for 2c7c6c4

File tree

1 file changed

-9

lines changed

src/common
- file_perm.c

1 file changed

-9

lines changed

`‎src/common/file_perm.c`

Lines changed: 5 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -59,12 +59,12 @@ SetDataDirectoryCreatePerm(int dataDirMode)`
`59`	`59`	`* false is returned.`
`60`	`60`	`*`
`61`	`61`	`* Suppress when on Windows, because there may not be proper support for Unix-y`
`62`		`- * file permissions.`
	`62`	`+ * file permissions. But we still run stat() on the directory so that callers`
	`63`	`+ * get consistent behavior for example if the directory does not exist.`
`63`	`64`	`*/`
`64`	`65`	`bool`
`65`	`66`	`GetDataDirectoryCreatePerm(constchar*dataDir)`
`66`	`67`	`{`
`67`		`-#if !defined(WIN32)&& !defined(__CYGWIN__)`
`68`	`68`	`structstatstatBuf;`
`69`	`69`
`70`	`70`	`/*`
`@@ -75,16 +75,12 @@ GetDataDirectoryCreatePerm(const char *dataDir)`
`75`	`75`	`if (stat(dataDir,&statBuf)==-1)`
`76`	`76`	`return false;`
`77`	`77`
	`78`	`+#if !defined(WIN32)&& !defined(__CYGWIN__)`
`78`	`79`	`/* Set permissions */`
`79`	`80`	`SetDataDirectoryCreatePerm(statBuf.st_mode);`
`80`		`-return true;`
`81`		`-#else/* !defined(WIN32) && !defined(__CYGWIN__) */`
`82`		`-/*`
`83`		`- * On Windows, we don't have anything to do here since they don't have`
`84`		`- * Unix-y permissions.`
`85`		`- */`
`86`		`-return true;`
`87`	`81`	`#endif`
	`82`	`+`
	`83`	`+return true;`
`88`	`84`	`}`
`89`	`85`
`90`	`86`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit2c7c6c4

File tree

1 file changed

1 file changed

`‎src/common/file_perm.c`

0 commit comments