Improved support for cygwin. Ticket #1165. (CVS 2407)

FossilOrigin-Name: fcb5cee440ab49e39b62b177cbb04ab0b061a477

diff --git a/manifest b/manifest
index 4dbb384e9de3b6394461b3abdcaded843bf6d562..7ef1bd5e5c5e5f9bf8adffdd693d2167c3a0cc1e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sformatting\serror\sin\sthe\ssyntax\sdocumentation.\s\sTicket\s#1145.\s(CVS\s2406)
-D 2005-03-21T00:28:24
+C Improved\ssupport\sfor\scygwin.\s\sTicket\s#1165.\s(CVS\s2407)
+D 2005-03-21T00:36:09
 F Makefile.in 5c00d0037104de2a50ac7647a5f12769795957a3
 F Makefile.linux-gcc 06be33b2a9ad4f005a5f42b22c4a19dab3cbb5c7
 F README a01693e454a00cc117967e3f9fdab2d4d52e9bc1
@@ -50,7 +50,7 @@ F src/os_test.c 91e5f22dd89491e5e1554820e715805f43fa4ece
 F src/os_test.h 903c93554c23d88f34f667f1979e4a1cee792af3
 F src/os_unix.c fba0167576f09e242afd4c4978e1d2944b1da8b5
 F src/os_unix.h 40b2fd1d02cfa45d6c3dea25316fd019cf9fcb0c
-F src/os_win.c bddeae1c3299be0fbe47077dd4e98b786a067f71
+F src/os_win.c 2bbbe6fbb010763c3fa79d5e951afca9b138c6b5
 F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b
 F src/pager.c e5000ca94ba2894d249213675318bbc918f97e9c
 F src/pager.h 70d496f372163abb6340f474288c4bb9ea962cf7
@@ -277,7 +277,7 @@ F www/tclsqlite.tcl e73f8f8e5f20e8277619433f7970060ab01088fc
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0
 F www/whentouse.tcl 528299b8316726dbcc5548e9aa0648c8b1bd055b
-P d9aa0aa9ae2ca0dec976ba2ae4cd7047132be45b
-R 2b34668b2d8f277a786664b2b3ee3d4b
+P 59892be6a4c344cb6654f76e4b3b9db96d52f132
+R 7b9b0e475a0ba0a45e3591ea7a4c1c07
 U drh
-Z 57278797fa48aac7cc9da77551ab025e
+Z 7b822fed2c83a481176e10a65925da64

diff --git a/manifest.uuid b/manifest.uuid
index f1c9e27250db242d5156eda24aa8b4c49aefc772..97f975429f8b89070224fcb9cb67df3448d368cf 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-59892be6a4c344cb6654f76e4b3b9db96d52f132
\ No newline at end of file
+fcb5cee440ab49e39b62b177cbb04ab0b061a477
\ No newline at end of file

diff --git a/src/os_win.c b/src/os_win.c
index 2614ed08a6c31624ea037d88cbda5dbb7f0f97f6..6e51947afa6dbf4cead0e81df096ef64d6bc5ef9 100644 (file)
--- a/src/os_win.c
+++ b/src/os_win.c
@@ -18,6 +18,10 @@
 
 #include <winbase.h>
 
+#ifdef __CYGWIN__
+# include <sys/cygwin.h>
+#endif
+
 /*
 ** Macros used to determine whether or not to use threads.
 */
@@ -703,10 +707,17 @@ char *sqlite3OsFullPathname(const char *zRelative){
   char *zNotUsed;
   char *zFull;
   int nByte;
+#ifdef __CYGWIN__
+  nByte = strlen(zRelative) + MAX_PATH + 1001;
+  zFull = sqliteMalloc( nByte );
+  if( zFull==0 ) return 0;
+  if( cygwin_conv_to_full_win32_path(zRelative, zFull) ) return 0;
+#else
   nByte = GetFullPathNameA(zRelative, 0, 0, &zNotUsed) + 1;
   zFull = sqliteMalloc( nByte );
   if( zFull==0 ) return 0;
   GetFullPathNameA(zRelative, nByte, zFull, &zNotUsed);
+#endif
   return zFull;
 }