Commit47a19a4

committed

Create wrapper pgwin32_safestat() and redefine stat() to it

on win32, because the stat() function in the runtime cannotbe trusted to always update the st_size field.Per report and research by Sergey Zubkovsky.

1 parenta57a1e6 commit47a19a4Copy full SHA for 47a19a4

File tree

+49

-2

lines changed

+49

-2

lines changed

Lines changed: 14 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`* Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group`
`7`	`7`	`* Portions Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`		`- * $PostgreSQL: pgsql/src/include/port.h,v 1.118 2008/02/29 15:31:33 mha Exp $`
	`9`	`+ * $PostgreSQL: pgsql/src/include/port.h,v 1.119 2008/04/10 16:58:51 mha Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -298,6 +298,19 @@ extern FILE pgwin32_fopen(const char , const char *);`
`298`	`298`	`#definepopen(a,b) _popen(a,b)`
`299`	`299`	`#definepclose(a) _pclose(a)`
`300`	`300`
	`301`	`+/*`
	`302`	`+ * stat() is not guaranteed to set the st_size field on win32, so we`
	`303`	`+ * redefine it to our own implementation that is.`
	`304`	`+ *`
	`305`	`+ * We must pull in sys/stat.h here so the system header definition`
	`306`	`+ * goes in first, and we redefine that, and not the other way around.`
	`307`	`+ */`
	`308`	`+externintpgwin32_safestat(constcharpath,structstatbuf);`
	`309`	`+#if !defined(FRONTEND)&& !defined(_DIRMOD_C)`
	`310`	`+#include<sys/stat.h>`
	`311`	`+#definestat(a,b) pgwin32_safestat(a,b)`
	`312`	`+#endif`
	`313`	`+`
`301`	`314`	`/* Missing rand functions */`
`302`	`315`	`externlonglrand48(void);`
`303`	`316`	`externvoidsrand48(longseed);`

Lines changed: 35 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`*Win32 (NT, Win2k, XP).replace() doesn't work on Win95/98/Me.`
`11`	`11`	`*`
`12`	`12`	`* IDENTIFICATION`
`13`		`- * $PostgreSQL: pgsql/src/port/dirmod.c,v 1.51 2008/01/01 19:46:00 momjian Exp $`
	`13`	`+ * $PostgreSQL: pgsql/src/port/dirmod.c,v 1.52 2008/04/10 16:58:51 mha Exp $`
`14`	`14`	`*`
`15`	`15`	`*-------------------------------------------------------------------------`
`16`	`16`	`*/`
`@@ -447,3 +447,37 @@ rmtree(char *path, bool rmtopdir)`
`447`	`447`	`pgfnames_cleanup(filenames);`
`448`	`448`	`return false;`
`449`	`449`	`}`
	`450`	`+`
	`451`	`+`
	`452`	`+#ifdefWIN32`
	`453`	`+/*`
	`454`	`+ * The stat() function in win32 is not guaranteed to update the st_size`
	`455`	`+ * field when run. So we define our own version that uses the Win32 API`
	`456`	`+ * to update this field.`
	`457`	`+ */`
	`458`	`+#undef stat`
	`459`	`+int`
	`460`	`+pgwin32_safestat(constcharpath,structstatbuf)`
	`461`	`+{`
	`462`	`+intr;`
	`463`	`+WIN32_FILE_ATTRIBUTE_DATAattr;`
	`464`	`+`
	`465`	`+r=stat(path,buf);`
	`466`	`+if (r<0)`
	`467`	`+returnr;`
	`468`	`+`
	`469`	`+if (!GetFileAttributesEx(path,GetFileExInfoStandard,&attr))`
	`470`	`+{`
	`471`	`+_dosmaperr(GetLastError());`
	`472`	`+return-1;`
	`473`	`+}`
	`474`	`+`
	`475`	`+/*`
	`476`	`+ * XXX no support for large files here, but we don't do that in`
	`477`	`+ * general on Win32 yet.`
	`478`	`+ */`
	`479`	`+buf->st_size=attr.nFileSizeLow;`
	`480`	`+`
	`481`	`+return0;`
	`482`	`+}`
	`483`	`+#endif`

Comments

(0)