X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/d7d7b7b91dd75cec636fc144da7e27eed860f971..5903c6ff59527362e869fedb565c56935ce8dd68:/src/src/lookups/ibase.c diff --git a/src/src/lookups/ibase.c b/src/src/lookups/ibase.c index c5fa88210..7f1775c1f 100644 --- a/src/src/lookups/ibase.c +++ b/src/src/lookups/ibase.c @@ -1,24 +1,15 @@ -/* $Cambridge: exim/src/src/lookups/ibase.c,v 1.3 2006/02/07 11:19:01 ph10 Exp $ */ - /************************************************* * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2006 */ +/* Copyright (c) University of Cambridge 1995 - 2015 */ /* See the file NOTICE for conditions of use and distribution. */ /* The code in this module was contributed by Ard Biesheuvel. */ #include "../exim.h" #include "lf_functions.h" -#include "ibase.h" -#ifndef LOOKUP_IBASE -static void dummy(int x) -{ - dummy(x - 1); -} -#else #include /* The system header */ /* Structure and anchor for caching connections. */ @@ -40,7 +31,7 @@ static ibase_connection *ibase_connections = NULL; /* See local README for interface description. */ -void *ibase_open(uschar * filename, uschar ** errmsg) +static void *ibase_open(uschar * filename, uschar ** errmsg) { return (void *) (1); /* Just return something non-null */ } @@ -53,7 +44,7 @@ void *ibase_open(uschar * filename, uschar ** errmsg) /* See local README for interface description. */ -void ibase_tidy(void) +static void ibase_tidy(void) { ibase_connection *cn; ISC_STATUS status[20]; @@ -300,35 +291,35 @@ has the password removed. This copy is also used for debugging output. */ (char *) store_get(sizeof(char) * var->sqllen); break; case SQL_SHORT: - var->sqldata = (char *) store_get(sizeof(short)); + var->sqldata = CS store_get(sizeof(short)); break; case SQL_LONG: - var->sqldata = (char *) store_get(sizeof(ISC_LONG)); + var->sqldata = CS store_get(sizeof(ISC_LONG)); break; #ifdef SQL_INT64 case SQL_INT64: - var->sqldata = (char *) store_get(sizeof(ISC_INT64)); + var->sqldata = CS store_get(sizeof(ISC_INT64)); break; #endif case SQL_FLOAT: - var->sqldata = (char *) store_get(sizeof(float)); + var->sqldata = CS store_get(sizeof(float)); break; case SQL_DOUBLE: - var->sqldata = (char *) store_get(sizeof(double)); + var->sqldata = CS store_get(sizeof(double)); break; #ifdef SQL_TIMESTAMP case SQL_DATE: - var->sqldata = (char *) store_get(sizeof(ISC_QUAD)); + var->sqldata = CS store_get(sizeof(ISC_QUAD)); break; #else case SQL_TIMESTAMP: - var->sqldata = (char *) store_get(sizeof(ISC_TIMESTAMP)); + var->sqldata = CS store_get(sizeof(ISC_TIMESTAMP)); break; case SQL_TYPE_DATE: - var->sqldata = (char *) store_get(sizeof(ISC_DATE)); + var->sqldata = CS store_get(sizeof(ISC_DATE)); break; case SQL_TYPE_TIME: - var->sqldata = (char *) store_get(sizeof(ISC_TIME)); + var->sqldata = CS store_get(sizeof(ISC_TIME)); break; #endif } @@ -362,14 +353,14 @@ has the password removed. This copy is also used for debugging output. */ } if (result != NULL) - result = string_cat(result, &ssize, &offset, US "\n", 1); + result = string_catn(result, &ssize, &offset, US "\n", 1); /* Find the number of fields returned. If this is one, we don't add field names to the data. Otherwise we do. */ if (out_sqlda->sqld == 1) { if (out_sqlda->sqlvar[0].sqlind == NULL || *out_sqlda->sqlvar[0].sqlind != -1) /* NULL value yields nothing */ result = - string_cat(result, &ssize, &offset, US buffer, + string_catn(result, &ssize, &offset, US buffer, fetch_field(buffer, sizeof(buffer), &out_sqlda->sqlvar[0])); } @@ -383,19 +374,19 @@ has the password removed. This copy is also used for debugging output. */ string_cat(result, &ssize, &offset, US out_sqlda->sqlvar[i].aliasname, out_sqlda->sqlvar[i].aliasname_length); - result = string_cat(result, &ssize, &offset, US "=", 1); + result = string_catn(result, &ssize, &offset, US "=", 1); /* Quote the value if it contains spaces or is empty */ if (*out_sqlda->sqlvar[i].sqlind == -1) { /* NULL value */ result = - string_cat(result, &ssize, &offset, US "\"\"", 2); + string_catn(result, &ssize, &offset, US "\"\"", 2); } else if (buffer[0] == 0 || Ustrchr(buffer, ' ') != NULL) { int j; result = - string_cat(result, &ssize, &offset, US "\"", 1); + string_catn(result, &ssize, &offset, US "\"", 1); for (j = 0; j < len; j++) { if (buffer[j] == '\"' || buffer[j] == '\\') result = @@ -406,13 +397,12 @@ has the password removed. This copy is also used for debugging output. */ US buffer + j, 1); } result = - string_cat(result, &ssize, &offset, US "\"", 1); + string_catn(result, &ssize, &offset, US "\"", 1); } else { result = - string_cat(result, &ssize, &offset, US buffer, - len); + string_catn(result, &ssize, &offset, US buffer, len); } - result = string_cat(result, &ssize, &offset, US " ", 1); + result = string_catn(result, &ssize, &offset, US " ", 1); } } @@ -436,7 +426,7 @@ always leaves enough room for a terminating zero. */ if (stmth != NULL) isc_dsql_free_statement(status, &stmth, DSQL_drop); -/* Non-NULL result indicates a sucessful result */ +/* Non-NULL result indicates a successful result */ if (result != NULL) { *resultptr = result; @@ -458,9 +448,9 @@ always leaves enough room for a terminating zero. */ arguments are not used. Loop through a list of servers while the query is deferred with a retryable error. */ -int +static int ibase_find(void *handle, uschar * filename, uschar * query, int length, - uschar ** result, uschar ** errmsg, BOOL *do_cache) + uschar ** result, uschar ** errmsg, uint *do_cache) { int sep = 0; uschar *server; @@ -510,7 +500,7 @@ Arguments: Returns: the processed string or NULL for a bad option */ -uschar *ibase_quote(uschar * s, uschar * opt) +static uschar *ibase_quote(uschar * s, uschar * opt) { register int c; int count = 0; @@ -553,6 +543,41 @@ uschar *ibase_quote(uschar * s, uschar * opt) return quoted; } + +/************************************************* +* Version reporting entry point * +*************************************************/ + +/* See local README for interface description. */ + +#include "../version.h" + +void +ibase_version_report(FILE *f) +{ +#ifdef DYNLOOKUP +fprintf(f, "Library version: ibase: Exim version %s\n", EXIM_VERSION_STR); +#endif +} + + +static lookup_info _lookup_info = { + US"ibase", /* lookup name */ + lookup_querystyle, /* query-style lookup */ + ibase_open, /* open function */ + NULL, /* no check function */ + ibase_find, /* find function */ + NULL, /* no close function */ + ibase_tidy, /* tidy function */ + ibase_quote, /* quoting function */ + ibase_version_report /* version reporting */ +}; + +#ifdef DYNLOOKUP +#define ibase_lookup_module_info _lookup_module_info #endif +static lookup_info *_lookup_list[] = { &_lookup_info }; +lookup_module_info ibase_lookup_module_info = { LOOKUP_MODULE_INFO_MAGIC, _lookup_list, 1 }; + /* End of lookups/ibase.c */