Commitbc5717b

itagaki.takahiro

committed

Add a portable implementation for IsDir().

dirent.d_type is not in POSIX and does not exist at least on Solaris.git-svn-id:http://pg-rman.googlecode.com/svn/trunk@23 182aca00-e38e-11de-a668-6fd11605f5ce

1 parent8863b79 commitbc5717bCopy full SHA for bc5717b

File tree

-9

lines changed

-9

lines changed

Lines changed: 8 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,9 @@`
`12`	`12`	`#include<dirent.h>`
`13`	`13`	`#include<fcntl.h>`
`14`	`14`	`#include<libgen.h>`
	`15`	`+#include<sys/file.h>`
`15`	`16`	`#include<sys/stat.h>`
`16`	`17`	`#include<sys/types.h>`
`17`		`-#include<sys/file.h>`
`18`	`18`	`#include<stdlib.h>`
`19`	`19`	`#include<time.h>`
`20`	`20`	`#include<unistd.h>`
`@@ -96,19 +96,18 @@ IsDir(const char dirpath, const DIR dir, const struct dirent *ent)`
`96`	`96`	`#if defined(DT_DIR)`
`97`	`97`	`returnent->d_type==DT_DIR;`
`98`	`98`	`#elif defined(_finddata_t)`
	`99`	`+/* Optimization for VC++ on Windows. */`
`99`	`100`	`return (dir->dd_dta.attrib&FILE_ATTRIBUTE_DIRECTORY)!=0;`
`100`		`-#elif defined(WIN32)`
`101`		`-charpath[MAXPGPATH];`
`102`		`-DWORDattr;`
	`101`	`+#else`
	`102`	`+/* Portable implementation because dirent.d_type is not in POSIX. */`
	`103`	`+charpath[MAXPGPATH];`
	`104`	`+structstatst;`
`103`	`105`
`104`		`-/* dirent.d_type does not exists */`
`105`	`106`	`strlcpy(path,dirpath,MAXPGPATH);`
`106`	`107`	`strlcat(path,"/",MAXPGPATH);`
`107`	`108`	`strlcat(path,ent->d_name,MAXPGPATH);`
`108`		`-attr=GetFileAttributes(path);`
`109`		`-returnattr!= (DWORD)-1&& (attr&FILE_ATTRIBUTE_DIRECTORY)!=0;`
`110`		`-#else`
`111`		`-#error IsDir: this platform is not supported.`
	`109`	`+`
	`110`	`+returnstat(path,&st)==0&&S_ISDIR(st.st_mode);`
`112`	`111`	`#endif`
`113`	`112`	`}`
`114`	`113`

Comments

(0)