NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit5e49c98

committed

Improve pg_check_dir code and comments.

Avoid losing errno if readdir() fails and closedir() works. Consistentlyreturn 4 rather than 3 if both a lost+found directory and other files arefound, rather than returning one value or the other depending on theorder of the directory listing. Update comments to match the actualbehavior.These oversights date to commits6f03927and17f1523.Marco Nenciarini

1 parent23291a7 commit5e49c98Copy full SHA for 5e49c98

File tree

1 file changed

+19

-4

lines changed

src/port
- pgcheckdir.c

1 file changed

+19

-4

lines changed

`‎src/port/pgcheckdir.c`

Lines changed: 19 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,9 @@`
`22`	`22`	`* Returns:`
`23`	`23`	`*0 if nonexistent`
`24`	`24`	`*1 if exists and empty`
`25`		`- *2 if exists and not empty`
	`25`	`+ *2 if exists and contains _only_ dot files`
	`26`	`+ *3 if exists and contains a mount point`
	`27`	`+ *4 if exists and not empty`
`26`	`28`	`*-1 if trouble accessing directory (errno reflects the error)`
`27`	`29`	`*/`
`28`	`30`	`int`
`@@ -32,6 +34,8 @@ pg_check_dir(const char *dir)`
`32`	`34`	`DIR*chkdir;`
`33`	`35`	`structdirent*file;`
`34`	`36`	`booldot_found= false;`
	`37`	`+boolmount_found= false;`
	`38`	`+intreaddir_errno;`
`35`	`39`
`36`	`40`	`chkdir=opendir(dir);`
`37`	`41`	`if (chkdir==NULL)`
`@@ -51,10 +55,10 @@ pg_check_dir(const char *dir)`
`51`	`55`	`{`
`52`	`56`	`dot_found= true;`
`53`	`57`	`}`
	`58`	`+/* lost+found directory */`
`54`	`59`	`elseif (strcmp("lost+found",file->d_name)==0)`
`55`	`60`	`{`
`56`		`-result=3;/* not empty, mount point */`
`57`		`-break;`
	`61`	`+mount_found= true;`
`58`	`62`	`}`
`59`	`63`	`#endif`
`60`	`64`	`else`
`@@ -64,9 +68,20 @@ pg_check_dir(const char *dir)`
`64`	`68`	`}`
`65`	`69`	`}`
`66`	`70`
`67`		`-if (errno\|\|closedir(chkdir))`
	`71`	`+if (errno)`
`68`	`72`	`result=-1;/* some kind of I/O error? */`
`69`	`73`
	`74`	`+/* Close chkdir and avoid overwriting the readdir errno on success */`
	`75`	`+readdir_errno=errno;`
	`76`	`+if (closedir(chkdir))`
	`77`	`+result=-1;/* error executing closedir */`
	`78`	`+else`
	`79`	`+errno=readdir_errno;`
	`80`	`+`
	`81`	`+/* We report on mount point if we find a lost+found directory */`
	`82`	`+if (result==1&&mount_found)`
	`83`	`+result=3;`
	`84`	`+`
`70`	`85`	`/* We report on dot-files if we _only_ find dot files */`
`71`	`86`	`if (result==1&&dot_found)`
`72`	`87`	`result=2;`

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!

Commit5e49c98

File tree

1 file changed

1 file changed

`‎src/port/pgcheckdir.c`

0 commit comments