Split utilities dir

builds/posix/Makefile.in.client.util

@@ -27,7 +27,7 @@
 #  Contributor(s):
 # 
 #
-#  $Id: Makefile.in.client.util,v 1.10 2003-07-14 23:21:39 brodsom Exp $
+#  $Id: Makefile.in.client.util,v 1.11 2003-07-15 02:35:53 brodsom Exp $
 #
 ROOT=..
 ObjModuleName=client.util
@@ -51,16 +51,16 @@ DROP_Sources = $(addprefix utilities/, $(DROP_Files))
 DROP_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(DROP_Sources))))
 
 GSEC_Files =  gsec.cpp
-GSEC_Sources = $(addprefix utilities/, $(GSEC_Files))
+GSEC_Sources = $(addprefix utilities/gsec/, $(GSEC_Files))
 GSEC_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(GSEC_Sources))))
 
 GSTAT_Files =  dba.epp ppg.cpp
-GSTAT_Sources = $(addprefix utilities/, $(GSTAT_Files))
+GSTAT_Sources = $(addprefix utilities/gstat/, $(GSTAT_Files))
 GSTAT_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(GSTAT_Sources))))
 
 
 FBGUARD_Files =  guard.cpp util.cpp
-FBGUARD_Sources = $(addprefix utilities/, $(FBGUARD_Files))
+FBGUARD_Sources = $(addprefix utilities/guard/, $(FBGUARD_Files))
 FBGUARD_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(FBGUARD_Sources))))
 
 IBGUARD_A_Files =  cntl_guard.cpp iscguard.cpp
@@ -71,19 +71,19 @@ IBGUARD_B_Sources = $(addprefix remote/, $(IBGUARD_B_Files))
 IBGUARD_B_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(IBGUARD_B_Sources))))
 
 FBMGR_Files =  	ibmgr.cpp srvrmgr.cpp
-FBMGR_Sources = $(addprefix utilities/, $(FBMGR_Files))
+FBMGR_Sources = $(addprefix utilities/ibmgr/, $(FBMGR_Files))
 FBMGR_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(FBMGR_Sources))))
 
 INSTREG_Files =  	install_reg.cpp registry.cpp
-INSTREG_Sources = $(addprefix utilities/, $(INSTREG_Files))
+INSTREG_Sources = $(addprefix utilities/install/, $(INSTREG_Files))
 INSTREG_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(INSTREG_Sources))))
 
 INSTSVC_Files =  	install_svc.cpp services.cpp
-INSTSVC_Sources = $(addprefix utilities/, $(INSTSVC_Files))
+INSTSVC_Sources = $(addprefix utilities/install/, $(INSTSVC_Files))
 INSTSVC_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(INSTSVC_Sources))))
 
 REBUILD_Files =  rebuild.cpp rstore.epp rmet.epp 
-REBUILD_Sources = $(addprefix utilities/, $(REBUILD_Files))
+REBUILD_Sources = $(addprefix utilities/rebuild/, $(REBUILD_Files))
 REBUILD_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(REBUILD_Sources))))
 
 

builds/posix/Makefile.in.embed.util

@@ -27,7 +27,7 @@
 #  Contributor(s):
 # 
 #
-#  $Id: Makefile.in.embed.util,v 1.8 2003-03-28 11:29:18 aafemt Exp $
+#  $Id: Makefile.in.embed.util,v 1.9 2003-07-15 02:35:53 brodsom Exp $
 #
 ROOT=..
 ObjModuleName=embed.util
@@ -51,26 +51,26 @@ DROP_Sources = $(addprefix utilities/, $(DROP_Files))
 DROP_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(DROP_Sources))))
 
 GSEC_Files =  gsec.cpp
-GSEC_Sources = $(addprefix utilities/, $(GSEC_Files))
+GSEC_Sources = $(addprefix utilities/gsec/, $(GSEC_Files))
 GSEC_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(GSEC_Sources))))
 
 GSTAT_Files =  dba.epp ppg.cpp
-GSTAT_Sources = $(addprefix utilities/, $(GSTAT_Files))
+GSTAT_Sources = $(addprefix utilities/gstat/, $(GSTAT_Files))
 GSTAT_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(GSTAT_Sources))))
 
 
 IBGUARD_Files =  guard.cpp util.cpp
-IBGUARD_Sources = $(addprefix utilities/, $(IBGUARD_Files))
+IBGUARD_Sources = $(addprefix utilities/guard/, $(IBGUARD_Files))
 IBGUARD_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(IBGUARD_Sources))))
 
 
 IBMGR_Files =  	ibmgr.cpp srvrmgr.cpp
-IBMGR_Sources = $(addprefix utilities/, $(IBMGR_Files))
+IBMGR_Sources = $(addprefix utilities/ibmgr/, $(IBMGR_Files))
 IBMGR_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(IBMGR_Sources))))
 
 
 REBUILD_Files =  rebuild.cpp rstore.epp rmet.epp 
-REBUILD_Sources = $(addprefix utilities/, $(REBUILD_Files))
+REBUILD_Sources = $(addprefix utilities/rebuild/, $(REBUILD_Files))
 REBUILD_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(REBUILD_Sources))))
 
 

