home
***
CD-ROM
|
disk
|
FTP
|
other
***
search
/
OS/2 Shareware BBS: InfoMgt
/
InfoMgt.zip
/
msql2011.zip
/
patch.os2
< prev
next >
Wrap
Text File
|
1999-08-24
|
4KB
|
145 lines
diff -urbB src/lang-common/lib.c src/lang-common/lib.c
--- src/lang-common/lib.c Thu Aug 19 05:33:10 1999
+++ src/lang-common/lib.c Tue Aug 24 10:24:10 1999
@@ -374,14 +374,27 @@
#ifdef DEBUG
printf("Loading library %s\n",filename);
#endif
- curLib++;
- libNames[curLib] = (char *)filename;
fd = open(filename,O_RDONLY|O_BINARY,0);
if (fd < 0)
{
+ char root[ _MAX_PATH];
+ /* try to open file relative to DOCUMENT_ROOT */
+ if (getenv( "DOCUMENT_ROOT")==NULL)
+ return( -1);
+ strcpy( root, getenv( "DOCUMENT_ROOT"));
+ if (filename[0]!='/' && filename[0]!='\\')
+ strcat( root, "/");
+ strcat( root, filename);
+#ifdef DEBUG
+ printf("Second try: loading library %s\n", root);
+#endif
+ fd = open(root,O_RDONLY|O_BINARY,0);
+ if (fd < 0)
+ {
return(-1);
}
+ }
numBytes = read(fd,&hdr,sizeof(hdr));
if (hdr.magic != LIB_MAG)
{
@@ -393,6 +406,9 @@
parseError("Bad library version!\nPlease recompile the library with the current version of Lite");
return(-2);
}
+
+ curLib++;
+ libNames[curLib] = (char *)filename;
litBase = curLitIdx;
labelBase = curLabel;
diff -urbB src/lang-common/lite.h src/lang-common/lite.h
--- src/lang-common/lite.h Thu Aug 19 05:33:10 1999
+++ src/lang-common/lite.h Tue Aug 24 10:24:10 1999
@@ -205,6 +205,9 @@
#define SYM_HASH_SIZE 128
+#ifdef FILE_NORMAL
+# undef FILE_NORMAL /* avoid conflict with OS/2 system headers */
+#endif
#define FILE_NORMAL 1
#define FILE_PIPE 2
#define FILE_FIFO 3
diff -urbB src/msql/msql.h src/msql/msql.h
--- src/msql/msql.h Thu Aug 19 05:33:18 1999
+++ src/msql/msql.h Tue Aug 24 10:24:16 1999
@@ -156,10 +156,8 @@
int APIENTRY msqlMoveDB __ANSI_PROTO((int, char*, char*));
char * APIENTRY msqlGetServerInfo __ANSI_PROTO((void));
char * APIENTRY msqlGetHostInfo __ANSI_PROTO((void));
-/*
char * APIENTRY msqlUnixTimeToDate __ANSI_PROTO((time_t));
char * APIENTRY msqlUnixTimeToTime __ANSI_PROTO((time_t));
-*/
void APIENTRY msqlClose __ANSI_PROTO((int));
void APIENTRY msqlDataSeek __ANSI_PROTO((m_result*, int));
void APIENTRY msqlFieldSeek __ANSI_PROTO((m_result*, int));
diff -urbB src/msql/msqld.c src/msql/msqld.c
--- src/msql/msqld.c Thu Aug 19 05:33:20 1999
+++ src/msql/msqld.c Tue Aug 24 11:06:10 1999
@@ -20,6 +20,7 @@
# define INCL_WINSHELLDATA
# define INCL_DOSPROCESS
# define INCL_DOSERRORS
+# define INCL_DOSEXCEPTIONS
# include <os2.h>
#endif
@@ -671,6 +672,7 @@
struct passwd *pwd;
#endif
#if defined(_OS_OS2)
+ mmap_reg_t my_mmap;
APIRET rc = NO_ERROR;
#endif
@@ -686,6 +688,7 @@
if (rc != NO_ERROR) {
printf ("DosSetPriority error : rc = %u\n", rc);
}
+ mregister(&my_mmap); /* register OS/2 mmap services */
#endif
@@ -1406,6 +1409,9 @@
writePkt(comSock);
puntServer(-1);
exit(0);
+#ifdef _OS_OS2
+ mderegister(&my_mmap);
+#endif
break;
case SERVER_STATS:
@@ -1428,4 +1434,7 @@
comSock++;
}
}
+#ifdef _OS_OS2
+ mderegister(&my_mmap);
+#endif
}
diff -urbB src/msql/msqldb.c src/msql/msqldb.c
--- src/msql/msqldb.c Thu Aug 19 05:33:20 1999
+++ src/msql/msqldb.c Tue Aug 24 10:24:16 1999
@@ -2923,6 +2923,8 @@
return;
}
+ invalidateCachedDatabase(db);
+
/*
** Blow away any files but dodge '.' and '..'
*/
@@ -2948,7 +2950,6 @@
}
closedir(dirp);
- invalidateCachedDatabase(db);
if (sock < 0)
return;
strcpy(packet,"-100:\n");
diff -urbB src/tests/rtest.src/reset src/tests/rtest.src/reset
--- src/tests/rtest.src/reset Thu Aug 19 05:33:22 1999
+++ src/tests/rtest.src/reset Tue Aug 24 10:24:28 1999
@@ -2,3 +2,4 @@
drop table contact\p\g
drop table users\p\g
drop table pay\p\g
+drop table bad_money\p\g
\ No newline at end of file