git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Debug: feed startup "whats supported" info through normal debug channel
[exim.git]
/
src
/
src
/
lookups
/
mysql.c
diff --git
a/src/src/lookups/mysql.c
b/src/src/lookups/mysql.c
index 4e6ca8a72cd813b034b8684a5915ac41137d72fb..782ad2a5fb1c73642ecb531064ef0f4148b6f060 100644
(file)
--- a/
src/src/lookups/mysql.c
+++ b/
src/src/lookups/mysql.c
@@
-308,7
+308,7
@@
fields = mysql_fetch_fields(mysql_result);
while ((mysql_row_data = mysql_fetch_row(mysql_result)))
{
while ((mysql_row_data = mysql_fetch_row(mysql_result)))
{
- unsigned long *lengths = mysql_fetch_lengths(mysql_result);
+ unsigned long *
lengths = mysql_fetch_lengths(mysql_result);
if (result)
result = string_catn(result, US"\n", 1);
if (result)
result = string_catn(result, US"\n", 1);
@@
-319,7
+319,9
@@
while ((mysql_row_data = mysql_fetch_row(mysql_result)))
result);
else if (mysql_row_data[0] != NULL) /* NULL value yields nothing */
result);
else if (mysql_row_data[0] != NULL) /* NULL value yields nothing */
- result = string_catn(result, US mysql_row_data[0], lengths[0]);
+ result = lengths[0] == 0 && !result
+ ? string_get(1) /* for 0-len string result ensure non-null gstring */
+ : string_catn(result, US mysql_row_data[0], lengths[0]);
}
/* more results? -1 = no, >0 = error, 0 = yes (keep looping)
}
/* more results? -1 = no, >0 = error, 0 = yes (keep looping)
@@
-416,38
+418,33
@@
Returns: the processed string or NULL for a bad option
*/
static uschar *
*/
static uschar *
-mysql_quote(uschar *
s, uschar *
opt)
+mysql_quote(uschar *
s, uschar *
opt)
{
register int c;
int count = 0;
uschar *t = s;
uschar *quoted;
{
register int c;
int count = 0;
uschar *t = s;
uschar *quoted;
-if (opt
!= NULL
) return NULL; /* No options recognized */
+if (opt) return NULL; /* No options recognized */
-while ((c = *t++)
!= 0
)
+while ((c = *t++))
if (Ustrchr("\n\t\r\b\'\"\\", c) != NULL) count++;
if (count == 0) return s;
t = quoted = store_get(Ustrlen(s) + count + 1, is_tainted(s));
if (Ustrchr("\n\t\r\b\'\"\\", c) != NULL) count++;
if (count == 0) return s;
t = quoted = store_get(Ustrlen(s) + count + 1, is_tainted(s));
-while ((c = *s++)
!= 0
)
+while ((c = *s++))
{
if (Ustrchr("\n\t\r\b\'\"\\", c) != NULL)
{
*t++ = '\\';
switch(c)
{
{
if (Ustrchr("\n\t\r\b\'\"\\", c) != NULL)
{
*t++ = '\\';
switch(c)
{
- case '\n': *t++ = 'n';
- break;
- case '\t': *t++ = 't';
- break;
- case '\r': *t++ = 'r';
- break;
- case '\b': *t++ = 'b';
- break;
- default: *t++ = c;
- break;
+ case '\n': *t++ = 'n'; break;
+ case '\t': *t++ = 't'; break;
+ case '\r': *t++ = 'r'; break;
+ case '\b': *t++ = 'b'; break;
+ default: *t++ = c; break;
}
}
else *t++ = c;
}
}
else *t++ = c;
@@
-466,16
+463,19
@@
return quoted;
#include "../version.h"
#include "../version.h"
-void
-mysql_version_report(
FILE *f
)
+gstring *
+mysql_version_report(
gstring * g
)
{
{
-fprintf(f, "Library version: MySQL: Compile: %lu %s [%s]\n"
- " Runtime: %lu %s\n",
+g = string_fmt_append(g,
+ "Library version: MySQL: Compile: %lu %s [%s]\n"
+ " Runtime: %lu %s\n",
(long)EXIM_MxSQL_VERSION_ID, EXIM_MxSQL_VERSION_STR, EXIM_MxSQL_BASE_STR,
mysql_get_client_version(), mysql_get_client_info());
#ifdef DYNLOOKUP
(long)EXIM_MxSQL_VERSION_ID, EXIM_MxSQL_VERSION_STR, EXIM_MxSQL_BASE_STR,
mysql_get_client_version(), mysql_get_client_info());
#ifdef DYNLOOKUP
-fprintf(f, " Exim version %s\n", EXIM_VERSION_STR);
+g = string_fmt_append(g,
+ " Exim version %s\n", EXIM_VERSION_STR);
#endif
#endif
+return g;
}
/* These are the lookup_info blocks for this driver */
}
/* These are the lookup_info blocks for this driver */