Commitf0d7a12

itagaki.takahiro

committed

Add missing headers and portable flock() implemented with fcntl() for Solaris.

git-svn-id:http://pg-rman.googlecode.com/svn/trunk@19 182aca00-e38e-11de-a668-6fd11605f5ce

1 parent6545c64 commitf0d7a12Copy full SHA for f0d7a12

File tree

+77

-13

lines changed

+77

-13

lines changed

Lines changed: 8 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,14 +9,15 @@`
`9`	`9`
`10`	`10`	`#include"pg_rman.h"`
`11`	`11`
`12`		`-#include<stdlib.h>`
`13`		`-#include<libgen.h>`
`14`		`-#include<unistd.h>`
`15`	`12`	`#include<dirent.h>`
`16`		`-#include<time.h>`
	`13`	`+#include<fcntl.h>`
	`14`	`+#include<libgen.h>`
`17`	`15`	`#include<sys/stat.h>`
`18`	`16`	`#include<sys/types.h>`
`19`	`17`	`#include<sys/file.h>`
	`18`	`+#include<stdlib.h>`
	`19`	`+#include<time.h>`
	`20`	`+#include<unistd.h>`
`20`	`21`
`21`	`22`	`#include"pgut/pgut-port.h"`
`22`	`23`
`@@ -96,7 +97,7 @@ IsDir(const char dirpath, const DIR dir, const struct dirent *ent)`
`96`	`97`	`returnent->d_type==DT_DIR;`
`97`	`98`	`#elif defined(_finddata_t)`
`98`	`99`	`return (dir->dd_dta.attrib&FILE_ATTRIBUTE_DIRECTORY)!=0;`
`99`		`-#else`
	`100`	`+#elif defined(WIN32)`
`100`	`101`	`charpath[MAXPGPATH];`
`101`	`102`	`DWORDattr;`
`102`	`103`
`@@ -106,6 +107,8 @@ IsDir(const char dirpath, const DIR dir, const struct dirent *ent)`
`106`	`107`	`strlcat(path,ent->d_name,MAXPGPATH);`
`107`	`108`	`attr=GetFileAttributes(path);`
`108`	`109`	`returnattr!= (DWORD)-1&& (attr&FILE_ATTRIBUTE_DIRECTORY)!=0;`
	`110`	`+#else`
	`111`	`+#error IsDir: this platform is not supported.`
`109`	`112`	`#endif`
`110`	`113`	`}`
`111`	`114`

Lines changed: 42 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,11 @@`
`10`	`10`	`#include"c.h"`
`11`	`11`	`#include"pgut-port.h"`
`12`	`12`
	`13`	`+#undef flock`
	`14`	`+`
	`15`	`+#include<unistd.h>`
	`16`	`+#include<fcntl.h>`
	`17`	`+`
`13`	`18`	`#ifdefWIN32`
`14`	`19`
`15`	`20`	`#include<winioctl.h>`
`@@ -119,13 +124,18 @@ readlink(const char path, char target, size_t size)`
`119`	`124`	`returnr;`
`120`	`125`	`}`
`121`	`126`
	`127`	`+#endif`
	`128`	`+`
	`129`	`+#ifdefPGUT_FLOCK`
	`130`	`+`
	`131`	`+#ifdefWIN32`
`122`	`132`	`int`
`123`		`-flock(intfd,intoperation)`
	`133`	`+pgut_flock(intfd,intoperation)`
`124`	`134`	`{`
`125`	`135`	`BOOLret;`
`126`	`136`	`HANDLEhandle= (HANDLE)_get_osfhandle(fd);`
`127`	`137`	`DWORDlo=0;`
`128`		`-DWORDhi=1;`
	`138`	`+DWORDhi=0;`
`129`	`139`
`130`	`140`	`if (operation&LOCK_UN)`
`131`	`141`	`{`
`@@ -150,4 +160,34 @@ flock(int fd, int operation)`
`150`	`160`	`return0;`
`151`	`161`	`}`
`152`	`162`
	`163`	`+#else`
	`164`	`+`
	`165`	`+int`
	`166`	`+pgut_flock(intfd,intoperation)`
	`167`	`+{`
	`168`	`+structflocklck;`
	`169`	`+intcmd;`
	`170`	`+`
	`171`	`+memset(&lck,0,sizeof(lck));`
	`172`	`+lck.l_whence=SEEK_SET;`
	`173`	`+lck.l_start=0;`
	`174`	`+lck.l_len=0;`
	`175`	`+lck.l_pid=getpid();`
	`176`	`+`
	`177`	`+if (operation&LOCK_UN)`
	`178`	`+lck.l_type=F_UNLCK;`
	`179`	`+elseif (operation&LOCK_EX)`
	`180`	`+lck.l_type=F_WRLCK;`
	`181`	`+else`
	`182`	`+lck.l_type=F_RDLCK;`
	`183`	`+`
	`184`	`+if (operation&LOCK_NB)`
	`185`	`+cmd=F_SETLK;`
	`186`	`+else`
	`187`	`+cmd=F_SETLKW;`
	`188`	`+`
	`189`	`+returnfcntl(fd,cmd,&lck);`
	`190`	`+}`
	`191`	`+#endif`
	`192`	`+`
`153`	`193`	`#endif`

Lines changed: 26 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,21 +10,41 @@`
`10`	`10`	`#ifndefPGUT_PORT_H`
`11`	`11`	`#definePGUT_PORT_H`
`12`	`12`
	`13`	`+/*`
	`14`	`+ * readlink ports`
	`15`	`+ */`
`13`	`16`	`#ifdefWIN32`
`14`	`17`
`15`		`-#defineLOCK_SH1/* Shared lock. */`
`16`		`-#defineLOCK_EX2/* Exclusive lock. */`
`17`		`-#defineLOCK_UN8/* Unlock. */`
`18`		`-#defineLOCK_NB4/* Don't block when locking. */`
`19`		`-`
`20`	`18`	`#defineS_IFLNK(0)`
`21`	`19`	`#defineS_IRWXG(0)`
`22`	`20`	`#defineS_IRWXO(0)`
`23`	`21`	`#defineS_ISLNK(mode)(0)`
`24`	`22`
`25`		`-externintflock(intfd,intoperation);`
`26`	`23`	`externssize_treadlink(constcharpath,chartarget,size_tsize);`
`27`	`24`
`28`	`25`	`#endif`
`29`	`26`
	`27`	`+/*`
	`28`	`+ * flock ports`
	`29`	`+ */`
	`30`	`+#ifndefLOCK_EX`
	`31`	`+`
	`32`	`+#definePGUT_FLOCK`
	`33`	`+`
	`34`	`+#undef LOCK_SH`
	`35`	`+#undef LOCK_EX`
	`36`	`+#undef LOCK_UN`
	`37`	`+#undef LOCK_NB`
	`38`	`+`
	`39`	`+#defineLOCK_SH1/* Shared lock. */`
	`40`	`+#defineLOCK_EX2/* Exclusive lock. */`
	`41`	`+#defineLOCK_UN8/* Unlock. */`
	`42`	`+#defineLOCK_NB4/* Don't block when locking. */`
	`43`	`+`
	`44`	`+externintpgut_flock(intfd,intoperation);`
	`45`	`+`
	`46`	`+#defineflockpgut_flock`
	`47`	`+`
	`48`	`+#endif`
	`49`	`+`
`30`	`50`	`#endif/* PGUT_PORT_H */`

Lines changed: 1 addition & 0 deletions

Comments

(0)