firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-22 20:43:02 +01:00
Code Issues

Code cleanup of obsolete EPSON port

Browse Source
This commit is contained in:
seanleyne 2002-02-16 02:21:35 +00:00
parent 2df62a391a
commit e134ef027f
29 changed files with 352 additions and 346 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/burp/burp.cpp
View File

@ -22,6 +22,9 @@
* 2001.07.06 Sean Leyne - Code Cleanup, removed "#ifdef READONLY_DATABASE" * 2001.07.06 Sean Leyne - Code Cleanup, removed "#ifdef READONLY_DATABASE"
* conditionals, as the engine now fully supports * conditionals, as the engine now fully supports
* readonly databases. * readonly databases.
*
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "EPSON" defines
*
*/ */
#include "firebird.h" #include "firebird.h"
@ -102,10 +105,6 @@
#include <io.h> #include <io.h>
#endif #endif
#ifdef EPSON
#include <sys/fcntl.h>
#endif
#ifndef O_CREAT #ifndef O_CREAT
#include <sys/types.h> #include <sys/types.h>
#include <sys/file.h> #include <sys/file.h>

8
src/include/gen/autoconfig_msvc.h
View File

@ -1,6 +1,7 @@
/* /*
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "MAC" and "MAC_CP" defines * 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "MAC" and "MAC_CP" defines
*/ * 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "EPSON" define
*/
#ifndef AUTOCONFIG_H #ifndef AUTOCONFIG_H
#define AUTOCONFIG_H #define AUTOCONFIG_H
@ -80,6 +81,5 @@
#undef UNIXWARE #undef UNIXWARE
#undef NCR3000 #undef NCR3000
#undef IMP #undef IMP
#undef EPSON
#endif #endif

8
src/journal/server.e
View File

@ -1,7 +1,7 @@
/* /*
* PROGRAM: JRD Journal Server * PROGRAM: JRD Journal Server
* MODULE: server.e * MODULE: server.e
* DESCRIPTION: * DESCRIPTION:
* *
* The contents of this file are subject to the Interbase Public * The contents of this file are subject to the Interbase Public
* License Version 1.0 (the "License"); you may not use this file * License Version 1.0 (the "License"); you may not use this file
@ -19,6 +19,9 @@
* *
* All Rights Reserved. * All Rights Reserved.
* Contributor(s): ______________________________________. * Contributor(s): ______________________________________.
*
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "EPSON" define
*
*/ */
#include <stdio.h> #include <stdio.h>
@ -36,9 +39,6 @@
#ifdef _AIX #ifdef _AIX
#include <sys/select.h> #include <sys/select.h>
#endif #endif
#ifdef EPSON
#include <sys/select.h>
#endif
#include "../jrd/common.h" #include "../jrd/common.h"
/* Block types */ /* Block types */

33
src/jrd/common.h
View File

@ -28,9 +28,11 @@
* *
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "MAC" and "MAC_CP" defines * 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "MAC" and "MAC_CP" defines
* *
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "EPSON" define
*
*/ */
/* /*
$Id: common.h,v 1.7 2002-02-16 01:58:24 seanleyne Exp $ $Id: common.h,v 1.8 2002-02-16 02:21:27 seanleyne Exp $
*/ */
#ifndef JRD_COMMON_H #ifndef JRD_COMMON_H
@ -1010,35 +1012,6 @@ typedef unsigned long DWORD;
#endif #endif
#ifdef EPSON
#define I386 1
#define VAX 1
#define UNIX 1
#define IEEE
#define SETPGRP setpgrp()
#define SIGACTION_SUPPORTED
#define MMAP_SUPPORTED
#define NO_FLOCK
#define SMALL_FILE_NAMES
#define ATEXIT(c) atexit (c)
#define KILLER_SIGNALS
#define INTL
#define IMPLEMENTATION 51
#define NO_PYXIS
#define MOVE_FAST(from,to,length) memcpy (to, from, (int) (length))
#define MOVE_FASTER(from,to,length) memcpy (to, from, (int) (length))
#define MOVE_CLEAR(to,length) memset (to, 0, (int) (length))
#ifndef MAXPATHLEN
#define MAXPATHLEN 1024
#endif
#define setreuid(ruid,euid) setuid(euid)
#define setregid(rgid,egid) setgid(egid)
#endif /* EPSON */
#ifdef UNIX #ifdef UNIX
#define NO_CHECKSUM 1 #define NO_CHECKSUM 1
#define SYS_ARG isc_arg_unix #define SYS_ARG isc_arg_unix

8
src/jrd/file_params.h
View File

@ -19,6 +19,9 @@
* *
* All Rights Reserved. * All Rights Reserved.
* Contributor(s): ______________________________________. * Contributor(s): ______________________________________.
*
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "EPSON" define*
*
*/ */
#ifndef _JRD_FILE_PARAMS_H_ #ifndef _JRD_FILE_PARAMS_H_
@ -100,11 +103,6 @@
#endif #endif
#endif #endif
#ifdef EPSON
#include <sys/types.h>
#include <sys/ipc.h>
#endif
#ifdef LINUX #ifdef LINUX
#include <sys/types.h> #include <sys/types.h>
#include <sys/ipc.h> #include <sys/ipc.h>

23
src/jrd/flu.cpp
View File