builds/posix/Makefile.in.libfbclient

@@ -27,7 +27,7 @@
 #  Contributor(s):
 # 
 #
-#  $Id: Makefile.in.libfbclient,v 1.14 2003-03-31 10:29:15 aafemt Exp $
+#  $Id: Makefile.in.libfbclient,v 1.15 2003-07-15 02:35:53 brodsom Exp $
 #
 ROOT=..
 ObjModuleName=libfbclient
@@ -73,8 +73,8 @@ WAL_ClientSources = $(addprefix wal/, $(WAL_ClientFiles))
 WAL_ClientObjects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(WAL_ClientSources))))
 
 
-SECURITY_ClientSources = $(addprefix utilities/, $(SECURITY_ClientFiles))
+SECURITY_ClientSources_gsec = $(addprefix utilities/gsec/, $(SECURITY_ClientFiles_gsec))
-SECURITY_ClientObjects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(SECURITY_ClientSources))))
+SECURITY_ClientObjects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(SECURITY_ClientSources_gsec))))
 
 
 FBUTIL_ClientSources = $(addprefix fbutil/, $(FBUTIL_ClientFiles))

builds/posix/make.shared.variables

@@ -170,17 +170,26 @@ BURP_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(BURP_Sources)))
 #
 # utilities
 
-SECURITY_ClientFiles = security.cpp
+SECURITY_ClientFiles_gsec = security.cpp
 
-SECURITY_ServerFiles:=
+SECURITY_ServerFiles_gsec:=
+SECURITY_ServerFiles_gstat:=
+SECURITY_ServerFiles_common:=
 
 ifeq ($(ArchType),super)
-    SECURITY_ServerFiles:= $(SECURITY_ServerFiles) gsec.cpp dba.epp ppg.cpp cmd_util.cpp
+    SECURITY_ServerFiles_gsec:= $(SECURITY_ServerFiles_gsec) gsec.cpp 
+    SECURITY_ServerFiles_gstat:= $(SECURITY_ServerFiles_gstat) dba.epp ppg.cpp 
+    SECURITY_ServerFiles_common:= $(SECURITY_ServerFiles_common) cmd_util.cpp
 endif
 
-SECURITY_Files = $(SECURITY_ClientFiles) $(SECURITY_ServerFiles)
+SECURITY_Files_gsec = $(SECURITY_ClientFiles_gsec) $(SECURITY_ServerFiles_gsec)
+SECURITY_Files_gstat = $(SECURITY_ServerFiles_gstat)
+SECURITY_Files_common = $(SECURITY_ServerFiles_common)
+SECURITY_Sources_gsec = $(addprefix utilities/gsec/, $(SECURITY_Files_gsec))
+SECURITY_Sources_gstat = $(addprefix utilities/gstat/, $(SECURITY_Files_gstat))
+SECURITY_Sources_common = $(addprefix utilities/common/, $(SECURITY_Files_common))
 
-SECURITY_Sources = $(addprefix utilities/, $(SECURITY_Files))
+SECURITY_Sources = $(SECURITY_Sources_gsec) $(SECURITY_Sources_gstat) $(SECURITY_Sources_common)
 SECURITY_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(SECURITY_Sources))))
 
 #________________________________________________________________________

builds/win32/make_boot.bat

@@ -42,6 +42,10 @@
 @mkdir %ROOT_PATH%\gen\qli 2>nul
 @rmdir /s /q %ROOT_PATH%\gen\utilities 2>nul
 @mkdir %ROOT_PATH%\gen\utilities 2>nul
+@rmdir /s /q %ROOT_PATH%\gen\utilities\gstat 2>nul
+@mkdir %ROOT_PATH%\gen\utilities\gstat 2>nul
+@rmdir /s /q %ROOT_PATH%\gen\utilities\gsec 2>nul
+@mkdir %ROOT_PATH%\gen\utilities\gsec 2>nul
 
 ::=======
 @call :gpre_boot

builds/win32/msvc6/fb_inet_server.dsp

@@ -97,11 +97,11 @@ LINK32=link.exe
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\..\gen\utilities\dba.cpp
+SOURCE=..\..\..\gen\utilities\gstat\dba.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\utilities\ppg.cpp
+SOURCE=..\..\..\src\utilities\gstat\ppg.cpp
 # End Source File
 # End Group
 # Begin Group "Resource files"

builds/win32/msvc6/fbclient.dsp

@@ -288,7 +288,7 @@ SOURCE=..\..\..\src\remote\xnet.cpp
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\..\gen\utilities\security.cpp
+SOURCE=..\..\..\gen\utilities\gsec\security.cpp
 # End Source File
 # End Group
 # Begin Group "Header files"

builds/win32/msvc6/fbembed.dsp

@@ -281,11 +281,11 @@ SOURCE=..\..\..\src\remote\xnet.cpp
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\..\gen\utilities\dba.cpp
+SOURCE=..\..\..\gen\utilities\gstat\dba.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\utilities\ppg.cpp
+SOURCE=..\..\..\src\utilities\gstat\ppg.cpp
 # End Source File
 # End Group
 # Begin Group "Resource files"

