]> granicus.if.org Git - php/commitdiff
- move sybase to pecl
authorPierre Joye <pajoye@php.net>
Mon, 23 Jun 2008 19:55:27 +0000 (19:55 +0000)
committerPierre Joye <pajoye@php.net>
Mon, 23 Jun 2008 19:55:27 +0000 (19:55 +0000)
NEWS
ext/sybase/CREDITS [deleted file]
ext/sybase/config.m4 [deleted file]
ext/sybase/php_sybase_db.c [deleted file]
ext/sybase/php_sybase_db.h [deleted file]

diff --git a/NEWS b/NEWS
index a3d385664587800f662ff3bda69efe96bef3cc6b..5b9c269a4c2aa36e7c5b2340053a08cf61019a12 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -169,9 +169,10 @@ PHP                                                                        NEWS
 - Improved md5() implementation. (Solar Designer, Dmitry)
 
 - Upgraded bundled sqlite to version 3.5.6. (Scott)
-- Moved extensions to PECL:
-  . ext/fdpf (Pierre)
-  . ext/ncurses (Pierre)
+- Moved extensions to PECL (Pierre):
+  . ext/fdpf
+  . ext/ncurses
+  . ext/sybase (not maintained anymore, sybase_ct has to be used instead)
 
 - Fixed html_entity_decode() incorrectly converting numeric html entities
   to different characters with cp1251 and cp866. (Scott)
