forked frompostgres/postgres
- Notifications
You must be signed in to change notification settings - Fork6
Commitbd0a767
committed
Here is a patch to make the current snapshot compile on Win32 (native, libpq
and psql) again. Changes are:1) psql requires the includes of "io.h" and "fcntl.h" in command.c in orderto make a call to open() work (io.h for _open(), fcntl.h for the O_xxx)2) PG_VERSION is no longer defined in version.h[.in], but in configure.in.Since we don't do configure on native win32, we need to put it inconfig.h.win32 :-(3) Added define of SYSCONFDIR to config.h.win32 - libpq won't compilewithout it. This functionality is *NOT* tested - it's just defined as "" fornow. May work, may not.4) DEF_PGPORT renamed to DEF_PGPORT_STRI have done the "basic tests" on it - it connects to a database, and I canrun queries. Haven't tested any of the fancier functions (yet).However, I stepped on a much bigger problem when fixing psql to work. It nolonger works when linked against the .DLL version of libpq (which theMakefile does for it). I have left it linked against this version anyway,pending the comments I get on this mail :-)The problem is that there are strings being allocated from libpq.dll usingPQExpBuffers (for example, initPQExpBuffer() on line 92 of input.c). Theseare being allocated using the malloc function used by libpq.dll. Thisfunction *may* be different from the malloc function used by psql.exe - onlythe resulting pointer must be valid. And with the default linking methods,it *WILL* be different. Later, psql.exe tries to free() this string, atwhich point it crashes because the free() function can't find the allocatedblock (it's on the allocated blocks list used by the runtime lib oflibpq.dll).Shouldn't the right thing to do be to have psql call termPQExpBuffer() onthe data instead? As it is now, gets_fromFile() will just return the pointerreceived from the PQExpBuffer.data (this may well be present at severalplaces - this is the one I was bitten by so far). Isn't that kind of"accessing the internals of the PQExpBuffer structure" wrong? Instead,perhaps it shuold make a copy of the string, adn then termPQExpBuffer() it?In that case, the string will have been allocated from within the samelibrary as the free() is called.I can get it to work just fine by doing this - changing from (around line100 of input.c):and the same a bit further down in the same function.But, as I said above, this may be at more places in the code? Perhapssomeone more familiar to it could comment on that?What do you think shuld be done about this? Personally, I go by the "If youallocate a piece of memory using an interface, use the same interface tofree it", but the question is how to make it work :-)Also, AFAIK this only affects psql.exe, so the changes made to the libpqthis patch are required no matter how the other issue is handled.Regards, Magnus1 parenta939e97 commitbd0a767
2 files changed
+8
-4
lines changedLines changed: 3 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
6 | | - | |
| 6 | + | |
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
| |||
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
| 21 | + | |
| 22 | + | |
21 | 23 | | |
22 | 24 | | |
23 | 25 | | |
| |||
Lines changed: 5 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
6 | | - | |
7 | | - | |
| 6 | + | |
| 7 | + | |
8 | 8 | | |
9 | | - | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
10 | 12 | | |
11 | 13 | | |
12 | 14 | | |
| |||
0 commit comments
Comments
(0)