@ -19,9 +19,12 @@
* *
* All Rights Reserved. * All Rights Reserved.
* Contributor(s): ______________________________________. * Contributor(s): ______________________________________.
*
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "EPSON" define
*
*/ */
/* /*
$Id: flu.cpp,v 1.5 2001-12-24 02:50:51 tamlin Exp $ $Id: flu.cpp,v 1.6 2002-02-16 02:21:27 seanleyne Exp $
*/ */
#include "firebird.h" #include "firebird.h"
@ -76,9 +79,9 @@ static int condition_handler(int *, int *, int *);
#endif #endif
/* SGI, EPSON, UNIXWARE, M88K, DECOSF specific stuff */ /* SGI, UNIXWARE, M88K, DECOSF specific stuff */
#if (defined SOLARIS || defined sgi || defined EPSON || defined M88K || defined UNIXWARE || defined NCR3000 || defined DECOSF || defined SCO_EV || defined linux || defined AIX_PPC) #if (defined SOLARIS || defined sgi || defined M88K || defined UNIXWARE || defined NCR3000 || defined DECOSF || defined SCO_EV || defined linux || defined AIX_PPC)
#include <dlfcn.h> #include <dlfcn.h>
#define DYNAMIC_SHARED_LIBRARIES #define DYNAMIC_SHARED_LIBRARIES
#include <unistd.h> #include <unistd.h>
@ -253,7 +256,7 @@ void FLU_unregister_module(MOD module)
**************************************/ **************************************/
MOD *mod; MOD *mod;
#ifdef DARWIN #ifdef DARWIN
NSSymbol symbol; NSSymbol symbol;
void (*fini)(void); void (*fini)(void);
#endif #endif
@ -292,7 +295,7 @@ void FLU_unregister_module(MOD module)
{ {
fini = (void (*)(void)) NSAddressOfSymbol(symbol); fini = (void (*)(void)) NSAddressOfSymbol(symbol);
fini(); fini();
} }
NSUnLinkModule (module->mod_handle, 0); NSUnLinkModule (module->mod_handle, 0);
#endif #endif
@ -475,7 +478,7 @@ FPTR_INT ISC_lookup_entrypoint(TEXT * module,
const USHORT length = strlen(absolute_module); const USHORT length = strlen(absolute_module);
/* call search_for_module with the supplied name, /* call search_for_module with the supplied name,
and if unsuccessful, then with <name>.sl . */ and if unsuccessful, then with <name>.sl . */
mod = search_for_module(absolute_module, name); mod = search_for_module(absolute_module, name);
if (!mod) if (!mod)
@ -756,7 +759,7 @@ FPTR_INT ISC_lookup_entrypoint(TEXT* module,
const USHORT length = strlen(absolute_module); const USHORT length = strlen(absolute_module);
/* call search_for_module with the supplied name, /* call search_for_module with the supplied name,
and if unsuccessful, then with <name>.so . */ and if unsuccessful, then with <name>.so . */
mod = search_for_module(absolute_module, name); mod = search_for_module(absolute_module, name);
@ -765,7 +768,7 @@ FPTR_INT ISC_lookup_entrypoint(TEXT* module,
mod = search_for_module(absolute_module, name); mod = search_for_module(absolute_module, name);
} }
if (!mod) { // Start looking for "libxxxx.so" module names if (!mod) { // Start looking for "libxxxx.so" module names
string moduleName = "lib"; string moduleName = "lib";
moduleName += (const char*) absolute_module; moduleName += (const char*) absolute_module;
mod = search_for_module((TEXT*) moduleName.c_str(), name); mod = search_for_module((TEXT*) moduleName.c_str(), name);
@ -1008,7 +1011,7 @@ FPTR_INT ISC_lookup_entrypoint(TEXT* module,
* *
* Functional description * Functional description
* Lookup entrypoint of function. * Lookup entrypoint of function.
* If ib_path_env_var is defined, make sure * If ib_path_env_var is defined, make sure
* that the module is in the path defined * that the module is in the path defined
* by that environment variable. * by that environment variable.
* *
@ -1635,4 +1638,4 @@ static int condition_handler(int *sig, int *mech, int *enbl)
#endif #endif
} // extern "C" } // extern "C"

8
src/jrd/gdsold.h
View File

@ -19,6 +19,9 @@
* *
* All Rights Reserved. * All Rights Reserved.
* Contributor(s): ______________________________________. * Contributor(s): ______________________________________.
*
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "EPSON" define
*
*/ */
@ -901,7 +904,6 @@ const char gds_info_forced_writes = 52;
#define gds__info_db_impl_isc_next 46 #define gds__info_db_impl_isc_next 46
#define gds__info_db_impl_isc_dos 47 #define gds__info_db_impl_isc_dos 47
#define gds__info_db_impl_isc_winnt 48 #define gds__info_db_impl_isc_winnt 48
#define gds__info_db_impl_isc_epson 49
#define gds__info_db_class_access 1 #define gds__info_db_class_access 1
#define gds__info_db_class_y_valve 2 #define gds__info_db_class_y_valve 2
@ -951,7 +953,6 @@ const char gds_info_db_impl_isc_delta = 45;
const char gds_info_db_impl_isc_next = 46; const char gds_info_db_impl_isc_next = 46;
const char gds_info_db_impl_isc_dos = 47; const char gds_info_db_impl_isc_dos = 47;
const char gds_info_db_impl_isc_winnt = 48; const char gds_info_db_impl_isc_winnt = 48;
const char gds_info_db_impl_isc_epson = 49;
const char gds_info_db_class_access = 1; const char gds_info_db_class_access = 1;
const char gds_info_db_class_y_valve = 2; const char gds_info_db_class_y_valve = 2;
@ -967,9 +968,6 @@ const char gds_info_db_class_cache = 12;
#endif #endif
/*****************************/ /*****************************/
/* Request information items */ /* Request information items */
/*****************************/ /*****************************/

10
src/jrd/ibase.h
View File

@ -19,10 +19,13 @@
* All Rights Reserved. * All Rights Reserved.
* Contributor(s): ______________________________________. * Contributor(s): ______________________________________.
* Added TCP_NO_DELAY option for superserver on Linux * Added TCP_NO_DELAY option for superserver on Linux
* FSG 16.03.2001 * FSG 16.03.2001
*/ */
/* /*
$Id: ibase.h,v 1.4 2001-12-24 02:50:51 tamlin Exp $ $Id: ibase.h,v 1.5 2002-02-16 02:21:27 seanleyne Exp $
*
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "EPSON" define
*
*/ */
#ifndef JRD_IBASE_H #ifndef JRD_IBASE_H
@ -63,7 +66,7 @@ $Id: ibase.h,v 1.4 2001-12-24 02:50:51 tamlin Exp $
/******************************************************************/ /******************************************************************/
#define ISC_EXPORT GDS_EXPORT #define ISC_EXPORT GDS_EXPORT
#define ISC_FAR #define ISC_FAR
#if (defined(_MSC_VER) && defined(_WIN32)) || \ #if (defined(_MSC_VER) && defined(_WIN32)) || \
(defined(__BORLANDC__) && (defined(__WIN32__) || defined(__OS2__))) (defined(__BORLANDC__) && (defined(__WIN32__) || defined(__OS2__)))
@ -1529,7 +1532,6 @@ ISC_STATUS ISC_EXPORT isc_suspend_window(ISC_STATUS ISC_FAR*,
#define isc_info_db_impl_isc_next 46 #define isc_info_db_impl_isc_next 46
#define isc_info_db_impl_isc_dos 47 #define isc_info_db_impl_isc_dos 47
#define isc_info_db_impl_isc_winnt 48 #define isc_info_db_impl_isc_winnt 48
#define isc_info_db_impl_isc_epson 49
#define isc_info_db_class_access 1 #define isc_info_db_class_access 1
#define isc_info_db_class_y_valve 2 #define isc_info_db_class_y_valve 2

5
src/jrd/isc_file.cpp
View File

@ -19,6 +19,9 @@
* *
* All Rights Reserved. * All Rights Reserved.
* Contributor(s): ______________________________________. * Contributor(s): ______________________________________.
*
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "EPSON" define
*
*/ */
#ifdef SHLIB_DEFS #ifdef SHLIB_DEFS
@ -93,7 +96,7 @@ typedef struct itm {
#define MTAB "/etc/mnttab" #define MTAB "/etc/mnttab"
#endif #endif
#if (defined SOLARIS || defined M88K || defined UNIXWARE || defined NCR3000 || defined EPSON) #if (defined SOLARIS || defined M88K || defined UNIXWARE || defined NCR3000)
#define SV_MNTENT #define SV_MNTENT
#define NON_MNTENT #define NON_MNTENT
#include <sys/mnttab.h> #include <sys/mnttab.h>

8
src/jrd/isc_ipc.cpp
View File

@ -20,9 +20,12 @@
* All Rights Reserved. * All Rights Reserved.
* Contributor(s): ______________________________________. * Contributor(s): ______________________________________.
* Solaris x86 changes - Konstantin Kuznetsov, Neil McCalden * Solaris x86 changes - Konstantin Kuznetsov, Neil McCalden
*
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "EPSON" define
*
*/ */
/* $Id: isc_ipc.cpp,v 1.6 2001-12-24 02:50:51 tamlin Exp $ */ /* $Id: isc_ipc.cpp,v 1.7 2002-02-16 02:21:27 seanleyne Exp $ */
#ifdef SHLIB_DEFS #ifdef SHLIB_DEFS
#define LOCAL_SHLIB_DEFS #define LOCAL_SHLIB_DEFS
@ -100,9 +103,6 @@ typedef void (*CLIB_ROUTINE SIG_FPTR) ();
#define GT_32_SIGNALS #define GT_32_SIGNALS
#define HANDLER_ADDR_ARG #define HANDLER_ADDR_ARG
#endif #endif
#ifdef EPSON
#define HANDLER_ADDR_ARG
#endif
#ifdef UNIXWARE #ifdef UNIXWARE
#define HANDLER_ADDR_ARG #define HANDLER_ADDR_ARG
#endif #endif

11
src/jrd/jio.cpp
View File

@ -19,6 +19,9 @@
* *
* All Rights Reserved. * All Rights Reserved.
* Contributor(s): ______________________________________. * Contributor(s): ______________________________________.
*
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "EPSON" define
*
*/ */
/* NOTE that this module is used only on platforms that use /* NOTE that this module is used only on platforms that use
@ -59,10 +62,6 @@
#include <fcntl.h> #include <fcntl.h>
#endif #endif
#ifdef EPSON
#include <fcntl.h>
#endif
#ifdef PC_PLATFORM #ifdef PC_PLATFORM
#include <fcntl.h> #include <fcntl.h>
#include <sys/stat.h> #include <sys/stat.h>
@ -298,7 +297,7 @@ JIO_put(journal, message, size)
break; break;
} }
/* Compute next available block. If there isn't room in this segment, write a /* Compute next available block. If there isn't room in this segment, write a
dummy block to take the extra space, then allocate new data segment. */ dummy block to take the extra space, then allocate new data segment. */
block = block_number(data.data_items.segment, data.data_items.block); block = block_number(data.data_items.segment, data.data_items.block);
@ -1465,4 +1464,4 @@ static vms_convert(journal, data, mode, wait)
return TRUE; return TRUE;
} }
#endif #endif

9
src/jrd/license.h
View File

@ -19,7 +19,7 @@
* *
* All Rights Reserved. * All Rights Reserved.
* Contributor(s): ______________________________________. * Contributor(s): ______________________________________.
* $Id: license.h,v 1.4 2002-02-16 01:58:24 seanleyne Exp $ * $Id: license.h,v 1.5 2002-02-16 02:21:27 seanleyne Exp $
* Revision 1.5 2000/12/08 16:18:21 fsg * Revision 1.5 2000/12/08 16:18:21 fsg
* Preliminary changes to get IB_BUILD_NO automatically * Preliminary changes to get IB_BUILD_NO automatically
* increased on commits. * increased on commits.
@ -35,6 +35,7 @@
* now be done in 'builds_win32/original/build_no.ksh'. * now be done in 'builds_win32/original/build_no.ksh'.
* *
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "MAC" and "MAC_CP" defines * 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "MAC" and "MAC_CP" defines
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "EPSON" define
* *
*/ */
@ -169,10 +170,6 @@
#endif #endif
#endif #endif
#ifdef EPSON
#define FB_PLATFORM "EP" /* epson */
#endif
#ifdef ALPHA_NT #ifdef ALPHA_NT
#define FB_PLATFORM "AN" /* Alpha NT */ #define FB_PLATFORM "AN" /* Alpha NT */
#endif #endif
@ -214,4 +211,4 @@
#define GDS_VERSION FB_PLATFORM "-" FB_BUILD_TYPE FB_MAJOR_VER "." FB_MINOR_VER "." FB_REV_NO "." FB_BUILD_NO " " FB_BUILD_SUFFIX #define GDS_VERSION FB_PLATFORM "-" FB_BUILD_TYPE FB_MAJOR_VER "." FB_MINOR_VER "." FB_REV_NO "." FB_BUILD_NO " " FB_BUILD_SUFFIX
#endif #endif
#endif /* _JRD_LICENSE_H_ */ #endif /* _JRD_LICENSE_H_ */

7
src/jrd/llio.cpp
View File

@ -19,6 +19,9 @@
* *
* All Rights Reserved. * All Rights Reserved.
* Contributor(s): ______________________________________. * Contributor(s): ______________________________________.
*
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "EPSON" define
*
*/ */
#include "firebird.h" #include "firebird.h"
@ -67,7 +70,7 @@
# endif # endif
#endif #endif
#if (defined IMP || defined EPSON || defined sparc) #if (defined IMP || defined sparc)
#include <unistd.h> #include <unistd.h>
#endif #endif
@ -114,7 +117,7 @@ int LLIO_allocate_file_space(
* Open (create if necessary) the given file and write 'size' * Open (create if necessary) the given file and write 'size'
* number of bytes to it. Each byte is initialized to * number of bytes to it. Each byte is initialized to
* the passed fill_char. If 'overwrite' is FALSE and the file * the passed fill_char. If 'overwrite' is FALSE and the file
* already exists, return FAILURE. * already exists, return FAILURE.
* *
* This routine may be used to make sure that the file already * This routine may be used to make sure that the file already
* has enough space allocated to it. * has enough space allocated to it.

9
src/jrd/pag.cpp
View File

@ -19,6 +19,9 @@
* *
* All Rights Reserved. * All Rights Reserved.
* Contributor(s): ______________________________________. * Contributor(s): ______________________________________.
*
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "EPSON" define
*
*/ */
/* /*
@ -96,7 +99,7 @@ static BOOLEAN find_type(SLONG, WIN *, PAG *, USHORT, USHORT, UCHAR **,
1 Apollo 68K, Dn 10K 1 Apollo 68K, Dn 10K
2 Sun 68k, Sun Sparc, HP 9000/300, MAC AUX, IMP, DELTA, NeXT, UNIXWARE, DG_X86 2 Sun 68k, Sun Sparc, HP 9000/300, MAC AUX, IMP, DELTA, NeXT, UNIXWARE, DG_X86
3 Sun 386i, XENIX, EPSON 3 Sun 386i, XENIX
4 VMS 4 VMS
5 Ultrix/VAX 5 Ultrix/VAX
6 Ultrix/MIPS 6 Ultrix/MIPS
@ -211,10 +214,6 @@ static BOOLEAN find_type(SLONG, WIN *, PAG *, USHORT, USHORT, UCHAR **,
#define CLASS 8 #define CLASS 8
#endif #endif
#ifdef EPSON
#define CLASS 3
#endif
#ifdef DECOSF #ifdef DECOSF
#define CLASS 15 #define CLASS 15
#endif #endif

9
src/jrd/svc.cpp
View File

@ -19,6 +19,9 @@
* *
* All Rights Reserved. * All Rights Reserved.
* Contributor(s): ______________________________________. * Contributor(s): ______________________________________.
*
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "EPSON" define
*
*/ */
#include "firebird.h" #include "firebird.h"
@ -77,16 +80,18 @@
#include <vfork.h> #include <vfork.h>
#endif #endif
#endif #endif
#if (defined DELTA || defined IMP) #if (defined DELTA || defined IMP)
#include <fcntl.h> #include <fcntl.h>
#include <sys/types.h> #include <sys/types.h>
#endif #endif
#if (defined EPSON || defined SCO_UNIX)
#ifdef SCO_UNIX
#include <fcntl.h> #include <fcntl.h>
#endif #endif
/* This is defined in JRD/SCL.H, but including it causes /* This is defined in JRD/SCL.H, but including it causes
* a linker warning. * a linker warning.
*/ */
#define SYSDBA_USER_NAME "SYSDBA" #define SYSDBA_USER_NAME "SYSDBA"
#define SVC_user_dba 2 #define SVC_user_dba 2

23
src/jrd/utl.cpp
View File

@ -19,6 +19,9 @@
* *
* All Rights Reserved. * All Rights Reserved.
* Contributor(s): ______________________________________. * Contributor(s): ______________________________________.
*
* 2002.02.15 Sean Leyne - Code Cleanup is required of obsolete "EPSON" port
*
*/ */
#ifdef SHLIB_DEFS #ifdef SHLIB_DEFS
@ -330,7 +333,7 @@ int API_ROUTINE gds__blob_size(
{ {
/************************************** /**************************************
* *
* g d s _ $ b l o b _ s i z e * g d s _ $ b l o b _ s i z e
* *
************************************** **************************************
* *
@ -401,8 +404,8 @@ void API_ROUTINE_VARARG isc_expand_dpb(SCHAR ** dpb, SSHORT * dpb_size, ...)
* *
* Functional description * Functional description
* Extend a database parameter block dynamically * Extend a database parameter block dynamically
* to include runtime info. Generated * to include runtime info. Generated
* by gpre to provide host variable support for * by gpre to provide host variable support for
* READY statement options. * READY statement options.
* This expects the list of variable args * This expects the list of variable args
* to be zero terminated. * to be zero terminated.
@ -424,7 +427,7 @@ void API_ROUTINE_VARARG isc_expand_dpb(SCHAR ** dpb, SSHORT * dpb_size, ...)
va_list args; va_list args;
USHORT type; USHORT type;
/* calculate length of database parameter block, /* calculate length of database parameter block,
setting initial length to include version */ setting initial length to include version */
if (!*dpb || !(new_dpb_length = *dpb_size)) if (!*dpb || !(new_dpb_length = *dpb_size))
@ -541,10 +544,10 @@ int API_ROUTINE isc_modify_dpb(SCHAR** dpb,
* *
* Functional description * Functional description
* Extend a database parameter block dynamically * Extend a database parameter block dynamically
* to include runtime info. Generated * to include runtime info. Generated
* by gpre to provide host variable support for * by gpre to provide host variable support for
* READY statement options. * READY statement options.
* This expects one arg at a time. * This expects one arg at a time.
* the length of the string is passed by the caller and hence * the length of the string is passed by the caller and hence
* is not expected to be null terminated. * is not expected to be null terminated.
* this call is a variation of isc_expand_dpb without a variable * this call is a variation of isc_expand_dpb without a variable
@ -554,8 +557,8 @@ int API_ROUTINE isc_modify_dpb(SCHAR** dpb,
* parameters either nulled or with proper value and type. * parameters either nulled or with proper value and type.
* *
* **** This can be modified to be so at a later date, making sure * **** This can be modified to be so at a later date, making sure
* **** all callers follow the same convention * **** all callers follow the same convention
* *
* Note: dpb_size is signed short only for compatibility * Note: dpb_size is signed short only for compatibility
* with other calls (isc_attach_database) that take a dpb length. * with other calls (isc_attach_database) that take a dpb length.
* *
@ -563,7 +566,7 @@ int API_ROUTINE isc_modify_dpb(SCHAR** dpb,
SSHORT length, new_dpb_length; SSHORT length, new_dpb_length;
UCHAR *new_dpb, *p, *q; UCHAR *new_dpb, *p, *q;
/* calculate length of database parameter block, /* calculate length of database parameter block,
setting initial length to include version */ setting initial length to include version */
if (!*dpb || !(new_dpb_length = *dpb_size)) if (!*dpb || !(new_dpb_length = *dpb_size))

7
src/lock/lock.h
View File

@ -19,6 +19,9 @@
* *
* All Rights Reserved. * All Rights Reserved.
* Contributor(s): ______________________________________. * Contributor(s): ______________________________________.
*
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "EPSON" define
*
*/ */
#ifndef _ISC_LOCK_LOCK_H_ #ifndef _ISC_LOCK_LOCK_H_
@ -81,10 +84,6 @@
#define EXTEND_SIZE 32768 #define EXTEND_SIZE 32768
#endif #endif
#ifdef EPSON
#define SEMAPHORES 10
#endif
#ifdef M88K #ifdef M88K
#define SEMAPHORES 10 #define SEMAPHORES 10
#endif #endif

141
src/make.new/Makefile.in.firebird
View File

@ -1,4 +1,4 @@
# #
# The contents of this file are subject to the Mozilla Public # The contents of this file are subject to the Mozilla Public
# License Version 1.1 (the "License"); you may not use this file # License Version 1.1 (the "License"); you may not use this file
# except in compliance with the License. You may obtain a copy of # except in compliance with the License. You may obtain a copy of
@ -8,26 +8,29 @@
# "GPL"), in which case the provisions of the GPL are applicable # "GPL"), in which case the provisions of the GPL are applicable
# instead of those above. You may obtain a copy of the Licence at # instead of those above. You may obtain a copy of the Licence at
# http://www.gnu.org/copyleft/gpl.html # http://www.gnu.org/copyleft/gpl.html
# #
# This program is distributed in the hope that it will be useful, # This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# Relevant for more details. # Relevant for more details.
# #
# This file was created by members of the firebird development team. # This file was created by members of the firebird development team.
# All individual contributions remain the Copyright (C) of those # All individual contributions remain the Copyright (C) of those
# individuals. Contributors to this file are either listed here or # individuals. Contributors to this file are either listed here or
# can be obtained from a CVS history command. # can be obtained from a CVS history command.
# #
# All rights reserved. # All rights reserved.
# #
# Created by: Mark O'Donohue <mark.odonohue@ludwig.edu.au> # Created by: Mark O'Donohue <mark.odonohue@ludwig.edu.au>
# #
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.firebird,v 1.13 2002-01-06 13:06:36 skywalker Exp $ # $Id: Makefile.in.firebird,v 1.14 2002-02-16 02:21:27 seanleyne Exp $
# #
# 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "EPSON" define
#
#
ROOT=.. ROOT=..
@ -56,7 +59,7 @@ export LD_LIBRARY_PATH
dirs = alice burp dudley dsql extlib gpre intl isql journal jrd lock msgs \ dirs = alice burp dudley dsql extlib gpre intl isql journal jrd lock msgs \
pyxis qli remote super/remote utilities wal pyxis qli remote super/remote utilities wal
.PHONY: firebird super_firebird $(dirs) .PHONY: firebird super_firebird $(dirs)
@ -66,9 +69,9 @@ firebird: updateBuildNum phase1 phase2 phase3
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
# jrd/build_no.h contains the version and build# fields used throughout the # jrd/build_no.h contains the version and build# fields used throughout the
# program and quoted in the tools. This routine will update the build_no.h # program and quoted in the tools. This routine will update the build_no.h
# file with the auto update build# script file, writeBuildNum.sh. The # file with the auto update build# script file, writeBuildNum.sh. The
# writeBuildNum.sh script is autoupdated by CVS checkins. # writeBuildNum.sh script is autoupdated by CVS checkins.
# #
.PHONY: updateBuildNum .PHONY: updateBuildNum
@ -81,10 +84,10 @@ jrd/build_no.h : misc/writeBuildNum.sh
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# Phase1: make a gpre_static from scratch so we can parse .e and .epp files # Phase1: make a gpre_static from scratch so we can parse .e and .epp files
# to build the rest of the system. It goes in two bits make a real simple # to build the rest of the system. It goes in two bits make a real simple
# gpre_boot one and use that to build a gpre_static one. # gpre_boot one and use that to build a gpre_static one.
# #
# gpre_static has a fair bit more in it and we have now actually built most # gpre_static has a fair bit more in it and we have now actually built most
# of the libraries. With gpre_static we now have enough to build gbak and # of the libraries. With gpre_static we now have enough to build gbak and
# start restoring databases. # start restoring databases.
# #
# if $(BIN)/gpre_static exists then phase1 is complete. phase1 does not then # if $(BIN)/gpre_static exists then phase1 is complete. phase1 does not then
@ -92,7 +95,7 @@ jrd/build_no.h : misc/writeBuildNum.sh
# only need on gpre_static to boot after we have one we don't care. # only need on gpre_static to boot after we have one we don't care.
# (If you really want to rebuild it you need to remove the executable file # (If you really want to rebuild it you need to remove the executable file
# $(BIN)/gpre_static). # $(BIN)/gpre_static).
# #
.PHONY: phase1 phase1_build jrd_boot gpre_boot gpre_static .PHONY: phase1 phase1_build jrd_boot gpre_boot gpre_static
@ -125,11 +128,11 @@ fbmem_boot :
#-------------------------------------------------------------------------- #--------------------------------------------------------------------------
#Phase2: We can now start build some of the static utilities needed to build #Phase2: We can now start build some of the static utilities needed to build
# an empty database (lock manager and create_db). Then we rebuild all the # an empty database (lock manager and create_db). Then we rebuild all the
# items we have built in the static library into a dynamic library. # items we have built in the static library into a dynamic library.
# (It's probably possible to directly build the dynamic library - but thats # (It's probably possible to directly build the dynamic library - but thats
# for another day). We still don't have the security database stuff. # for another day). We still don't have the security database stuff.
# #
# Phase2 is complete with the building of an isc4.gdb user store database # Phase2 is complete with the building of an isc4.gdb user store database
# in order to do that isql and gdef tools need to be built without security # in order to do that isql and gdef tools need to be built without security
# to do that a special alt_boot.o is inserted into the shared library. # to do that a special alt_boot.o is inserted into the shared library.
@ -140,10 +143,10 @@ fbmem_boot :
.PHONY: create_db gds_lock_manager refDatabases .PHONY: create_db gds_lock_manager refDatabases
phase2 : $(ISC_GDB) phase2 : $(ISC_GDB)
$(ISC_GDB): utilities/isc4.sql utilities/isc4.gdl $(ISC_GDB): utilities/isc4.sql utilities/isc4.gdl
$(MAKE) phase2_build $(MAKE) phase2_build
phase2_build: build_alt_use_boot create_db gds_lock_manager empty_db gbak_static \ phase2_build: build_alt_use_boot create_db gds_lock_manager empty_db gbak_static \
ref_databases jrdlib_main gfix gbak gdef msgs isql \ ref_databases jrdlib_main gfix gbak gdef msgs isql \
@ -168,7 +171,7 @@ gbak_static : empty_db
ref_databases : gbak_static ref_databases : gbak_static
$(MAKE) -C refDatabases $@ $(MAKE) -C refDatabases $@
jrdlib_dependencies : jrdlib_dependencies :
$(MAKE) -C jrd $@ $(MAKE) -C jrd $@
$(MAKE) -C dsql $@ $(MAKE) -C dsql $@
$(MAKE) -C lock $@ $(MAKE) -C lock $@
@ -196,11 +199,11 @@ isc4.gdb: gdef isql # build the security database
#-------------------------------------------------------------------------- #--------------------------------------------------------------------------
#Phase3: Now we start building the tools we are actually going to use #Phase3: Now we start building the tools we are actually going to use
# against the shared library. # against the shared library.
# an empty database (lock manager and create_db). Then we rebuild all the # an empty database (lock manager and create_db). Then we rebuild all the
# items we have built in the static library into a dynamic library. # items we have built in the static library into a dynamic library.
# (It's probably possible to directly build the dynamic library - but thats # (It's probably possible to directly build the dynamic library - but thats
# for another day). We still don't have the security database stuff. # for another day). We still don't have the security database stuff.
# #
# Notes: # Notes:
# mainly we need gdef and isql to be able to build isc4.gdb. I wonder # mainly we need gdef and isql to be able to build isc4.gdb. I wonder
# if we could reduce the tricky dependancy by restoring the isc4.gdb database # if we could reduce the tricky dependancy by restoring the isc4.gdb database
@ -221,7 +224,7 @@ build_alt_use_main: # alter header file so jrd/alt.cpp DOES use security.
sysdba_user gstat: # add sysdba user and build gstat program sysdba_user gstat: # add sysdba user and build gstat program
$(MAKE) -C utilities $@ $(MAKE) -C utilities $@
gfix: gfix:
$(MAKE) -C alice $@ # (alice - all-else ) $(MAKE) -C alice $@ # (alice - all-else )
@ -240,7 +243,7 @@ locks: # the lock manager for classic server
$(MAKE) -C lock all $(MAKE) -C lock all
qli: # the query line interpreter (predates sql interface) qli: # the query line interpreter (predates sql interface)
$(MAKE) -C qli allx $(MAKE) -C qli allx
inet_server: # the classic server inet_server: # the classic server
$(MAKE) -C remote inet_server $(MAKE) -C remote inet_server
@ -249,7 +252,7 @@ gpre: # c/c++ embedded SQL code precompiler
$(MAKE) -C gpre $@ $(MAKE) -C gpre $@
extlib: # user define functions extlib: # user define functions
$(MAKE) -C extlib all $(MAKE) -C extlib all
includes: include_generic # distribution include files (this one in this file) includes: include_generic # distribution include files (this one in this file)
@ -278,12 +281,12 @@ include_generic: $(INCLUDE_DEST)/ib_util.h \
# ib_util.h actually is a marker for a number of headers # ib_util.h actually is a marker for a number of headers
# All these files are #includes in gds.h here we cat them all together # All these files are #includes in gds.h here we cat them all together
# and remove the embedded #includes to make it simpler for external usage. # and remove the embedded #includes to make it simpler for external usage.
GDS_ExtraFiles = misc/gds_header.txt include/fb_types.h \ GDS_ExtraFiles = misc/gds_header.txt include/fb_types.h \
jrd/ibase.h jrd/blr.h include/gen/iberror.h \ jrd/ibase.h jrd/blr.h include/gen/iberror.h \
jrd/gdsold.h include/gen/codes.h jrd/gdsold.h include/gen/codes.h
SRC_GDS_ExtraFiles = $(addprefix $(SRC_ROOT)/, $(GDS_ExtraFiles)) SRC_GDS_ExtraFiles = $(addprefix $(SRC_ROOT)/, $(GDS_ExtraFiles))
@ -307,7 +310,7 @@ $(INCLUDE_DEST)/ibase.h: $(SRC_IBASE_ExtraFiles)
# Copy all the other headers to the distribution directory. we use # Copy all the other headers to the distribution directory. we use
# ib_util.h as the marker for all the files. # ib_util.h as the marker for all the files.
OtherDistribHeaders = extlib/ib_util.h \ OtherDistribHeaders = extlib/ib_util.h \
jrd/perf.h \ jrd/perf.h \
@ -320,7 +323,7 @@ $(INCLUDE_DEST)/ib_util.h : $(SRC_OtherDistribHeaders)
$(CP) $^ $(INCLUDE_DEST)/ $(CP) $^ $(INCLUDE_DEST)/
# There are also gds*f and gds*ada header files around if someone # There are also gds*f and gds*ada header files around if someone
# wants them. You might need to hunt around in the old cvs tree for them. # wants them. You might need to hunt around in the old cvs tree for them.
@ -328,11 +331,11 @@ $(INCLUDE_DEST)/ib_util.h : $(SRC_OtherDistribHeaders)
#___________________________________________________________________________ #___________________________________________________________________________
# When the msgs.gdb dataabse has changed with new messages a number of header # When the msgs.gdb dataabse has changed with new messages a number of header
# files need to be regenerated. This is the target to do it. These new # files need to be regenerated. This is the target to do it. These new
# header files (placed in include/gen) then need to be committed since they # header files (placed in include/gen) then need to be committed since they
# are not generally rebuilt from scratch # are not generally rebuilt from scratch
rebuild_codes : rebuild_codes :
$(MAKE) -C jrd $@ $(MAKE) -C jrd $@
@ -357,7 +360,7 @@ $(FIREBIRD)/misc/% :: $(SRC_ROOT)/install/misc/%
#___________________________________________________________________________ #___________________________________________________________________________
# #
CLASSIC_ScriptFiles = CSchangeRunUser.sh CSrestoreRootRunUser.sh changeDBAPassword.sh CLASSIC_ScriptFiles = CSchangeRunUser.sh CSrestoreRootRunUser.sh changeDBAPassword.sh
SUPER_ScriptFiles = SSchangeRunUser.sh SSrestoreRootRunUser.sh changeDBAPassword.sh SUPER_ScriptFiles = SSchangeRunUser.sh SSrestoreRootRunUser.sh changeDBAPassword.sh
@ -385,7 +388,7 @@ $(BIN)/% :: $(SRC_ROOT)/install/misc/%
# Just a note that some of the script files (xinetd/firebird etc) need to h # Just a note that some of the script files (xinetd/firebird etc) need to h
# have their paths changed in their shell scripts. # have their paths changed in their shell scripts.
#___________________________________________________________________________ #___________________________________________________________________________
# #
.PHONY: install .PHONY: install
@ -414,10 +417,10 @@ clean: clean_objs clean_libs clean_exes clean_dbs clean_build
clean_objs: clean_objs:
-echo $(GDSLIB_Objects) | xargs rm -f -echo $(GDSLIB_Objects) | xargs rm -f
-echo $(GDSLIB_SharedObjects) | xargs rm -f -echo $(GDSLIB_SharedObjects) | xargs rm -f
-rm */*\.o -rm */*\.o
-rm */*\.lo -rm */*\.lo
-rm */*\.j -rm */*\.j
-rm */*\.bin -rm */*\.bin
-rm */*\.d -rm */*\.d
clean_libs: clean_libs:
@ -535,7 +538,7 @@ EXTERNAL_P_OBJECTS= $(CSI_P_OBJS) dsql_p_objects lock.bin $(PYXIS_P_OBJS) rem_p_
SRC_DIRS= alice burp dudley dsql extlib gpre intl isql journal jrd lock msgs \ SRC_DIRS= alice burp dudley dsql extlib gpre intl isql journal jrd lock msgs \
pyxis qli remote super/remote utilities wal pyxis qli remote super/remote utilities wal
GPRE= $(OBJS)/firebird/bin/gpre GPRE= $(OBJS)/firebird/bin/gpre
GPRE_BOOT= $(OBJS)/firebird/bin/gpre_boot GPRE_BOOT= $(OBJS)/firebird/bin/gpre_boot
@ -560,9 +563,9 @@ CODES=source/jrd/codes
#FSG 093000 #FSG 093000
# The only difference between firebird and super_firebird is the executables # The only difference between firebird and super_firebird is the executables
# target and in there super just had one more target "super_targets". The # target and in there super just had one more target "super_targets". The
# difference used to be done via a parameter passed into this makefile, but # difference used to be done via a parameter passed into this makefile, but
# I've put the change here to reduce the complexity of the build script files. # I've put the change here to reduce the complexity of the build script files.
# MOD 07-Apr-2001. # MOD 07-Apr-2001.
# I've taken run_codes out pending a decision on how to handle the codes thing # I've taken run_codes out pending a decision on how to handle the codes thing
@ -592,7 +595,7 @@ super_executables: alice burp dudley gpre superMiscFiles $(INTL) isql locks \
super_targets pyxis qli remote spit utilities \ super_targets pyxis qli remote spit utilities \
$(SHARED_AM) $(LINKABLE_LIBS) $(SHARED_AM) $(LINKABLE_LIBS)
super_targets: s_run_codes s_alice s_burp s_dba s_security_c super_client super_server super_utils super_targets: s_run_codes s_alice s_burp s_dba s_security_c super_client super_server super_utils
#phase1: ISC_USER = sysdba #phase1: ISC_USER = sysdba
#phase1: ISC_PASSWORD = masterkey #phase1: ISC_PASSWORD = masterkey
@ -624,7 +627,7 @@ run_codes: force
# NOTE: "journals" removed from "executables" as it currently doesn't # NOTE: "journals" removed from "executables" as it currently doesn't
# build and isn't used for V4 anyway. # build and isn't used for V4 anyway.
# 1995-June-7 David Schnepper # 1995-June-7 David Schnepper
@ -746,7 +749,7 @@ gdslib.apollo: $(GPRE) $(EXTERNAL_OBJECTS) pyxislib force
$(QUIET_ECHO) "Building GDSLIB..." $(QUIET_ECHO) "Building GDSLIB..."
$(CD) $(OBJS)/jrd && $(MAKE) $(SUBMAKE_FLAGS) gdslib $(CD) $(OBJS)/jrd && $(MAKE) $(SUBMAKE_FLAGS) gdslib
gdslib.decosf gdslib.sgi gdslib.epson : \ gdslib.decosf gdslib.sgi : \
$(GPRE) $(EXTERNAL_OBJECTS) $(GDS_PYXIS) force $(GPRE) $(EXTERNAL_OBJECTS) $(GDS_PYXIS) force
$(QUIET_ECHO) "Building GDSLIB..." $(QUIET_ECHO) "Building GDSLIB..."
$(CD) $(OBJS)/jrd && $(MAKE) $(SUBMAKE_FLAGS) gds.so.o $(CD) $(OBJS)/jrd && $(MAKE) $(SUBMAKE_FLAGS) gds.so.o
@ -757,7 +760,7 @@ gdslib.linux: \
$(CD) $(OBJS)/jrd && $(MAKE) $(SUBMAKE_FLAGS) gds.so.linux $(CD) $(OBJS)/jrd && $(MAKE) $(SUBMAKE_FLAGS) gds.so.linux
gdslib.dylib: \ gdslib.dylib: \
$(GPRE) $(EXTERNAL_OBJECTS) $(GDS_PYXIS) force $(GPRE) $(EXTERNAL_OBJECTS) $(GDS_PYXIS) force
$(QUIET_ECHO) "Building GDSLIB..." $(QUIET_ECHO) "Building GDSLIB..."
$(CD) $(OBJS)/jrd && $(MAKE) $(SUBMAKE_FLAGS) gds.dylib $(CD) $(OBJS)/jrd && $(MAKE) $(SUBMAKE_FLAGS) gds.dylib
@ -833,9 +836,9 @@ gds.a.solaris: force
#$(GPRE_BOOT) $(GPRE_STATIC): force #$(GPRE_BOOT) $(GPRE_STATIC): force
# $(CD) $(OBJS)/gpre && $(MAKE) $(SUBMAKE_FLAGS) $@ # $(CD) $(OBJS)/gpre && $(MAKE) $(SUBMAKE_FLAGS) $@
# Run the codes program (for SUPERSERVER hierarchy), # Run the codes program (for SUPERSERVER hierarchy),
# thus generating codes.h, iberror.h, etc # thus generating codes.h, iberror.h, etc
s_run_codes: s_run_codes:
# force $(CODES) # force $(CODES)
$(QUIET_ECHO) "Running codes in super ..." $(QUIET_ECHO) "Running codes in super ..."
# $(SH) '$(CD) source/super/jrd; $(CODES)' # $(SH) '$(CD) source/super/jrd; $(CODES)'
@ -1056,8 +1059,8 @@ darwin_installer_common: force
$(CP) $(SOURCE)/sandbox/bellardo/darwin/makefile \ $(CP) $(SOURCE)/sandbox/bellardo/darwin/makefile \
$(OBJS)/firebird/installer_tmp $(OBJS)/firebird/installer_tmp
ln -s $(OBJS)/firebird/bellardo/darwin \ ln -s $(OBJS)/firebird/bellardo/darwin \
$(OBJS)/firebird/installer_tmp/files $(OBJS)/firebird/installer_tmp/files
ln -s ../.. $(OBJS)/firebird/installer_tmp/source ln -s ../.. $(OBJS)/firebird/installer_tmp/source
$(CD) $(OBJS)/firebird/installer_tmp && $(MAKE) install_package $(CD) $(OBJS)/firebird/installer_tmp && $(MAKE) install_package
$(RM) -rf $(OBJS)/firebird/installer_tmp $(RM) -rf $(OBJS)/firebird/installer_tmp
-$(RM) -rf $(OBJS)/firebird/Firebird.framework -$(RM) -rf $(OBJS)/firebird/Firebird.framework
@ -1096,23 +1099,23 @@ makedepend:
source/qli/depends.mak \ source/qli/depends.mak \
source/remote/depends.mak \ source/remote/depends.mak \
source/utilities/depends.mak \ source/utilities/depends.mak \
source/wal/depends.mak source/wal/depends.mak
$(SH) '$(CD) source/alice; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak' $(SH) '$(CD) source/alice; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak'
$(SH) '$(CD) source/burp; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak' $(SH) '$(CD) source/burp; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak'
$(SH) '$(CD) source/csv; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak' $(SH) '$(CD) source/csv; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak'
$(SH) '$(CD) source/dsql; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak' $(SH) '$(CD) source/dsql; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak'
$(SH) '$(CD) source/dudley; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak' $(SH) '$(CD) source/dudley; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak'
$(SH) '$(CD) source/gpre; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak' $(SH) '$(CD) source/gpre; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak'
$(SH) '$(CD) source/intl; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak' $(SH) '$(CD) source/intl; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak'
$(SH) '$(CD) source/lock; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak' $(SH) '$(CD) source/lock; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak'
$(SH) '$(CD) source/isql; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak' $(SH) '$(CD) source/isql; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak'
$(SH) '$(CD) source/journal; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak' $(SH) '$(CD) source/journal; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak'
$(SH) '$(CD) source/jrd; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak' $(SH) '$(CD) source/jrd; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak'
$(SH) '$(CD) source/msgs; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak' $(SH) '$(CD) source/msgs; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak'
$(SH) '$(CD) source/qli; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak' $(SH) '$(CD) source/qli; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak'
$(SH) '$(CD) source/remote; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak' $(SH) '$(CD) source/remote; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak'
$(SH) '$(CD) source/utilities; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak' $(SH) '$(CD) source/utilities; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak'
$(SH) '$(CD) source/wal; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak' $(SH) '$(CD) source/wal; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak'
cleanx: clean_executables cleanx: clean_executables
-$(RM) \ -$(RM) \
@ -1166,7 +1169,7 @@ clean_objx:
rm $${ND}/*.a ; \ rm $${ND}/*.a ; \
rm $${ND}/*.j ; \ rm $${ND}/*.j ; \
rm $${ND}/*.bin ; \ rm $${ND}/*.bin ; \
done done
clean_build_gdbx: clean_build_gdbx:
-$(RM) \ -$(RM) \
source/example5/*.gdb \ source/example5/*.gdb \
@ -1177,7 +1180,7 @@ clean_build_gdbx:
# The installations need to find a better and possibly linux # The installations need to find a better and possibly linux
# specific home. The tar installs should probably work with # specific home. The tar installs should probably work with
# other unix type of systems. # other unix type of systems.
# I have seperated super and classic out since I needed different # I have seperated super and classic out since I needed different
@ -1231,4 +1234,4 @@ superrpmfile: force
FORCE: FORCE:
force: force:

79
src/make.new/Makefile.in.jrd
View File

@ -1,4 +1,4 @@
# #
# The contents of this file are subject to the Mozilla Public # The contents of this file are subject to the Mozilla Public
# License Version 1.1 (the "License"); you may not use this file # License Version 1.1 (the "License"); you may not use this file
# except in compliance with the License. You may obtain a copy of # except in compliance with the License. You may obtain a copy of
@ -8,26 +8,29 @@
# "GPL"), in which case the provisions of the GPL are applicable # "GPL"), in which case the provisions of the GPL are applicable
# instead of those above. You may obtain a copy of the Licence at # instead of those above. You may obtain a copy of the Licence at
# http://www.gnu.org/copyleft/gpl.html # http://www.gnu.org/copyleft/gpl.html
# #
# This program is distributed in the hope that it will be useful, # This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# Relevant for more details. # Relevant for more details.
# #
# This file was created by members of the firebird development team. # This file was created by members of the firebird development team.
# All individual contributions remain the Copyright (C) of those # All individual contributions remain the Copyright (C) of those
# individuals. Contributors to this file are either listed here or # individuals. Contributors to this file are either listed here or
# can be obtained from a CVS history command. # can be obtained from a CVS history command.
# #
# All rights reserved. # All rights reserved.
# #
# Created by: Mark O'Donohue <mark.odonohue@ludwig.edu.au> # Created by: Mark O'Donohue <mark.odonohue@ludwig.edu.au>
# #
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.jrd,v 1.10 2002-01-04 11:34:16 skywalker Exp $ # $Id: Makefile.in.jrd,v 1.11 2002-02-16 02:21:27 seanleyne Exp $
# #
# 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "EPSON" define
#
#
ROOT=../.. ROOT=../..
@ -40,7 +43,7 @@ include $(ROOT)/src/make.shared.variables
# jrd has it's own rule for using gpre to use gpre boot. # jrd has it's own rule for using gpre to use gpre boot.
# I would eventually like to set these based on a determination # I would eventually like to set these based on a determination
# if the file GPRE_STATIC exists or not. # if the file GPRE_STATIC exists or not.
GPRE_FLAGS = -n -z -gds_cxx -raw -ids GPRE_FLAGS = -n -z -gds_cxx -raw -ids
@ -59,7 +62,7 @@ GPRE_FLAGS = -n -z -gds_cxx -raw -ids
# This is the very first library built it contains just enough methods # This is the very first library built it contains just enough methods
# to enable a gpre_boot program to built. # to enable a gpre_boot program to built.
BOOT_Sources = dsc.cpp gds.cpp isc_ipc.cpp isc.cpp dls.cpp BOOT_Sources = dsc.cpp gds.cpp isc_ipc.cpp isc.cpp dls.cpp
BOOT_Objects = $(BOOT_Sources:%.cpp=$(OBJ)/%.o) BOOT_Objects = $(BOOT_Sources:%.cpp=$(OBJ)/%.o)
@ -86,27 +89,27 @@ jrdlib_dependencies: $(JRD_Objects)
# The jrdlib_main will equate to either the libgds.so or libgds.a # The jrdlib_main will equate to either the libgds.so or libgds.a
# depending upon choices made in make.rules and prefix.xxx where # depending upon choices made in make.rules and prefix.xxx where
# xxx is plaform. # xxx is plaform.
jrdlib_main : $(LIBGDS_LA) jrdlib_main : $(LIBGDS_LA)
#jrdlib_main : $(LIBGDS_SO) $(LIBGDS_A) #jrdlib_main : $(LIBGDS_SO) $(LIBGDS_A)
$(LIBGDS_SO) : $(GDSLIB_Objects) $(LIBGDS_SO) : $(GDSLIB_Objects)
$(LIB_LINK) $(LIBGDS_LINK_OPTIONS) -o $@ $^ $(LIB_LINK) $(LIBGDS_LINK_OPTIONS) -o $@ $^
-$(LN) $(@F) $(LIBGDS_SO_X_LNK) -$(LN) $(@F) $(LIBGDS_SO_X_LNK)
-$(LN) $(notdir $(LIBGDS_SO_X_LNK)) $(LIBGDS_SO_LNK) -$(LN) $(notdir $(LIBGDS_SO_X_LNK)) $(LIBGDS_SO_LNK)
$(LIBGDS_A) : $(GDSLIB_Objects) $(LIBGDS_A) : $(GDSLIB_Objects)
$(STATICLIB_LINK) $(LIBGDS_LINK_OPTIONS) $@ $^ $(STATICLIB_LINK) $(LIBGDS_LINK_OPTIONS) $@ $^
#____________________________________________________________________________ #____________________________________________________________________________
# #
# Everything below here is crap - well maybe that's an overstatement :-). # Everything below here is crap - well maybe that's an overstatement :-).
# It comes from the original sfx.jrd file and I've left it here for now # It comes from the original sfx.jrd file and I've left it here for now
# for reference until I finish rewriting the super server make. # for reference until I finish rewriting the super server make.
CSI_FILES= $(OBJS)/csv/csi.o $(OBJS)/csv/css.o CSI_FILES= $(OBJS)/csv/csi.o $(OBJS)/csv/css.o
@ -147,7 +150,7 @@ CODES_FILES= $(OBJS)/firebird/include/gds_codes.pas \
# Temporarily removing $(BACKEND_BRIDGE_MISC) from SUPER_OBJECTS # Temporarily removing $(BACKEND_BRIDGE_MISC) from SUPER_OBJECTS
# Also, whatever SUPER_OBJECTS includes should be forced to build under # Also, whatever SUPER_OBJECTS includes should be forced to build under
# the 'super_server_objects' target. Currently DSQL, LOCK, REMOTE, # the 'super_server_objects' target. Currently DSQL, LOCK, REMOTE,
# WAL are included. INTL is not needed. # WAL are included. INTL is not needed.
SUPER_OBJECTS= $(DSQL_MISC) $(LOCK_MISC) \ SUPER_OBJECTS= $(DSQL_MISC) $(LOCK_MISC) \
$(REMOTE_MISC) \ $(REMOTE_MISC) \
@ -317,7 +320,7 @@ gdslib.so.1.0 $(SUN_GDSSHR): $(JRD_P_OBJECTS) flu.bin $(CSI_P_MISC) \
$(TOUCH) gdslib.so.1.0 $(TOUCH) gdslib.so.1.0
$(CHMOD_6) gdslib.so.1.0 $(CHMOD_6) gdslib.so.1.0
# If you really need this and can't do this via a define of NON_DL_COMPATIBLE # If you really need this and can't do this via a define of NON_DL_COMPATIBLE
# when building flu.cpp then this should work. # when building flu.cpp then this should work.
#JRD_P_OBJECTS := $(subst flu.bin, flu_non_dl.bin, $JRD_P_OBJECTS) #JRD_P_OBJECTS := $(subst flu.bin, flu_non_dl.bin, $JRD_P_OBJECTS)
@ -342,7 +345,7 @@ gdsflib.so.0.0 $(SUN_FUNCSHR): functions.bin
$(TOUCH) gdsflib.so.0.0 $(TOUCH) gdsflib.so.0.0
$(CHMOD_6) gdsflib.so.0.0 $(CHMOD_6) gdsflib.so.0.0
gds.so.o $(SGI_GDSSHR) $(DECOSF_GDSSHR) $(EPSON_GDSSHR) : \ gds.so.o $(SGI_GDSSHR) $(DECOSF_GDSSHR) : \
$(WHY_O) $(JRD_OBJECTS) $(DSQL_MISC) $(LOCK_MISC) \ $(WHY_O) $(JRD_OBJECTS) $(DSQL_MISC) $(LOCK_MISC) \
$(REMOTE_MISC) $(BRIDGE_MISC) \ $(REMOTE_MISC) $(BRIDGE_MISC) \
$(INTL_MISC) $(WAL_MISC) $(FUNCTIONS) $(SECURITY_MISC) $(INTL_MISC) $(WAL_MISC) $(FUNCTIONS) $(SECURITY_MISC)
@ -360,7 +363,7 @@ gds.so.o $(SGI_GDSSHR) $(DECOSF_GDSSHR) $(EPSON_GDSSHR) : \
gds.so.O $(SCO_EV_GDSSHR): \ gds.so.O $(SCO_EV_GDSSHR): \
$(WHY_O) $(JRD_OBJECTS) $(DSQL_MISC) $(LOCK_MISC) \ $(WHY_O) $(JRD_OBJECTS) $(DSQL_MISC) $(LOCK_MISC) \
$(REMOTE_MISC) $(BRIDGE_MISC) \ $(REMOTE_MISC) $(BRIDGE_MISC) \
$(INTL_MISC) $(WAL_MISC) $(SECURITY_MISC) $(INTL_MISC) $(WAL_MISC) $(SECURITY_MISC)
-$(RM) gds.so.O -$(RM) gds.so.O
ld $(LD_OPTS) libgds.so.0 $(ZDEFS) $(WHY_O) $(JRD_OBJECTS) \ ld $(LD_OPTS) libgds.so.0 $(ZDEFS) $(WHY_O) $(JRD_OBJECTS) \
$(DSQL_MISC) $(LOCK_MISC) $(REMOTE_MISC) $(BRIDGE_MISC) \ $(DSQL_MISC) $(LOCK_MISC) $(REMOTE_MISC) $(BRIDGE_MISC) \
@ -375,7 +378,7 @@ libgds.so gds.so.linux: \
$(JRD_P_OBJECTS) flu.bin $(CSI_P_MISC) $(DSQL_P_MISC) \ $(JRD_P_OBJECTS) flu.bin $(CSI_P_MISC) $(DSQL_P_MISC) \
$(LOCK_P_MISC) $(REMOTE_P_MISC) $(SECURITY_P_MISC) $(BRIDGE_P_MISC) \ $(LOCK_P_MISC) $(REMOTE_P_MISC) $(SECURITY_P_MISC) $(BRIDGE_P_MISC) \
$(INTL_P_MISC) $(WAL_P_MISC) \ $(INTL_P_MISC) $(WAL_P_MISC) \
$(FUNCTIONS) $(FUNCTIONS)
-$(RM) gds.so -$(RM) gds.so
ld $(LD_OPTS) $(ZDEFS) $(JRD_P_OBJECTS) flu.bin \ ld $(LD_OPTS) $(ZDEFS) $(JRD_P_OBJECTS) flu.bin \
$(CSI_P_MISC) $(DSQL_P_MISC) $(LOCK_P_MISC) \ $(CSI_P_MISC) $(DSQL_P_MISC) $(LOCK_P_MISC) \
@ -391,7 +394,7 @@ gds.so.0 $(DG_GDSSHR) $(DG_X86_GDSSHR) $(UNIXWARE_GDSSHR) $(NCR3000_GDSSHR): \
$(JRD_P_OBJECTS) flu.bin $(CSI_P_MISC) $(DSQL_P_MISC) \ $(JRD_P_OBJECTS) flu.bin $(CSI_P_MISC) $(DSQL_P_MISC) \
$(LOCK_P_MISC) $(REMOTE_P_MISC) $(SECURITY_P_MISC) $(BRIDGE_P_MISC) \ $(LOCK_P_MISC) $(REMOTE_P_MISC) $(SECURITY_P_MISC) $(BRIDGE_P_MISC) \
$(INTL_P_MISC) $(WAL_P_MISC) \ $(INTL_P_MISC) $(WAL_P_MISC) \
$(FUNCTIONS) $(FUNCTIONS)
-$(RM) gds.so.0 -$(RM) gds.so.0
ld $(LD_OPTS) libgds.so.0 $(ZDEFS) $(JRD_P_OBJECTS) flu.bin \ ld $(LD_OPTS) libgds.so.0 $(ZDEFS) $(JRD_P_OBJECTS) flu.bin \
$(CSI_P_MISC) $(DSQL_P_MISC) $(LOCK_P_MISC) \ $(CSI_P_MISC) $(DSQL_P_MISC) $(LOCK_P_MISC) \
@ -438,7 +441,7 @@ gdsmt.so.0: \
$(LOCK_P_MISC) \ $(LOCK_P_MISC) \
$(REMOTE_P_MISC) $(SECURITY_P_MISC) $(BRIDGE_P_MISC) \ $(REMOTE_P_MISC) $(SECURITY_P_MISC) $(BRIDGE_P_MISC) \
$(INTL_P_MISC) $(WAL_P_MISC) \ $(INTL_P_MISC) $(WAL_P_MISC) \
$(FUNCTIONS) $(FUNCTIONS)
-$(RM) gdsmt.so.0 -$(RM) gdsmt.so.0
ld $(LD_OPTS) libgdsmt.so.0 $(ZDEFS) $(JRD_P_OBJECTS) flu.bin \ ld $(LD_OPTS) libgdsmt.so.0 $(ZDEFS) $(JRD_P_OBJECTS) flu.bin \
$(CSI_P_MISC) $(DSQL_P_MISC) $(LOCK_P_MISC) \ $(CSI_P_MISC) $(DSQL_P_MISC) $(LOCK_P_MISC) \
@ -541,7 +544,7 @@ event_print.exe: print.o
gds.a: $(HEAD_OBJECTS) $(NOLINK_MACHINES) gds.a: $(HEAD_OBJECTS) $(NOLINK_MACHINES)
-$(RM) gds.a -$(RM) gds.a
$(AR) gds.a $(HEAD_OBJECTS) $(AR) gds.a $(HEAD_OBJECTS)
-ranlib gds.a -ranlib gds.a
$(CHMOD_6) gds.a $(CHMOD_6) gds.a
$(MV) gds.a $(HEAD_LIB) $(MV) gds.a $(HEAD_LIB)
@ -552,7 +555,7 @@ gds.a: $(HEAD_OBJECTS) $(NOLINK_MACHINES)
# to isolate clients that might use signals from threads. # to isolate clients that might use signals from threads.
# Note that its internal library name is libgds.so for compatibility # Note that its internal library name is libgds.so for compatibility
# with existing applications. # with existing applications.
gdspipe.so.0: $(HEAD_J_OBJECTS) gdspipe.so.0: $(HEAD_J_OBJECTS)
-$(RM) gdspipe.so.0 -$(RM) gdspipe.so.0
-$(RM) gds.so.0 -$(RM) gds.so.0
ld $(LD_OPTS) libgds.so.0 $(HEAD_J_OBJECTS) $(LD_LIBS_J) \ ld $(LD_OPTS) libgds.so.0 $(HEAD_J_OBJECTS) $(LD_LIBS_J) \
@ -567,7 +570,7 @@ gdspipe.so.0: $(HEAD_J_OBJECTS)
# which isn't optimal, but will function fine. # which isn't optimal, but will function fine.
gds.a.solaris: $(HEAD_J_OBJECTS) gds.a.solaris: $(HEAD_J_OBJECTS)
-$(RM) gds.a.solaris -$(RM) gds.a.solaris
$(AR) gds.a $(HEAD_J_OBJECTS) $(AR) gds.a $(HEAD_J_OBJECTS)
-ranlib gds.a -ranlib gds.a
$(CHMOD_6) gds.a $(CHMOD_6) gds.a
$(MV) gds.a $(HEAD_LIB) $(MV) gds.a $(HEAD_LIB)
@ -595,7 +598,7 @@ bridge.unix: gds_pipe
gds_pipe.a: $(FOOT_OBJECTS) $(NOLINK_MACHINES) gds_pipe.a: $(FOOT_OBJECTS) $(NOLINK_MACHINES)
-$(RM) gds_pipe.a -$(RM) gds_pipe.a
$(AR) gds_pipe.a $(FOOT_OBJECTS) $(AR) gds_pipe.a $(FOOT_OBJECTS)
-ranlib gds_pipe.a -ranlib gds_pipe.a
$(CHMOD_6) gds_pipe.a $(CHMOD_6) gds_pipe.a
$(MV) gds_pipe.a $(FOOT_LIB) $(MV) gds_pipe.a $(FOOT_LIB)
@ -645,7 +648,7 @@ $(CODES_FILES):
# different to the newly generated entries. # different to the newly generated entries.
# #
# There are also blrtable.h and ids.h which are generated as well. # There are also blrtable.h and ids.h which are generated as well.
# Regeneration is a manual thing, and you will need to # Regeneration is a manual thing, and you will need to
generated_headers: ensureRebuild rebuild_codes ../include/gen/blrtable.h ../include/gen/ids.h generated_headers: ensureRebuild rebuild_codes ../include/gen/blrtable.h ../include/gen/ids.h
@ -677,19 +680,19 @@ codes: codes.o $(STDIO) $(LIBGDS_DEP)
# Security requires a database to compile so it cannot be used until # Security requires a database to compile so it cannot be used until
# after gpre_static and gbak have been built. The alt.cpp file has a # after gpre_static and gbak have been built. The alt.cpp file has a
# -DPHASE_1_NO_SECURITY macro that disables compilaton of security # -DPHASE_1_NO_SECURITY macro that disables compilaton of security
# components. So the early _boot and _static builds use the boot one and # components. So the early _boot and _static builds use the boot one and
# the later ones rely on the complete alt.o. This is controlled by the # the later ones rely on the complete alt.o. This is controlled by the
# makefile building a different jrd/alt_use_sec.h at # makefile building a different jrd/alt_use_sec.h at
# BTW: Ann (and I think Jim as well) believe that the security # BTW: Ann (and I think Jim as well) believe that the security
# database has no business being applied at this level, and should be # database has no business being applied at this level, and should be
# removed or moved - MOD 22-7-2001 # removed or moved - MOD 22-7-2001
# The file alt.cpp can be built in two versions BOOT and normal, where # The file alt.cpp can be built in two versions BOOT and normal, where
# boot does not use the security database and the normal build does. # boot does not use the security database and the normal build does.
# We build a different header file from alt_use_sec.h.pre in the boot and # We build a different header file from alt_use_sec.h.pre in the boot and
# the post boot stages of the build. # the post boot stages of the build.
build_alt_use_boot: alt_use_sec.h.pre build_alt_use_boot: alt_use_sec.h.pre
sed '/^#undef PHASE_1_BUILD_NO_SECURITY_DB/s/undef/define/' < $^ > alt_use_sec.h sed '/^#undef PHASE_1_BUILD_NO_SECURITY_DB/s/undef/define/' < $^ > alt_use_sec.h
@ -703,10 +706,10 @@ build_alt_use_main: alt_use_sec.h.pre
# Some of these you have to wonderabout, since here are a number of files # Some of these you have to wonderabout, since here are a number of files
# that use DATABASE FILENAME = 'ODS.RDB' but ODS.RDB does not exsit # that use DATABASE FILENAME = 'ODS.RDB' but ODS.RDB does not exsit
# For that reason all the .epp files in this directory are compiled # For that reason all the .epp files in this directory are compiled
# with the following options. # with the following options.
# fun.epp they allow you to compile without having a database present. # fun.epp they allow you to compile without having a database present.
# The db file ODS.RDB (as used in fun.epp doesn't exist, and was not part # The db file ODS.RDB (as used in fun.epp doesn't exist, and was not part
# of the original 6.0 build). # of the original 6.0 build).
@ -766,9 +769,9 @@ iscb.bin: isc.cpp
$(CXX) -c $(PIC_FLAGS) $(CXX_INCLUDE_DIRS) $(VERSION_FLAG) -DBRIDGE $< -o $@ $(CXX) -c $(PIC_FLAGS) $(CXX_INCLUDE_DIRS) $(VERSION_FLAG) -DBRIDGE $< -o $@
# This is the one where dyn_def.epp produced dyn_def.cpp and then the sed # This is the one where dyn_def.epp produced dyn_def.cpp and then the sed
# script is run to remove a component of it. This is pretty ugly, and even # script is run to remove a component of it. This is pretty ugly, and even
# if we have to live with it, the makefile should be changed to make the # if we have to live with it, the makefile should be changed to make the
# dependencies clearer. # dependencies clearer.
$(SRC)/dyn_def.cpp : $(SRC)/dyn_def.epp $(SRC)/dyn_def.sed $(SRC)/dyn_def.cpp : $(SRC)/dyn_def.epp $(SRC)/dyn_def.sed
@ -798,4 +801,4 @@ Dependencies = $(AllObjects:.o=.d)
FORCE: FORCE:
-include $(Dependencies) -include $(Dependencies)

2
src/make.new/config/config.h.in
View File

@ -1,5 +1,6 @@
/* /*
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "MAC" and "MAC_CP" defines * 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "MAC" and "MAC_CP" defines
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "EPSON" define
*/ */
#ifndef AUTOCONFIG_H #ifndef AUTOCONFIG_H
@ -71,6 +72,5 @@
#undef UNIXWARE #undef UNIXWARE
#undef NCR3000 #undef NCR3000
#undef IMP #undef IMP
#undef EPSON
#endif #endif

83
src/makefiles/boot.sfx.interbase
View File

@ -14,11 +14,14 @@
# #
# All Rights Reserved. # All Rights Reserved.
# Contributor(s): ______________________________________. # Contributor(s): ______________________________________.
# #
# #
# Tom Coleman TMC Systems <tcoleman@autowares.com> # Tom Coleman TMC Systems <tcoleman@autowares.com>
# #
# $Id: boot.sfx.interbase,v 1.2 2001-12-24 02:50:52 tamlin Exp $ # $Id: boot.sfx.interbase,v 1.3 2002-02-16 02:21:27 seanleyne Exp $
#
# 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "EPSON" define
#
#== WARNING ============================================================== #== WARNING ==============================================================
@ -41,7 +44,7 @@ EXTERNAL_P_OBJECTS= $(CSI_P_OBJS) dsql_p_objects lock.bin $(PYXIS_P_OBJS) rem_p_
INCLUDE_DEST= source/interbase/include/ INCLUDE_DEST= source/interbase/include/
SRC_DIRS= alice burp dudley dsql extlib gpre intl isql journal jrd lock msgs \ SRC_DIRS= alice burp dudley dsql extlib gpre intl isql journal jrd lock msgs \
pyxis qli remote super/remote utilities wal pyxis qli remote super/remote utilities wal
GPRE= source/interbase/bin/gpre GPRE= source/interbase/bin/gpre
GBAK= source/interbase/bin/gbak GBAK= source/interbase/bin/gbak
@ -70,7 +73,7 @@ SCODES=super/source/jrd/codes
firebird: gds.h includes fireboot run_codes executables help msgs msgs_intl extlib examples completed firebird: gds.h includes fireboot run_codes executables help msgs msgs_intl extlib examples completed
# burp wanted to build gpre # burp wanted to build gpre
# we break this dependency # we break this dependency
# 1) build burp (gbak) # 1) build burp (gbak)
# 2) use gbak to create the message databases # 2) use gbak to create the message databases
@ -81,10 +84,10 @@ fireboot: burp boot_dbs msgs gpre
boot_dbs: $(GBAK) $(METADATA) $(MESSAGES) $(HELP) $(ISC) boot_dbs: $(GBAK) $(METADATA) $(MESSAGES) $(HELP) $(ISC)
$(METADATA): misc/metadata.gbak $(METADATA): misc/metadata.gbak
$(GBAK) -c misc/metadata.gbak $(METADATA) $(GBAK) -c misc/metadata.gbak $(METADATA)
$(ISC): misc/isc4.gbak $(ISC): misc/isc4.gbak
$(GBAK) -c misc/isc4.gbak $(ISC) $(GBAK) -c misc/isc4.gbak $(ISC)
$(MESSAGES): misc/msg.gbak $(MESSAGES): misc/msg.gbak
@ -94,7 +97,7 @@ $(HELP): misc/help.gbak
$(GBAK) -c misc/help.gbak $(HELP) $(GBAK) -c misc/help.gbak $(HELP)
all_example_dbs: example_dbs v4_dbs v5_dbs all_example_dbs: example_dbs v4_dbs v5_dbs
example_dbs: example_dbs:
$(ECHO) "- building example dbs" $(ECHO) "- building example dbs"
$(CD) $(REFDBPATH)/examples; \ $(CD) $(REFDBPATH)/examples; \
@ -107,7 +110,7 @@ example_dbs:
$(FBNewBuildBin)/gdef $(FBBuildRoot)/examples/c_guide.gdl; \ $(FBNewBuildBin)/gdef $(FBBuildRoot)/examples/c_guide.gdl; \
$(FBNewBuildBin)/gdef $(FBBuildRoot)/examples/stocks.gdl $(FBNewBuildBin)/gdef $(FBBuildRoot)/examples/stocks.gdl
touch example_dbs touch example_dbs
v4_dbs: v4_dbs:
$(ECHO) "- copying example files" $(ECHO) "- copying example files"
$(CP) example4/*.sql $(REFDBPATH)/example4 $(CP) example4/*.sql $(REFDBPATH)/example4
@ -122,12 +125,12 @@ v4_dbs:
$(SED) -e s/' year'/' proj_year'/g -e s/\(year/\(proj_year/g -e s/\(YEAR/\(PROJ_YEAR/g -e s/' DATE'/' TIMESTAMP'/g $(FBBuildRoot)/example4/intlddl.sql >intlddl.sql; \ $(SED) -e s/' year'/' proj_year'/g -e s/\(year/\(proj_year/g -e s/\(YEAR/\(PROJ_YEAR/g -e s/' DATE'/' TIMESTAMP'/g $(FBBuildRoot)/example4/intlddl.sql >intlddl.sql; \
$(FBNewBuildBin)/isql -i intlbld.sql $(FBNewBuildBin)/isql -i intlbld.sql
touch v4_dbs touch v4_dbs
# The following were not used but the source files exist # The following were not used but the source files exist
# (cd examples; $IBBin/gdef $IBSrc/examples/cs_load.gdl) # (cd examples; $IBBin/gdef $IBSrc/examples/cs_load.gdl)
# (cd examples; $IBBin/gdef $IBSrc/examples/sources.gdl) # (cd examples; $IBBin/gdef $IBSrc/examples/sources.gdl)
# (cd examples; $IBBin/gdef $IBSrc/examples/udf_trig.gdl) # (cd examples; $IBBin/gdef $IBSrc/examples/udf_trig.gdl)
v5_dbs: v5_dbs:
echo "- building examples5" echo "- building examples5"
$(CP) example5/*.sql $(REFDBPATH)/example5 $(CP) example5/*.sql $(REFDBPATH)/example5
@ -139,7 +142,7 @@ v5_dbs:
$(SED) -e s/' year'/' proj_year'/g -e s/' YEAR'/' PROJ_YEAR'/g -e s/' DATE'/' TIMESTAMP'/g $(FBBuildRoot)/example5/intlddl.sql >intlddl.sql; \ $(SED) -e s/' year'/' proj_year'/g -e s/' YEAR'/' PROJ_YEAR'/g -e s/' DATE'/' TIMESTAMP'/g $(FBBuildRoot)/example5/intlddl.sql >intlddl.sql; \
$(FBNewBuildBin)/isql -i intlbld.sql $(FBNewBuildBin)/isql -i intlbld.sql
touch v5_dbs touch v5_dbs
# Run the codes program, thus generating codes.h, iberror.h, etc # Run the codes program, thus generating codes.h, iberror.h, etc
# compare and copy the file only if the files are different # compare and copy the file only if the files are different
@ -151,24 +154,24 @@ run_codes: $(CODES)
$(SH) 'if [ ! -f $(INCLUDE_DEST)iberror.h ] ; then $(CP) source/jrd/iberror.h $(INCLUDE_DEST)iberror.h; fi' $(SH) 'if [ ! -f $(INCLUDE_DEST)iberror.h ] ; then $(CP) source/jrd/iberror.h $(INCLUDE_DEST)iberror.h; fi'
$(SH) '$(CMP) source/jrd/iberror.h $(INCLUDE_DEST)iberror.h; if [ $$? != 0 ]; then $(CP) source/jrd/iberror.h $(INCLUDE_DEST)iberror.h; fi' $(SH) '$(CMP) source/jrd/iberror.h $(INCLUDE_DEST)iberror.h; if [ $$? != 0 ]; then $(CP) source/jrd/iberror.h $(INCLUDE_DEST)iberror.h; fi'
$(CODES) : source/jrd/codes.e $(CODES) : source/jrd/codes.e
$(SH) '$(CD) source/jrd; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="$(SYSTEM)" codes' $(SH) '$(CD) source/jrd; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="$(SYSTEM)" codes'
# NOTE: "journals" removed from "executables" as it currently doesn't # NOTE: "journals" removed from "executables" as it currently doesn't
# build and isn't used for V4 anyway. # build and isn't used for V4 anyway.
# 1995-June-7 David Schnepper # 1995-June-7 David Schnepper
# removed pyxis 3-Aug-00 TMC # removed pyxis 3-Aug-00 TMC
#executables: alice burp dudley gpre miscFiles $(INTL) isql locks \ #executables: alice burp dudley gpre miscFiles $(INTL) isql locks \
$(SUPER_SERVER) pyxis qli remote spit utilities \ $(SUPER_SERVER) pyxis qli remote spit utilities \
$(SHARED_AM) $(LINKABLE_LIBS) $(SHARED_AM) $(LINKABLE_LIBS)
executables: alice dudley miscFiles $(INTL) isql locks \ executables: alice dudley miscFiles $(INTL) isql locks \
$(SUPER_SERVER) pyxis qli remote spit utilities \ $(SUPER_SERVER) pyxis qli remote spit utilities \
$(SHARED_AM) $(LINKABLE_LIBS) $(SHARED_AM) $(LINKABLE_LIBS)
super_firebird: gds.h includes fireboot super_targets dudley superMiscFiles $(INTL) isql locks qli remote spit help msgs msgs_intl dba gfix gsec security_db extlib examples completed super_firebird: gds.h includes fireboot super_targets dudley superMiscFiles $(INTL) isql locks qli remote spit help msgs msgs_intl dba gfix gsec security_db extlib examples completed
super_targets: s_run_codes s_alice s_burp s_dba s_security_c super_client super_server super_utils super_targets: s_run_codes s_alice s_burp s_dba s_security_c super_client super_server super_utils
#added completed according to inprise tree #added completed according to inprise tree
@ -266,7 +269,7 @@ gdslib.apollo: $(GPRE) $(EXTERNAL_OBJECTS) pyxislib force
$(QUIET_ECHO) "Building GDSLIB..." $(QUIET_ECHO) "Building GDSLIB..."
$(SH) '$(CD) source/jrd; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="$(SYSTEM)" gdslib' $(SH) '$(CD) source/jrd; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="$(SYSTEM)" gdslib'
gdslib.decosf gdslib.sgi gdslib.epson : \ gdslib.decosf gdslib.sgi : \
$(GPRE) $(EXTERNAL_OBJECTS) $(GDS_PYXIS) force $(GPRE) $(EXTERNAL_OBJECTS) $(GDS_PYXIS) force
$(QUIET_ECHO) "Building GDSLIB..." $(QUIET_ECHO) "Building GDSLIB..."
$(SH) '$(CD) source/jrd; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="$(SYSTEM)" gds.so.o' $(SH) '$(CD) source/jrd; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="$(SYSTEM)" gds.so.o'
@ -345,7 +348,7 @@ security_c: force
$(QUIET_ECHO) "Building security.c ..." $(QUIET_ECHO) "Building security.c ..."
$(SH) '$(CD) source/utilities; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="$(SYSTEM)" security.c' $(SH) '$(CD) source/utilities; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="$(SYSTEM)" security.c'
# Run the codes program (for SUPERSERVER hierarchy), # Run the codes program (for SUPERSERVER hierarchy),
# thus generating codes.h, iberror.h, etc # thus generating codes.h, iberror.h, etc
# Note the troubling, use of SCODES macro, and source/jrd/codes in the target # Note the troubling, use of SCODES macro, and source/jrd/codes in the target
# it's a hack to get around the directory structure stuff. # it's a hack to get around the directory structure stuff.
@ -353,7 +356,7 @@ s_run_codes: $(SCODES)
$(QUIET_ECHO) "Running codes in super ..." $(QUIET_ECHO) "Running codes in super ..."
$(SH) '$(CD) source/super/jrd; source/jrd/codes' $(SH) '$(CD) source/super/jrd; source/jrd/codes'
$(SCODES) : super/source/jrd/codes.e $(SCODES) : super/source/jrd/codes.e
$(SH) '$(CD) super/source/jrd; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="$(SYSTEM)" codes' $(SH) '$(CD) super/source/jrd; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="$(SYSTEM)" codes'
@ -436,7 +439,7 @@ include_sgi: include_generic
include_so: include_generic include_so: include_generic
$(CP) source/jrd/gds_sun.f $(INCLUDE_DEST)gds.f $(CP) source/jrd/gds_sun.f $(INCLUDE_DEST)gds.f
include_so_ada: include_generic include_so_ada: include_generic
# $(ECHO) "sm interbase_sol.a $(INCLUDE_DEST)interbase.a" >> sm_include # $(ECHO) "sm interbase_sol.a $(INCLUDE_DEST)interbase.a" >> sm_include
@ -671,24 +674,24 @@ makedepend:
source/qli/depends.mak \ source/qli/depends.mak \
source/remote/depends.mak \ source/remote/depends.mak \
source/utilities/depends.mak \ source/utilities/depends.mak \
source/wal/depends.mak source/wal/depends.mak
$(SH) '$(CD) source/alice; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak' $(SH) '$(CD) source/alice; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak'
$(SH) '$(CD) source/burp; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak' $(SH) '$(CD) source/burp; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak'
$(SH) '$(CD) source/csv; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak' $(SH) '$(CD) source/csv; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak'
$(SH) '$(CD) source/dsql; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak' $(SH) '$(CD) source/dsql; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak'
$(SH) '$(CD) source/dudley; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak' $(SH) '$(CD) source/dudley; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak'
$(SH) '$(CD) source/gpre; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak' $(SH) '$(CD) source/gpre; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak'
$(SH) '$(CD) source/intl; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak' $(SH) '$(CD) source/intl; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak'
$(SH) '$(CD) source/lock; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak' $(SH) '$(CD) source/lock; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak'
$(SH) '$(CD) source/isql; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak' $(SH) '$(CD) source/isql; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak'
$(SH) '$(CD) source/journal; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak' $(SH) '$(CD) source/journal; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak'
$(SH) '$(CD) source/jrd; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak' $(SH) '$(CD) source/jrd; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak'
$(SH) '$(CD) source/msgs; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak' $(SH) '$(CD) source/msgs; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak'
$(SH) '$(CD) source/qli; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak' $(SH) '$(CD) source/qli; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak'
$(SH) '$(CD) source/remote; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak' $(SH) '$(CD) source/remote; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak'
$(SH) '$(CD) source/utilities; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak' $(SH) '$(CD) source/utilities; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak'
$(SH) '$(CD) source/wal; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak' $(SH) '$(CD) source/wal; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak'
clean: clean_executables clean: clean_executables
-$(RM) \ -$(RM) \
source/burp/gbaklib.a \ source/burp/gbaklib.a \
@ -741,7 +744,7 @@ clean_obj:
rm $${ND}/*.a ; \ rm $${ND}/*.a ; \
rm $${ND}/*.j ; \ rm $${ND}/*.j ; \
rm $${ND}/*.bin ; \ rm $${ND}/*.bin ; \
done done
clean_build_gdb: clean_build_gdb:
-$(RM) \ -$(RM) \
@ -752,7 +755,7 @@ clean_build_gdb:
# The installations need to find a better and possibly linux # The installations need to find a better and possibly linux
# specific home. The tar installs should probably work with # specific home. The tar installs should probably work with
# other unix type of systems. # other unix type of systems.
# I have seperated super and classic out since I needed different # I have seperated super and classic out since I needed different

3
src/makefiles/config/config.h.in
View File

@ -1,5 +1,6 @@
/* /*
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "MAC" and "MAC_CP" defines * 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "MAC" and "MAC_CP" defines
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "EPSON" define
*/ */
#ifndef AUTOCONFIG_H #ifndef AUTOCONFIG_H
@ -61,7 +62,5 @@
#undef UNIXWARE #undef UNIXWARE
#undef NCR3000 #undef NCR3000
#undef IMP #undef IMP
#undef EPSON
#endif #endif

7
src/makefiles/prefix.epson
View File

@ -14,6 +14,10 @@
# #
# All Rights Reserved. # All Rights Reserved.
# Contributor(s): ______________________________________. # Contributor(s): ______________________________________.
#
# 2002.02.15 Sean Leyne - This module is now obsolete - "EPSON" port
#
.SUFFIXES: .c .e .SUFFIXES: .c .e
.e.c: .e.c:
$(GPRE) $(GPRE_FLAGS) $< $(GPRE) $(GPRE_FLAGS) $<
@ -59,7 +63,7 @@ INTL_PIC_FLAGS= $(CFLAGS)
INTL_TARGET= intl_shr_objs INTL_TARGET= intl_shr_objs
IO_OBJECTS= unix.o IO_OBJECTS= unix.o
JRD_MISC_OBJECTS= stubs.o JRD_MISC_OBJECTS= stubs.o
LANG_OBJECTS= LANG_OBJECTS=
LANGUAGES= cc cxx gdl1 make15 LANGUAGES= cc cxx gdl1 make15
LD_LIBS= -ldl LD_LIBS= -ldl
LD_OPTS= -G -h LD_OPTS= -G -h
@ -104,4 +108,3 @@ EXEC_EXT=
V3PRINTER= source/lock/printv3.o V3PRINTER= source/lock/printv3.o

70
src/makefiles/sfx.firebird
View File

@ -14,6 +14,10 @@
# #
# All Rights Reserved. # All Rights Reserved.
# Contributor(s): ______________________________________. # Contributor(s): ______________________________________.
#
# 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "EPSON" define
#
@SET_MAKE@ @SET_MAKE@
OBJS= objs OBJS= objs
@ -96,7 +100,7 @@ EXTERNAL_P_OBJECTS= $(CSI_P_OBJS) dsql_p_objects lock.bin $(PYXIS_P_OBJS) rem_p_
INCLUDE_DEST= $(OBJS)/firebird/include/ INCLUDE_DEST= $(OBJS)/firebird/include/
SRC_DIRS= alice burp dudley dsql extlib gpre intl isql journal jrd lock msgs \ SRC_DIRS= alice burp dudley dsql extlib gpre intl isql journal jrd lock msgs \
pyxis qli remote super/remote utilities wal pyxis qli remote super/remote utilities wal
GPRE= $(OBJS)/firebird/bin/gpre GPRE= $(OBJS)/firebird/bin/gpre
GPRE_BOOT= $(OBJS)/firebird/bin/gpre_boot GPRE_BOOT= $(OBJS)/firebird/bin/gpre_boot
@ -121,9 +125,9 @@ CODES=source/jrd/codes
#FSG 093000 #FSG 093000
# The only difference between firebird and super_firebird is the executables # The only difference between firebird and super_firebird is the executables
# target and in there super just had one more target "super_targets". The # target and in there super just had one more target "super_targets". The
# difference used to be done via a parameter passed into this makefile, but # difference used to be done via a parameter passed into this makefile, but
# I've put the change here to reduce the complexity of the build script files. # I've put the change here to reduce the complexity of the build script files.
# MOD 07-Apr-2001. # MOD 07-Apr-2001.
# I've taken run_codes out pending a decision on how to handle the codes thing # I've taken run_codes out pending a decision on how to handle the codes thing
@ -152,8 +156,8 @@ executables: alice burp dudley gpre miscFiles $(INTL) isql locks \
super_executables: alice burp dudley gpre superMiscFiles $(INTL) isql locks \ super_executables: alice burp dudley gpre superMiscFiles $(INTL) isql locks \
super_targets pyxis qli remote spit utilities \ super_targets pyxis qli remote spit utilities \
$(SHARED_AM) $(LINKABLE_LIBS) $(SHARED_AM) $(LINKABLE_LIBS)
super_targets: s_run_codes s_alice s_burp s_dba s_security_c super_client super_server super_utils super_targets: s_run_codes s_alice s_burp s_dba s_security_c super_client super_server super_utils
phase1: ISC_USER = sysdba phase1: ISC_USER = sysdba
phase1: ISC_PASSWORD = masterkey phase1: ISC_PASSWORD = masterkey
@ -180,7 +184,7 @@ run_codes: force
# NOTE: "journals" removed from "executables" as it currently doesn't # NOTE: "journals" removed from "executables" as it currently doesn't
# build and isn't used for V4 anyway. # build and isn't used for V4 anyway.
# 1995-June-7 David Schnepper # 1995-June-7 David Schnepper
@ -291,7 +295,7 @@ gds_server: $(ACCESS_METHOD) force
$(GDSSHR)_PHASE_2: force $(GDSSHR)_PHASE_2: force
$(QUIET_ECHO) "Building GDSSHR..." $(QUIET_ECHO) "Building GDSSHR..."
$(CD) $(OBJS)/jrd && $(MAKE) $(SUBMAKE_FLAGS) ALT_O="alt.o.ps1" ALT_BIN="alt.bin.ps1" SECURITY_MISC="" SECURITY_P_MISC="" $(GDSSHR) $(CD) $(OBJS)/jrd && $(MAKE) $(SUBMAKE_FLAGS) ALT_O="alt.o.ps1" ALT_BIN="alt.bin.ps1" SECURITY_MISC="" SECURITY_P_MISC="" $(GDSSHR)
$(GDSSHR): force $(GDSSHR): force
$(QUIET_ECHO) "Building GDSSHR..." $(QUIET_ECHO) "Building GDSSHR..."
$(CD) $(OBJS)/jrd && $(MAKE) $(SUBMAKE_FLAGS) DO_FORCE="force" $(GDSSHR) $(CD) $(OBJS)/jrd && $(MAKE) $(SUBMAKE_FLAGS) DO_FORCE="force" $(GDSSHR)
@ -304,7 +308,7 @@ gdslib.apollo: $(GPRE) $(EXTERNAL_OBJECTS) pyxislib force
$(QUIET_ECHO) "Building GDSLIB..." $(QUIET_ECHO) "Building GDSLIB..."
$(CD) $(OBJS)/jrd && $(MAKE) $(SUBMAKE_FLAGS) gdslib $(CD) $(OBJS)/jrd && $(MAKE) $(SUBMAKE_FLAGS) gdslib
gdslib.decosf gdslib.sgi gdslib.epson : \ gdslib.decosf gdslib.sgi : \
$(GPRE) $(EXTERNAL_OBJECTS) $(GDS_PYXIS) force $(GPRE) $(EXTERNAL_OBJECTS) $(GDS_PYXIS) force
$(QUIET_ECHO) "Building GDSLIB..." $(QUIET_ECHO) "Building GDSLIB..."
$(CD) $(OBJS)/jrd && $(MAKE) $(SUBMAKE_FLAGS) gds.so.o $(CD) $(OBJS)/jrd && $(MAKE) $(SUBMAKE_FLAGS) gds.so.o
@ -315,7 +319,7 @@ gdslib.linux: \
$(CD) $(OBJS)/jrd && $(MAKE) $(SUBMAKE_FLAGS) gds.so.linux $(CD) $(OBJS)/jrd && $(MAKE) $(SUBMAKE_FLAGS) gds.so.linux
gdslib.dylib: \ gdslib.dylib: \
$(GPRE) $(EXTERNAL_OBJECTS) $(GDS_PYXIS) force $(GPRE) $(EXTERNAL_OBJECTS) $(GDS_PYXIS) force
$(QUIET_ECHO) "Building GDSLIB..." $(QUIET_ECHO) "Building GDSLIB..."
$(CD) $(OBJS)/jrd && $(MAKE) $(SUBMAKE_FLAGS) gds.dylib $(CD) $(OBJS)/jrd && $(MAKE) $(SUBMAKE_FLAGS) gds.dylib
@ -391,9 +395,9 @@ security_c: force
$(GPRE_BOOT) $(GPRE_STATIC): force $(GPRE_BOOT) $(GPRE_STATIC): force
$(CD) $(OBJS)/gpre && $(MAKE) $(SUBMAKE_FLAGS) $@ $(CD) $(OBJS)/gpre && $(MAKE) $(SUBMAKE_FLAGS) $@
# Run the codes program (for SUPERSERVER hierarchy), # Run the codes program (for SUPERSERVER hierarchy),
# thus generating codes.h, iberror.h, etc # thus generating codes.h, iberror.h, etc
s_run_codes: s_run_codes:
# force $(CODES) # force $(CODES)
$(QUIET_ECHO) "Running codes in super ..." $(QUIET_ECHO) "Running codes in super ..."
# $(SH) '$(CD) source/super/jrd; $(CODES)' # $(SH) '$(CD) source/super/jrd; $(CODES)'
@ -468,7 +472,7 @@ include_sgi: include_generic
include_so: include_generic include_so: include_generic
$(CP) source/jrd/gds_sun.f $(INCLUDE_DEST)gds.f $(CP) source/jrd/gds_sun.f $(INCLUDE_DEST)gds.f
include_darwin: include_generic force include_darwin: include_generic force
$(RM) -rf $(FB_FRAMEWORK) $(RM) -rf $(FB_FRAMEWORK)
mkdir -p $(FB_FRAMEWORK)/Versions/A/Resources/English.lproj/var mkdir -p $(FB_FRAMEWORK)/Versions/A/Resources/English.lproj/var
@ -697,8 +701,8 @@ darwin_installer_common: force
$(CP) $(SOURCE)/sandbox/bellardo/darwin/makefile \ $(CP) $(SOURCE)/sandbox/bellardo/darwin/makefile \
$(OBJS)/firebird/installer_tmp $(OBJS)/firebird/installer_tmp
ln -s $(OBJS)/firebird/bellardo/darwin \ ln -s $(OBJS)/firebird/bellardo/darwin \
$(OBJS)/firebird/installer_tmp/files $(OBJS)/firebird/installer_tmp/files
ln -s ../.. $(OBJS)/firebird/installer_tmp/source ln -s ../.. $(OBJS)/firebird/installer_tmp/source
$(CD) $(OBJS)/firebird/installer_tmp && $(MAKE) install_package $(CD) $(OBJS)/firebird/installer_tmp && $(MAKE) install_package
$(RM) -rf $(OBJS)/firebird/installer_tmp $(RM) -rf $(OBJS)/firebird/installer_tmp
-$(RM) -rf $(OBJS)/firebird/Firebird.framework -$(RM) -rf $(OBJS)/firebird/Firebird.framework
@ -737,24 +741,24 @@ makedepend:
source/qli/depends.mak \ source/qli/depends.mak \
source/remote/depends.mak \ source/remote/depends.mak \
source/utilities/depends.mak \ source/utilities/depends.mak \
source/wal/depends.mak source/wal/depends.mak
$(SH) '$(CD) source/alice; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak' $(SH) '$(CD) source/alice; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak'
$(SH) '$(CD) source/burp; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak' $(SH) '$(CD) source/burp; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak'
$(SH) '$(CD) source/csv; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak' $(SH) '$(CD) source/csv; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak'
$(SH) '$(CD) source/dsql; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak' $(SH) '$(CD) source/dsql; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak'
$(SH) '$(CD) source/dudley; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak' $(SH) '$(CD) source/dudley; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak'
$(SH) '$(CD) source/gpre; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak' $(SH) '$(CD) source/gpre; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak'
$(SH) '$(CD) source/intl; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak' $(SH) '$(CD) source/intl; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak'
$(SH) '$(CD) source/lock; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak' $(SH) '$(CD) source/lock; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak'
$(SH) '$(CD) source/isql; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak' $(SH) '$(CD) source/isql; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak'
$(SH) '$(CD) source/journal; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak' $(SH) '$(CD) source/journal; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak'
$(SH) '$(CD) source/jrd; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak' $(SH) '$(CD) source/jrd; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak'
$(SH) '$(CD) source/msgs; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak' $(SH) '$(CD) source/msgs; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak'
$(SH) '$(CD) source/qli; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak' $(SH) '$(CD) source/qli; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak'
$(SH) '$(CD) source/remote; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak' $(SH) '$(CD) source/remote; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak'
$(SH) '$(CD) source/utilities; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak' $(SH) '$(CD) source/utilities; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak'
$(SH) '$(CD) source/wal; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak' $(SH) '$(CD) source/wal; $(MAKE) CFLAGS="$(CFLAGS)" depends.mak'
clean: clean_executables clean: clean_executables
-$(RM) \ -$(RM) \
$(OBJS)/burp/gbaklib.a \ $(OBJS)/burp/gbaklib.a \

35
src/makefiles/sfx.jrd
View File

@ -15,8 +15,11 @@
# All Rights Reserved. # All Rights Reserved.
# Contributor(s): ______________________________________. # Contributor(s): ______________________________________.
# #
# $Id: sfx.jrd,v 1.2 2001-12-24 02:50:52 tamlin Exp $ # $Id: sfx.jrd,v 1.3 2002-02-16 02:21:27 seanleyne Exp $
# #
# 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "EPSON" define
#
@SET_MAKE@ @SET_MAKE@
SOURCE= source SOURCE= source
OBJS= objs OBJS= objs
@ -181,7 +184,7 @@ JRD_J_MISC= alt.j gds.j isc.j isc_file.j isc_ipc.j isc_sync.j \
WHY_O= why.o WHY_O= why.o
WHYBK_O= whybk.o WHYBK_O= whybk.o
# I removed qatest.o from the targets to close an ugly # I removed qatest.o from the targets to close an ugly
# security hole. # security hole.
# FSG 18.Dez.2000 # FSG 18.Dez.2000
@ -242,7 +245,7 @@ CODES_FILES= $(OBJS)/firebird/include/gds_codes.pas \
# Temporarily removing $(BACKEND_BRIDGE_MISC) from SUPER_OBJECTS # Temporarily removing $(BACKEND_BRIDGE_MISC) from SUPER_OBJECTS
# Also, whatever SUPER_OBJECTS includes should be forced to build under # Also, whatever SUPER_OBJECTS includes should be forced to build under
# the 'super_server_objects' target. Currently DSQL, LOCK, REMOTE, # the 'super_server_objects' target. Currently DSQL, LOCK, REMOTE,
# WAL are included. INTL is not needed. # WAL are included. INTL is not needed.
SUPER_OBJECTS= $(DSQL_MISC) $(LOCK_MISC) \ SUPER_OBJECTS= $(DSQL_MISC) $(LOCK_MISC) \
$(REMOTE_MISC) $(REGISTER_MISC) \ $(REMOTE_MISC) $(REGISTER_MISC) \
@ -442,7 +445,7 @@ gdsflib.so.0.0 $(SUN_FUNCSHR): functions.bin
$(TOUCH) gdsflib.so.0.0 $(TOUCH) gdsflib.so.0.0
$(CHMOD_6) gdsflib.so.0.0 $(CHMOD_6) gdsflib.so.0.0
gds.so.o $(SGI_GDSSHR) $(DECOSF_GDSSHR) $(EPSON_GDSSHR) : \ gds.so.o $(SGI_GDSSHR) $(DECOSF_GDSSHR) : \
$(WHY_O) $(JRD_OBJECTS) $(CSI_MISC) $(DSQL_MISC) $(LOCK_MISC) \ $(WHY_O) $(JRD_OBJECTS) $(CSI_MISC) $(DSQL_MISC) $(LOCK_MISC) \
$(REMOTE_MISC) $(BRIDGE_MISC) $(REGISTER_MISC) \ $(REMOTE_MISC) $(BRIDGE_MISC) $(REGISTER_MISC) \
$(INTL_MISC) $(WAL_MISC) $(FUNCTIONS) $(GDSFLIB) $(SECURITY_MISC) $(INTL_MISC) $(WAL_MISC) $(FUNCTIONS) $(GDSFLIB) $(SECURITY_MISC)
@ -643,7 +646,7 @@ event_print.exe: print.o
gds.a: $(HEAD_OBJECTS) $(NOLINK_MACHINES) gds.a: $(HEAD_OBJECTS) $(NOLINK_MACHINES)
-$(RM) gds.a -$(RM) gds.a
$(AR) gds.a $(HEAD_OBJECTS) $(AR) gds.a $(HEAD_OBJECTS)
-ranlib gds.a -ranlib gds.a
$(CHMOD_6) gds.a $(CHMOD_6) gds.a
$(MV) gds.a $(HEAD_LIB) $(MV) gds.a $(HEAD_LIB)
@ -654,7 +657,7 @@ gds.a: $(HEAD_OBJECTS) $(NOLINK_MACHINES)
# to isolate clients that might use signals from threads. # to isolate clients that might use signals from threads.
# Note that its internal library name is libgds.so for compatibility # Note that its internal library name is libgds.so for compatibility
# with existing applications. # with existing applications.
gdspipe.so.0: $(HEAD_J_OBJECTS) gdspipe.so.0: $(HEAD_J_OBJECTS)
-$(RM) gdspipe.so.0 -$(RM) gdspipe.so.0
-$(RM) gds.so.0 -$(RM) gds.so.0
ld $(LD_OPTS) libgds.so.0 $(HEAD_J_OBJECTS) $(LD_LIBS_J) \ ld $(LD_OPTS) libgds.so.0 $(HEAD_J_OBJECTS) $(LD_LIBS_J) \
@ -669,7 +672,7 @@ gdspipe.so.0: $(HEAD_J_OBJECTS)
# which isn't optimal, but will function fine. # which isn't optimal, but will function fine.
gds.a.solaris: $(HEAD_J_OBJECTS) gds.a.solaris: $(HEAD_J_OBJECTS)
-$(RM) gds.a.solaris -$(RM) gds.a.solaris
$(AR) gds.a $(HEAD_J_OBJECTS) $(AR) gds.a $(HEAD_J_OBJECTS)
-ranlib gds.a -ranlib gds.a
$(CHMOD_6) gds.a $(CHMOD_6) gds.a
$(MV) gds.a $(HEAD_LIB) $(MV) gds.a $(HEAD_LIB)
@ -697,7 +700,7 @@ bridge.unix: gds_pipe
gds_pipe.a: $(FOOT_OBJECTS) $(NOLINK_MACHINES) gds_pipe.a: $(FOOT_OBJECTS) $(NOLINK_MACHINES)
-$(RM) gds_pipe.a -$(RM) gds_pipe.a
$(AR) gds_pipe.a $(FOOT_OBJECTS) $(AR) gds_pipe.a $(FOOT_OBJECTS)
-ranlib gds_pipe.a -ranlib gds_pipe.a
$(CHMOD_6) gds_pipe.a $(CHMOD_6) gds_pipe.a
$(MV) gds_pipe.a $(FOOT_LIB) $(MV) gds_pipe.a $(FOOT_LIB)
@ -786,7 +789,7 @@ alt.bin.ps1: alt.cpp \
apollo.o: apollo.cpp $(JRD_H) pio.h cch.h ods.h lck.h $(SOURCE)/lock/plserver.h apollo.o: apollo.cpp $(JRD_H) pio.h cch.h ods.h lck.h $(SOURCE)/lock/plserver.h
bookmark.o: bookmark.cpp $(JRD_H) $(EXE_H) $(RSE_H) \ bookmark.o: bookmark.cpp $(JRD_H) $(EXE_H) $(RSE_H) \
all_proto.h bookmark.h $(ERR_PROTO_DEP) err_proto.h evl_proto.h \ all_proto.h bookmark.h $(ERR_PROTO_DEP) err_proto.h evl_proto.h \
mov_proto.h $(THD_PROTO_H) mov_proto.h $(THD_PROTO_H)
blb.o: blb.cpp $(JRD_H) blb.h tra.h $(VAL_H) $(EXE_H) req.h ods.h lls.h \ blb.o: blb.cpp $(JRD_H) blb.h tra.h $(VAL_H) $(EXE_H) req.h ods.h lls.h \
blob_filter.h sdl.h ibsetjmp.h $(INTL_H) cch.h constants.h \ blob_filter.h sdl.h ibsetjmp.h $(INTL_H) cch.h constants.h \
all_proto.h blb_proto.h blf_proto.h cch_proto.h \ all_proto.h blb_proto.h blf_proto.h cch_proto.h \
@ -805,7 +808,7 @@ btr.o: btr.cpp $(JRD_H) ods.h btr.h $(VAL_H) req.h tra.h $(INTL_H) jrn.h \
all_proto.h btr_proto.h $(BTR_PROTO_DEP)$ cch_proto.h dpm_proto.h \ all_proto.h btr_proto.h $(BTR_PROTO_DEP)$ cch_proto.h dpm_proto.h \
$(ERR_PROTO_DEP) err_proto.h evl_proto.h intl_proto.h met_proto.h \ $(ERR_PROTO_DEP) err_proto.h evl_proto.h intl_proto.h met_proto.h \
mov_proto.h $(NAV_PROTO_H) pag_proto.h pcmet_proto.h \ mov_proto.h $(NAV_PROTO_H) pag_proto.h pcmet_proto.h \
sbm_proto.h sort_proto.h $(THD_PROTO_H) tra_proto.h sbm_proto.h sort_proto.h $(THD_PROTO_H) tra_proto.h
builtin.o: builtin.cpp \ builtin.o: builtin.cpp \
flu_proto.h gds_proto.h flu_proto.h gds_proto.h
cch.o: cch.cpp $(JRD_H) cch.h que.h lck.h ods.h jrn.h lls.h \ cch.o: cch.cpp $(JRD_H) cch.h que.h lck.h ods.h jrn.h lls.h \
@ -852,20 +855,20 @@ dfw.o: dfw.cpp $(JRD_H) $(VAL_H) irq.h tra.h btr.h req.h $(EXE_H) scl.h \
event_proto.h exe_proto.h gds_proto.h grant_proto.h \ event_proto.h exe_proto.h gds_proto.h grant_proto.h \
$(IDX_PROTO_H) intl_proto.h isc_f_proto.h $(LCK_PROTO_H) \ $(IDX_PROTO_H) intl_proto.h isc_f_proto.h $(LCK_PROTO_H) \
met_proto.h mov_proto.h pag_proto.h pcmet_proto.h \ met_proto.h mov_proto.h pag_proto.h pcmet_proto.h \
pio_proto.h scl_proto.h sdw_proto.h $(THD_PROTO_H) pio_proto.h scl_proto.h sdw_proto.h $(THD_PROTO_H)
divorce.o: divorce.cpp divorce.o: divorce.cpp
dls.o: dls.cpp sort.h dls_proto.h gds_proto.h dls.o: dls.cpp sort.h dls_proto.h gds_proto.h
dmp.o: dmp.cpp $(JRD_H) cch.h pag.h ods.h $(VAL_H) btr.h tra.h lck.h \ dmp.o: dmp.cpp $(JRD_H) cch.h pag.h ods.h $(VAL_H) btr.h tra.h lck.h \
ibsetjmp.h\ ibsetjmp.h\
cch_proto.h dmp_proto.h gds_proto.h cch_proto.h dmp_proto.h gds_proto.h
dpm.cpp: dpm.epp dpm.cpp: dpm.epp
dpm.o: dpm.cpp $(JRD_H) ods.h req.h sqz.h irq.h blb.h tra.h lls.h \ dpm.o: dpm.cpp $(JRD_H) ods.h req.h sqz.h irq.h blb.h tra.h lls.h \
cch.h jrn.h pag.h sbm.h $(RSE_H) lck.h vio_debug.h ibsetjmp.h\ cch.h jrn.h pag.h sbm.h $(RSE_H) lck.h vio_debug.h ibsetjmp.h\
all_proto.h cch_proto.h $(CMP_PROTO_DEP) cmp_proto.h dpm_proto.h \ all_proto.h cch_proto.h $(CMP_PROTO_DEP) cmp_proto.h dpm_proto.h \
$(ERR_PROTO_DEP) err_proto.h exe_proto.h met_proto.h mov_proto.h \ $(ERR_PROTO_DEP) err_proto.h exe_proto.h met_proto.h mov_proto.h \
pag_proto.h sqz_proto.h $(THD_PROTO_H) pag_proto.h sqz_proto.h $(THD_PROTO_H)
dsc.o: dsc.cpp dsc.h constants.h $(INTL_H) \ dsc.o: dsc.cpp dsc.h constants.h $(INTL_H) \
dsc_proto.h dsc_proto.h
dyn.cpp: dyn.epp dyn.cpp: dyn.epp
dyn.o: dyn.cpp $(JRD_H) tra.h scl.h drq.h flags.h lls.h all.h $(INTL_H) \ dyn.o: dyn.cpp $(JRD_H) tra.h scl.h drq.h flags.h lls.h all.h $(INTL_H) \
$(MET_H) btr.h ibsetjmp.h license.h\ $(MET_H) btr.h ibsetjmp.h license.h\
@ -932,7 +935,7 @@ evl.o: evl.cpp $(JRD_H) $(VAL_H) req.h $(EXE_H) sbm.h blb.h scl.h lck.h \
dsc_proto.h $(ERR_PROTO_DEP) err_proto.h evl_proto.h exe_proto.h \ dsc_proto.h $(ERR_PROTO_DEP) err_proto.h evl_proto.h exe_proto.h \
fun_proto.h intl_proto.h $(LCK_PROTO_H) mov_proto.h \ fun_proto.h intl_proto.h $(LCK_PROTO_H) mov_proto.h \
pag_proto.h rlck_proto.h rse_proto.h sbm_proto.h \ pag_proto.h rlck_proto.h rse_proto.h sbm_proto.h \
$(SCH_PROTO_H) scl_proto.h $(THD_PROTO_H) sort_proto.h $(SCH_PROTO_H) scl_proto.h $(THD_PROTO_H) sort_proto.h
exe.o: exe.cpp $(JRD_H) req.h $(VAL_H) $(EXE_H) tra.h btr.h $(RSE_H) \ exe.o: exe.cpp $(JRD_H) req.h $(VAL_H) $(EXE_H) tra.h btr.h $(RSE_H) \
lck.h $(INTL_H) blb.h ods.h rng.h sbm.h blr.h ibsetjmp.h \ lck.h $(INTL_H) blb.h ods.h rng.h sbm.h blr.h ibsetjmp.h \
all_proto.h bookmark.h blb_proto.h btr_proto.h $(BTR_PROTO_DEP) \ all_proto.h bookmark.h blb_proto.h btr_proto.h $(BTR_PROTO_DEP) \

21
src/pipe/head.cpp
View File

@ -19,11 +19,14 @@
* *
* All Rights Reserved. * All Rights Reserved.
* Contributor(s): ______________________________________. * Contributor(s): ______________________________________.
* Solaris x86 changes - Konstantin Kuznetsov, Neil McCalden * Solaris x86 changes - Konstantin Kuznetsov, Neil McCalden
*
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "EPSON" define
*
*/ */
/* $Id: head.cpp,v 1.4 2001-12-24 02:50:53 tamlin Exp $ */ /* $Id: head.cpp,v 1.5 2002-02-16 02:21:28 seanleyne Exp $ */
#include "firebird.h" #include "firebird.h"
#include "../jrd/ib_stdio.h" #include "../jrd/ib_stdio.h"
#include <stdlib.h> #include <stdlib.h>
@ -64,7 +67,7 @@
#include <fcntl.h> #include <fcntl.h>
#endif #endif
#if (defined DELTA || defined M88K || defined SCO_UNIX || defined EPSON) #if (defined DELTA || defined M88K || defined SCO_UNIX)
#include <fcntl.h> #include <fcntl.h>
#endif #endif
@ -133,7 +136,7 @@ static void release_sql_request (RSR);
static void release_transaction (RTR); static void release_transaction (RTR);
static STATUS send_blob (STATUS *, RBL, USHORT, UCHAR *); static STATUS send_blob (STATUS *, RBL, USHORT, UCHAR *);
static FILE *read_pipe = NULL, static FILE *read_pipe = NULL,
*write_pipe = NULL, *write_pipe = NULL,
*event_pipe = NULL; *event_pipe = NULL;
static int event_fd = -1; static int event_fd = -1;
@ -150,11 +153,11 @@ static RDB connection = NULL;
* a file lock/unlock for each character IO. This is a performance * a file lock/unlock for each character IO. This is a performance
* drain; however, the main reason for making the change is that * drain; however, the main reason for making the change is that
* getc&putc don't work on (at least) Solaris 2.4 with the -mt CC option. * getc&putc don't work on (at least) Solaris 2.4 with the -mt CC option.
* Our testing on Solaris revealed that the standard definitions * Our testing on Solaris revealed that the standard definitions
* of putc/getc would obtain bogus EOF indicators - which would * of putc/getc would obtain bogus EOF indicators - which would
* cause one end of the pipe connection to terminate after a message. * cause one end of the pipe connection to terminate after a message.
* *
* Note also that getc_unlocked & putc_unlocked are macros. * Note also that getc_unlocked & putc_unlocked are macros.
* *
* The man page for putc_unlocked/getc_unlocked state that we must * The man page for putc_unlocked/getc_unlocked state that we must
* do our own file locking to ensure that the usage is MT safe - * do our own file locking to ensure that the usage is MT safe -

39
src/remote/inet.cpp
View File

@ -20,10 +20,13 @@
* All Rights Reserved. * All Rights Reserved.
* Contributor(s): ______________________________________. * Contributor(s): ______________________________________.
* Added TCP_NO_DELAY option for superserver on Linux * Added TCP_NO_DELAY option for superserver on Linux
* FSG 16.03.2001 * FSG 16.03.2001
*
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "EPSON" define
*
*/ */
/* /*
$Id: inet.cpp,v 1.5 2002-01-04 11:34:16 skywalker Exp $ $Id: inet.cpp,v 1.6 2002-02-16 02:21:28 seanleyne Exp $
*/ */
#include "firebird.h" #include "firebird.h"
#include "../jrd/ib_stdio.h" #include "../jrd/ib_stdio.h"
@ -121,7 +124,7 @@ int h_errno; /* In Other platforms one of the system header files declares t
extern int h_errno; extern int h_errno;
#endif #endif
#if (defined EPSON || defined UNIXWARE || defined NCR3000 || defined M88K) #if (defined UNIXWARE || defined NCR3000 || defined M88K)
#include <sys/sockio.h> #include <sys/sockio.h>
#endif #endif
@ -162,7 +165,7 @@ extern int h_errno;
#define sleep(seconds) Sleep ((seconds) * 1000) #define sleep(seconds) Sleep ((seconds) * 1000)
typedef int socklen_t; typedef int socklen_t;
/* /*
** Winsock has a typedef for socket, so #define SOCKET to the typedef here ** Winsock has a typedef for socket, so #define SOCKET to the typedef here
** so that it won't be redefined below. ** so that it won't be redefined below.
*/ */
@ -880,7 +883,7 @@ PORT INET_analyze( TEXT* file_name,
port->port_protocol = packet->p_acpt.p_acpt_version; port->port_protocol = packet->p_acpt.p_acpt_version;
/* once we've decided on a protocol, concatenate the version /* once we've decided on a protocol, concatenate the version
string to reflect it... */ string to reflect it... */
sprintf(buffer, "%s/P%d", port->port_version->str_data, port->port_protocol); sprintf(buffer, "%s/P%d", port->port_version->str_data, port->port_protocol);
@ -1566,14 +1569,14 @@ static int accept_connection(PORT port, P_CNCT* cnct)
} }
{ {
/* If the environment varible ISC_INET_SERVER_HOME is set, /* If the environment varible ISC_INET_SERVER_HOME is set,
* change the home directory to the specified directory. * change the home directory to the specified directory.
* Note that this will overrule the normal setting of * Note that this will overrule the normal setting of
* the current directory to the effective user's home directory. * the current directory to the effective user's home directory.
* This feature was added primarily for testing via remote * This feature was added primarily for testing via remote
* loopback - but does seem to be of good general use, so * loopback - but does seem to be of good general use, so
* is activiated for the production product. * is activiated for the production product.
* 1995-February-27 David Schnepper * 1995-February-27 David Schnepper
*/ */
char* home = getenv("ISC_INET_SERVER_HOME"); char* home = getenv("ISC_INET_SERVER_HOME");
if (home) { if (home) {
@ -1826,7 +1829,7 @@ static PORT aux_request( PORT port, PACKET * packet)
************************************** **************************************
* *
* Functional description * Functional description
* A remote interface has requested the server prepare an auxiliary * A remote interface has requested the server prepare an auxiliary
* connection; the server calls aux_request to set up the connection. * connection; the server calls aux_request to set up the connection.
* *
**************************************/ **************************************/
@ -2192,7 +2195,7 @@ static void cleanup_port( PORT port)
{ {
/************************************** /**************************************
* *
* c l e a n u p _ p o r t * c l e a n u p _ p o r t
* *
************************************** **************************************
* *
@ -2358,9 +2361,9 @@ static int fork( SOCKET old_handle, USHORT flag)
//____________________________________________________________ //____________________________________________________________
// //
// Copy an array of p_cnct::p_cnct_repeat. // Copy an array of p_cnct::p_cnct_repeat.
// //
static void copy_p_cnct_repeat_array( p_cnct::p_cnct_repeat* pDest, static void copy_p_cnct_repeat_array( p_cnct::p_cnct_repeat* pDest,
const p_cnct::p_cnct_repeat* pSource, const p_cnct::p_cnct_repeat* pSource,
size_t nEntries) size_t nEntries)
@ -2459,7 +2462,7 @@ static int parse_line(
{ {
/***************************************************************** /*****************************************************************
* *
* p a r s e _ l i n e * p a r s e _ l i n e
* *
***************************************************************** *****************************************************************
* *
@ -2491,7 +2494,7 @@ static int parse_line(
if (strcmp(entry1, host_name)) if (strcmp(entry1, host_name))
#ifdef UNIX #ifdef UNIX
#if !(defined XENIX || defined EPSON || defined UNIXWARE || defined NCR3000) #if !(defined XENIX || defined UNIXWARE || defined NCR3000)
if (entry1[1] == '@') { if (entry1[1] == '@') {
if (!innetgr(&entry1[2], host_name, 0, 0)) if (!innetgr(&entry1[2], host_name, 0, 0))
return -1; return -1;
@ -2520,7 +2523,7 @@ static int parse_line(
/* if they're in the user group: + they're in, - they're out */ /* if they're in the user group: + they're in, - they're out */
#ifdef UNIX #ifdef UNIX
#if !(defined XENIX || defined EPSON || defined UNIXWARE || defined NCR3000) #if !(defined XENIX || defined UNIXWARE || defined NCR3000)
if (entry2[1] == '@') { if (entry2[1] == '@') {
if (innetgr(&entry2[2], 0, user_name, 0)) { if (innetgr(&entry2[2], 0, user_name, 0)) {
if (entry2[0] == '+') if (entry2[0] == '+')
@ -2529,7 +2532,7 @@ static int parse_line(
return FALSE; return FALSE;
} }
else { else {
/* if they're NOT in the user group AND we're excluding it /* if they're NOT in the user group AND we're excluding it
- they're in */ - they're in */
if (entry2[0] == '-') if (entry2[0] == '-')
@ -2566,9 +2569,9 @@ static PORT receive( PORT main_port, PACKET * packet)
if (!(main_port->port_server_flags & SRVR_multi_client)) { if (!(main_port->port_server_flags & SRVR_multi_client)) {
/* loop as long as we are receiving dummy packets, just /* loop as long as we are receiving dummy packets, just
throwing them away--note that if we are a server we won't throwing them away--note that if we are a server we won't
be receiving them, but it is better to check for them at be receiving them, but it is better to check for them at
this level rather than try to catch them in all places where this level rather than try to catch them in all places where
this routine is called */ this routine is called */
do { do {

17
src/remote/protocol.h
View File

@ -20,10 +20,13 @@
* All Rights Reserved. * All Rights Reserved.
* Contributor(s): ______________________________________. * Contributor(s): ______________________________________.
* Added TCP_NO_DELAY option for superserver on Linux * Added TCP_NO_DELAY option for superserver on Linux
* FSG 16.03.2001 * FSG 16.03.2001
*
* 2002.02.15 Sean Leyne - This module needs to be cleanedup to remove obsolete "EPSON" port/define
*
*/ */
/* /*
$Id: protocol.h,v 1.3 2001-12-24 02:50:53 tamlin Exp $ $Id: protocol.h,v 1.4 2002-02-16 02:21:28 seanleyne Exp $
*/ */
#ifndef _REMOTE_PROTOCOL_H_ #ifndef _REMOTE_PROTOCOL_H_
#define _REMOTE_PROTOCOL_H_ #define _REMOTE_PROTOCOL_H_
@ -57,9 +60,9 @@ $Id: protocol.h,v 1.3 2001-12-24 02:50:53 tamlin Exp $
#define PROTOCOL_VERSION8 8 #define PROTOCOL_VERSION8 8
/* Protocol 9 includes support for SPX32 /* Protocol 9 includes support for SPX32
SPX32 uses WINSOCK instead of Novell SDK SPX32 uses WINSOCK instead of Novell SDK
In order to differentiate between the old implementation In order to differentiate between the old implementation
of SPX and this one, different PROTOCOL VERSIONS are used */ of SPX and this one, different PROTOCOL VERSIONS are used */
#define PROTOCOL_VERSION9 9 #define PROTOCOL_VERSION9 9
@ -69,8 +72,8 @@ $Id: protocol.h,v 1.3 2001-12-24 02:50:53 tamlin Exp $
#define PROTOCOL_VERSION10 10 #define PROTOCOL_VERSION10 10
#ifdef SCROLLABLE_CURSORS #ifdef SCROLLABLE_CURSORS
This Protocol includes support for scrollable cursors This Protocol includes support for scrollable cursors
and is purposely being undefined so that changes can be made and is purposely being undefined so that changes can be made
to the remote protocol version to support new features without the 'fear' that to the remote protocol version to support new features without the 'fear' that
they will be turned off once SCROLLABLE_CURSORS is turned on. they will be turned off once SCROLLABLE_CURSORS is turned on.
@ -176,7 +179,7 @@ typedef enum
op_detach = 21, /* Detach database */ op_detach = 21, /* Detach database */
op_compile = 22, /* Request based operations */ op_compile = 22, /* Request based operations */
op_start = 23, op_start = 23,
op_start_and_send = 24, op_start_and_send = 24,
op_send = 25, op_send = 25,
op_receive = 26, op_receive = 26,
op_unwind = 27, op_unwind = 27,

8
src/remote/remote_def.h
View File

@ -19,6 +19,9 @@
* *
* All Rights Reserved. * All Rights Reserved.
* Contributor(s): ______________________________________. * Contributor(s): ______________________________________.
*
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "EPSON" define
*
*/ */
#ifndef _REMOTE_REMOTE_DEF_H_ #ifndef _REMOTE_REMOTE_DEF_H_
@ -108,10 +111,6 @@
#define ARCHITECTURE arch_sco_ev #define ARCHITECTURE arch_sco_ev
#endif #endif
#ifdef EPSON
#define ARCHITECTURE arch_epson
#endif
#ifdef _PPC_ #ifdef _PPC_
#define ARCHITECTURE arch_nt_ppc #define ARCHITECTURE arch_nt_ppc
#endif #endif
@ -155,4 +154,3 @@
#define SRVR_thread_per_port 2048 /* 0x0800 Bind thread to a port */ #define SRVR_thread_per_port 2048 /* 0x0800 Bind thread to a port */
#define SRVR_no_icon 4096 /* 0x1000 Tell the server not to show the icon */ #define SRVR_no_icon 4096 /* 0x1000 Tell the server not to show the icon */
#endif /* _REMOTE_REMOTE_DEF_H_ */ #endif /* _REMOTE_REMOTE_DEF_H_ */