Date: Wed, 18 Nov 1998 10:27:23 -0500 (EST) From: Steve Ames <steve@ns1.cioe.com> To: freebsd-ports@FreeBSD.ORG Cc: jfitz@FreeBSD.ORG Subject: MSQL patch-am screwy Message-ID: <199811181527.KAA23279@ns1.cioe.com>
next in thread | raw e-mail | index | archive | help
patch-am in /usr/ports/databases/msql2/patches is broken in a
few spots. As is it causes 'relshow' and 'msqldump' not to
function.
Correct patch listed below. Thanks.
-Steve
-----PATCH BEGINS-----
--- src/msql/msqldb.c.orig Fri Aug 28 14:57:51 1998
+++ src/msql/msqldb.c Fri Aug 28 15:04:11 1998
@@ -136,7 +136,7 @@
#endif
msqlTrace(TRACE_IN,"msqlListDBs()");
- (void)snprintf(path, MAXPATHLEN, "%s/msqldb",msqlHomeDir);
+ (void)snprintf(path, MAXPATHLEN, "/var/db/msqldb");
dirp = opendir(path);
if (!dirp)
{
@@ -199,7 +199,7 @@
#endif
msqlTrace(TRACE_IN,"msqlListTables()");
- (void)snprintf(path,MAXPATHLEN,"%s/msqldb/%s",msqlHomeDir,db);
+ (void)snprintf(path,MAXPATHLEN,"/var/db/msqldb/%s",db);
dirp = opendir(path);
if (!dirp)
{
@@ -1441,7 +1441,7 @@
struct stat buf;
msqlTrace(TRACE_IN,"msqlInit()");
- (void)snprintf(path, MAXPATHLEN, "%s/msqldb/%s",msqlHomeDir,db);
+ (void)snprintf(path, MAXPATHLEN, "/var/db/msqldb/%s",db);
if (stat(path,&buf) < 0)
{
snprintf(errMsg, MAX_ERR_MSG, BAD_DB_ERROR,db);
@@ -1479,8 +1479,8 @@
/*
** Write the catalog entry
*/
- (void)snprintf(defPath, MAXPATHLEN, "%s/msqldb/%s/%s.def",
- msqlHomeDir,db,table);
+ (void)snprintf(defPath, MAXPATHLEN, "/var/db/msqldb/%s/%s.def",
+ db,table);
if (stat(defPath, &sbuf) >= 0)
{
snprintf(errMsg,MAX_ERR_MSG,TABLE_EXISTS_ERROR,table);
@@ -1531,8 +1531,8 @@
** Create an empty 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);
#ifdef OS2
fd = _sopen(datPath,O_CREAT | O_WRONLY | O_BINARY, SH_DENYNO,
S_IREAD | S_IWRITE);
@@ -1577,8 +1577,8 @@
**
** Create an empty overflow file
*/
- (void)snprintf(oflPath,MAXPATHLEN,"%s/msqldb/%s/%s.ofl",
- msqlHomeDir,db,table);
+ (void)snprintf(oflPath,MAXPATHLEN,"/var/db/msqldb/%s/%s.ofl",
+ db,table);
#ifdef OS2
fd = _sopen(oflPath,O_CREAT | O_WRONLY | O_BINARY, SH_DENYNO,
S_IREAD | S_IWRITE);
@@ -1745,11 +1745,11 @@
/*
** Can't clash with another index either
*/
- (void)snprintf(defPath,MAXPATHLEN,"%s/msqldb/%s/%s.idx",msqlHomeDir,
+ (void)snprintf(defPath,MAXPATHLEN,"/var/db/msqldb/%s/%s.idx",
db, index->table);
- (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
fd = _sopen(defPath,O_RDWR | O_CREAT | O_BINARY, SH_DENYNO,
@@ -1989,7 +1989,7 @@
/*
** Now blow away the table files
*/
- (void)snprintf(path,MAXPATHLEN,"%s/msqldb/%s/%s.def",msqlHomeDir,
+ (void)snprintf(path,MAXPATHLEN,"/var/db/msqldb/%s/%s.def",
db,table);
cp = (char *)rindex(path,'.');
#ifdef OS2
@@ -2072,7 +2072,7 @@
return(-1);
}
- (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);
@@ -2086,8 +2086,8 @@
msqlTrace(TRACE_OUT,"msqlDropIndex()");
return(-1);
}
- (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,
S_IREAD | S_IWRITE);
@@ -2137,7 +2137,7 @@
*/
unlink(defPath);
rename(tmpPath,defPath);
- 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);
@@ -2757,7 +2757,7 @@
** See if the directory exists
*/
- (void)snprintf(path,MAXPATHLEN,"%s/msqldb/%s", msqlHomeDir, db);
+ (void)snprintf(path,MAXPATHLEN,"/var/db/msqldb/%s", db);
dirp = opendir(path);
if (dirp)
{
@@ -2807,7 +2807,7 @@
** See if the "to" directory exists
*/
- (void)snprintf(toPath,MAXPATHLEN,"%s/msqldb/%s", msqlHomeDir, toDB);
+ (void)snprintf(toPath,MAXPATHLEN,"/var/db/msqldb/%s", toDB);
dirp = opendir(toPath);
if (dirp)
{
@@ -2822,8 +2822,7 @@
** See if the "from" directory exists
*/
- (void)snprintf(fromPath,MAXPATHLEN, "%s/msqldb/%s", msqlHomeDir,
- fromDB);
+ (void)snprintf(fromPath,MAXPATHLEN, "/var/db/msqldb/%s", fromDB);
dirp = opendir(fromPath);
if (!dirp)
{
@@ -2886,7 +2885,7 @@
** See if the "to" directory exists
*/
- (void)snprintf(toPath,MAXPATHLEN,"%s/msqldb/%s", msqlHomeDir, toDB);
+ (void)snprintf(toPath,MAXPATHLEN,"/var/db/msqldb/%s", toDB);
dirp = opendir(toPath);
if (dirp)
{
@@ -2901,8 +2900,7 @@
** See if the "from" directory exists
*/
- (void)snprintf(fromPath,MAXPATHLEN,"%s/msqldb/%s", msqlHomeDir,
- fromDB);
+ (void)snprintf(fromPath,MAXPATHLEN,"/var/db/msqldb/%s", fromDB);
dirp = opendir(fromPath);
if (!dirp)
{
@@ -2948,7 +2946,7 @@
** See if the directory exists
*/
- (void)snprintf(path,MAXPATHLEN,"%s/msqldb/%s", msqlHomeDir, db);
+ (void)snprintf(path,MAXPATHLEN,"/var/db/msqldb/%s", db);
dirp = opendir(path);
if (!dirp)
{
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199811181527.KAA23279>