diff --git a/ext/sybase/CREDITS b/ext/sybase/CREDITS
deleted file mode 100644 (file)
index 632dcce..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-Sybase-DB
-Zeev Suraski
diff --git a/ext/sybase/config.m4 b/ext/sybase/config.m4
deleted file mode 100644 (file)
index 742a5e6..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-dnl
-dnl $Id$
-dnl
-
-PHP_ARG_WITH(sybase,for Sybase support,
-[  --with-sybase[=DIR]     Include Sybase-DB support.  DIR is the Sybase home
-                          directory [/home/sybase]])
-
-if test "$PHP_SYBASE" != "no"; then
-  if test "$PHP_SYBASE" = "yes"; then
-    SYBASE_INCDIR=/home/sybase/include
-    SYBASE_LIBDIR=/home/sybase/lib
-  else
-    SYBASE_INCDIR=$PHP_SYBASE/include
-    SYBASE_LIBDIR=$PHP_SYBASE/lib
-  fi
-  PHP_ADD_INCLUDE($SYBASE_INCDIR)
-  PHP_ADD_LIBRARY_WITH_PATH(sybdb, $SYBASE_LIBDIR, SYBASE_SHARED_LIBADD)
-  PHP_NEW_EXTENSION(sybase, php_sybase_db.c, $ext_shared)
-  AC_CHECK_LIB(dnet_stub, dnet_addr,
-     [ PHP_ADD_LIBRARY_WITH_PATH(dnet_stub,,SYBASE_SHARED_LIBADD)
-        AC_DEFINE(HAVE_LIBDNET_STUB,1,[ ])
-     ])
-  AC_DEFINE(HAVE_SYBASE,1,[ ])
-  AC_CHECK_LIB(sybdb, tdsdbopen, 
-     [ AC_DEFINE(PHP_SYBASE_DBOPEN,tdsdbopen,[ ])
-       AC_DEFINE(DBMFIX,1,[ ]) ],
-     [ AC_DEFINE(PHP_SYBASE_DBOPEN,dbopen,[ ]) ])
-     
-  PHP_SUBST(SYBASE_SHARED_LIBADD)
-fi
diff --git a/ext/sybase/php_sybase_db.c b/ext/sybase/php_sybase_db.c
deleted file mode 100644 (file)
index 1546694..0000000
+++ /dev/null
@@ -1,1448 +0,0 @@
-/*
-   +----------------------------------------------------------------------+
-   | PHP Version 5                                                        |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2008 The PHP Group                                |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 3.01 of the PHP license,      |
-   | that is bundled with this package in the file LICENSE, and is        |
-   | available through the world-wide-web at the following url:           |
-   | http://www.php.net/license/3_01.txt                                  |
-   | If you did not receive a copy of the PHP license and are unable to   |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@php.net so we can mail you a copy immediately.               |
-   +----------------------------------------------------------------------+
-   | Authors: Zeev Suraski <zeev@zend.com>                                |
-   +----------------------------------------------------------------------+
-   | php_sybase_get_column_content_with_type() based on code by:          |
-   |                     Muhammad A Muquit <MA_Muquit@fccc.edu>           |
-   |                     Rasmus Lerdorf <rasmus@lerdorf.on.ca>            |
-   +----------------------------------------------------------------------+
- */
-/* $Id$ */
-
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "php.h"
-#include "php_sybase_db.h"
-#include "ext/standard/php_standard.h"
-#include "ext/standard/info.h"
-#include "php_globals.h"
-#include "php_ini.h"
-
-#if HAVE_SYBASE
-
-#include <sybfront.h>
-#include <sybdb.h>
-#include <syberror.h>
-
-#if BROKEN_SYBASE_PCONNECTS
-#include "http_log.h"
-#endif
-
-/* Moved these structures/defines into the .c file (or into a *private* header),
-   because leaving them in php_sybase_db.h caused namespace pollution in
-   main/internal_functions.c. */
-
-#define coltype(j) dbcoltype(sybase_ptr->link,j)
-#define intcol(i) ((int) *(DBINT *) dbdata(sybase_ptr->link,i))
-#define smallintcol(i) ((int) *(DBSMALLINT *) dbdata(sybase_ptr->link,i))
-#define tinyintcol(i) ((int) *(DBTINYINT *) dbdata(sybase_ptr->link,i))
-#define anyintcol(j) (coltype(j)==SYBINT4?intcol(j):(coltype(j)==SYBINT2?smallintcol(j):tinyintcol(j)))
-#define charcol(i) ((DBCHAR *) dbdata(sybase_ptr->link,i))
-#define floatcol(i) ((float) *(DBFLT8 *) dbdata(sybase_ptr->link,i))
-
-typedef struct sybase_link_struct sybase_link;
-
-struct sybase_link_struct {
-        LOGINREC *login;
-        DBPROCESS *link;
-        int valid;
-};
-
-#define SYBASE_ROWS_BLOCK 128
-
-typedef struct {
-        char *name,*column_source;
-        int max_length, numeric;
-        int type;
-} sybase_field;
-
-typedef struct {
-        zval ***data;
-        sybase_field *fields;
-        sybase_link *sybase_ptr;
-        int cur_row,cur_field;
-        int num_rows,num_fields;
-} sybase_result;
-
-
-const zend_function_entry sybase_functions[] = {
-       PHP_FE(sybase_connect,                  NULL)
-       PHP_FE(sybase_pconnect,                 NULL)
-       PHP_FE(sybase_close,                    NULL)
-       PHP_FE(sybase_select_db,                NULL)
-       PHP_FE(sybase_query,                    NULL)
-       PHP_FE(sybase_free_result,              NULL)
-       PHP_FE(sybase_get_last_message, NULL)
-       PHP_FE(sybase_num_rows,                 NULL)
-       PHP_FE(sybase_num_fields,               NULL)
-       PHP_FE(sybase_fetch_row,                NULL)
-       PHP_FE(sybase_fetch_array,              NULL)
-       PHP_FE(sybase_fetch_object,             NULL)
-       PHP_FE(sybase_data_seek,                NULL)
-       PHP_FE(sybase_fetch_field,              NULL)
-       PHP_FE(sybase_field_seek,               NULL)
-       PHP_FE(sybase_result,                   NULL)
-       PHP_FE(sybase_affected_rows,            NULL)
-       PHP_FE(sybase_min_error_severity,       NULL)
-       PHP_FE(sybase_min_message_severity,     NULL)
-
-#if !defined(PHP_WIN32) && !defined(HAVE_MSSQL)
-       PHP_FALIAS(mssql_connect,               sybase_connect,                 NULL)
-       PHP_FALIAS(mssql_pconnect,              sybase_pconnect,                NULL)
-       PHP_FALIAS(mssql_close,                 sybase_close,                   NULL)
-       PHP_FALIAS(mssql_select_db,             sybase_select_db,               NULL)
-       PHP_FALIAS(mssql_query,                 sybase_query,                   NULL)
-       PHP_FALIAS(mssql_free_result,   sybase_free_result,             NULL)
-       PHP_FALIAS(mssql_get_last_message,      sybase_get_last_message,        NULL)
-       PHP_FALIAS(mssql_num_rows,              sybase_num_rows,                NULL)
-       PHP_FALIAS(mssql_num_fields,    sybase_num_fields,              NULL)
-       PHP_FALIAS(mssql_fetch_row,             sybase_fetch_row,               NULL)
-       PHP_FALIAS(mssql_fetch_array,   sybase_fetch_array,             NULL)
-       PHP_FALIAS(mssql_fetch_object,  sybase_fetch_object,    NULL)
-       PHP_FALIAS(mssql_data_seek,             sybase_data_seek,               NULL)
-       PHP_FALIAS(mssql_fetch_field,   sybase_fetch_field,             NULL)
-       PHP_FALIAS(mssql_field_seek,    sybase_field_seek,              NULL)
-       PHP_FALIAS(mssql_result,                sybase_result,                  NULL)
-       PHP_FALIAS(mssql_affected_rows,         sybase_affected_rows,                   NULL)
-       PHP_FALIAS(mssql_min_error_severity,    sybase_min_error_severity,              NULL)
-       PHP_FALIAS(mssql_min_message_severity,  sybase_min_message_severity,    NULL)
-#endif
-       {NULL, NULL, NULL}
-};
-
-zend_module_entry sybase_module_entry = {
-       STANDARD_MODULE_HEADER,
-       "sybase", sybase_functions, PHP_MINIT(sybase), PHP_MSHUTDOWN(sybase), PHP_RINIT(sybase), PHP_RSHUTDOWN(sybase), PHP_MINFO(sybase), NO_VERSION_YET, STANDARD_MODULE_PROPERTIES
-};
-
-#ifdef COMPILE_DL_SYBASE
-ZEND_GET_MODULE(sybase)
-#endif
-
-THREAD_LS sybase_module php_sybase_module;
-
-
-#define CHECK_LINK(link) { if (link==-1) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sybase:  A link to the server could not be established"); RETURN_FALSE; } }
-
-
-static void php_sybase_get_column_content(sybase_link *sybase_ptr,int offset,zval **result_ptr, int column_type);
-
-/* error handler */
-static int php_sybase_error_handler(DBPROCESS *dbproc,int severity,int dberr,
-                                                                               int oserr,char *dberrstr,char *oserrstr)
-{
-       if (severity >= php_sybase_module.min_error_severity) {
-               TSRMLS_FETCH();
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sybase error:  %s (severity %d)",dberrstr,severity);
-       }
-       return INT_CANCEL;  
-}
-
-/* message handler */
-static int php_sybase_message_handler(DBPROCESS *dbproc,DBINT msgno,int msgstate,
-                                                                               int severity,char *msgtext,char *srvname,
-                                                                               char *procname,DBUSMALLINT line)
-{
-       if (severity >= php_sybase_module.min_message_severity) {
-               TSRMLS_FETCH();
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sybase message:  %s (severity %d)",msgtext,severity);
-       }
-       STR_FREE(php_sybase_module.server_message);
-       php_sybase_module.server_message = estrdup(msgtext);
-       return 0;
-}
-
-
-static int _clean_invalid_results(zend_rsrc_list_entry *le TSRMLS_DC)
-{
-       if (Z_TYPE_P(le) == php_sybase_module.le_result) {
-               sybase_link *sybase_ptr = ((sybase_result *) le->ptr)->sybase_ptr;
-               
-               if (!sybase_ptr->valid) {
-                       return 1;
-               }
-       }
-       return 0;
-}
-
-
-static void _free_sybase_result(zend_rsrc_list_entry *rsrc TSRMLS_DC)
-{
-       sybase_result *result = (sybase_result *)rsrc->ptr;
-       int i,j;
-       
-       if (result->data) {
-               for (i=0; i<result->num_rows; i++) {
-                       for (j=0; j<result->num_fields; j++) {
-                               zval_ptr_dtor(&result->data[i][j]);
-                       }
-                       efree(result->data[i]);
-               }
-               efree(result->data);
-       }
-       
-       if (result->fields) {
-               for (i=0; i<result->num_fields; i++) {
-                       STR_FREE(result->fields[i].name);
-                       STR_FREE(result->fields[i].column_source);
-               }
-               efree(result->fields);
-       }
-       efree(result);
-}
-
-
-static void _close_sybase_link(zend_rsrc_list_entry *rsrc TSRMLS_DC)
-{
-       sybase_link *sybase_ptr = (sybase_link *)rsrc->ptr;
-
-       sybase_ptr->valid = 0;
-
-    /* 
-         this can cause crashes in the current model.
-      if the resource gets destroyed via destroy_resource_list() resource_list
-      will *not* be in a consistent state. thies@thieso.net
-    */
-
-       zend_hash_apply(&EG(regular_list), (apply_func_t) _clean_invalid_results TSRMLS_CC);
-       dbclose(sybase_ptr->link);
-       dbloginfree(sybase_ptr->login);
-       efree(sybase_ptr);
-       php_sybase_module.num_links--;
-}
-
-
-static void _close_sybase_plink(zend_rsrc_list_entry *rsrc TSRMLS_DC)
-{
-       sybase_link *sybase_ptr = (sybase_link *)rsrc->ptr;
-
-       dbclose(sybase_ptr->link);
-       dbloginfree(sybase_ptr->login);
-       free(sybase_ptr);
-       php_sybase_module.num_persistent--;
-       php_sybase_module.num_links--;
-}
-
-
-PHP_MINIT_FUNCTION(sybase)
-{
-       char *interface_file;
-
-       if (dbinit()==FAIL) {
-               return FAILURE;
-       }
-       dberrhandle((EHANDLEFUNC) php_sybase_error_handler);
-       dbmsghandle((MHANDLEFUNC) php_sybase_message_handler);
-
-       if (cfg_get_string("sybase.interface_file",&interface_file)==SUCCESS) {
-               dbsetifile(interface_file);
-       }
-       if (cfg_get_long("sybase.allow_persistent",&php_sybase_module.allow_persistent)==FAILURE) {
-               php_sybase_module.allow_persistent=1;
-       }
-       if (cfg_get_long("sybase.max_persistent",&php_sybase_module.max_persistent)==FAILURE) {
-               php_sybase_module.max_persistent=-1;
-       }
-       if (cfg_get_long("sybase.max_links",&php_sybase_module.max_links)==FAILURE) {
-               php_sybase_module.max_links=-1;
-       }
-       if (cfg_get_long("sybase.min_error_severity",&php_sybase_module.cfg_min_error_severity)==FAILURE) {
-               php_sybase_module.cfg_min_error_severity=10;
-       }
-       if (cfg_get_long("sybase.min_message_severity",&php_sybase_module.cfg_min_message_severity)==FAILURE) {
-               php_sybase_module.cfg_min_message_severity=10;
-       }
-       if (cfg_get_long("sybase.compatability_mode",&php_sybase_module.compatability_mode)==FAILURE) {
-               php_sybase_module.compatability_mode = 0;
-       }
-       
-       php_sybase_module.num_persistent=0;
-       php_sybase_module.le_link = zend_register_list_destructors_ex(_close_sybase_link, NULL, "sybase-db link", module_number);
-       php_sybase_module.le_plink = zend_register_list_destructors_ex(NULL, _close_sybase_plink, "sybase-db link persistent", module_number);
-       php_sybase_module.le_result = zend_register_list_destructors_ex(_free_sybase_result, NULL, "sybase-db result", module_number);
-       
-       return SUCCESS;
-}
-
-
-PHP_RINIT_FUNCTION(sybase)
-{
-       php_sybase_module.default_link=-1;
-       php_sybase_module.num_links = php_sybase_module.num_persistent;
-       php_sybase_module.appname = estrndup("PHP " PHP_VERSION, sizeof("PHP " PHP_VERSION));
-       php_sybase_module.server_message = STR_EMPTY_ALLOC();
-       php_sybase_module.min_error_severity = php_sybase_module.cfg_min_error_severity;
-       php_sybase_module.min_message_severity = php_sybase_module.cfg_min_message_severity;
-       return SUCCESS;
-}
-
-PHP_MSHUTDOWN_FUNCTION(sybase)
-{
-       dbexit();
-       return SUCCESS;
-}
-
-PHP_RSHUTDOWN_FUNCTION(sybase)
-{
-       efree(php_sybase_module.appname);
-       php_sybase_module.appname = NULL;
-       STR_FREE(php_sybase_module.server_message);
-       php_sybase_module.server_message = NULL;
-       return SUCCESS;
-}
-
-static void php_sybase_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent)
-{
-       char *user=NULL,*passwd=NULL,*host=NULL,*charset=NULL,*appname=NULL;
-       char *hashed_details;
-       int hashed_details_length;
-       sybase_link sybase,*sybase_ptr;
-
-       switch(ZEND_NUM_ARGS()) {
-               case 0: /* defaults */
-                       hashed_details_length=6+3;
-                       hashed_details = (char *) emalloc(hashed_details_length+1);
-                       strcpy(hashed_details,"sybase___");
-                       break;
-               case 1: {
-                               zval **yyhost;
-                               
-                               if (zend_get_parameters_ex(1, &yyhost) == FAILURE) {
-                                       RETURN_FALSE;
-                               }
-                               convert_to_string_ex(yyhost);
-                               host = Z_STRVAL_PP(yyhost);
-                               hashed_details_length = spprintf(&hashed_details, 0, "sybase_%s____", Z_STRVAL_PP(yyhost));
-                       }
-                       break;
-               case 2: {
-                               zval **yyhost, **yyuser;
-                               
-                               if (zend_get_parameters_ex(2, &yyhost, &yyuser) == FAILURE) {
-                                       RETURN_FALSE;
-                               }
-                               convert_to_string_ex(yyhost);
-                               convert_to_string_ex(yyuser);
-                               host = Z_STRVAL_PP(yyhost);
-                               user = Z_STRVAL_PP(yyuser);
-                               hashed_details_length = spprintf(&hashed_details, 0, "sybase_%s_%s___", Z_STRVAL_PP(yyhost), Z_STRVAL_PP(yyuser));
-                       }
-                       break;
-               case 3: {
-                               zval **yyhost, **yyuser,**yypasswd;
-                       
-                               if (zend_get_parameters_ex(3, &yyhost, &yyuser, &yypasswd) == FAILURE) {
-                                       RETURN_FALSE;
-                               }
-                               convert_to_string_ex(yyhost);
-                               convert_to_string_ex(yyuser);
-                               convert_to_string_ex(yypasswd);
-                               host = Z_STRVAL_PP(yyhost);
-                               user = Z_STRVAL_PP(yyuser);
-                               passwd = Z_STRVAL_PP(yypasswd);
-                               hashed_details_length = spprintf(&hashed_details, 0, "sybase_%s_%s_%s__", Z_STRVAL_PP(yyhost), Z_STRVAL_PP(yyuser), Z_STRVAL_PP(yypasswd));
-                       }
-                       break;
-               case 4: {
-                               zval **yyhost, **yyuser, **yypasswd, **yycharset;
-
-                               if (zend_get_parameters_ex(4, &yyhost, &yyuser, &yypasswd, &yycharset) == FAILURE) {
-                                       RETURN_FALSE;
-                               }
-                               convert_to_string_ex(yyhost);
-                               convert_to_string_ex(yyuser);
-                               convert_to_string_ex(yypasswd);
-                               convert_to_string_ex(yycharset);
-                               host = Z_STRVAL_PP(yyhost);
-                               user = Z_STRVAL_PP(yyuser);
-                               passwd = Z_STRVAL_PP(yypasswd);
-                               charset = Z_STRVAL_PP(yycharset);
-                               hashed_details_length = spprintf(&hashed_details, 0, "sybase_%s_%s_%s_%s_", Z_STRVAL_PP(yyhost), Z_STRVAL_PP(yyuser), Z_STRVAL_PP(yypasswd), Z_STRVAL_PP(yycharset));
-                       }
-                       break;
-               case 5: {
-                               zval **yyhost, **yyuser, **yypasswd, **yycharset, **yyappname;
-
-                               if (zend_get_parameters_ex(5, &yyhost, &yyuser, &yypasswd, &yycharset, &yyappname) == FAILURE) {
-                                       RETURN_FALSE;
-                               }
-                               convert_to_string_ex(yyhost);
-                               convert_to_string_ex(yyuser);
-                               convert_to_string_ex(yypasswd);
-                               convert_to_string_ex(yycharset);
-                               convert_to_string_ex(yyappname);
-                               host = Z_STRVAL_PP(yyhost);
-                               user = Z_STRVAL_PP(yyuser);
-                               passwd = Z_STRVAL_PP(yypasswd);
-                               charset = Z_STRVAL_PP(yycharset);
-                               appname = Z_STRVAL_PP(yyappname);
-                               hashed_details_length = spprintf(&hashed_details, 0, "sybase_%s_%s_%s_%s_%s", Z_STRVAL_PP(yyhost), Z_STRVAL_PP(yyuser), Z_STRVAL_PP(yypasswd), Z_STRVAL_PP(yycharset), Z_STRVAL_PP(yyappname));
-                       }
-                       break;
-               default:
-                       WRONG_PARAM_COUNT;
-                       break;
-       }
-
-
-       /* set a DBLOGIN record */      
-       if ((sybase.login=dblogin())==NULL) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING,"Sybase:  Unable to allocate login record");
-               goto err;
-       }
-       
-       if (user) {
-               DBSETLUSER(sybase.login,user);
-       }
-       if (passwd) {
-               DBSETLPWD(sybase.login,passwd);
-       }
-       if (charset) {
-               DBSETLCHARSET(sybase.login,charset);
-       }
-       if (appname) {
-               DBSETLAPP(sybase.login,appname);
-       } else {
-               DBSETLAPP(sybase.login,php_sybase_module.appname);
-       }
-
-       sybase.valid = 1;
-
-       if (!php_sybase_module.allow_persistent) {
-               persistent=0;
-       }
-       if (persistent) {
-               zend_rsrc_list_entry *le;
-
-               /* try to find if we already have this link in our persistent list */
-               if (zend_hash_find(&EG(persistent_list), hashed_details, hashed_details_length+1, (void **) &le)==FAILURE) {  /* we don't */
-                       zend_rsrc_list_entry new_le;
-
-                       if (php_sybase_module.max_links!=-1 && php_sybase_module.num_links>=php_sybase_module.max_links) {
-                               php_error_docref(NULL TSRMLS_CC, E_WARNING,"Sybase:  Too many open links (%d)",php_sybase_module.num_links);
-                               goto err_login;
-                       }
-                       if (php_sybase_module.max_persistent!=-1 && php_sybase_module.num_persistent>=php_sybase_module.max_persistent) {
-                               php_error_docref(NULL TSRMLS_CC, E_WARNING,"Sybase:  Too many open persistent links (%d)",php_sybase_module.num_persistent);
-                               goto err_login;
-                       }
-                       /* create the link */
-                       if ((sybase.link=PHP_SYBASE_DBOPEN(sybase.login,host))==FAIL) {
-                               /*php_error_docref(NULL TSRMLS_CC, E_WARNING,"Sybase:  Unable to connect to server:  %s",sybase_error(sybase));*/
-                               goto err_login;
-                       }
-
-                       if (dbsetopt(sybase.link,DBBUFFER,"2",-1)==FAIL) {
-                               goto err_link;
-                       }
-
-                       /* hash it up */
-                       sybase_ptr = (sybase_link *) malloc(sizeof(sybase_link));
-                       memcpy(sybase_ptr,&sybase,sizeof(sybase_link));
-                       Z_TYPE(new_le) = php_sybase_module.le_plink;
-                       new_le.ptr = sybase_ptr;
-                       if (zend_hash_update(&EG(persistent_list), hashed_details, hashed_details_length+1, (void *) &new_le, sizeof(zend_rsrc_list_entry),NULL)==FAILURE) {
-                               free(sybase_ptr);
-                               goto err_link;
-                       }
-                       php_sybase_module.num_persistent++;
-                       php_sybase_module.num_links++;
-               } else {  /* we do */
-                       if (Z_TYPE_P(le) != php_sybase_module.le_plink) {
-                               php_error_docref(NULL TSRMLS_CC, E_WARNING,"Sybase:  Hashed persistent link is not a Sybase link!");
-                               goto err_login;
-                       }
-                       
-                       sybase_ptr = (sybase_link *) le->ptr;
-                       /* test that the link hasn't died */
-                       if (DBDEAD(sybase_ptr->link)==TRUE) {
-                               if ((sybase_ptr->link=PHP_SYBASE_DBOPEN(sybase_ptr->login,host))==FAIL) {
-                                       /*php_error_docref(NULL TSRMLS_CC, E_WARNING,"Sybase:  Link to server lost, unable to reconnect");*/
-                                       zend_hash_del(&EG(persistent_list), hashed_details, hashed_details_length+1);
-                                       goto err_login;
-                               }
-                               if (dbsetopt(sybase_ptr->link,DBBUFFER,"2",-1)==FAIL) {
-                                       zend_hash_del(&EG(persistent_list), hashed_details, hashed_details_length+1);
-                                       goto err_login;
-                               }
-                       }
-               }
-               Z_LVAL_P(return_value) = zend_list_insert(sybase_ptr,php_sybase_module.le_plink);
-               Z_TYPE_P(return_value) = IS_LONG;
-       } else { /* non persistent */
-               zend_rsrc_list_entry *index_ptr,new_index_ptr;
-               
-               /* first we check the hash for the hashed_details key.  if it exists,
-                * it should point us to the right offset where the actual sybase link sits.
-                * if it doesn't, open a new sybase link, add it to the resource list,
-                * and add a pointer to it with hashed_details as the key.
-                */
-               if (zend_hash_find(&EG(regular_list),hashed_details,hashed_details_length+1,(void **) &index_ptr)==SUCCESS) {
-                       int type,link;
-                       void *ptr;
-
-                       if (Z_TYPE_P(index_ptr) != le_index_ptr) {
-                               goto err_login;
-                       }
-                       link = (int) index_ptr->ptr;
-                       ptr = zend_list_find(link,&type);   /* check if the link is still there */
-                       if (ptr && (type==php_sybase_module.le_link || type==php_sybase_module.le_plink)) {
-                               Z_LVAL_P(return_value) = php_sybase_module.default_link = link;
-                               Z_TYPE_P(return_value) = IS_LONG;
-                               efree(hashed_details);
-                               dbloginfree(sybase.login);
-                               return;
-                       } else {
-                               zend_hash_del(&EG(regular_list),hashed_details,hashed_details_length+1);
-                       }
-               }
-               if (php_sybase_module.max_links!=-1 && php_sybase_module.num_links>=php_sybase_module.max_links) {
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING,"Sybase:  Too many open links (%d)",php_sybase_module.num_links);
-                       goto err_login;
-               }
-               
-               if ((sybase.link=PHP_SYBASE_DBOPEN(sybase.login,host))==NULL) {
-                       /*php_error_docref(NULL TSRMLS_CC, E_WARNING,"Sybase:  Unable to connect to server:  %s",sybase_error(sybase));*/
-                       goto err_login;
-               }
-
-               if (dbsetopt(sybase.link,DBBUFFER,"2",-1)==FAIL) {
-                       goto err_link;
-               }
-               
-               /* add it to the list */
-               sybase_ptr = (sybase_link *) emalloc(sizeof(sybase_link));
-               memcpy(sybase_ptr,&sybase,sizeof(sybase_link));
-               Z_LVAL_P(return_value) = zend_list_insert(sybase_ptr,php_sybase_module.le_link);
-               Z_TYPE_P(return_value) = IS_LONG;
-               
-               /* add it to the hash */
-               new_index_ptr.ptr = (void *) Z_LVAL_P(return_value);
-               Z_TYPE(new_index_ptr) = le_index_ptr;
-               if (zend_hash_update(&EG(regular_list),hashed_details,hashed_details_length+1,(void *) &new_index_ptr, sizeof(zend_rsrc_list_entry),NULL)==FAILURE) {
-                       goto err_link;
-               }
-               php_sybase_module.num_links++;
-       }
-       efree(hashed_details);
-       php_sybase_module.default_link=Z_LVAL_P(return_value);
-       return;
-
-err_link:
-       dbclose(sybase.link);
-err_login:
-       dbloginfree(sybase.login);
-err:
-       efree(hashed_details);
-       RETURN_FALSE;
-}
-
-
-static int php_sybase_get_default_link(INTERNAL_FUNCTION_PARAMETERS)
-{
-       if (php_sybase_module.default_link==-1) { /* no link opened yet, implicitly open one */
-               ht = 0;
-               php_sybase_do_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU,0);
-       }
-       return php_sybase_module.default_link;
-}
-
-
-/* {{{ proto int sybase_connect([string host [, string user [, string password [, string charset [, string appname]]]]])
-   Open Sybase server connection */
-PHP_FUNCTION(sybase_connect)
-{
-       php_sybase_do_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU,0);
-}
-/* }}} */
-
-/* {{{ proto int sybase_pconnect([string host [, string user [, string password [, string charset [, string appname]]]]])
-   Open persistent Sybase connection */
-PHP_FUNCTION(sybase_pconnect)
-{
-       php_sybase_do_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU,1);
-}
-/* }}} */
-
-/* {{{ proto bool sybase_close([int link_id])
-   Close Sybase connection */
-PHP_FUNCTION(sybase_close)
-{
-       zval **sybase_link_index;
-       int id,type;
-       
-       switch (ZEND_NUM_ARGS()) {
-               case 0:
-                       id = php_sybase_module.default_link;
-                       break;
-               case 1:
-                       if (zend_get_parameters_ex(1, &sybase_link_index) == FAILURE) {
-                               RETURN_FALSE;
-                       }
-                       convert_to_long_ex(sybase_link_index);
-                       id = Z_LVAL_PP(sybase_link_index);
-                       break;
-               default:
-                       WRONG_PARAM_COUNT;
-                       break;
-       }
-       
-       zend_list_find(id,&type);
-       if (type!=php_sybase_module.le_link && type!=php_sybase_module.le_plink) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING,"%d is not a Sybase link index",id);
-               RETURN_FALSE;
-       }
-       
-       zend_list_delete(id);
-       RETURN_TRUE;
-}
-/* }}} */
-       
-
-/* {{{ proto bool sybase_select_db(string database [, int link_id])
-   Select Sybase database */
-PHP_FUNCTION(sybase_select_db)
-{
-       zval **db, **sybase_link_index;
-       int id,type;
-       sybase_link  *sybase_ptr;
-       
-       switch(ZEND_NUM_ARGS()) {
-               case 1:
-                       if (zend_get_parameters_ex(1, &db) == FAILURE) {
-                               RETURN_FALSE;
-                       }
-                       id = php_sybase_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU);
-                       break;
-               case 2:
-                       if (zend_get_parameters_ex(2, &db, &sybase_link_index) == FAILURE) {
-                               RETURN_FALSE;
-                       }
-                       convert_to_long_ex(sybase_link_index);
-                       id = Z_LVAL_PP(sybase_link_index);
-                       break;
-               default:
-                       WRONG_PARAM_COUNT;
-                       break;
-       }
-       
-       CHECK_LINK(id);
-       
-       sybase_ptr = (sybase_link *) zend_list_find(id,&type);
-       if (type!=php_sybase_module.le_link && type!=php_sybase_module.le_plink) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING,"%d is not a Sybase link index",id);
-               RETURN_FALSE;
-       }
-       
-       convert_to_string_ex(db);
-       
-       if (dbuse(sybase_ptr->link,Z_STRVAL_PP(db))==FAIL) {
-               /*php_error_docref(NULL TSRMLS_CC, E_WARNING,"Sybase:  Unable to select database:  %s",sybase_error(sybase));*/
-               RETURN_FALSE;
-       } else {
-               RETURN_TRUE;
-       }
-}
-/* }}} */
-       
-
-static void php_sybase_get_column_content(sybase_link *sybase_ptr,int offset,zval **result_ptr, int column_type)
-{
-       zval *result;
-
-       ALLOC_INIT_ZVAL(result);
-       *result_ptr = result;
-
-       if (dbdatlen(sybase_ptr->link,offset) == 0) {
-               ZVAL_FALSE(result);
-               return;
-       }
-
-       switch (column_type)
-       {
-               case SYBINT2:
-               case SYBINT4: { 
-                       Z_LVAL_P(result) = (long) anyintcol(offset);
-                       Z_TYPE_P(result) = IS_LONG;
-                       break;
-               }
-               case SYBCHAR:
-               case SYBTEXT: {
-                       int length;
-                       char *data = charcol(offset);
-
-                       length=dbdatlen(sybase_ptr->link,offset);
-                       while (length>0 && charcol(offset)[length-1] == ' ') { /* nuke trailing whitespace */
-                               length--;
-                       }
-                       Z_STRVAL_P(result) = estrndup(data,length);
-                       Z_STRLEN_P(result) = length;
-                       Z_TYPE_P(result) = IS_STRING;
-                       break;
-               }
-               /*case SYBFLT8:*/
-               case SYBREAL: {
-                       Z_DVAL_P(result) = (double) floatcol(offset);
-                       Z_TYPE_P(result) = IS_DOUBLE;
-                       break;
-               }
-               default: {
-                       if (dbwillconvert(coltype(offset),SYBCHAR)) {
-                               char *res_buf;
-                               int res_length = dbdatlen(sybase_ptr->link,offset);
-                               int src_length = res_length;
-                               register char *p;
-                       
-                               switch (coltype(offset)) {
-                                       case SYBBINARY:
-                                       case SYBVARBINARY:
-                                       case SYBIMAGE:
-                                               res_length *= 2;
-                                               break;
-                                       case SYBCHAR:
-                                       case SYBVARCHAR:
-                                       case SYBTEXT:
-                                               break;
-                                       default:
-                                               /* take no chances, no telling how big the result would really be */
-                                               res_length += 20;
-                                               break;
-                               }
-
-                               res_buf = (char *) emalloc(res_length+1);
-                               memset(res_buf,' ',res_length+1);  /* XXX i'm sure there's a better way
-                                                                                                         but i don't have sybase here to test
-                                                                                                         991105 thies@thieso.net  */
-                               dbconvert(NULL,coltype(offset),dbdata(sybase_ptr->link,offset), src_length,SYBCHAR,res_buf,res_length);
-#if ilia_0             
-                               /* get rid of trailing spaces */
-                               p = res_buf + res_length;
-                               while (p >= res_buf && (*p == ' ' || *p == '\0')) {
-                                       p--;
-                               }
-                               *(++p) = 0; /* put a trailing NULL */
-                               res_length = p - res_buf;
-#endif         
-                               Z_STRLEN_P(result) = res_length;
-                               Z_STRVAL_P(result) = res_buf;
-                               Z_TYPE_P(result) = IS_STRING;
-                       } else {
-                               TSRMLS_FETCH();
-                               php_error_docref(NULL TSRMLS_CC, E_WARNING,"Sybase:  column %d has unknown data type (%d)", offset, coltype(offset));
-                               ZVAL_FALSE(result);
-                       }
-               }
-       }
-}
-
-
-/* {{{ proto int sybase_query(string query [, int link_id])
-   Send Sybase query */
-PHP_FUNCTION(sybase_query)
-{
-       zval **query, **sybase_link_index;
-       int id,type,retvalue;
-       sybase_link *sybase_ptr;
-       sybase_result *result;
-       int num_fields;
-       int blocks_initialized=1;
-       int i,j;
-       int *column_types;
-       RETCODE dbresults_retval;
-
-       switch(ZEND_NUM_ARGS()) {
-               case 1:
-                       if (zend_get_parameters_ex(1, &query) == FAILURE) {
-                               RETURN_FALSE;
-                       }
-                       id = php_sybase_module.default_link;
-                       break;
-               case 2:
-                       if (zend_get_parameters_ex(2, &query, &sybase_link_index) == FAILURE) {
-                               RETURN_FALSE;
-                       }
-                       convert_to_long_ex(sybase_link_index);
-                       id = Z_LVAL_PP(sybase_link_index);
-                       break;
-               default:
-                       WRONG_PARAM_COUNT;
-                       break;
-       }
-       
-       sybase_ptr = (sybase_link *) zend_list_find(id,&type);
-       if (type!=php_sybase_module.le_link && type!=php_sybase_module.le_plink) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING,"%d is not a Sybase link index",id);
-               RETURN_FALSE;
-       }
-       
-       convert_to_string_ex(query);
-       if (dbcmd(sybase_ptr->link,Z_STRVAL_PP(query))==FAIL) {
-               /*php_error_docref(NULL TSRMLS_CC, E_WARNING,"Sybase:  Unable to set query");*/
-               RETURN_FALSE;
-       }
-
-       if (dbsqlexec(sybase_ptr->link)==FAIL) {
-               /*php_error(E_WARNING,"Sybase:  Query failed");*/
-               RETURN_FALSE;
-       }
-
-       dbresults_retval = dbresults(sybase_ptr->link);
-       if (dbresults_retval==FAIL) {
-               /*php_error_docref(NULL TSRMLS_CC, E_WARNING,"Sybase:  Query failed");*/
-               RETURN_FALSE;
-       }
-       
-       /* The following is more or less the equivalent of mysql_store_result().
-        * fetch all rows from the server into the row buffer, thus:
-        * 1)  Being able to fire up another query without explicitly reading all rows
-        * 2)  Having numrows accessible
-        */
-       
-       retvalue=dbnextrow(sybase_ptr->link);
-       
-       if (retvalue==FAIL) {
-               RETURN_FALSE;
-       }
-
-       num_fields = dbnumcols(sybase_ptr->link);
-       if (num_fields<=0) {
-               RETURN_TRUE;
-       }
-       
-       column_types = (int *) safe_emalloc(sizeof(int), num_fields, 0);
-       for (i=0; i<num_fields; i++) {
-               column_types[i] = coltype(i+1);
-       }
-       
-       result = (sybase_result *) emalloc(sizeof(sybase_result));
-       result->data = (zval ***) safe_emalloc(sizeof(zval **), SYBASE_ROWS_BLOCK, 0);
-       result->sybase_ptr = sybase_ptr;
-       result->cur_field=result->cur_row=result->num_rows=0;
-       result->num_fields = num_fields;
-
-       i=0;
-       while (retvalue!=FAIL && retvalue!=NO_MORE_ROWS) {
-               result->num_rows++;
-               if (result->num_rows > blocks_initialized*SYBASE_ROWS_BLOCK) {
-                       result->data = (zval ***) safe_erealloc(result->data, SYBASE_ROWS_BLOCK*(++blocks_initialized), sizeof(zval **), 0);
-               }
-               result->data[i] = (zval **) safe_emalloc(sizeof(zval *), num_fields, 0);
-               for (j=1; j<=num_fields; j++) {
-                       php_sybase_get_column_content(sybase_ptr, j, &result->data[i][j-1], column_types[j-1]);
-                       if (!php_sybase_module.compatability_mode) {
-                               zval *cur_value = result->data[i][j-1];
-
-                               convert_to_string(cur_value);
-                               if (PG(magic_quotes_runtime)) {
-                                       Z_STRVAL_P(cur_value) = php_addslashes(Z_STRVAL_P(cur_value), Z_STRLEN_P(cur_value), &Z_STRLEN_P(cur_value),0 TSRMLS_CC);
-                               }
-                       }
-               }
-               retvalue=dbnextrow(sybase_ptr->link);
-               dbclrbuf(sybase_ptr->link,DBLASTROW(sybase_ptr->link)-1); 
-               i++;
-       }
-       result->num_rows = DBCOUNT(sybase_ptr->link);
-       
-       result->fields = (sybase_field *) safe_emalloc(sizeof(sybase_field), num_fields, 0);
-       j=0;
-       for (i=0; i<num_fields; i++) {
-               char *fname = dbcolname(sybase_ptr->link,i+1);
-               char computed_buf[16];
-               
-               if (*fname) {
-                       result->fields[i].name = estrdup(fname);
-               } else {
-                       if (j>0) {
-                               snprintf(computed_buf,16,"computed%d",j);
-                       } else {
-                               strcpy(computed_buf,"computed");
-                       }
-                       result->fields[i].name = estrdup(computed_buf);
-                       j++;
-               }
-               result->fields[i].max_length = dbcollen(sybase_ptr->link,i+1);
-               result->fields[i].column_source = estrdup(dbcolsource(sybase_ptr->link,i+1));
-               if (!result->fields[i].column_source) {
-                       result->fields[i].column_source = STR_EMPTY_ALLOC();
-               }
-               Z_TYPE(result->fields[i]) = column_types[i];
-               /* set numeric flag */
-               switch (column_types[i]) {
-                       case SYBINT2:
-                       case SYBINT4:
-                       case SYBFLT8:
-                       case SYBREAL:
-                               result->fields[i].numeric = 1;
-                               break;
-                       case SYBCHAR:
-                       case SYBTEXT:
-                       default:
-                               result->fields[i].numeric = 0;
-                               break;
-               }
-       }
-       efree(column_types);
-       Z_LVAL_P(return_value) = zend_list_insert(result,php_sybase_module.le_result);
-       Z_TYPE_P(return_value) = IS_LONG;
-
-       /**
-        * mgruetzner@rw3.com -- 3-6/2003
-        *
-        * If you do a query that calls a stored procedure which returns
-        * data AND calls raiserror to generated a user-defined error message,
-        * then after retrieving the first set of results above, the call
-        * to dbresults will have returned SUCCESS, instead of NO_MORE_RESULTS
-        * which indicates that the message generated by raiserror is still 
-        * waiting to be read.  If this is the case, then call dbresults
-        * again to force the reading of the message.  This will ensure the 
-        * get_last_message call will return the message properly if called
-        * after mssql_query, like it should.
-        *
-        * One thing to note, we are assuming that no more data should follow
-        * in this case--only the message will be read.  To make sure, I have
-        * added a call to dbnextrow.  The assumption is that it will return
-        * NO_MORE_ROWS in this case.  If the assumption is false, generate
-        * a PHP error so we can debug this case.
-        *
-        */
-       if (dbresults_retval != NO_MORE_RESULTS) {
-               /* Call dbresults again to read message */
-               dbresults_retval = dbresults(sybase_ptr->link);
-
-               /* Check assumption that dbnextrow returns NO_MORE_ROWS */
-               retvalue = dbnextrow(sybase_ptr->link);
-               if (retvalue != NO_MORE_ROWS) {
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING,"Expected dbnextrow() to return NO_MORE_ROWS");
-               }
-       }
-}
-/* }}} */
-
-                        
-/* {{{ proto bool sybase_free_result(int result)
-   Free result memory */
-PHP_FUNCTION(sybase_free_result)
-{
-       zval **sybase_result_index;
-       sybase_result *result;
-       int type;
-       
-       if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &sybase_result_index) == FAILURE) {
-               WRONG_PARAM_COUNT;
-       }
-       
-       convert_to_long_ex(sybase_result_index);
-       if (Z_LVAL_PP(sybase_result_index)==0) {
-               RETURN_FALSE;
-       }
-       result = (sybase_result *) zend_list_find(Z_LVAL_PP(sybase_result_index),&type);
-       
-       if (type!=php_sybase_module.le_result) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "%ld is not a Sybase result index", Z_LVAL_PP(sybase_result_index));
-               RETURN_FALSE;
-       }
-       zend_list_delete(Z_LVAL_PP(sybase_result_index));
-       RETURN_TRUE;
-}
-/* }}} */
-
-
-
-/* {{{ proto string sybase_get_last_message(void)
-   Returns the last message from server (over min_message_severity) */
-PHP_FUNCTION(sybase_get_last_message)
-{
-       RETURN_STRING(php_sybase_module.server_message,1);
-}
-/* }}} */
-
-/* {{{ proto int sybase_num_rows(int result)
-   Get number of rows in result */
-PHP_FUNCTION(sybase_num_rows)
-{
-       zval **result_index;
-       int type,id;
-       sybase_result *result;
-       
-       if (ZEND_NUM_ARGS() !=1 || zend_get_parameters_ex(1, &result_index) == FAILURE) {
-               WRONG_PARAM_COUNT;
-       }
-       
-       convert_to_long_ex(result_index);
-       id = Z_LVAL_PP(result_index);
-       
-       result = (sybase_result *) zend_list_find(id,&type);
-       if (type!=php_sybase_module.le_result) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING,"%d is not a Sybase result index",id);
-               RETURN_FALSE;
-       }       
-       
-       Z_LVAL_P(return_value) = result->num_rows;
-       Z_TYPE_P(return_value) = IS_LONG;
-}
-/* }}} */
-
-/* {{{ proto int sybase_num_fields(int result)
-   Get number of fields in result */
-PHP_FUNCTION(sybase_num_fields)
-{
-       zval **result_index;
-       int type,id;
-       sybase_result *result;
-       
-       if (ZEND_NUM_ARGS() !=1 || zend_get_parameters_ex(1, &result_index) == FAILURE) {
-               WRONG_PARAM_COUNT;
-       }
-       
-       convert_to_long_ex(result_index);
-       id = Z_LVAL_PP(result_index);
-       
-       result = (sybase_result *) zend_list_find(id,&type);
-       if (type!=php_sybase_module.le_result) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING,"%d is not a Sybase result index",id);
-               RETURN_FALSE;
-       }       
-       
-       Z_LVAL_P(return_value) = result->num_fields;
-       Z_TYPE_P(return_value) = IS_LONG;
-}
-/* }}} */
-
-/* {{{ proto array sybase_fetch_row(int result)
-   Get row as enumerated array */
-PHP_FUNCTION(sybase_fetch_row)
-{
-       zval **sybase_result_index;
-       int type,i,id;
-       sybase_result *result;
-       zval *field_content;
-
-       if (ZEND_NUM_ARGS() !=1 || zend_get_parameters_ex(1, &sybase_result_index)==FAILURE) {
-               WRONG_PARAM_COUNT;
-       }
-       
-       convert_to_long_ex(sybase_result_index);
-       id = Z_LVAL_PP(sybase_result_index);
-       
-       result = (sybase_result *) zend_list_find(id,&type);
-       if (type!=php_sybase_module.le_result) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING,"%d is not a Sybase result index",id);
-               RETURN_FALSE;
-       }
-       
-       if (result->cur_row >= result->num_rows) {
-               RETURN_FALSE;
-       }
-       
-       array_init(return_value);
-       for (i=0; i<result->num_fields; i++) {
-               Z_ADDREF_P(result->data[result->cur_row][i]);
-               zend_hash_index_update(Z_ARRVAL_P(return_value), i, (void *) &result->data[result->cur_row][i], sizeof(zval *), NULL);
-       }
-       result->cur_row++;
-}
-/* }}} */
-
-
-static void php_sybase_fetch_hash(INTERNAL_FUNCTION_PARAMETERS)
-{
-       zval **sybase_result_index;
-       sybase_result *result;
-       int type;
-       int i;
-       
-       if (ZEND_NUM_ARGS() !=1 || zend_get_parameters_ex(1, &sybase_result_index) == FAILURE) {
-               WRONG_PARAM_COUNT;
-       }
-       
-       convert_to_long_ex(sybase_result_index);
-       result = (sybase_result *) zend_list_find(Z_LVAL_PP(sybase_result_index),&type);
-       
-       if (type!=php_sybase_module.le_result) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "%ld is not a Sybase result index", Z_LVAL_PP(sybase_result_index));
-               RETURN_FALSE;
-       }
-       
-       if (result->cur_row >= result->num_rows) {
-               RETURN_FALSE;
-       }
-       
-       array_init(return_value);
-       
-       for (i=0; i<result->num_fields; i++) {
-               Z_ADDREF_P(result->data[result->cur_row][i]);
-               zend_hash_index_update(Z_ARRVAL_P(return_value), i, (void *) &result->data[result->cur_row][i], sizeof(zval *), NULL);
-               Z_ADDREF_P(result->data[result->cur_row][i]);
-               zend_hash_update(Z_ARRVAL_P(return_value), result->fields[i].name, strlen(result->fields[i].name)+1, (void *) &result->data[result->cur_row][i], sizeof(zval  *), NULL);
-       }
-       result->cur_row++;
-}
-
-
-/* {{{ proto object sybase_fetch_object(int result)
-   Fetch row as object */
-PHP_FUNCTION(sybase_fetch_object)
-{
-       php_sybase_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU);
-       if (Z_TYPE_P(return_value)==IS_ARRAY) {
-               object_and_properties_init(
-                       return_value,
-                       ZEND_STANDARD_CLASS_DEF_PTR,
-                       Z_ARRVAL_P(return_value)
-               );
-       }
-}
-/* }}} */
-
-/* {{{ proto array sybase_fetch_array(int result)
-   Fetch row as array */
-PHP_FUNCTION(sybase_fetch_array)
-{
-       php_sybase_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU);
-}
-/* }}} */
-
-/* {{{ proto bool sybase_data_seek(int result, int offset)
-   Move internal row pointer */
-PHP_FUNCTION(sybase_data_seek)
-{
-       zval **sybase_result_index, **offset;
-       int type,id;
-       sybase_result *result;
-
-       if (ZEND_NUM_ARGS()!=2 || zend_get_parameters_ex(2, &sybase_result_index, &offset) == FAILURE) {
-               WRONG_PARAM_COUNT;
-       }
-       
-       convert_to_long_ex(sybase_result_index);
-       id = Z_LVAL_PP(sybase_result_index);
-       
-       result = (sybase_result *) zend_list_find(id,&type);
-       if (type!=php_sybase_module.le_result) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING,"%d is not a Sybase result index",id);
-               RETURN_FALSE;
-       }
-
-       convert_to_long_ex(offset);
-       if (Z_LVAL_PP(offset)<0 || Z_LVAL_PP(offset)>=result->num_rows) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING,"Sybase:  Bad row offset");
-               RETURN_FALSE;
-       }
-       
-       result->cur_row = Z_LVAL_PP(offset);
-       RETURN_TRUE;
-}
-/* }}} */
-
-static char *php_sybase_get_field_name(int type)
-{
-       switch (type) {
-               case SYBBINARY:
-               case SYBVARBINARY:
-                       return "blob";
-                       break;
-               case SYBCHAR:
-               case SYBVARCHAR:
-               case SYBTEXT:
-                       return "string";
-               case SYBDATETIME:
-               case SYBDATETIME4:
-               case SYBDATETIMN:
-                       return "datetime";
-                       break;
-               case SYBDECIMAL:
-               case SYBFLT8:
-               case SYBFLTN:
-               case SYBREAL:
-               case SYBNUMERIC:
-                       return "real";
-                       break;
-               case SYBINT1:
-               case SYBINT2:
-               case SYBINT4:
-               case SYBINTN:
-                       return "int";
-                       break;
-               case SYBMONEY:
-               case SYBMONEY4:
-               case SYBMONEYN:
-                       return "money";
-                       break;
-               case SYBBIT:
-                       return "bit";
-                       break;
-               case SYBIMAGE:
-                       return "image";
-                       break;
-               default:
-                       return "unknown";
-                       break;
-       }
-}
-
-
-/* {{{ proto object sybase_fetch_field(int result [, int offset])
-   Get field information */
-PHP_FUNCTION(sybase_fetch_field)
-{
-       zval **sybase_result_index, **offset;
-       int type,id,field_offset;
-       sybase_result *result;
-
-       switch (ZEND_NUM_ARGS()) {
-               case 1:
-                       if (zend_get_parameters_ex(1, &sybase_result_index) == FAILURE) {
-                               RETURN_FALSE;
-                       }
-                       field_offset=-1;
-                       break;
-               case 2:
-                       if (zend_get_parameters_ex(2, &sybase_result_index, &offset) == FAILURE) {
-                               RETURN_FALSE;
-                       }
-                       convert_to_long_ex(offset);
-                       field_offset = Z_LVAL_PP(offset);
-                       break;
-               default:
-                       WRONG_PARAM_COUNT;
-                       break;
-       }
-       
-       convert_to_long_ex(sybase_result_index);
-       id = Z_LVAL_PP(sybase_result_index);
-       
-       result = (sybase_result *) zend_list_find(id,&type);
-       if (type!=php_sybase_module.le_result) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING,"%d is not a Sybase result index",id);
-               RETURN_FALSE;
-       }
-       
-       if (field_offset==-1) {
-               field_offset = result->cur_field;
-               result->cur_field++;
-       }
-       
-       if (field_offset<0 || field_offset >= result->num_fields) {
-               if (ZEND_NUM_ARGS()==2) { /* field specified explicitly */
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING,"Sybase:  Bad column offset");
-               }
-               RETURN_FALSE;
-       }
-
-       object_init(return_value);
-
-       add_property_string(return_value, "name",result->fields[field_offset].name, 1);
-       add_property_long(return_value, "max_length",result->fields[field_offset].max_length);
-       add_property_string(return_value, "column_source",result->fields[field_offset].column_source, 1);
-       add_property_long(return_value, "numeric", result->fields[field_offset].numeric);
-       add_property_string(return_value, "type", php_sybase_get_field_name(Z_TYPE(result->fields[field_offset])), 1);
-}
-/* }}} */
-
-/* {{{ proto bool sybase_field_seek(int result, int offset)
-   Set field offset */
-PHP_FUNCTION(sybase_field_seek)
-{
-       zval **sybase_result_index, **offset;
-       int type,id,field_offset;
-       sybase_result *result;
-
-       if (ZEND_NUM_ARGS() !=2 || zend_get_parameters_ex(2, &sybase_result_index, &offset) == FAILURE) {
-               WRONG_PARAM_COUNT;
-       }
-       
-       convert_to_long_ex(sybase_result_index);
-       id = Z_LVAL_PP(sybase_result_index);
-       
-       result = (sybase_result *) zend_list_find(id,&type);
-       if (type!=php_sybase_module.le_result) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING,"%d is not a Sybase result index",id);
-               RETURN_FALSE;
-       }
-       
-       convert_to_long_ex(offset);
-       field_offset = Z_LVAL_PP(offset);
-       
-       if (field_offset<0 || field_offset >= result->num_fields) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING,"Sybase:  Bad column offset");
-               RETURN_FALSE;
-       }
-
-       result->cur_field = field_offset;
-       RETURN_TRUE;
-}
-/* }}} */
-
-/* {{{ proto string sybase_result(int result, int row, mixed field)
-   Get result data */
-PHP_FUNCTION(sybase_result)
-{
-       zval **row, **field, **sybase_result_index;
-       int id,type,field_offset=0;
-       sybase_result *result;
-       
-
-       if (ZEND_NUM_ARGS() !=3 || zend_get_parameters_ex(3, &sybase_result_index, &row, &field) == FAILURE) {
-               WRONG_PARAM_COUNT;
-       }
-
-       convert_to_long_ex(sybase_result_index);
-       id = Z_LVAL_PP(sybase_result_index);
-       
-       result = (sybase_result *) zend_list_find(id,&type);
-       if (type!=php_sybase_module.le_result) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING,"%d is not a Sybase result index",id);
-               RETURN_FALSE;
-       }
-       
-       convert_to_long_ex(row);
-       if (Z_LVAL_PP(row)<0 || Z_LVAL_PP(row)>=result->num_rows) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING,"Sybase:  Bad row offset (%ld)", Z_LVAL_PP(row));
-               RETURN_FALSE;
-       }
-
-       switch(Z_TYPE_PP(field)) {
-               case IS_STRING: {
-                       int i;
-
-                       for (i=0; i<result->num_fields; i++) {
-                               if (!strcasecmp(result->fields[i].name,Z_STRVAL_PP(field))) {
-                                       field_offset = i;
-                                       break;
-                               }
-                       }
-                       if (i>=result->num_fields) { /* no match found */
-                               php_error_docref(NULL TSRMLS_CC, E_WARNING,"Sybase:  %s field not found in result",Z_STRVAL_PP(field));
-                               RETURN_FALSE;
-                       }
-                       break;
-               }
-               default:
-                       convert_to_long_ex(field);
-                       field_offset = Z_LVAL_PP(field);
-                       if (field_offset<0 || field_offset>=result->num_fields) {
-                               php_error_docref(NULL TSRMLS_CC, E_WARNING,"Sybase:  Bad column offset specified");
-                               RETURN_FALSE;
-                       }
-                       break;
-       }
-
-       *return_value = *result->data[Z_LVAL_PP(row)][field_offset];
-       zval_copy_ctor(return_value);
-}
-/* }}} */
-
-
-/* {{{ proto int sybase_affected_rows([int link_id])
-    Get number of affected rows in last query */
-PHP_FUNCTION(sybase_affected_rows)
-{
-       zval **sybase_link_index = NULL;
-       sybase_link *sybase_ptr = NULL;
-       int id                  = 0;
-       int type                = 0;
-
-       switch(ZEND_NUM_ARGS()) {
-               case 0:
-                       id = php_sybase_module.default_link;
-                       break;
-               case 1:
-                       if (zend_get_parameters_ex(1, &sybase_link_index) == FAILURE) {
-                               RETURN_FALSE;
-                       }
-                       convert_to_long_ex(sybase_link_index);
-                       id = Z_LVAL_PP(sybase_link_index);
-                       break;
-               default:
-                       WRONG_PARAM_COUNT;
-                       break;
-       }
-       
-       sybase_ptr = (sybase_link *)zend_list_find(id, &type);
-
-       if(type != php_sybase_module.le_link && type != php_sybase_module.le_plink) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING,"%d is not a Sybase link index",id);
-               RETURN_FALSE;
-       }
-
-       Z_LVAL_P(return_value) = DBCOUNT(sybase_ptr->link);
-       Z_TYPE_P(return_value) = IS_LONG;
-}
-
-PHP_MINFO_FUNCTION(sybase)
-{
-       char maxp[32], maxl[32];
-       
-       if (php_sybase_module.max_persistent==-1) {
-               snprintf(maxp, 31, "%ld/unlimited", php_sybase_module.num_persistent );
-       } else {
-               snprintf(maxp, 31, "%ld/%ld", php_sybase_module.num_persistent, php_sybase_module.max_persistent);
-       }
-       maxp[31]=0;
-
-       if (php_sybase_module.max_links==-1) {
-               snprintf(maxl, 31, "%ld/unlimited", php_sybase_module.num_links );
-       } else {
-               snprintf(maxl, 31, "%ld/%ld", php_sybase_module.num_links, php_sybase_module.max_links);
-       }
-       maxl[31]=0;
-
-       php_info_print_table_start();
-       php_info_print_table_row(2, "Sybase Support", "enabled");
-       php_info_print_table_row(2, "Allow Persistent Links", (php_sybase_module.allow_persistent?"Yes":"No") );
-       php_info_print_table_row(2, "Persistent Links", maxp);
-       php_info_print_table_row(2, "Total Links", maxl);
-       php_info_print_table_row(2, "Application Name", php_sybase_module.appname );
-       php_info_print_table_row(2, "Client API Version", dbversion() );
-       php_info_print_table_end();
-
-}
-
-
-/* {{{ proto void sybase_min_error_severity(int severity)
-   Sets the minimum error severity */
-PHP_FUNCTION(sybase_min_error_severity)
-{
-       zval **severity;
-       
-       if (ZEND_NUM_ARGS() !=1 || zend_get_parameters_ex(1, &severity) == FAILURE) {
-               WRONG_PARAM_COUNT;
-       }
-       convert_to_long_ex(severity);
-       php_sybase_module.min_error_severity = Z_LVAL_PP(severity);
-}
-/* }}} */
-
-/* {{{ proto void sybase_min_message_severity(int severity)
-   Sets the minimum message severity */
-PHP_FUNCTION(sybase_min_message_severity)
-{
-       zval **severity;
-       
-       if (ZEND_NUM_ARGS() !=1 || zend_get_parameters_ex(1, &severity) == FAILURE) {
-               WRONG_PARAM_COUNT;
-       }
-       convert_to_long_ex(severity);
-       php_sybase_module.min_message_severity = Z_LVAL_PP(severity);
-}
-/* }}} */
-
-#endif
diff --git a/ext/sybase/php_sybase_db.h b/ext/sybase/php_sybase_db.h
deleted file mode 100644 (file)
index eca3058..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
-/* 
-   +----------------------------------------------------------------------+
-   | PHP Version 5                                                        |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2008 The PHP Group                                |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 3.01 of the PHP license,      |
-   | that is bundled with this package in the file LICENSE, and is        |
-   | available through the world-wide-web at the following url:           |
-   | http://www.php.net/license/3_01.txt                                  |
-   | If you did not receive a copy of the PHP license and are unable to   |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@php.net so we can mail you a copy immediately.               |
-   +----------------------------------------------------------------------+
-   | Author: Zeev Suraski <zeev@zend.com>                                 |
-   +----------------------------------------------------------------------+
-*/
-
-/* $Id$ */
-
-#ifndef PHP_SYBASE_DB_H
-#define PHP_SYBASE_DB_H
-
-#if HAVE_SYBASE
-
-extern zend_module_entry sybase_module_entry;
-#define sybase_module_ptr &sybase_module_entry
-
-PHP_MINIT_FUNCTION(sybase);
-PHP_RINIT_FUNCTION(sybase);
-PHP_MSHUTDOWN_FUNCTION(sybase);
-PHP_RSHUTDOWN_FUNCTION(sybase);
-PHP_MINFO_FUNCTION(sybase);
-PHP_FUNCTION(sybase_connect);
-PHP_FUNCTION(sybase_pconnect);
-PHP_FUNCTION(sybase_close);
-PHP_FUNCTION(sybase_select_db);
-PHP_FUNCTION(sybase_query);
-PHP_FUNCTION(sybase_free_result);
-PHP_FUNCTION(sybase_get_last_message);
-PHP_FUNCTION(sybase_num_rows);
-PHP_FUNCTION(sybase_num_fields);
-PHP_FUNCTION(sybase_fetch_row);
-PHP_FUNCTION(sybase_fetch_array);
-PHP_FUNCTION(sybase_fetch_object);
-PHP_FUNCTION(sybase_data_seek);
-PHP_FUNCTION(sybase_affected_rows);
-PHP_FUNCTION(sybase_result);
-PHP_FUNCTION(sybase_field_seek);
-PHP_FUNCTION(sybase_min_error_severity);
-PHP_FUNCTION(sybase_min_message_severity);
-
-PHP_FUNCTION(sybase_db_query);
-PHP_FUNCTION(sybase_list_fields);
-PHP_FUNCTION(sybase_fetch_lengths);
-PHP_FUNCTION(sybase_fetch_field);
-PHP_FUNCTION(sybase_field_seek);
-PHP_FUNCTION(sybase_free_result);
-PHP_FUNCTION(sybase_field_name);
-PHP_FUNCTION(sybase_field_table);
-PHP_FUNCTION(sybase_field_len);
-PHP_FUNCTION(sybase_field_type);
-PHP_FUNCTION(sybase_field_flags);
-
-
-typedef struct {
-       long default_link;
-       long num_links,num_persistent;
-       long max_links,max_persistent;
-       long allow_persistent;
-       char *appname;
-       char *server_message;
-       int le_link,le_plink,le_result;
-       long min_error_severity,min_message_severity;
-       long cfg_min_error_severity,cfg_min_message_severity;
-       long compatability_mode;
-} sybase_module;
-
-extern sybase_module php_sybase_module;
-
-#else
-
-#define sybase_module_ptr NULL
-
-#endif
-
-#define phpext_sybase_ptr sybase_module_ptr
-
-#endif /* PHP_SYBASE_DB_H */