builds/win32/msvc6/fbserver.dsp

@@ -97,11 +97,11 @@ LINK32=link.exe
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\..\gen\utilities\dba.cpp
+SOURCE=..\..\..\gen\utilities\gstat\dba.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\utilities\ppg.cpp
+SOURCE=..\..\..\src\utilities\gstat\ppg.cpp
 # End Source File
 # End Group
 # Begin Group "Resource files"

builds/win32/msvc6/gsec.dsp

@@ -93,11 +93,11 @@ SOURCE=..\..\..\src\common\fb_exception.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\utilities\gsec.cpp
+SOURCE=..\..\..\src\utilities\gsec\gsec.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\gen\utilities\security.cpp
+SOURCE=..\..\..\gen\utilities\gsec\security.cpp
 # End Source File
 # End Group
 # Begin Group "JRD files"
@@ -117,11 +117,11 @@ SOURCE=..\..\..\src\jrd\isc.cpp
 # PROP Default_Filter "h;hpp;hxx;hm;inl"
 # Begin Source File
 
-SOURCE=..\..\..\src\utilities\gsec.h
+SOURCE=..\..\..\src\utilities\gsec\gsec.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\utilities\secur_proto.h
+SOURCE=..\..\..\src\utilities\gsec\secur_proto.h
 # End Source File
 # End Group
 # Begin Group "Resource files"

builds/win32/msvc6/gstat.dsp

@@ -89,7 +89,7 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
-SOURCE=..\..\..\gen\utilities\dba.cpp
+SOURCE=..\..\..\gen\utilities\gstat\dba.cpp
 # End Source File
 # Begin Source File
 
@@ -101,7 +101,7 @@ SOURCE=..\..\..\src\common\fb_exception.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\utilities\ppg.cpp
+SOURCE=..\..\..\src\utilities\gstat\ppg.cpp
 # End Source File
 # End Group
 # Begin Group "Header files"
@@ -113,7 +113,7 @@ SOURCE=..\..\..\src\jrd\enc_proto.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\utilities\ppg_proto.h
+SOURCE=..\..\..\src\utilities\gstat\ppg_proto.h
 # End Source File
 # End Group
 # Begin Group "Resource files"

builds/win32/msvc6/instreg.dsp

@@ -89,11 +89,11 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
-SOURCE=..\..\..\src\utilities\install_reg.cpp
+SOURCE=..\..\..\src\utilities\install\install_reg.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\utilities\registry.cpp
+SOURCE=..\..\..\src\utilities\install\registry.cpp
 # End Source File
 # End Group
 # Begin Group "Header files"
@@ -101,11 +101,11 @@ SOURCE=..\..\..\src\utilities\registry.cpp
 # PROP Default_Filter "h;hpp;hxx;hm;inl"
 # Begin Source File
 
-SOURCE=..\..\..\src\utilities\regis_proto.h
+SOURCE=..\..\..\src\utilities\install\regis_proto.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\utilities\registry.h
+SOURCE=..\..\..\src\utilities\install\registry.h
 # End Source File
 # End Group
 # Begin Group "Resource files"

builds/win32/msvc6/instsvc.dsp

@@ -89,11 +89,11 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
-SOURCE=..\..\..\src\utilities\install_svc.cpp
+SOURCE=..\..\..\src\utilities\install\install_svc.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\utilities\services.cpp
+SOURCE=..\..\..\src\utilities\install\services.cpp
 # End Source File
 # End Group
 # Begin Group "Header files"
@@ -101,7 +101,7 @@ SOURCE=..\..\..\src\utilities\services.cpp
 # PROP Default_Filter "h;hpp;hxx;hm;inl"
 # Begin Source File
 
-SOURCE=..\..\..\src\utilities\servi_proto.h
+SOURCE=..\..\..\src\utilities\install\servi_proto.h
 # End Source File
 # End Group
 # Begin Group "Resource files"

builds/win32/msvc6/utilities.dsp

@@ -89,19 +89,19 @@ LIB32=link.exe -lib
 # PROP Default_Filter "epp"
 # Begin Source File
 
-SOURCE=..\..\..\src\utilities\dba.epp
+SOURCE=..\..\..\src\utilities\gstat\dba.epp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\utilities\rmet.epp
+SOURCE=..\..\..\src\utilities\rebuild\rmet.epp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\utilities\rstore.epp
+SOURCE=..\..\..\src\utilities\rebuild\rstore.epp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\utilities\security.epp
+SOURCE=..\..\..\src\utilities\gsec\security.epp
 # End Source File
 # End Group
 # Begin Group "Generated files"
@@ -109,16 +109,16 @@ SOURCE=..\..\..\src\utilities\security.epp
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\..\gen\utilities\security.cpp
+SOURCE=..\..\..\gen\utilities\gsec\security.cpp
 # End Source File
 # End Group
 # Begin Source File
 
