Upgrade to 2.0.3; James seems to be busy at the moment.

PR:		4769
Submitted by:	Mikhail Teterin <mi@aldan.ziplink.net>

7 files changed, 118 insertions, 89 deletions

diff --git a/databases/msql3/files/patch-ag b/databases/msql3/files/patch-ag
index fbf7d0b77f91..f89720db93ca 100644
--- a/databases/msql3/files/patch-ag
+++ b/databases/msql3/files/patch-ag
@@ -4,8 +4,8 @@
  	}
  	else
  	{
--		sprintf(buf,"%s/msql.conf", INST_DIR);
-+		sprintf(buf,"%s/etc/msql2/msql.conf", INST_DIR);
+-		snprintf(buf,sizeof(buf),"%s/msql.conf", INST_DIR);
++		snprintf(buf,sizeof(buf),"%s/etc/msql2/msql.conf", INST_DIR);
  		fp = fopen(buf,"r");
  	}
  	if (!fp)
diff --git a/databases/msql3/files/patch-ai b/databases/msql3/files/patch-ai
index a7c866c82b8a..dcf168a1f723 100644
--- a/databases/msql3/files/patch-ai
+++ b/databases/msql3/files/patch-ai
@@ -4,17 +4,18 @@
  
  	if (*confFile == 0)
  	{
--		sprintf(confFile,"%s/msql.conf", INST_DIR);
-+		sprintf(confFile,"%s/etc/msql2/msql.conf", INST_DIR);
+-		snprintf(confFile,sizeof(confFile),"%s/msql.conf", INST_DIR);
++		snprintf(confFile,sizeof(confFile),"%s/etc/msql2/msql.conf", INST_DIR);
  	}
  	printf("\tLoading configuration from '%s'.\n",confFile);
  	msqlLoadConfigFile(confFile);
-@@ -687,7 +687,7 @@
+@@ -687,8 +687,7 @@
  	/*
  	** Ensure that the correct user owns the database files
  	*/
--	sprintf(path,"%s/msqldb",(char *)msqlGetCharConf("general","inst_dir"));
-+	sprintf(path,"/var/db/msqldb");
+-	snprintf(path,MAXPATHLEN, "%s/msqldb",
+-		(char *)msqlGetCharConf("general","inst_dir"));
++	strcpy(path, "/var/db/msqldb");
  	if (stat(path,&sbuf) < 0)
  	{
  		printf("\nError!  Can't stat '%s'\n\n",path);
diff --git a/databases/msql3/files/patch-ak b/databases/msql3/files/patch-ak
index 4d94bbfde825..ead616de559e 100644
--- a/databases/msql3/files/patch-ak
+++ b/databases/msql3/files/patch-ak
@@ -1,20 +1,22 @@
 --- src/msql/index.c	Fri Feb  7 10:06:42 1997
 +++ src/msql/index.c	Fri Feb  7 10:17:04 1997
-@@ -105,7 +105,7 @@
+@@ -105,8 +105,7 @@
                  fd;
  
          msqlTrace(TRACE_IN,"loadIndices()");
--        (void)sprintf(path,"%s/msqldb/%s/%s.idx",msqlHomeDir,db,table);
-+        (void)sprintf(path,"/var/db/msqldb/%s/%s.idx",db,table);
+-        (void)snprintf(path,MAXPATHLEN,"%s/msqldb/%s/%s.idx",
+-		msqlHomeDir,db,table);
++        (void)snprintf(path,MAXPATHLEN,"/var/db/msqldb/%s/%s.idx",db,table);
  #ifdef OS2
          fd = _sopen(path ,O_RDONLY | O_BINARY, SH_DENYNO, S_IREAD | S_IWRITE);
  #else
-@@ -163,7 +163,7 @@
+@@ -163,8 +163,8 @@
  				curIndex->next = NULL;
  			}
                  }
