mirror of
https://github.com/FirebirdSQL/firebird.git
synced 2025-01-22 16:43:03 +01:00
Get rid of SCO.
This commit is contained in:
robocop
parent
28d3c00fe7
commit
dea57e9099
66
configure.in
66
configure.in
@ -39,7 +39,7 @@ dnl Use /usr/lib for library links on most platforms except some 64-bit ones
|
||||
libdir=/usr/lib
|
||||
ICU_PLATFORM=LinuxRedHat
|
||||
|
||||
dnl Should system editline and/or icu be used
|
||||
dnl Should system editline and/or icu be used
|
||||
STD_EDITLINE=false
|
||||
STD_ICU=false
|
||||
RPM64=
|
||||
@ -104,7 +104,7 @@ dnl ICU_PLATFORM=AIXPPCXLC
|
||||
;;
|
||||
|
||||
*-*-freebsd*)
|
||||
MAKEFILE_PREFIX=freebsd
|
||||
MAKEFILE_PREFIX=freebsd
|
||||
PLATFORM=FREEBSD
|
||||
AC_DEFINE(FREEBSD, 1, [Define this if OS is FreeBSD])
|
||||
EDITLINE_FLG=Y
|
||||
@ -277,14 +277,6 @@ dnl ICU_PLATFORM=AIXPPCXLC
|
||||
RT_LIB_CHECK=true
|
||||
;;
|
||||
|
||||
i*-sni-sysv4)
|
||||
MAKEFILE_PREFIX=sinixz
|
||||
PLATFORM="SINIX-Z"
|
||||
AC_DEFINE(SINIXZ, 1, [Define this if OS is SINIX-Z])
|
||||
EDITLINE_FLG=Y
|
||||
SHRLIB_EXT=so
|
||||
;;
|
||||
|
||||
*-*-mingw*)
|
||||
MAKEFILE_PREFIX=mingw
|
||||
PLATFORM=win32
|
||||
@ -516,7 +508,7 @@ if test "$ac_cv_header_unistd_h" = "yes"; then
|
||||
dnl http://people.redhat.com/drepper/posix-option-groups.html
|
||||
AC_MSG_CHECKING(if POSIX threads are available)
|
||||
AC_TRY_RUN([#include <unistd.h>
|
||||
main () {
|
||||
main () {
|
||||
#if defined(_POSIX_THREADS) && _POSIX_THREADS >= 200112L
|
||||
exit(0);
|
||||
#else
|
||||
@ -539,6 +531,7 @@ AC_CHECK_HEADERS(socket.h sys/socket.h sys/sockio.h winsock2.h)
|
||||
AC_CHECK_HEADERS(sys/resource.h)
|
||||
AC_CHECK_HEADERS(sys/sem.h)
|
||||
AC_CHECK_HEADERS(semaphore.h)
|
||||
AC_CHECK_HEADERS(float.h)
|
||||
|
||||
|
||||
dnl Check for libraries
|
||||
@ -549,7 +542,7 @@ if test "$EDITLINE_FLG" = "Y"; then
|
||||
AC_CHECK_LIB(ncurses, tgetent, TERMLIB=ncurses, \
|
||||
AC_CHECK_LIB(termcap, tgetent, TERMLIB=termcap, \
|
||||
AC_CHECK_LIB(tinfo, tgetent, TERMLIB=tinfo, \
|
||||
AC_MSG_ERROR(termcap support not found)))))
|
||||
AC_MSG_ERROR(termcap support not found)))))
|
||||
AC_SUBST(TERMLIB)
|
||||
XE_APPEND(-l$TERMLIB, LIBS)
|
||||
fi
|
||||
@ -577,10 +570,10 @@ AC_TRY_COMPILE([#define _ISOC99_SOURCE 1
|
||||
#include <stdarg.h>
|
||||
void vafun(const char* fmt, ...)
|
||||
{
|
||||
va_list par, par2;
|
||||
va_start(par, fmt);
|
||||
va_copy(par2, par);
|
||||
va_end(par2);
|
||||
va_list par, par2;
|
||||
va_start(par, fmt);
|
||||
va_copy(par2, par);
|
||||
va_end(par2);
|
||||
va_end(par);
|
||||
}
|
||||
],
|
||||
@ -591,12 +584,6 @@ void vafun(const char* fmt, ...)
|
||||
dnl Check for functions
|
||||
AC_CHECK_FUNCS(gettimeofday)
|
||||
if test "$ac_cv_func_gettimeofday" = "yes"; then
|
||||
dnl EKU: SINIX-Z has no prototype for gettimeofday() so the following test
|
||||
dnl will always succeed, which is wrong.
|
||||
case "$PLATFORM" in
|
||||
SINIX-Z)
|
||||
;;
|
||||
*)
|
||||
AC_MSG_CHECKING(if gettimeofday accepts second (timezone) argument)
|
||||
AC_TRY_COMPILE([#include <sys/time.h>],
|
||||
[struct timeval tp; gettimeofday(&tp, (struct timezone *)0);],
|
||||
@ -604,8 +591,6 @@ if test "$ac_cv_func_gettimeofday" = "yes"; then
|
||||
[Define this if gettimeofday accepts second (timezone) argument])
|
||||
AC_MSG_RESULT(yes)],
|
||||
[AC_MSG_RESULT(no)])
|
||||
;;
|
||||
esac
|
||||
AH_BOTTOM([#ifdef GETTIMEOFDAY_RETURNS_TIMEZONE
|
||||
#define GETTIMEOFDAY(x) gettimeofday((x), (struct timezone *)0)
|
||||
#else
|
||||
@ -621,6 +606,7 @@ AC_CHECK_FUNCS(strcasecmp stricmp)
|
||||
AC_CHECK_FUNCS(strncasecmp strnicmp)
|
||||
if test "$ac_cv_func_strcasecmp" = "no" -a "$ac_cv_func_stricmp" = "no"; then
|
||||
dnl EKU: On SINIX-Z strcasecmp is in libresolv.
|
||||
dnl CVC: Maybe other platforms need this, too? Otherwise, delete the block.
|
||||
AC_CHECK_LIB(resolv, strcasecmp,
|
||||
[XE_APPEND(-lresolv,LIBS)
|
||||
unset ac_cv_func_strcasecmp
|
||||
@ -631,7 +617,7 @@ AC_CHECK_FUNCS(dirname)
|
||||
AC_CHECK_FUNCS(sigaction setitimer)
|
||||
AC_CHECK_FUNCS(snprintf vsnprintf)
|
||||
AC_CHECK_FUNCS(swab _swab)
|
||||
AC_FUNC_MMAP
|
||||
AC_FUNC_MMAP
|
||||
AC_FUNC_FORK
|
||||
AC_FUNC_SETPGRP
|
||||
AC_CHECK_FUNCS(setpgid)
|
||||
@ -687,7 +673,7 @@ AC_CHECK_FUNCS(pthread_mutex_consistent_np)
|
||||
|
||||
# Checks for typedefs, structures, and compiler characteristics.
|
||||
AC_C_BIGENDIAN
|
||||
AC_C_VOLATILE
|
||||
AC_C_VOLATILE
|
||||
AC_TYPE_SIGNAL
|
||||
AC_TYPE_OFF_T
|
||||
AC_TYPE_SIZE_T
|
||||
@ -696,7 +682,7 @@ AC_SYS_LARGEFILE
|
||||
if test "$ac_cv_sys_file_offset_bits" = "no"; then
|
||||
AC_MSG_CHECKING(for native large file support)
|
||||
AC_TRY_RUN([#include <unistd.h>
|
||||
main () {
|
||||
main () {
|
||||
exit(!(sizeof(off_t) == 8));
|
||||
}],
|
||||
[ac_cv_sys_file_offset_bits=64; AC_DEFINE(_FILE_OFFSET_BITS,64)
|
||||
@ -721,14 +707,14 @@ if test "$ac_cv_type_semun" = "no"; then
|
||||
[AC_MSG_RESULT(no)])
|
||||
fi
|
||||
|
||||
AC_CHECK_TYPES([struct XDR::xdr_ops],,,[#include <rpc/rpc.h>
|
||||
AC_CHECK_TYPES([struct XDR::xdr_ops],,,[#include <rpc/rpc.h>
|
||||
#include <rpc/xdr.h>])
|
||||
AC_CHECK_TYPES([struct xdr_ops],,,[#include <rpc/rpc.h>
|
||||
AC_CHECK_TYPES([struct xdr_ops],,,[#include <rpc/rpc.h>
|
||||
#include <rpc/xdr.h>])
|
||||
|
||||
dnl AC_STRUCT_DIRENT_D_TYPE
|
||||
AC_CHECK_MEMBER([struct dirent.d_type],
|
||||
AC_DEFINE(HAVE_STRUCT_DIRENT_D_TYPE,1,[Define this if struct dirent has d_type]),,
|
||||
AC_DEFINE(HAVE_STRUCT_DIRENT_D_TYPE,1,[Define this if struct dirent has d_type]),,
|
||||
[#include <dirent.h>])
|
||||
|
||||
dnl EKU: try to determine the alignment of long and double
|
||||
@ -782,7 +768,7 @@ case "$PLATFORM" in
|
||||
;;
|
||||
HPUX)
|
||||
AC_DEFINE(HAVE_POSIX_THREADS)
|
||||
;;
|
||||
;;
|
||||
FREEBSD|GENTOOFREEBSD)
|
||||
dnl the AC_CHECK_TYPES for socklen_t doesn't include sys/socket.h
|
||||
dnl so test for socklen_t with sys/socket.h included
|
||||
@ -799,8 +785,8 @@ case "$PLATFORM" in
|
||||
SOLARIS|solx86)
|
||||
dnl kkuznetsov: Solaris always check for -lnsl and use Sun thread (!not posix)
|
||||
AC_CHECK_LIB(nsl, gethostname, XE_APPEND(-lnsl,LIBS))
|
||||
AC_CHECK_LIB(thread, thr_create, XE_PREPEND(-lthread,LIBS))
|
||||
|
||||
AC_CHECK_LIB(thread, thr_create, XE_PREPEND(-lthread,LIBS))
|
||||
|
||||
if test "$EDITLINE_FLG" = "Y"; then
|
||||
AC_CHECK_LIB(termcap, main, XE_APPEND(-ltermcap,EDITLINE_A))
|
||||
fi
|
||||
@ -816,13 +802,13 @@ case "$PLATFORM" in
|
||||
SFIO_DIR=""
|
||||
SFIO_FLAGS=""
|
||||
SFIO_LDFLAGS=""
|
||||
else
|
||||
AC_CHECK_LIB(sfio, main)
|
||||
else
|
||||
AC_CHECK_LIB(sfio, main)
|
||||
dnl Kkuznetsov: using sfio-mt looks like double protecting of FILE*
|
||||
dnl and I avoid to use vthread based on posix threading
|
||||
#AC_CHECK_LIB(sfio-mt, main,,
|
||||
#AC_CHECK_LIB(sfio-mt, main,,
|
||||
#AC_MSG_ERROR([sfio library not found]),-lvthread)
|
||||
#XE_PREPEND(-lvthread,LIBS)
|
||||
#XE_PREPEND(-lvthread,LIBS)
|
||||
|
||||
SFIO_DIR="$ac_cv_use_sfio"
|
||||
SFIO_FLAGS="-DSFIO -I$ac_cv_use_sfio/include"
|
||||
@ -1170,7 +1156,7 @@ case "$PLATFORM" in
|
||||
gen/firebird/bin/changedbaPassword.sh:builds/install/arch-specific/hpux/misc/changedbaPassword.sh.in
|
||||
gen/firebird/bin/changegdslibrarycompatibleLink.sh:builds/install/arch-specific/hpux/misc/changegdslibrarycompatibleLink.sh.in
|
||||
gen/firebird/bin/hpuxLibrary.sh:builds/install/arch-specific/hpux/misc/hpuxLibrary.sh.in
|
||||
gen/firebird/bin/createaliasDB.sh:builds/install/arch-specific/hpux/misc/createaliasDB.sh.in],
|
||||
gen/firebird/bin/createaliasDB.sh:builds/install/arch-specific/hpux/misc/createaliasDB.sh.in],
|
||||
[chmod a+x gen/install/scripts/*.sh gen/install/*.sh 2>/dev/null])
|
||||
;;
|
||||
|
||||
@ -1193,7 +1179,7 @@ case "$PLATFORM" in
|
||||
gen/firebird/bin/changemulticonnectmode.aix.sh:builds/install/misc/changeMultiConnectMode.sh.in
|
||||
gen/firebird/bin/changegdslibrarycompatiblelink.aix.sh:builds/install/misc/changeGdsLibraryCompatibleLink.sh.in
|
||||
gen/firebird/bin/createaliasdb.aix.sh:builds/install/misc/createAliasDB.sh.in
|
||||
gen/firebird/bin/aixLibrary.sh:builds/install/arch-specific/aix/misc/aixLibrary.sh.in],
|
||||
gen/firebird/bin/aixLibrary.sh:builds/install/arch-specific/aix/misc/aixLibrary.sh.in],
|
||||
[chmod a+x gen/install/scripts/*.sh gen/install/*.sh 2>/dev/null])
|
||||
;;
|
||||
FREEBSD)
|
||||
@ -1309,7 +1295,7 @@ fi
|
||||
|
||||
dnl Print out the build configuration (the most interesting thing)
|
||||
echo
|
||||
echo
|
||||
echo
|
||||
echo The Firebird2 package has been configured with the following options:
|
||||
echo
|
||||
|
||||
|
||||
@ -55,18 +55,13 @@
|
||||
#include <sys/types.h>
|
||||
#endif
|
||||
|
||||
#ifdef sun
|
||||
#define DBL_MAX_10_EXP 308
|
||||
#endif
|
||||
|
||||
#ifdef SCO_UNIX
|
||||
#define DBL_MAX_10_EXP 308
|
||||
#endif
|
||||
|
||||
#ifndef DBL_MAX_10_EXP
|
||||
#ifdef HAVE_FLOAT_H
|
||||
#include <float.h>
|
||||
#else
|
||||
#define DBL_MAX_10_EXP 308
|
||||
#endif
|
||||
|
||||
|
||||
using namespace Firebird;
|
||||
|
||||
/* normally the following two definitions are part of limits.h
|
||||
|
||||
@ -146,7 +146,6 @@ static bool sw_standard_out;
|
||||
static bool sw_first;
|
||||
static bool sw_lines;
|
||||
static bool sw_trace;
|
||||
static bool sw_alsys;
|
||||
static int line_global;
|
||||
static int warnings_global;
|
||||
static int fatals_global;
|
||||
@ -221,10 +220,6 @@ static const ext_table_t dml_ext_table[] =
|
||||
#else
|
||||
{ lang_ada, IN_SW_GPRE_ADA, ".ea", ".a" },
|
||||
#endif
|
||||
|
||||
#ifdef ALSYS_ADA
|
||||
{ lang_ada, IN_SW_GPRE_ALSYS, ".eada", ".ada" },
|
||||
#endif
|
||||
#endif // GPRE_ADA
|
||||
|
||||
#if (defined( WIN_NT))
|
||||
@ -315,7 +310,6 @@ int main(int argc, char* argv[])
|
||||
sw_lines = true;
|
||||
gpreGlob.sw_auto = true;
|
||||
gpreGlob.sw_cstring = true;
|
||||
sw_alsys = false;
|
||||
gpreGlob.sw_external = false;
|
||||
sw_standard_out = false;
|
||||
#ifdef GPRE_COBOL
|
||||
@ -555,26 +549,6 @@ int main(int argc, char* argv[])
|
||||
db->dbb_name->sym_string = "isc_database";
|
||||
comment_stop = "--";
|
||||
break;
|
||||
|
||||
case IN_SW_GPRE_ALSYS:
|
||||
sw_alsys = true;
|
||||
gpreGlob.sw_case = true;
|
||||
gpreGlob.sw_language = lang_ada;
|
||||
sw_lines = false;
|
||||
gpreGlob.sw_cstring = false;
|
||||
gen_routine = ADA_action;
|
||||
gpreGlob.utility_name = "isc_utility";
|
||||
gpreGlob.count_name = "isc_count";
|
||||
gpreGlob.slack_name = "isc_slack";
|
||||
gpreGlob.transaction_name = "gds_trans";
|
||||
gpreGlob.database_name = "isc_database";
|
||||
gpreGlob.ident_pattern = "isc_%d";
|
||||
gpreGlob.long_ident_pattern = "isc_%ld";
|
||||
comment_start = "--";
|
||||
if (db)
|
||||
db->dbb_name->sym_string = "isc_database";
|
||||
comment_stop = "--";
|
||||
break;
|
||||
#endif // GPRE_ADA
|
||||
|
||||
|
||||
@ -729,15 +703,6 @@ int main(int argc, char* argv[])
|
||||
if (gpreGlob.sw_language == lang_cpp || gpreGlob.sw_language == lang_cplusplus)
|
||||
gpreGlob.sw_language = lang_cxx;
|
||||
|
||||
#ifdef ALSYS_ADA
|
||||
if (sw_alsys)
|
||||
{
|
||||
for (src_ext_tab = dml_ext_table;; src_ext_tab++)
|
||||
if (src_ext_tab->ext_in_sw == IN_SW_GPRE_ALSYS)
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
|
||||
#if defined(GPRE_COBOL) && !defined(BOOT_BUILD)
|
||||
// if cobol is defined we need both sw_cobol and sw_cob_dialect to
|
||||
// determine how the string substitution table is set up
|
||||
|
||||
@ -75,11 +75,6 @@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef GPRE_ADA
|
||||
#if defined SCO_UNIX
|
||||
#define ALSYS_ADA
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/* If the C compiler supports the ANSI const directive, we emit it before
|
||||
BLR string definitions */
|
||||
|
||||
@ -76,7 +76,6 @@ enum gpre_cmd_switch
|
||||
IN_SW_GPRE_ADA, /* source is ada */
|
||||
IN_SW_GPRE_HANDLES, /* ada handles package */
|
||||
IN_SW_GPRE_Z, /* print software version */
|
||||
IN_SW_GPRE_ALSYS, /* source is alsys ada */
|
||||
IN_SW_GPRE_D_FLOAT, /* use blr_d_float for doubles */
|
||||
IN_SW_GPRE_CXX, /* source is C++ */
|
||||
IN_SW_GPRE_SCXX, /* source is C++ with Saber extension */
|
||||
@ -153,9 +152,6 @@ static const in_sw_tab_t gpre_in_sw_table[] =
|
||||
{
|
||||
#ifdef GPRE_ADA
|
||||
{IN_SW_GPRE_ADA , 0, "ADA" , 0, 0, 0, FALSE, 0, 0, "\t\textended ADA program"},
|
||||
#ifdef ALSYS_ADA
|
||||
{IN_SW_GPRE_ALSYS , 0, "ALSYS" , 0, 0, 0, FALSE, 0, 0, "\t\textended ADA program"},
|
||||
#endif
|
||||
{IN_SW_GPRE_HANDLES , 0, "HANDLES" , 0, 0, 0, FALSE, 0, 0, "\t\tADA handle package requires handle package name"},
|
||||
#endif
|
||||
{IN_SW_GPRE_C , 0, "C" , 0, 0, 0, FALSE, 0, 0, "\t\textended C program"},
|
||||
|
||||
@ -124,6 +124,7 @@
|
||||
#undef HAVE_SYS_SOCKET_H
|
||||
#undef HAVE_SYS_SOCKIO_H
|
||||
#undef HAVE_WINSOCK2_H
|
||||
#define HAVE_FLOAT_H
|
||||
|
||||
|
||||
/* Functions */
|
||||
|
||||
@ -469,29 +469,6 @@ extern "C" int remove(const char* path);
|
||||
#endif /* WIN_NT */
|
||||
|
||||
|
||||
/*****************************************************
|
||||
* SCO
|
||||
*****************************************************/
|
||||
#ifdef SCO_EV
|
||||
|
||||
#define QUADFORMAT "ll"
|
||||
#define QUADCONST(n) (n##LL)
|
||||
#define I386
|
||||
#define UNIX
|
||||
#define SCO_UNIX
|
||||
#define IEEE
|
||||
//
|
||||
//#define KILLER_SIGNALS
|
||||
//
|
||||
#define IMPLEMENTATION isc_info_db_impl_sco_ev /* 59 */
|
||||
|
||||
// These functions are supported so we don't need the defines
|
||||
//#define setreuid(ruid, euid) setuid(euid)
|
||||
//#define setregid(rgid, egid) setgid(egid)
|
||||
//
|
||||
|
||||
#endif /* SCO_EV */
|
||||
|
||||
/*****************************************************
|
||||
* UNIX
|
||||
*****************************************************/
|
||||
|
||||
@ -65,7 +65,7 @@
|
||||
|
||||
#include <string.h>
|
||||
|
||||
#if (defined SOLARIS || defined SCO_EV || defined LINUX || defined AIX_PPC || defined FREEBSD || defined NETBSD || defined HPUX)
|
||||
#if (defined SOLARIS || defined LINUX || defined AIX_PPC || defined FREEBSD || defined NETBSD || defined HPUX)
|
||||
#define DYNAMIC_SHARED_LIBRARIES
|
||||
#endif
|
||||
|
||||
|
||||
@ -59,10 +59,6 @@
|
||||
#include <sys/utsname.h>
|
||||
#endif
|
||||
|
||||
#ifdef SCO_EV
|
||||
#include <sys/utsname.h>
|
||||
#endif
|
||||
|
||||
/* Win32 specific stuff */
|
||||
|
||||
#ifdef WIN_NT
|
||||
@ -219,7 +215,7 @@ bool ISC_check_process_existence(SLONG pid)
|
||||
}
|
||||
|
||||
|
||||
#if (defined SOLARIS || defined SCO_EV)
|
||||
#if defined(SOLARIS)
|
||||
TEXT* ISC_get_host(TEXT* string, USHORT length)
|
||||
{
|
||||
/**************************************
|
||||
|
||||
@ -103,8 +103,6 @@ const char* MTAB = "/etc/mnttab";
|
||||
const char* MTAB = "/etc/mnttab";
|
||||
#elif defined(FREEBSD)
|
||||
const char* MTAB = "/etc/fstab";
|
||||
#elif defined(SCO_UNIX)
|
||||
const char* MTAB = "/etc/mount";
|
||||
#else
|
||||
const char* MTAB = "/etc/mtab";
|
||||
#endif
|
||||
@ -112,10 +110,6 @@ const char* MTAB = "/etc/mtab";
|
||||
#ifdef HAVE_SETMNTENT
|
||||
#define MTAB_OPEN(path,type) setmntent(path, "r")
|
||||
#define MTAB_CLOSE(stream) endmntent(stream)
|
||||
#elif defined(SCO_UNIX)
|
||||
/* EKU: popen/pclose to access a file??? */
|
||||
#define MTAB_OPEN(path,type) popen (path, type)
|
||||
#define MTAB_CLOSE(stream) pclose (stream)
|
||||
#else
|
||||
#define MTAB_OPEN(path,type) fopen(path, type)
|
||||
#define MTAB_CLOSE(stream) fclose(stream)
|
||||
@ -1271,6 +1265,7 @@ static bool get_full_path(const tstring& part, tstring& full)
|
||||
|
||||
|
||||
namespace {
|
||||
|
||||
#ifndef NO_NFS
|
||||
#if defined(HAVE_GETMNTENT) && !defined(SOLARIS)
|
||||
#define GET_MOUNTS
|
||||
@ -1318,7 +1313,9 @@ bool Mnt::get()
|
||||
else
|
||||
return false;
|
||||
}
|
||||
|
||||
#else // !GETMNTENT_TAKES_TWO_ARGUMENTS
|
||||
|
||||
bool Mnt::get()
|
||||
{
|
||||
/**************************************
|
||||
@ -1359,66 +1356,6 @@ bool Mnt::get()
|
||||
#endif // GETMNTENT_TAKES_TWO_ARGUMENTS
|
||||
#endif // HAVE_GETMNTENT && !SOLARIS
|
||||
|
||||
#ifdef SCO_UNIX
|
||||
#define GET_MOUNTS
|
||||
bool Mnt::get()
|
||||
{
|
||||
/**************************************
|
||||
*
|
||||
* g e t _ m o u n t s ( S C O - U N I X )
|
||||
*
|
||||
**************************************
|
||||
*
|
||||
* Functional description
|
||||
* Get ALL mount points.
|
||||
*
|
||||
**************************************/
|
||||
TEXT device[128], mount_point[128], type[16], rw[128], foo1[16];
|
||||
|
||||
/* Start by finding a mount point. */
|
||||
|
||||
TEXT* p = buffer;
|
||||
|
||||
/* note that the mount point and device are inverted from normal systems */
|
||||
for (;;) {
|
||||
/* Sake of argument, inverted the mount_point, device */
|
||||
|
||||
int n = fscanf(file, "%s %s %s %s %s %s %s %s %s %s", mount_point,
|
||||
foo1, device, rw, foo1, foo1, foo1, foo1, foo1, foo1);
|
||||
if (!strcmp(rw, "read"))
|
||||
n = fscanf(file, "%s", foo1);
|
||||
|
||||
if (n < 0)
|
||||
break;
|
||||
|
||||
/* Include non-NFS (local) mounts - some may be longer than
|
||||
NFS mount points */
|
||||
|
||||
/****
|
||||
if (strcmp (type, "nfs"))
|
||||
continue;
|
||||
****/
|
||||
|
||||
mount->mnt_node = p;
|
||||
const TEXT* q = device;
|
||||
while (*q && *q != ':')
|
||||
*p++ = *q++;
|
||||
*p++ = 0;
|
||||
if (*q != ':')
|
||||
mount->mnt_node = NULL;
|
||||
if (*q)
|
||||
q++;
|
||||
mount->mnt_path = p;
|
||||
while (*p++ = *q++); // empty loop's body
|
||||
mount->mnt_mount = p;
|
||||
q = mount_point;
|
||||
while (*p++ = *q++); // empty loop's body
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
#endif // SCO_UNIX
|
||||
|
||||
#ifdef SOLARIS
|
||||
#define GET_MOUNTS
|
||||
|
||||
@ -87,27 +87,24 @@
|
||||
#include <vfork.h>
|
||||
#endif
|
||||
|
||||
#ifdef SOLARIS
|
||||
#ifdef HAVE_FCNTL_H
|
||||
#include <fcntl.h>
|
||||
#endif
|
||||
|
||||
#ifdef SCO_UNIX
|
||||
#include <fcntl.h>
|
||||
#endif
|
||||
|
||||
#if !defined(WIN_NT)
|
||||
# include <signal.h>
|
||||
# include <sys/param.h>
|
||||
# include <sys/stat.h>
|
||||
# include <errno.h>
|
||||
#else
|
||||
# include <windows.h>
|
||||
# include <io.h> // _open, _get_osfhandle
|
||||
# include <stdlib.h>
|
||||
# include <fcntl.h>
|
||||
# include <sys/stat.h>
|
||||
#endif
|
||||
|
||||
# include <sys/stat.h>
|
||||
|
||||
|
||||
#define statistics stat
|
||||
|
||||
using namespace Firebird;
|
||||
|
||||
@ -110,16 +110,15 @@ const int INET_RETRY_CALL = 5;
|
||||
#include "../common/utils_proto.h"
|
||||
#include "../common/classes/ClumpletWriter.h"
|
||||
|
||||
#if (defined HPUX || defined SCO_UNIX)
|
||||
// Please review. Maybe not needed. See H_ERRNO in common.h.
|
||||
#if defined HPUX
|
||||
extern int h_errno;
|
||||
#endif
|
||||
|
||||
using namespace Firebird;
|
||||
|
||||
const char* PROXY_FILE = "/etc/gds_proxy";
|
||||
const char* HOSTS_FILE = "/etc/hosts.equiv";
|
||||
const USHORT MAX_PTYPE = ptype_lazy_send;
|
||||
const char* GDS_HOSTS_FILE = "/etc/gds_hosts.equiv";
|
||||
|
||||
|
||||
#ifdef WIN_NT
|
||||
|
||||
@ -155,9 +154,10 @@ const int NOTASOCKET = EBADF;
|
||||
#define INVALID_SOCKET -1
|
||||
#endif
|
||||
|
||||
#ifndef SIGURG
|
||||
#define SIGURG SIGINT
|
||||
#endif
|
||||
// Can't find were it's used.
|
||||
//#ifndef SIGURG
|
||||
//#define SIGURG SIGINT
|
||||
//#endif
|
||||
|
||||
#ifndef ENOBUFS
|
||||
#define ENOBUFS 0
|
||||
@ -223,7 +223,7 @@ const SLONG MAX_DATA_LW = 1448; /* Low Water mark */
|
||||
const SLONG MAX_DATA_HW = 32768; /* High Water mark */
|
||||
const SLONG DEF_MAX_DATA = 8192;
|
||||
|
||||
const int MAXHOSTLEN = 64;
|
||||
//const int MAXHOSTLEN = 64;
|
||||
|
||||
const int SELECT_TIMEOUT = 60; /* Dispatch thread select timeout (sec) */
|
||||
|
||||
@ -1037,16 +1037,12 @@ static bool accept_connection(rem_port* port, const P_CNCT* cnct)
|
||||
switch (id.getClumpTag())
|
||||
{
|
||||
case CNCT_user:
|
||||
{
|
||||
id.getString(name);
|
||||
break;
|
||||
}
|
||||
id.getString(name);
|
||||
break;
|
||||
|
||||
case CNCT_passwd:
|
||||
{
|
||||
id.getString(password);
|
||||
break;
|
||||
}
|
||||
id.getString(password);
|
||||
break;
|
||||
|
||||
case CNCT_group:
|
||||
{
|
||||
@ -1472,8 +1468,7 @@ static void disconnect( rem_port* port)
|
||||
|
||||
if (port->port_linger.l_onoff) {
|
||||
setsockopt((SOCKET) port->port_handle, SOL_SOCKET, SO_LINGER,
|
||||
(SCHAR *) & port->port_linger,
|
||||
sizeof(port->port_linger));
|
||||
(SCHAR*) &port->port_linger, sizeof(port->port_linger));
|
||||
}
|
||||
|
||||
#if defined WIN_NT
|
||||
@ -1699,7 +1694,7 @@ THREAD_ENTRY_DECLARE forkThread(THREAD_ENTRY_PARAM arg)
|
||||
break;
|
||||
|
||||
s = (*forkSockets)[0];
|
||||
forkSockets->remove((size_t)0);
|
||||
forkSockets->remove((size_t) 0);
|
||||
}
|
||||
fork(s, flag);
|
||||
SOCLOSE(s);
|
||||
@ -2156,11 +2151,11 @@ static bool select_wait( rem_port* main_port, slct_t* selct)
|
||||
if (!INET_shutting_down || port != main_port)
|
||||
{
|
||||
FD_SET((SLONG) port->port_handle, &selct->slct_fdset);
|
||||
#ifdef WIN_NT
|
||||
#ifdef WIN_NT
|
||||
++selct->slct_width;
|
||||
#else
|
||||
#else
|
||||
selct->slct_width = MAX(selct->slct_width, (int) port->port_handle + 1);
|
||||
#endif
|
||||
#endif
|
||||
found = true;
|
||||
}
|
||||
}
|
||||
|
||||
@ -54,8 +54,6 @@ const P_ARCH ARCHITECTURE = arch_sun;
|
||||
const P_ARCH ARCHITECTURE = arch_hpux;
|
||||
#elif (defined AIX || defined AIX_PPC)
|
||||
const P_ARCH ARCHITECTURE = arch_rt;
|
||||
#elif defined(SCO_EV)
|
||||
const P_ARCH ARCHITECTURE = arch_sco_ev;
|
||||
#elif defined(LINUX)
|
||||
const P_ARCH ARCHITECTURE = arch_linux;
|
||||
#elif defined(FREEBSD)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user