-SOURCE=..\..\..\src\utilities\cmd_util.cpp
+SOURCE=..\..\..\src\utilities\common\cmd_util.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\utilities\gsec.cpp
+SOURCE=..\..\..\src\utilities\gsec\gsec.cpp
 # End Source File
 # End Group
 # Begin Group "Header files"
@@ -126,15 +126,15 @@ SOURCE=..\..\..\src\utilities\gsec.cpp
 # PROP Default_Filter "h;hpp;hxx;hm;inl"
 # Begin Source File
 
-SOURCE=..\..\..\src\utilities\cmd_util_proto.h
+SOURCE=..\..\..\src\utilities\common\cmd_util_proto.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\utilities\gsec.h
+SOURCE=..\..\..\src\utilities\gsec\gsec.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\utilities\registry.h
+SOURCE=..\..\..\src\utilities\install\registry.h
 # End Source File
 # End Group
 # End Target

builds/win32/msvc6/utilities_classic.dsp

@@ -89,19 +89,19 @@ LIB32=link.exe -lib
 # PROP Default_Filter "epp"
 # Begin Source File
 
-SOURCE=..\..\..\src\utilities\dba.epp
+SOURCE=..\..\..\src\utilities\gstat\dba.epp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\utilities\rmet.epp
+SOURCE=..\..\..\src\utilities\rebuild\rmet.epp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\utilities\rstore.epp
+SOURCE=..\..\..\src\utilities\rebuild\rstore.epp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\utilities\security.epp
+SOURCE=..\..\..\src\utilities\gsec\security.epp
 # End Source File
 # End Group
 # Begin Group "Generated files"
@@ -109,16 +109,16 @@ SOURCE=..\..\..\src\utilities\security.epp
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\..\gen\utilities\security.cpp
+SOURCE=..\..\..\gen\utilities\gsec\security.cpp
 # End Source File
 # End Group
 # Begin Source File
 
-SOURCE=..\..\..\src\utilities\cmd_util.cpp
+SOURCE=..\..\..\src\utilities\common\cmd_util.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\utilities\gsec.cpp
+SOURCE=..\..\..\src\utilities\gsec\gsec.cpp
 # End Source File
 # End Group
 # Begin Group "Header files"
@@ -126,15 +126,15 @@ SOURCE=..\..\..\src\utilities\gsec.cpp
 # PROP Default_Filter "h;hpp;hxx;hm;inl"
 # Begin Source File
 
-SOURCE=..\..\..\src\utilities\cmd_util_proto.h
+SOURCE=..\..\..\src\utilities\common\cmd_util_proto.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\utilities\gsec.h
+SOURCE=..\..\..\src\utilities\gsec\gsec.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\src\utilities\registry.h
+SOURCE=..\..\..\src\utilities\install\registry.h
 # End Source File
 # End Group
 # End Target

builds/win32/msvc7/fb_inet_server.vcproj

@@ -138,10 +138,10 @@
 			Name="UTILITIES files"
 			Filter="">
 			<File
-				RelativePath="..\..\..\gen\utilities\dba.cpp">
+				RelativePath="..\..\..\gen\utilities\gstat\dba.cpp">
 			</File>
 			<File
-				RelativePath="..\..\..\src\utilities\ppg.cpp">
+				RelativePath="..\..\..\src\utilities\gstat\ppg.cpp">
 			</File>
 		</Filter>
 		<Filter

builds/win32/msvc7/fbembed.vcproj

@@ -311,10 +311,10 @@
 			Name="UTILITIES files"
 			Filter="">
 			<File
-				RelativePath="..\..\..\gen\utilities\dba.cpp">
+				RelativePath="..\..\..\gen\utilities\gstat\dba.cpp">
 			</File>
 			<File
-				RelativePath="..\..\..\src\utilities\ppg.cpp">
+				RelativePath="..\..\..\src\utilities\gstat\ppg.cpp">
 			</File>
 		</Filter>
 		<Filter

builds/win32/msvc7/fbserver.vcproj

@@ -138,10 +138,10 @@
 			Name="UTILITIES files"
 			Filter="">
 			<File
-				RelativePath="..\..\..\gen\utilities\dba.cpp">
+				RelativePath="..\..\..\gen\utilities\gstat\dba.cpp">
 			</File>
 			<File
-				RelativePath="..\..\..\src\utilities\ppg.cpp">
+				RelativePath="..\..\..\src\utilities\gstat\ppg.cpp">
 			</File>
 		</Filter>
 		<Filter

builds/win32/msvc7/gstat.vcproj

@@ -126,7 +126,7 @@
 			Name="UTILITIES files"
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
 			<File
-				RelativePath="..\..\..\gen\utilities\dba.cpp">
+				RelativePath="..\..\..\gen\utilities\gstat\dba.cpp">
 			</File>
 			<File
 				RelativePath="..\..\..\src\jrd\enc.cpp">
@@ -135,7 +135,7 @@
 				RelativePath="..\..\..\src\common\fb_exception.cpp">
 			</File>
 			<File
-				RelativePath="..\..\..\src\utilities\ppg.cpp">
+				RelativePath="..\..\..\src\utilities\gstat\ppg.cpp">
 			</File>
 		</Filter>
 		<Filter

