[Firebird-checkins] CVS: firebird2/src/utilities cmd_util.cpp,1.2,1.3 dba.epp,1.6,1.7 guard.cpp,1.3,1.4 ibmgr.cpp,1.3,1.4 rebuild.cpp,1.3,1.4 util.cpp,1.3,1.4 util_proto.h,1.1.1.1,1.2

[Mark O. <sky...@us...>]

Build Version :  T2.0.0.510 Firebird2 Dev1

(writeBuildNum.sh,v 1.489 2002/07/29 15:37:56 skywalker Exp )

Update of /cvsroot/firebird/firebird2/src/utilities
In directory usw-pr-cvs1:/tmp/cvs-serv2933/utilities

Modified Files:
	cmd_util.cpp dba.epp guard.cpp ibmgr.cpp rebuild.cpp util.cpp 
	util_proto.h 
Log Message:
Changes to make fb2 compile super version for linux


Index: cmd_util.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/utilities/cmd_util.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -b -U3 -r1.2 -r1.3
--- cmd_util.cpp	29 Jul 2001 23:43:24 -0000	1.2
+++ cmd_util.cpp	29 Jul 2002 15:37:55 -0000	1.3
@@ -43,6 +43,10 @@
 #include "../include/fb_blk.h"
 #endif
 
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
 #include "../jrd/svc.h"
 #include "../jrd/svc_proto.h"
 

Index: dba.epp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/utilities/dba.epp,v
retrieving revision 1.6
retrieving revision 1.7
diff -b -U3 -r1.6 -r1.7
--- dba.epp	5 Jul 2002 15:00:21 -0000	1.6
+++ dba.epp	29 Jul 2002 15:37:55 -0000	1.7
@@ -29,6 +29,7 @@
 #include "firebird.h"
 #include "../jrd/common.h"
 #include "../jrd/ib_stdio.h"
+#include "../common/memory/allocators.h"
 #include <errno.h>
 #include <string.h>
 #include <fcntl.h>
@@ -931,7 +932,7 @@
 
 	TDBA tddba = GET_THREAD_DATA;
 