--		sprintf(path,"%s/msqldb/%s/%s.idx-%s",msqlHomeDir,db,table,
-+		sprintf(path,"/var/db/msqldb/%s/%s.idx-%s",db,table,
- 			curIndex->name);
+-		snprintf(path,MAXPATHLEN,"%s/msqldb/%s/%s.idx-%s",
+-			msqlHomeDir,db,table, curIndex->name);
++		snprintf(path,MAXPATHLEN,"/var/db/msqldb/%s/%s.idx-%s",
++			db,table, curIndex->name);
  		curIndex->tree = avlOpen(path);
  		curIndex->buf = (char *)malloc(curIndex->length + 1);
diff --git a/databases/msql3/files/patch-al b/databases/msql3/files/patch-al
index 3a751c6128a7..6e64dbc12862 100644
--- a/databases/msql3/files/patch-al
+++ b/databases/msql3/files/patch-al
@@ -4,8 +4,8 @@
  	/*
  	** Open the acl file
  	*/
--	(void)sprintf(path,"%s/msql.acl", 
-+	(void)sprintf(path,"%s/etc/msql2/msql.acl", 
+-	(void)snprintf(path,MAXPATHLEN,"%s/msql.acl", 
++	(void)snprintf(path,MAXPATHLEN,"%s/etc/msql2/msql.acl", 
  		(char *)msqlGetCharConf("general", "inst_dir"));
  	fp = fopen(path,"r");
  	if (!fp)
diff --git a/databases/msql3/files/patch-am b/databases/msql3/files/patch-am
index 7e6773b28892..17f06135e704 100644
--- a/databases/msql3/files/patch-am
+++ b/databases/msql3/files/patch-am
@@ -4,8 +4,8 @@
  #endif
  
  	msqlTrace(TRACE_IN,"msqlListDBs()");
--	(void)sprintf(path,"%s/msqldb",msqlHomeDir);
-+	(void)sprintf(path,"/var/db/msqldb");
+-	(void)snprintf(path, MAXPATHLEN, "%s/msqldb",msqlHomeDir);
++	(void)snprintf(path, MAXPATHLEN, "/var/db/msqldb");
  	dirp = opendir(path);
  	if (!dirp)
  	{
@@ -13,8 +13,8 @@
  #endif
  
  	msqlTrace(TRACE_IN,"msqlListTables()");
--	(void)sprintf(path,"%s/msqldb/%s",msqlHomeDir,db);
-+	(void)sprintf(path,"/var/db/msqldb/%s",db);
+-	(void)snprintf(path,MAXPATHLEN,"%s/msqldb/%s",msqlHomeDir,db);
++	(void)snprintf(path, MAXPATHLEN, "/var/db/msqldb/%s",db);
  	dirp = opendir(path);
  	if (!dirp)
  	{
@@ -22,44 +22,48 @@
  	struct	stat buf;
  
  	msqlTrace(TRACE_IN,"msqlInit()");
--	(void)sprintf(path,"%s/msqldb/%s",msqlHomeDir,db);
-+	(void)sprintf(path,"/var/db/msqldb/%s",db);
+-	(void)snprintf(path, MAXPATHLEN, "%s/msqldb/%s",msqlHomeDir,db);
++	(void)snprintf(path, MAXPATHLEN, "/var/db/msqldb/%s",db);
  	if (stat(path,&buf) < 0)
  	{
- 		sprintf(errMsg,BAD_DB_ERROR,db);
-@@ -1165,7 +1165,7 @@
+ 		snprintf(errMsg,BAD_DB_ERROR,db);
+@@ -1165,8 +1165,7 @@
  	/*
  	** Write the catalog entry
  	*/
--	(void)sprintf(defPath,"%s/msqldb/%s/%s.def",msqlHomeDir,db,table);
-+	(void)sprintf(defPath,"/var/db/msqldb/%s/%s.def",db,table);
+-	(void)snprintf(defPath, MAXPATHLEN, "%s/msqldb/%s/%s.def",
+-		msqlHomeDir,db,table);
++	(void)snprintf(defPath, MAXPATHLEN, "/var/db/msqldb/%s/%s.def",db,table);
  #ifdef OS2
  	fd = _sopen(defPath,O_RDONLY,SH_DENYNO, S_IREAD | S_IWRITE);
  #else
-@@ -1239,7 +1239,7 @@
+@@ -1239,8 +1239,7 @@
  	** Create an empty table
  	*/
  	
--	(void)sprintf(datPath,"%s/msqldb/%s/%s.dat",msqlHomeDir,db,table);
-+	(void)sprintf(datPath,"/var/db/msqldb/%s/%s.dat",db,table);
+-	(void)snprintf(datPath,MAXPATHLEN, "%s/msqldb/%s/%s.dat",
+-		msqlHomeDir,db,table);
++	(void)snprintf(datPath, MAXPATHLEN, "/var/db/msqldb/%s/%s.dat",db,table);
  	(void)unlink(datPath);
  #ifdef OS2
          fd = _sopen(datPath,O_CREAT | O_WRONLY | O_BINARY, SH_DENYNO, 
-@@ -1279,7 +1279,7 @@
+@@ -1279,8 +1279,7 @@
  	** Create an empty index def file
  	*/
  	
--	(void)sprintf(idxPath,"%s/msqldb/%s/%s.idx",msqlHomeDir,db,table);
-+	(void)sprintf(idxPath,"/var/db/msqldb/%s/%s.idx",db,table);
+-	(void)snprintf(idxPath, MAXPATHLEN, "%s/msqldb/%s/%s.idx",
+-		msqlHomeDir,db,table);
++	(void)snprintf(idxPath, MAXPATHLEN, "/var/db/msqldb/%s/%s.idx",db,table);
  	(void)unlink(idxPath);
  #ifdef OS2
          fd = _sopen(idxPath,O_CREAT | O_WRONLY | O_BINARY, SH_DENYNO, 
-@@ -1302,7 +1302,7 @@
+@@ -1302,8 +1302,7 @@
  	/*
  	** Create an empty overflow file
  	*/
--	(void)sprintf(oflPath,"%s/msqldb/%s/%s.ofl",msqlHomeDir,db,table);
-+	(void)sprintf(oflPath,"/var/db/msqldb/%s/%s.ofl",db,table);
+-	(void)snprintf(oflPath,MAXPATHLEN,"%s/msqldb/%s/%s.ofl",
+-		msqlHomeDir,db,table);
++	(void)snprintf(oflPath, MAXPATHLEN, "/var/db/msqldb/%s/%s.ofl",db,table);
  	(void)unlink(oflPath);
  #ifdef OS2
          fd = _sopen(oflPath,O_CREAT | O_WRONLY | O_BINARY, SH_DENYNO, 
@@ -67,50 +71,57 @@
  	/*
  	** Can't clash with another index either
  	*/
--	(void)sprintf(defPath,"%s/msqldb/%s/%s.idx",msqlHomeDir,db,
-+	(void)sprintf(defPath,"/var/db/msqldb/%s/%s.idx",db,
- 		index->table);
+-	(void)snprintf(defPath,MAXPATHLEN,"%s/msqldb/%s/%s.idx",msqlHomeDir,
++	(void)snprintf(defPath, MAXPATHLEN, "/var/db/msqldb/%s/%s.idx",
+		db, index->table);
  
--	(void)sprintf(idxPath,"%s/msqldb/%s/%s.idx-%s",msqlHomeDir,db,
-+	(void)sprintf(idxPath,"/var/db/msqldb/%s/%s.idx-%s",db,
- 		index->table, index->name);
+-	(void)snprintf(idxPath,MAXPATHLEN,"%s/msqldb/%s/%s.idx-%s",
+-		msqlHomeDir,db, index->table, index->name);
++	(void)snprintf(idxPath, MAXPATHLEN, "/var/db/msqldb/%s/%s.idx-%s",
++ 		db, index->table, index->name);
  
  #ifdef OS2
-@@ -1718,7 +1718,7 @@
+@@ -1718,8 +1718,7 @@
  	/*
  	** Now blow away the table files
  	*/
--	(void)sprintf(path,"%s/msqldb/%s/%s.def",msqlHomeDir,db,table);
-+	(void)sprintf(path,"/var/db/msqldb/%s/%s.def",db,table);
+-	(void)snprintf(path,MAXPATHLEN,"%s/msqldb/%s/%s.def",msqlHomeDir,
+-		db,table);
++	(void)snprintf(path, MAXPATHLEN, "/var/db/msqldb/%s/%s.def",db,table);
  #ifdef OS2
- 	fp = fopen(path,"rb");
+ 	fp = fopen(path, MAXPATHLEN, "rb");
  #else
-@@ -1733,15 +1733,15 @@
+@@ -1733,18 +1733,15 @@
  	}
  	(void)fclose(fp);
  	unlink(path);
--	(void)sprintf(path,"%s/msqldb/%s/%s.dat",msqlHomeDir,db,table);
-+	(void)sprintf(path,"/var/db/msqldb/%s/%s.dat",db,table);
+-	(void)snprintf(path,MAXPATHLEN,"%s/msqldb/%s/%s.dat",msqlHomeDir,
+-		db,table);
++	(void)snprintf(path, MAXPATHLEN, "/var/db/msqldb/%s/%s.dat",db,table);
  	unlink(path);
--	(void)sprintf(path,"%s/msqldb/%s/%s.ofl",msqlHomeDir,db,table);
-+	(void)sprintf(path,"/var/db/msqldb/%s/%s.ofl",db,table);
+-	(void)snprintf(path,MAXPATHLEN,"%s/msqldb/%s/%s.ofl",msqlHomeDir,
+-		db,table);
++	(void)snprintf(path, MAXPATHLEN, "/var/db/msqldb/%s/%s.ofl",db,table);
  	unlink(path);
  
  	/*
  	** Take care of the index files.
  	*/
--	(void)sprintf(defPath,"%s/msqldb/%s/%s.idx",msqlHomeDir,db,table);
-+	(void)sprintf(defPath,"/var/db/msqldb/%s/%s.idx",db,table);
+-	(void)snprintf(defPath,MAXPATHLEN,"%s/msqldb/%s/%s.idx",msqlHomeDir,
+-		db,table);
++	(void)snprintf(defPath, MAXPATHLEN, "/var/db/msqldb/%s/%s.idx",db,table);
  #ifdef OS2
          fd = _sopen(defPath,O_RDONLY | O_BINARY, SH_DENYNO, S_IREAD | S_IWRITE);
  #else
-@@ -1751,8 +1751,8 @@
+@@ -1751,9 +1751,9 @@
  	{
  		while(read(fd,&tmp,sizeof(tmp)) == sizeof(tmp))
  		{
--			(void)sprintf(path,"%s/msqldb/%s/%s.idx-%s",
+-			(void)snprintf(path,MAXPATHLEN,
+-				"%s/msqldb/%s/%s.idx-%s",
 -				msqlHomeDir,db,table,tmp.name);
-+			(void)sprintf(path,"/var/db/msqldb/%s/%s.idx-%s",
++			(void)snprintf(path, MAXPATHLEN,
++				"/var/db/msqldb/%s/%s.idx-%s",
 +				db,table,tmp.name);
  			unlink(path);
  		}
@@ -119,26 +130,27 @@
  		return(-1);
  	}
  
--	(void)sprintf(defPath,"%s/msqldb/%s/%s.idx",msqlHomeDir,db,
-+	(void)sprintf(defPath,"/var/db/msqldb/%s/%s.idx",db,
- 		index->table);
+-	(void)snprintf(defPath,MAXPATHLEN,"%s/msqldb/%s/%s.idx",msqlHomeDir,
++	(void)snprintf(defPath, MAXPATHLEN, "/var/db/msqldb/%s/%s.idx",
+ 		db, index->table);
  #ifdef OS2
          in = _sopen(defPath,O_RDONLY | O_BINARY, SH_DENYNO, S_IREAD | S_IWRITE);
 @@ -1804,7 +1804,7 @@
  		msqlTrace(TRACE_OUT,"msqlDropIndex()");
  		return(-1);
  	}
--	(void)sprintf(tmpPath,"%s/msqldb/%s/%s.idx-tmp",msqlHomeDir,db,
-+	(void)sprintf(tmpPath,"/var/db/msqldb/%s/%s.idx-tmp",db,
- 		index->table);
+-	(void)snprintf(tmpPath,MAXPATHLEN,"%s/msqldb/%s/%s.idx-tmp",
+-		msqlHomeDir,db, index->table);
++	(void)snprintf(tmpPath, MAXPATHLEN, "/var/db/msqldb/%s/%s.idx-tmp",
++ 		db, index->table);
  #ifdef OS2
          out = _sopen(tmpPath,O_RDWR | O_CREAT | O_BINARY, SH_DENYNO, 
 @@ -1855,7 +1855,7 @@
  	*/
  	unlink(defPath);
  	rename(tmpPath,defPath);
--	sprintf(tmpPath,"%s/msqldb/%s/%s.idx-%s",msqlHomeDir,db,
-+	sprintf(tmpPath,"/var/db/msqldb/%s/%s.idx-%s",db,
+-	snprintf(tmpPath,MAXPATHLEN,"%s/msqldb/%s/%s.idx-%s",msqlHomeDir,db,
++	snprintf(tmpPath, MAXPATHLEN, "/var/db/msqldb/%s/%s.idx-%s",db,
                  index->table, index->name);
  	unlink(tmpPath);
  
@@ -146,8 +158,8 @@
  	** See if the directory exists
  	*/
  
--	(void)sprintf(path,"%s/msqldb/%s", msqlHomeDir, db);
-+	(void)sprintf(path,"/var/db/msqldb/%s", db);
+-	(void)snprintf(path,MAXPATHLEN,"%s/msqldb/%s", msqlHomeDir, db);
++	(void)snprintf(path, MAXPATHLEN, "/var/db/msqldb/%s", db);
  	dirp = opendir(path);
  	if (dirp)
  	{
@@ -155,8 +167,8 @@
  	** See if the directory exists
  	*/
  
--	(void)sprintf(path,"%s/msqldb/%s", msqlHomeDir, db);
-+	(void)sprintf(path,"/var/db/msqldb/%s", db);
+-	(void)snprintf(path,MAXPATHLEN,"%s/msqldb/%s", msqlHomeDir, db);
++	(void)snprintf(path, MAXPATHLEN, "/var/db/msqldb/%s", db);
  	dirp = opendir(path);
  	if (!dirp)
  	{
diff --git a/databases/msql3/files/patch-an b/databases/msql3/files/patch-an
index e693499dea56..ce08707d13fb 100644
--- a/databases/msql3/files/patch-an
+++ b/databases/msql3/files/patch-an
@@ -1,38 +1,41 @@
 --- src/msql/table.c	Fri Feb  7 10:06:42 1997
 +++ src/msql/table.c	Fri Feb  7 10:16:35 1997
-@@ -100,7 +100,7 @@
+@@ -100,8 +100,7 @@
  {
  	char	path[MAXPATHLEN];
  
--	(void)sprintf(path,"%s/msqldb/%s/%s.dat",msqlHomeDir,db,table);
-+	(void)sprintf(path,"/var/db/msqldb/%s/%s.dat",db,table);
+-	(void)snprintf(path, MAXPATHLEN, "%s/msqldb/%s/%s.dat",msqlHomeDir,db,
+-		table);
++	(void)snprintf(path, MAXPATHLEN, "/var/db/msqldb/%s/%s.dat",db,table);
  #ifdef OS2
-         return(_sopen(path,O_RDWR | O_BINARY, SH_DENYNO, S_IREAD | S_IWRITE));
+         return(_sopen(path, MAXPATHLEN, O_RDWR | O_BINARY, SH_DENYNO, S_IREAD | S_IWRITE));
  #else
-@@ -115,7 +115,7 @@
+@@ -115,8 +115,7 @@
  {
  	char	path[MAXPATHLEN];
  
--	(void)sprintf(path,"%s/msqldb/%s/%s.ofl",msqlHomeDir,db,table);
-+	(void)sprintf(path,"/var/db/msqldb/%s/%s.ofl",db,table);
+-	(void)snprintf(path, MAXPATHLEN,"%s/msqldb/%s/%s.ofl",msqlHomeDir,db,
+-		table);
++	(void)snprintf(path, MAXPATHLEN, "/var/db/msqldb/%s/%s.ofl",db,table);
  #ifdef OS2
-         return(_sopen(path,O_RDWR | O_BINARY, SH_DENYNO, S_IREAD | S_IWRITE));
+         return(_sopen(path, MAXPATHLEN, O_RDWR | O_BINARY, SH_DENYNO, S_IREAD | S_IWRITE));
  #else
-@@ -300,7 +300,7 @@
+@@ -300,8 +300,7 @@
  	static	char buf[MAX_FIELDS * sizeof(field_t)];
  
  	msqlTrace(TRACE_IN,"readTableDef()");
--	(void)sprintf(path,"%s/msqldb/%s/%s.def",msqlHomeDir,db,table);
-+	(void)sprintf(path,"/var/db/msqldb/%s/%s.def",db,table);
+-	(void)snprintf(path, MAXPATHLEN, "%s/msqldb/%s/%s.def",msqlHomeDir,
+-		db,table);
++	(void)snprintf(path, MAXPATHLEN, "/var/db/msqldb/%s/%s.def",db,table);
  #ifdef OS2
-         fd = _sopen(path, O_RDONLY | O_BINARY, SH_DENYNO, S_IREAD | S_IWRITE);
+         fd = _sopen(path, MAXPATHLEN,  O_RDONLY | O_BINARY, SH_DENYNO, S_IREAD | S_IWRITE);
  #else
 @@ -367,7 +367,7 @@
  	DIR	*dirp;
  	char	path[MAXPATHLEN];
  
--	(void)sprintf(path,"%s/msqldb/.tmp",msqlHomeDir);
-+	(void)sprintf(path,"/var/db/msqldb/.tmp");
+-	(void)snprintf(path,MAXPATHLEN,"%s/msqldb/.tmp",msqlHomeDir);
++	(void)strcpy(path, "/var/db/msqldb/.tmp");
  	dirp = opendir(path);
  	if (!dirp)
  	{
@@ -40,26 +43,29 @@
  			cur = readdir(dirp);
  			continue;
  		}
--		(void)sprintf(path,"%s/msqldb/.tmp/%s",msqlHomeDir,
-+		(void)sprintf(path,"/var/db/msqldb/.tmp/%s",
+-		(void)snprintf(path,MAXPATHLEN,"%s/msqldb/.tmp/%s",msqlHomeDir,
++		(void)snprintf(path, MAXPATHLEN, "/var/db/msqldb/.tmp/%s",
  			cur->d_name);
  		unlink(path);
  		cur = readdir(dirp);
-@@ -434,7 +434,7 @@
+@@ -434,8 +434,7 @@
  	{
  		tmpfile = cp+1;
  	}
--	(void)sprintf(path,"%s/msqldb/.tmp/%s.dat",msqlHomeDir,tmpfile);
-+	(void)sprintf(path,"/var/db/msqldb/.tmp/%s.dat",tmpfile);
+-	(void)snprintf(path,MAXPATHLEN,"%s/msqldb/.tmp/%s.dat",msqlHomeDir,
+-		tmpfile);
++	(void)snprintf(path, MAXPATHLEN, "/var/db/msqldb/.tmp/%s.dat",tmpfile);
  
  
  	/*
-@@ -642,7 +642,7 @@
+@@ -642,8 +642,8 @@
  	char	path[MAXPATHLEN];
  
          msqlTrace(TRACE_IN,"freeTmpTable()");
--	(void)sprintf(path,"%s/msqldb/.tmp/%s.dat",msqlHomeDir,entry->table);
-+	(void)sprintf(path,"/var/db/msqldb/.tmp/%s.dat",entry->table);
+-	(void)snprintf(path,MAXPATHLEN, "%s/msqldb/.tmp/%s.dat",msqlHomeDir,
+-		entry->table);
++	(void)snprintf(path, MAXPATHLEN, "/var/db/msqldb/.tmp/%s.dat",
++		entry->table);
  	freeTableDef(entry->def);
  	entry->def = NULL;
  	*(entry->db) = 0;
diff --git a/databases/msql3/files/patch-ao b/databases/msql3/files/patch-ao
new file mode 100644
index 000000000000..66b1e468884e
--- /dev/null
+++ b/databases/msql3/files/patch-ao
@@ -0,0 +1,8 @@
+--- src/conf/site.mm.in.orig	Wed Oct 15 01:43:58 1997
++++ src/conf/site.mm.in	Wed Oct 15 01:44:48 1997
+@@ -6 +6 @@
+-COMPILER= @CC@
++COMPILER:= $(CC)
+@@ -42 +42 @@
+-CFLAGS= -O -I$(TOP)/ $(EXTRA_CFLAGS)
++CFLAGS+= -I$(TOP)/ $(EXTRA_CFLAGS)