builds/win32/msvc7/utilities.vcproj

@@ -118,7 +118,7 @@
 				Name="epp files"
 				Filter="epp">
 				<File
-					RelativePath="..\..\..\src\utilities\dba.epp">
+					RelativePath="..\..\..\src\utilities\gstat.epp">
 				</File>
 				<File
 					RelativePath="..\..\..\src\utilities\rmet.epp">

builds/win32/msvc7/utilities_classic.vcproj

@@ -118,7 +118,7 @@
 				Name="epp files"
 				Filter="epp">
 				<File
-					RelativePath="..\..\..\src\utilities\dba.epp">
+					RelativePath="..\..\..\src\utilities\gstat.epp">
 				</File>
 				<File
 					RelativePath="..\..\..\src\utilities\rmet.epp">

builds/win32/preprocess.bat

@@ -65,7 +65,8 @@ goto :EOF
 @for %%i in (codes, relations, envelope) do @call :PREPROCESS misc %%i
 @for %%i in (build_file) do @call :PREPROCESS msgs %%i
 @for %%i in (help, meta, proc, show) do @call :PREPROCESS qli %%i
-@for %%i in (dba, security) do @call :PREPROCESS utilities %%i
+@for %%i in (dba) do @call :PREPROCESS utilities/gstat %%i
+@for %%i in (security) do @call :PREPROCESS utilities/gsec %%i
 
 @goto :EOF
 

src/alice/alice.cpp

@@ -24,7 +24,7 @@
 //
 //____________________________________________________________
 //
-//	$Id: alice.cpp,v 1.27 2003-04-10 06:04:41 aafemt Exp $
+//	$Id: alice.cpp,v 1.28 2003-07-15 02:40:52 brodsom Exp $
 //
 // 2001.07.06 Sean Leyne - Code Cleanup, removed "#ifdef READONLY_DATABASE"
 //                         conditionals, as the engine now fully supports
@@ -65,7 +65,7 @@
 #endif
 
 #ifdef SUPERSERVER
-#include "../utilities/cmd_util_proto.h"
+#include "../utilities/common/cmd_util_proto.h"
 #endif
 
 #ifdef WIN_NT

src/burp/burp.cpp

@@ -70,7 +70,7 @@
 #endif
 
 #ifdef SUPERSERVER
-#include "../utilities/cmd_util_proto.h"
+#include "../utilities/common/cmd_util_proto.h"
 #endif
 
 

src/iscguard/cntl_guard.cpp

@@ -26,7 +26,7 @@
 #include "../jrd/common.h"
 #include "../iscguard/cntlg_proto.h"
 #include "../remote/remote.h"
-#include "../utilities/install_nt.h"
+#include "../utilities/install/install_nt.h"
 #include "../jrd/thd.h"
 #include "../jrd/isc_proto.h"
 #include "../jrd/gds_proto.h"

src/iscguard/iscguard.cpp

@@ -37,7 +37,7 @@
 #include "../iscguard/iscguard.rh"
 #include "../iscguard/iscguard.h"
 #include "../iscguard/cntlg_proto.h"
-#include "../utilities/install_nt.h"
+#include "../utilities/install/install_nt.h"
 #include "../remote/os/win32/window.h"
 #include "../remote/os/win32/chop_proto.h"
 #include "../common/config/config.h"

src/jrd/alt.cpp

@@ -49,8 +49,8 @@
 #include "../jrd/gds_proto.h"
 #include "../jrd/utl_proto.h"
 #include "../jrd/why_proto.h"
-#include "../utilities/gsec.h"
+#include "../utilities/gsec/gsec.h"
-#include "../utilities/secur_proto.h"
+#include "../utilities/gsec/secur_proto.h"
 
 #include "../jrd/gdsold.h"
 

src/jrd/os/win32/config_root.cpp

@@ -32,7 +32,7 @@
 
 #include "../jrd/os/config_root.h"
 #include "../jrd/os/path_utils.h"
-#include "../utilities/registry.h"
+#include "../utilities/install/registry.h"
 
 typedef Firebird::string string;
 

src/jrd/svc.cpp

@@ -60,8 +60,8 @@
 #include "../jrd/utl_proto.h"
 #include "../jrd/jrd_proto.h"
 #include "../jrd/enc_proto.h"
-#include "../utilities/gsecswi.h"
+#include "../utilities/gsec/gsecswi.h"
-#include "../utilities/dbaswi.h"
+#include "../utilities/gstat/dbaswi.h"
 #include "../common/classes/alloc.h"
 #ifdef SERVER_SHUTDOWN
 #include "../jrd/jrd_proto.h"

src/remote/inet.cpp

@@ -41,7 +41,7 @@
  *
  */
 /*
-$Id: inet.cpp,v 1.70 2003-06-30 11:26:38 brodsom Exp $
+$Id: inet.cpp,v 1.71 2003-07-15 02:43:16 brodsom Exp $
 */
 #include "firebird.h"
 #include "../jrd/ib_stdio.h"