-	block = p = (SCHAR*) malloc(size);
+	block = p = new(*getDefaultMemoryPool()) SCHAR[size];
 	if (!p) {
 		/* NOMEM: return error */
 		dba_error(31, 0, 0, 0, 0, 0);
@@ -941,7 +942,7 @@
 		*p++ = 0;
 	while (--size);
 
-	mem* mem_list = (mem*)malloc(sizeof(mem));
+	mem* mem_list = new(*getDefaultMemoryPool()) mem;
 	if (!mem_list) {
 		/* NOMEM: return error */
 		dba_error(31, 0, 0, 0, 0, 0);
@@ -1360,7 +1361,8 @@
 		db_error(errno);
 	}
 
-	if (!(file_list = malloc(sizeof(*file_list)))) {
+	file_list = new(*getDefaultMemoryPool()) open_files;
+	if (!file_list) {
 		/* NOMEM: return error */
 		dba_error(31, 0, 0, 0, 0, 0);
 	}
@@ -1543,7 +1545,8 @@
 	}
 
 #ifdef SUPERSERVER
-	open_files* file_list = reinterpret_cast<open_files*>(malloc(sizeof(*file_list)));
+	open_files* file_list = new(*getDefaultMemoryPool()) open_files;
+	if (file_list == 0) {
 	if (!file_list) {
 		/* NOMEM: return error */
 		dba_error(31, 0, 0, 0, 0, 0);
@@ -1732,7 +1735,8 @@
 	}
 
 #ifdef SUPERSERVER
-	if (!(file_list = malloc(sizeof(*file_list)))) {
+	file_list = new(*getDefaultMemoryPool()) open_files;
+	if (!file_list) {
 		/* NOMEM: return error */
 		dba_error(31, 0, 0, 0, 0, 0);
 	}

Index: guard.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/utilities/guard.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -b -U3 -r1.3 -r1.4
--- guard.cpp	24 Dec 2001 02:50:53 -0000	1.3
+++ guard.cpp	29 Jul 2002 15:37:55 -0000	1.4
@@ -24,7 +24,7 @@
 #define IGNORE          3
 #define NORMAL_EXIT	0
 
-#define SUPER_SERVER_BINARY	"bin/ibserver"
+#define SUPER_SERVER_BINARY	"bin/fbserver"
 
 #define INTERBASE_USER		"interbase"
 #define FIREBIRD_USER		"firebird"
@@ -32,9 +32,18 @@
 
 #include "firebird.h"
 #include "../jrd/ib_stdio.h"
-#include <sys/types.h>
 
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
 
+#ifdef HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
 
 #include "../jrd/common.h"
 #include "../jrd/isc_proto.h"

Index: ibmgr.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/utilities/ibmgr.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -b -U3 -r1.3 -r1.4
--- ibmgr.cpp	24 Dec 2001 02:50:53 -0000	1.3
+++ ibmgr.cpp	29 Jul 2002 15:37:55 -0000	1.4
@@ -24,6 +24,15 @@
  */
 
 #include "firebird.h"
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
 #include "../jrd/ib_stdio.h"
 #include <stdlib.h>
 #include <string.h>
@@ -37,6 +46,7 @@
 #include "../utilities/srvrmgr_proto.h"
 
 
+
 #define MAXARGS		20			/* max number of args allowed on command line */
 #define MAXSTUFF	1000		/* longest interactive command line */
 
@@ -211,7 +221,7 @@
 }
 
 
-static get_line( int *argc, SCHAR ** argv, TEXT * stuff)
+static int get_line( int *argc, SCHAR ** argv, TEXT * stuff)
 {
 /**************************************
  *
@@ -816,7 +826,7 @@
 	ibmgr_data.par_entered = 0;
 
 	ret =
-		get_switches(argc, argv, &ibmgr_in_sw_table, &ibmgr_data, &quitflag);
+		get_switches(argc, argv, (IN_SW_TAB ) &ibmgr_in_sw_table, &ibmgr_data, &quitflag);
 	if (ret != SUCCESS) {
 		if (ret == ERR_SYNTAX) {
 			SRVRMGR_msg_get(MSG_SYNTAX, msg);

Index: rebuild.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/utilities/rebuild.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -b -U3 -r1.3 -r1.4
--- rebuild.cpp	29 Jun 2002 08:49:39 -0000	1.3
+++ rebuild.cpp	29 Jul 2002 15:37:55 -0000	1.4
@@ -96,7 +96,7 @@
 };
 
 
-void main( int argc, char *argv[])
+int main( int argc, char *argv[])
 {
 /**************************************
  *
@@ -276,6 +276,8 @@
 		gds__free(rbdb);
 		rbdb = next_db;
 	}
+
+    return 0;
 }
 
 

Index: util.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/utilities/util.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -b -U3 -r1.3 -r1.4
--- util.cpp	24 Dec 2001 02:50:53 -0000	1.3
+++ util.cpp	29 Jul 2002 15:37:55 -0000	1.4
@@ -35,11 +35,19 @@
 #include <sys/file.h>			/* for flock() */
 #endif
 
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>				/* for fork() */
+#endif
 
-#ifdef SOLARIS
+#ifdef HAVE_WAIT_H
 #include <wait.h>				/* for waitpid() */
-#else
+#endif
+
+#ifdef HAVE_SYS_WAIT_H
 #include <sys/wait.h>			/* for waitpid() */
 #endif
 
@@ -48,6 +56,7 @@
 #include "../jrd/gdsassert.h"
 #include "../utilities/util_proto.h"
 #include "../jrd/gds_proto.h"
+#include "../jrd/isc_proto.h"
 
 #ifndef MAXPATHLEN
 #define MAXPATHLEN      1024

Index: util_proto.h
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/utilities/util_proto.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -b -U3 -r1.1.1.1 -r1.2
--- util_proto.h	23 May 2001 13:26:41 -0000	1.1.1.1
+++ util_proto.h	29 Jul 2002 15:37:56 -0000	1.2
@@ -24,10 +24,10 @@
 #ifndef _UTIL_PROTO_H_
 #define _UTIL_PROTO_H_
 
-extern pid_t 	UTIL_fork_process   (char *process, char **arguments); 
-extern int 	UTIL_wait_for_child (pid_t child_pid); 
-extern int 	UTIL_ex_lock 	    (char *file); 
-extern void 	UTIL_ex_unlock      (int fd_file); 
+extern pid_t UTIL_start_process(char *process, char **argv);
+extern int 	UTIL_wait_for_child(pid_t child_pid); 
+extern int 	UTIL_ex_lock(char *file); 
+extern void UTIL_ex_unlock(int fd_file); 
 
 #endif /* _UTIL_PROTO_H_ */