Commit5e01aa7

committed

Fixups for Win32 symlinks.

1 parent9b3caeb commit5e01aa7Copy full SHA for 5e01aa7

File tree

+28

-7

lines changed

+28

-7

lines changed

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -12060,7 +12060,13 @@ LIBOBJS="$LIBOBJS copydir.$ac_objext"`
`12060`	`12060`	`LIBOBJS="$LIBOBJS gettimeofday.$ac_objext"`
`12061`	`12061`	`LIBOBJS="$LIBOBJS kill.$ac_objext"`
`12062`	`12062`	`LIBOBJS="$LIBOBJS open.$ac_objext"`
`12063`		`-LIBOBJS="$LIBOBJS rand.$ac_objext" ;;`
	`12063`	`+LIBOBJS="$LIBOBJS rand.$ac_objext"`
	`12064`	`+`
	`12065`	`+cat >>confdefs.h <<\_ACEOF`
	`12066`	`+#define HAVE_SYMLINK 1`
	`12067`	`+_ACEOF`
	`12068`	`+`
	`12069`	`+;;`
`12064`	`12070`	`esac`
`12065`	`12071`
`12066`	`12072`	`if test "$with_readline" = yes; then`

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`dnl Process this file with autoconf to produce a configure script.`
`2`		`-dnl $PostgreSQL: pgsql/configure.in,v 1.371 2004/08/04 21:33:35 tgl Exp $`
	`2`	`+dnl $PostgreSQL: pgsql/configure.in,v 1.372 2004/08/08 01:31:09 momjian Exp $`
`3`	`3`	`dnl`
`4`	`4`	`dnl Developers, please strive to achieve this order:`
`5`	`5`	`dnl`
`@@ -908,7 +908,10 @@ AC_LIBOBJ(copydir)`
`908`	`908`	`AC_LIBOBJ(gettimeofday)`
`909`	`909`	`AC_LIBOBJ(kill)`
`910`	`910`	`AC_LIBOBJ(open)`
`911`		`-AC_LIBOBJ(rand) ;;`
	`911`	`+AC_LIBOBJ(rand)`
	`912`	`+AC_DEFINE([HAVE_SYMLINK], 1,`
	`913`	+ [Define to 1 if you have the `symlink' function.])
	`914`	`+;;`
`912`	`915`	`esac`
`913`	`916`
`914`	`917`	`if test "$with_readline" = yes; then`

Lines changed: 10 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@`
`45`	`45`	`*`
`46`	`46`	`*`
`47`	`47`	`* IDENTIFICATION`
`48`		`- * $PostgreSQL: pgsql/src/backend/commands/tablespace.c,v 1.7 2004/08/01 20:30:48 tgl Exp $`
	`48`	`+ * $PostgreSQL: pgsql/src/backend/commands/tablespace.c,v 1.8 2004/08/08 01:31:11 momjian Exp $`
`49`	`49`	`*`
`50`	`50`	`*-------------------------------------------------------------------------`
`51`	`51`	`*/`
`@@ -482,11 +482,20 @@ DropTableSpace(DropTableSpaceStmt *stmt)`
`482`	`482`	`errmsg("could not unlink file \"%s\": %m",`
`483`	`483`	`subfile)));`
`484`	`484`
	`485`	`+#ifndefWIN32`
`485`	`486`	`if (unlink(location)<0)`
`486`	`487`	`ereport(ERROR,`
`487`	`488`	`(errcode_for_file_access(),`
`488`	`489`	`errmsg("could not unlink symbolic link \"%s\": %m",`
`489`	`490`	`location)));`
	`491`	`+#else`
	`492`	`+/* The junction is a directory, not a file */`
	`493`	`+if (rmdir(location)<0)`
	`494`	`+ereport(ERROR,`
	`495`	`+(errcode_for_file_access(),`
	`496`	`+errmsg("could not remove junction dir \"%s\": %m",`
	`497`	`+location)));`
	`498`	`+#endif`
`490`	`499`
`491`	`500`	`pfree(subfile);`
`492`	`501`	`pfree(location);`

Lines changed: 6 additions & 3 deletions

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.14 2004/08/07 21:48:09 momjian Exp $`
	`13`	`+ * $PostgreSQL: pgsql/src/port/dirmod.c,v 1.15 2004/08/08 01:31:15 momjian Exp $`
`14`	`14`	`*`
`15`	`15`	`*-------------------------------------------------------------------------`
`16`	`16`	`*/`
`@@ -153,9 +153,9 @@ pgsymlink(const char oldpath, const char newpath)`
`153`	`153`	`{`
`154`	`154`	`HANDLEdirhandle;`
`155`	`155`	`DWORDlen;`
`156`		`-char*p=nativeTarget;`
`157`	`156`	`charbuffer[MAX_PATH*sizeof(WCHAR)+sizeof(REPARSE_JUNCTION_DATA_BUFFER)];`
`158`	`157`	`charnativeTarget[MAX_PATH];`
	`158`	`+char*p=nativeTarget;`
`159`	`159`	`REPARSE_JUNCTION_DATA_BUFFERreparseBuf= (REPARSE_JUNCTION_DATA_BUFFER)buffer;`
`160`	`160`
`161`	`161`	`CreateDirectory(newpath,0);`
`@@ -203,9 +203,12 @@ pgsymlink(const char oldpath, const char newpath)`
`203`	`203`	`NULL,GetLastError(),`
`204`	`204`	`MAKELANGID(LANG_NEUTRAL,SUBLANG_DEFAULT),`
`205`	`205`	`(LPSTR)&msg,0,NULL );`
	`206`	`+#ifdefFRONTEND`
	`207`	`+fprintf(stderr,"Error setting junction for %s: %s",nativeTarget,msg);`
	`208`	`+#else`
`206`	`209`	`ereport(ERROR, (errcode_for_file_access(),`
`207`	`210`	`errmsg("Error setting junction for %s: %s",nativeTarget,msg)));`
`208`		`-`
	`211`	`+#endif`
`209`	`212`	`LocalFree(msg);`
`210`	`213`
`211`	`214`	`CloseHandle(dirhandle);`

Comments

(0)