@@ -137,7 +137,7 @@ extern int h_errno;
 #include <io.h>
 #include <process.h>
 #include <signal.h>
-#include "../utilities/install_nt.h"
+#include "../utilities/install/install_nt.h"
 #define ERRNO		WSAGetLastError()
 #define H_ERRNO		WSAGetLastError()
 #define SOCLOSE		closesocket

src/remote/os/win32/cntl.cpp

@@ -27,7 +27,7 @@
 #include "../remote/remote.h"
 #include "../jrd/os/thd_priority.h"
 #include "../jrd/thd.h"
-#include "../utilities/install_nt.h"
+#include "../utilities/install/install_nt.h"
 #include "../remote/os/win32/cntl_proto.h"
 #include "../jrd/gds_proto.h"
 #include "../jrd/isc_proto.h"

src/remote/os/win32/srvr_w32.cpp

@@ -89,7 +89,7 @@
 #include "../jrd/license.h"
 #include "../jrd/thd.h"
 #include "../jrd/license.h"
-#include "../utilities/install_nt.h"
+#include "../utilities/install/install_nt.h"
 #include "../remote/os/win32/cntl_proto.h"
 #include "../remote/inet_proto.h"
 #include "../remote/serve_proto.h"

src/remote/os/win32/wnet.cpp

@@ -34,7 +34,7 @@
 #include "../jrd/thd.h"
 #include "../jrd/iberr.h"
 
-#include "../utilities/install_nt.h"
+#include "../utilities/install/install_nt.h"
 
 #include "../remote/proto_proto.h"
 #include "../remote/remot_proto.h"

src/remote/xnet.cpp

@@ -32,7 +32,7 @@
 #include "../jrd/thd.h"
 #include "../jrd/iberr.h"
 #include "../remote/xnet.h"
-#include "../utilities/install_nt.h"
+#include "../utilities/install/install_nt.h"
 #include "../remote/proto_proto.h"
 #include "../remote/remot_proto.h"
 #include "../remote/xnet_proto.h"

src/utilities/gsec/gsec.cpp

@@ -33,13 +33,13 @@
 #include "../jrd/gds_proto.h"
 #include "../jrd/msg_encode.h"
 #include "../jrd/jrd.h"
-#include "../utilities/gsec.h"
+#include "../utilities/gsec/gsec.h"
 #include "../jrd/jrd_pwd.h"
 #include "../jrd/license.h"
 #include "../jrd/svc_proto.h"
-#include "../utilities/secur_proto.h"
+#include "../utilities/gsec/secur_proto.h"
-#include "../utilities/gsecswi.h"
+#include "../utilities/gsec/gsecswi.h"
-#include "../utilities/cmd_util_proto.h"
+#include "../utilities/common/cmd_util_proto.h"
 #ifdef WIN_NT
 #include <windows.h>
 #endif

src/utilities/gsec/security.epp

@@ -31,8 +31,8 @@
 #include "../jrd/jrd_pwd.h"
 #include "../jrd/enc_proto.h"
 #include "../jrd/gds_proto.h"
-#include "../utilities/gsec.h"
+#include "../utilities/gsec/gsec.h"
-#include "../utilities/secur_proto.h"
+#include "../utilities/gsec/secur_proto.h"
 
 DATABASE DB = STATIC FILENAME "security.fdb";
 

src/utilities/gstat/dba.epp

@@ -44,15 +44,15 @@
 #include "../jrd/msg_encode.h"
 #include "../jrd/gdsassert.h"
 #ifndef SUPERSERVER
-#include "../utilities/ppg_proto.h"
+#include "../utilities/gstat/ppg_proto.h"
 #endif
-#include "../utilities/dbaswi.h"
+#include "../utilities/gstat/dbaswi.h"
 #include "../jrd/gds_proto.h"
 #include "../jrd/isc_f_proto.h"
 #include "../jrd/thd.h"
 #include "../jrd/enc_proto.h"
 #ifdef SUPERSERVER
-#include "../utilities/cmd_util_proto.h"
+#include "../utilities/common/cmd_util_proto.h"
 #include "../jrd/thd_proto.h"
 #endif
 
@@ -172,7 +172,7 @@ static void dba_print(USHORT, TEXT *, TEXT *, TEXT *, TEXT *, TEXT *);
 #endif
 
 #include "../jrd/jrd_pwd.h"
-#include "../utilities/ppg_proto.h"
+#include "../utilities/gstat/ppg_proto.h"
 
 #define FPRINTF		SVC_fprintf
 
@@ -1416,7 +1416,7 @@ static PAG db_read( SLONG page_number)
 	tddba->page_number = page_number;
 
 	for (fil = tddba->files;
-		 page_number > fil->fil_max_page
+		 page_number > (SLONG) fil->fil_max_page
 		 && fil->fil_next;) fil = fil->fil_next;
 
 	page_number -= fil->fil_min_page - fil->fil_fudge;
@@ -1424,7 +1424,7 @@ static PAG db_read( SLONG page_number)
 		UInt32x32To64((DWORD) page_number, (DWORD) tddba->page_size);
 	if (SetFilePointer
 		(fil->fil_desc, (LONG) liOffset.LowPart, &liOffset.HighPart,
-		 FILE_BEGIN) == -1) {
+		 FILE_BEGIN) == (DWORD) -1) {
 #ifdef SUPERSERVER
 		CMD_UTIL_put_svc_status(tddba->dba_service_blk->svc_status,
 								GSTAT_MSG_FAC, 30,

src/utilities/gstat/dba_full.epp

@@ -35,7 +35,7 @@
 #include "../jrd/gds.h"
 #include "../jrd/ods.h"
 #include "../jrd/license.h"
-#include "../utilities/ppg_proto.h"
+#include "../utilities/gstat/ppg_proto.h"
 #include "../jrd/gds_proto.h"
 #include "../jrd/isc_f_proto.h"
 #include "../jrd/thd.h"

src/utilities/gstat/ppg.cpp

@@ -48,7 +48,7 @@ static const TEXT months[][4] = {
 
 #include "../jrd/svc.h"
 #include "../jrd/svc_proto.h"
-#include "../utilities/ppg_proto.h"
+#include "../utilities/gstat/ppg_proto.h"
 
 #define exit(code)	{service->svc_handle = 0; return (code);}
 #define FPRINTF		SVC_fprintf

src/utilities/guard/guard.cpp

@@ -15,7 +15,7 @@
  *
  * All Rights Reserved.
  * Contributor(s): ______________________________________.
- * $Id: guard.cpp,v 1.5 2002-09-08 07:56:50 dimitr Exp $
+ * $Id: guard.cpp,v 1.1 2003-07-15 02:39:38 brodsom Exp $
  */
  /* contains the main() and not shared routines for ibguard */
 
@@ -49,7 +49,7 @@
 #include "../jrd/isc_proto.h"
 #include "../jrd/gds_proto.h"
 #include "../jrd/file_params.h"
-#include "../utilities/util_proto.h"
+#include "../utilities/guard/util_proto.h"
 
 
 int CLIB_ROUTINE main( int argc, char **argv)

src/utilities/guard/util.cpp

@@ -21,7 +21,7 @@
  * Contributor(s): ______________________________________.
  */
 /*
-$Id: util.cpp,v 1.8 2002-11-06 07:08:47 eku Exp $
+$Id: util.cpp,v 1.1 2003-07-15 02:39:38 brodsom Exp $
 */
 
 #include "firebird.h"
@@ -60,7 +60,7 @@ $Id: util.cpp,v 1.8 2002-11-06 07:08:47 eku Exp $
 
 #include "../jrd/common.h"
 #include "../jrd/gdsassert.h"
-#include "../utilities/util_proto.h"
+#include "../utilities/guard/util_proto.h"
 #include "../jrd/gds_proto.h"
 #include "../jrd/isc_proto.h"
 

src/utilities/ibmgr/ibmgr.cpp

@@ -23,7 +23,7 @@
  *
  * 2002.10.29 Sean Leyne - Removed obsolete "Netware" port
  *
- * $Id: ibmgr.cpp,v 1.8 2003-02-19 06:14:39 eku Exp $
+ * $Id: ibmgr.cpp,v 1.1 2003-07-15 02:39:53 brodsom Exp $
  */
 
 #include "firebird.h"
@@ -45,10 +45,10 @@
 #endif
 #include "../jrd/common.h"
 #include "../jrd/gds.h"
-#include "../utilities/ibmgr.h"
+#include "../utilities/ibmgr/ibmgr.h"
-#include "../utilities/ibmgrswi.h"
+#include "../utilities/ibmgr/ibmgrswi.h"
 #include "../jrd/license.h"
-#include "../utilities/srvrmgr_proto.h"
+#include "../utilities/ibmgr/srvrmgr_proto.h"
 
 
 

src/utilities/ibmgr/ibmgr.h

@@ -19,7 +19,7 @@
  *
  * All Rights Reserved.
  * Contributor(s): ______________________________________.
- * $Id: ibmgr.h,v 1.4 2003-02-10 11:48:23 dimitr Exp $
+ * $Id: ibmgr.h,v 1.1 2003-07-15 02:39:53 brodsom Exp $
  */
 
 #ifndef _UTILITIES_IBMGR_H_

src/utilities/ibmgr/ibmgrswi.h

@@ -19,7 +19,7 @@
  *
  * All Rights Reserved.
  * Contributor(s): ______________________________________.
- * $Id: ibmgrswi.h,v 1.3 2001-12-24 02:50:53 tamlin Exp $
+ * $Id: ibmgrswi.h,v 1.1 2003-07-15 02:39:53 brodsom Exp $
  */
 
 #ifndef _IBMGR_IBMGRSWI_H_

src/utilities/ibmgr/srvrmgr.cpp

@@ -20,7 +20,7 @@
  *
  * All Rights Reserved.
  * Contributor(s): ______________________________________.
- * $Id: srvrmgr.cpp,v 1.13 2003-04-16 10:18:37 aafemt Exp $
+ * $Id: srvrmgr.cpp,v 1.1 2003-07-15 02:39:53 brodsom Exp $
  */
 
 #include "firebird.h"
@@ -48,8 +48,8 @@
 #include "../jrd/gds_proto.h"
 #include "../jrd/gdsassert.h"
 #include "../jrd/svc_undoc.h"
-#include "../utilities/ibmgr.h"
+#include "../utilities/ibmgr/ibmgr.h"
-#include "../utilities/srvrmgr_proto.h"
+#include "../utilities/ibmgr/srvrmgr_proto.h"
 
 #define STUFF_WORD(p, value)    {*p++ = value; *p++ = value >> 8;}
 

src/utilities/install/install_reg.cpp

@@ -27,8 +27,8 @@
 #include <windows.h>
 #include "../jrd/common.h"
 #include "../jrd/license.h"
-#include "../utilities/install_nt.h"
+#include "../utilities/install/install_nt.h"
-#include "../utilities/regis_proto.h"
+#include "../utilities/install/regis_proto.h"
 
 static USHORT reg_error(SLONG, TEXT *, HKEY);
 static void usage(void);

src/utilities/install/install_svc.cpp

@@ -27,9 +27,9 @@
 #include <windows.h>
 #include "../jrd/common.h"
 #include "../jrd/license.h"
-#include "../utilities/install_nt.h"
+#include "../utilities/install/install_nt.h"
-#include "../utilities/servi_proto.h"
+#include "../utilities/install/servi_proto.h"
-#include "../utilities/registry.h"
+#include "../utilities/install/registry.h"
 #include "../common/config/config.h"
 
 #define REMOTE_EXECUTABLE \

src/utilities/install/registry.cpp

@@ -31,9 +31,9 @@
 #include <windows.h>
 #include "../jrd/common.h"
 #include "../jrd/license.h"
-#include "../utilities/install_nt.h"
+#include "../utilities/install/install_nt.h"
-#include "../utilities/regis_proto.h"
+#include "../utilities/install/regis_proto.h"
-#include "../utilities/registry.h"
+#include "../utilities/install/registry.h"
 
 static USHORT remove_subkeys(HKEY, USHORT, USHORT(*)(SLONG, TEXT *, HKEY));
 

src/utilities/install/services.cpp

@@ -29,9 +29,9 @@
 #include <windows.h>
 #include "../jrd/common.h"
 #include "../jrd/license.h"
-#include "../utilities/install_nt.h"
+#include "../utilities/install/install_nt.h"
-#include "../utilities/servi_proto.h"
+#include "../utilities/install/servi_proto.h"
-#include "../utilities/registry.h"
+#include "../utilities/install/registry.h"
 
 /* Defines */
 #define RUNAS_SERVICE " -s"

src/utilities/rebuild/rebuild.cpp

@@ -32,10 +32,10 @@
 #include "../jrd/jrd_time.h"
 #include "../jrd/pag.h"
 #include "../jrd/tra.h"
-#include "../utilities/rebuild.h"
+#include "../utilities/rebuild/rebuild.h"
-#include "../utilities/rebui_proto.h"
+#include "../utilities/rebuild/rebui_proto.h"
-#include "../utilities/rmet_proto.h"
+#include "../utilities/rebuild/rmet_proto.h"
-#include "../utilities/rstor_proto.h"
+#include "../utilities/rebuild/rstor_proto.h"
 #include "../jrd/dmp_proto.h"
 #include "../jrd/gds_proto.h"
 

src/utilities/rebuild/rmet.epp

@@ -26,9 +26,9 @@
 #include "../jrd/jrd.h"
 #include "../jrd/tra.h"
 #include "../jrd/pag.h"
-#include "../utilities/rebuild.h"
+#include "../utilities/rebuild/rebuild.h"
-#include "../utilities/rebui_proto.h"
+#include "../utilities/rebuild/rebui_proto.h"
-#include "../utilities/rmet_proto.h"
+#include "../utilities/rebuild/rmet_proto.h"
 #include "../jrd/gds_proto.h"
 
 DATABASE DB = STATIC FILENAME "rebuild.fdb";

src/utilities/rebuild/rstore.epp

@@ -23,9 +23,9 @@
 
 #include "firebird.h"
 #include "../jrd/gds.h"
-#include "../utilities/rebuild.h"
+#include "../utilities/rebuild/rebuild.h"
-#include "../utilities/rebui_proto.h"
+#include "../utilities/rebuild/rebui_proto.h"
-#include "../utilities/rstor_proto.h"
+#include "../utilities/rebuild/rstor_proto.h"
 #include "../jrd/gds_proto.h"
 
 DATABASE DB = STATIC FILENAME "rebuild.fdb";

src/utilities/sbc_print.cpp

@@ -41,7 +41,7 @@
 #include "../jrd/cash.h"
 #include "../jrd/ods.h"
 #include "../jrd/llio.h"
-#include "../utilities/ppg_proto.h"
+#include "../utilities/gstat/ppg_proto.h"
 #include "../jrd/gds_proto.h"
 #include "../jrd/isc_f_proto.h"
 #include "../jrd/isc_s_proto.h"