Debug: indent lookup operations

[exim.git] / src / src / lookups / pgsql.c

diff --git a/src/src/lookups/pgsql.c b/src/src/lookups/pgsql.c
index 4be3d98f1546159154f4d74f2f1a605adead9767..cf1e1743e5329787f4da632c0d61ef8d08cfaf82 100644 (file)
--- a/src/src/lookups/pgsql.c
+++ b/src/src/lookups/pgsql.c
@@ -2,7 +2,7 @@
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 

-/* Copyright (c) University of Cambridge 1995 - 2015 */
+/* Copyright (c) University of Cambridge 1995 - 2018 */

 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Thanks to Petr Cech for contributing the original code for these
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Thanks to Petr Cech for contributing the original code for these


@@ -53,7 +53,7 @@ pgsql_connection *cn;
 while ((cn = pgsql_connections) != NULL)
   {
   pgsql_connections = cn->next;
 while ((cn = pgsql_connections) != NULL)
   {
   pgsql_connections = cn->next;

-  DEBUG(D_lookup) debug_printf("close PGSQL connection: %s\n", cn->server);
+  DEBUG(D_lookup) debug_printf_indent("close PGSQL connection: %s\n", cn->server);

   PQfinish(cn->handle);
   }
 }
   PQfinish(cn->handle);
   }
 }


@@ -77,7 +77,7 @@ static void
 notice_processor(void *arg, const char *message)
 {
 arg = arg;   /* Keep compiler happy */
 notice_processor(void *arg, const char *message)
 {
 arg = arg;   /* Keep compiler happy */

-DEBUG(D_lookup) debug_printf("PGSQL: %s\n", message);
+DEBUG(D_lookup) debug_printf_indent("PGSQL: %s\n", message);

 }
 
 
 }
 
 


@@ -97,7 +97,7 @@ configuration line for PostgreSQL via Unix domain sockets looks like this:
 hide pgsql_servers = (/tmp/.s.PGSQL.5432)/db/user/password[:<nextserver>]
 
 We enclose the path name in parentheses so that its slashes aren't visually
 hide pgsql_servers = (/tmp/.s.PGSQL.5432)/db/user/password[:<nextserver>]
 
 We enclose the path name in parentheses so that its slashes aren't visually

-confused with the delimeters for the other pgsql_server settings.
+confused with the delimiters for the other pgsql_server settings.

 
 For TCP/IP connections, the server is a host name and optional port (with a
 colon separator).
 
 For TCP/IP connections, the server is a host name and optional port (with a
 colon separator).


@@ -124,12 +124,9 @@ perform_pgsql_search(const uschar *query, uschar *server, uschar **resultptr,
 PGconn *pg_conn = NULL;
 PGresult *pg_result = NULL;
 
 PGconn *pg_conn = NULL;
 PGresult *pg_result = NULL;
 

-int i;
-int ssize = 0;
-int offset = 0;
+gstring * result = NULL;

 int yield = DEFER;
 unsigned int num_fields, num_tuples;
 int yield = DEFER;
 unsigned int num_fields, num_tuples;

-uschar *result = NULL;

 pgsql_connection *cn;
 uschar *server_copy = NULL;
 uschar *sdata[3];
 pgsql_connection *cn;
 uschar *server_copy = NULL;
 uschar *sdata[3];


@@ -139,10 +136,10 @@ path, database, user, password. We can write to the string, since it is in a
 nextinlist temporary buffer. The copy of the string that is used for caching
 has the password removed. This copy is also used for debugging output. */
 
 nextinlist temporary buffer. The copy of the string that is used for caching
 has the password removed. This copy is also used for debugging output. */
 

-for (i = 2; i >= 0; i--)
+for (int i = 2; i >= 0; i--)

   {
   uschar *pp = Ustrrchr(server, '/');
   {
   uschar *pp = Ustrrchr(server, '/');

-  if (pp == NULL)
+  if (!pp)

     {
     *errmsg = string_sprintf("incomplete pgSQL server data: %s",
       (i == 2)? server : server_copy);
     {
     *errmsg = string_sprintf("incomplete pgSQL server data: %s",
       (i == 2)? server : server_copy);


@@ -158,18 +155,16 @@ for (i = 2; i >= 0; i--)
 start is the identification of the server (host or path). See if we have a
 cached connection to the server. */
 
 start is the identification of the server (host or path). See if we have a
 cached connection to the server. */
 

-for (cn = pgsql_connections; cn != NULL; cn = cn->next)
-  {
+for (cn = pgsql_connections; cn; cn = cn->next)

   if (Ustrcmp(cn->server, server_copy) == 0)
     {
     pg_conn = cn->handle;
     break;
     }
   if (Ustrcmp(cn->server, server_copy) == 0)
     {
     pg_conn = cn->handle;
     break;
     }

-  }

 
 /* If there is no cached connection, we must set one up. */
 
 
 /* If there is no cached connection, we must set one up. */
 

-if (cn == NULL)
+if (!cn)

   {
   uschar *port = US"";
 
   {
   uschar *port = US"";
 


@@ -180,23 +175,22 @@ if (cn == NULL)
     uschar *last_slash, *last_dot, *p;
 
     p = ++server;
     uschar *last_slash, *last_dot, *p;
 
     p = ++server;

-    while (*p != 0 && *p != ')') p++;
+    while (*p && *p != ')') p++;

     *p = 0;
 
     last_slash = Ustrrchr(server, '/');
     last_dot = Ustrrchr(server, '.');
 
     *p = 0;
 
     last_slash = Ustrrchr(server, '/');
     last_dot = Ustrrchr(server, '.');
 

-    DEBUG(D_lookup) debug_printf("PGSQL new connection: socket=%s "
+    DEBUG(D_lookup) debug_printf_indent("PGSQL new connection: socket=%s "

       "database=%s user=%s\n", server, sdata[0], sdata[1]);
 
     /* A valid socket name looks like this: /var/run/postgresql/.s.PGSQL.5432
     We have to call PQsetdbLogin with '/var/run/postgresql' as the hostname
     argument and put '5432' into the port variable. */
 
       "database=%s user=%s\n", server, sdata[0], sdata[1]);
 
     /* A valid socket name looks like this: /var/run/postgresql/.s.PGSQL.5432
     We have to call PQsetdbLogin with '/var/run/postgresql' as the hostname
     argument and put '5432' into the port variable. */
 

-    if (last_slash == NULL || last_dot == NULL)
+    if (!last_slash || !last_dot)

       {
       {

-      *errmsg = string_sprintf("PGSQL invalid filename for socket: %s",
-        server);
+      *errmsg = string_sprintf("PGSQL invalid filename for socket: %s", server);

       *defer_break = TRUE;
       return DEFER;
       }
       *defer_break = TRUE;
       return DEFER;
       }


@@ -213,13 +207,13 @@ if (cn == NULL)
   else
     {
     uschar *p;
   else
     {
     uschar *p;

-    if ((p = Ustrchr(server, ':')) != NULL)
+    if ((p = Ustrchr(server, ':')))

       {
       *p++ = 0;
       port = p;
       }
 
       {
       *p++ = 0;
       port = p;
       }
 

-    if (Ustrchr(server, '/') != NULL)
+    if (Ustrchr(server, '/'))

       {
       *errmsg = string_sprintf("unexpected slash in pgSQL server hostname: %s",
         server);
       {
       *errmsg = string_sprintf("unexpected slash in pgSQL server hostname: %s",
         server);


@@ -227,7 +221,7 @@ if (cn == NULL)
       return DEFER;
       }
 
       return DEFER;
       }
 

-    DEBUG(D_lookup) debug_printf("PGSQL new connection: host=%s port=%s "
+    DEBUG(D_lookup) debug_printf_indent("PGSQL new connection: host=%s port=%s "

       "database=%s user=%s\n", server, port, sdata[0], sdata[1]);
     }
 
       "database=%s user=%s\n", server, port, sdata[0], sdata[1]);
     }
 


@@ -276,42 +270,43 @@ if (cn == NULL)
 
 else
   {
 
 else
   {

-  DEBUG(D_lookup) debug_printf("PGSQL using cached connection for %s\n",
+  DEBUG(D_lookup) debug_printf_indent("PGSQL using cached connection for %s\n",

     server_copy);
   }
 
 /* Run the query */
 
     server_copy);
   }
 
 /* Run the query */
 

-  pg_result = PQexec(pg_conn, CS query);
-  switch(PQresultStatus(pg_result))
-    {
-    case PGRES_EMPTY_QUERY:
-    case PGRES_COMMAND_OK:
+pg_result = PQexec(pg_conn, CS query);
+switch(PQresultStatus(pg_result))
+  {
+  case PGRES_EMPTY_QUERY:
+  case PGRES_COMMAND_OK:

     /* The command was successful but did not return any data since it was
     /* The command was successful but did not return any data since it was

-     * not SELECT but either an INSERT, UPDATE or DELETE statement. Tell the
-     * high level code to not cache this query, and clean the current cache for
-     * this handle by setting *do_cache zero. */
-    result = string_copy(US PQcmdTuples(pg_result));
-    offset = Ustrlen(result);
+    not SELECT but either an INSERT, UPDATE or DELETE statement. Tell the
+    high level code to not cache this query, and clean the current cache for
+    this handle by setting *do_cache zero. */
+
+    result = string_cat(result, US PQcmdTuples(pg_result));

     *do_cache = 0;
     *do_cache = 0;

-    DEBUG(D_lookup) debug_printf("PGSQL: command does not return any data "
-      "but was successful. Rows affected: %s\n", result);
+    DEBUG(D_lookup) debug_printf_indent("PGSQL: command does not return any data "
+      "but was successful. Rows affected: %s\n", string_from_gstring(result));
+    break;

 
 

-    case PGRES_TUPLES_OK:
+  case PGRES_TUPLES_OK:

     break;
 
     break;
 

-    default:
+  default:

     /* This was the original code:
     *errmsg = string_sprintf("PGSQL: query failed: %s\n",
     /* This was the original code:
     *errmsg = string_sprintf("PGSQL: query failed: %s\n",

-                             PQresultErrorMessage(pg_result));
+                            PQresultErrorMessage(pg_result));

     This was suggested by a user:
     */
 
     *errmsg = string_sprintf("PGSQL: query failed: %s (%s) (%s)\n",
     This was suggested by a user:
     */
 
     *errmsg = string_sprintf("PGSQL: query failed: %s (%s) (%s)\n",

-                             PQresultErrorMessage(pg_result),
-                             PQresStatus(PQresultStatus(pg_result)), query);
+                          PQresultErrorMessage(pg_result),
+                          PQresStatus(PQresultStatus(pg_result)), query);

     goto PGSQL_EXIT;
     goto PGSQL_EXIT;

-    }
+  }

 
 /* Result is in pg_result. Find the number of fields returned. If this is one,
 we don't add field names to the data. Otherwise we do. If the query did not
 
 /* Result is in pg_result. Find the number of fields returned. If this is one,
 we don't add field names to the data. Otherwise we do. If the query did not


@@ -324,43 +319,29 @@ num_tuples = PQntuples(pg_result);
 /* Get the fields and construct the result string. If there is more than one
 row, we insert '\n' between them. */
 
 /* Get the fields and construct the result string. If there is more than one
 row, we insert '\n' between them. */
 

-for (i = 0; i < num_tuples; i++)
+for (int i = 0; i < num_tuples; i++)

   {
   {

-  if (result != NULL)
-    result = string_cat(result, &ssize, &offset, US"\n", 1);
+  if (result)
+    result = string_catn(result, US"\n", 1);

 
 

-   if (num_fields == 1)
-    {
-    result = string_cat(result, &ssize, &offset,
-      US PQgetvalue(pg_result, i, 0), PQgetlength(pg_result, i, 0));
-    }
-
-   else
-    {
-    int j;
-    for (j = 0; j < num_fields; j++)
+  if (num_fields == 1)
+    result = string_catn(result,
+       US PQgetvalue(pg_result, i, 0), PQgetlength(pg_result, i, 0));
+  else
+    for (int j = 0; j < num_fields; j++)

       {
       uschar *tmp = US PQgetvalue(pg_result, i, j);
       {
       uschar *tmp = US PQgetvalue(pg_result, i, j);

-      result = lf_quote(US PQfname(pg_result, j), tmp, Ustrlen(tmp), result,
-        &ssize, &offset);
+      result = lf_quote(US PQfname(pg_result, j), tmp, Ustrlen(tmp), result);

       }
       }

-    }

   }
 
   }
 

-/* If result is NULL then no data has been found and so we return FAIL.
-Otherwise, we must terminate the string which has been built; string_cat()
-always leaves enough room for a terminating zero. */
+/* If result is NULL then no data has been found and so we return FAIL. */

 
 

-if (result == NULL)
+if (!result)

   {
   yield = FAIL;
   *errmsg = US"PGSQL: no data found";
   }
   {
   yield = FAIL;
   *errmsg = US"PGSQL: no data found";
   }

-else
-  {
-  result[offset] = 0;
-  store_reset(result + offset + 1);
-  }

 
 /* Get here by goto from various error checks. */
 
 
 /* Get here by goto from various error checks. */
 


@@ -369,18 +350,19 @@ PGSQL_EXIT:
 /* Free store for any result that was got; don't close the connection, as
 it is cached. */
 
 /* Free store for any result that was got; don't close the connection, as
 it is cached. */
 

-if (pg_result != NULL) PQclear(pg_result);
+if (pg_result) PQclear(pg_result);

 
 

-/* Non-NULL result indicates a sucessful result */
+/* Non-NULL result indicates a successful result */

 
 

-if (result != NULL)
+if (result)

   {
   {

-  *resultptr = result;
+  store_reset(result->s + result->ptr + 1);
+  *resultptr = string_from_gstring(result);

   return OK;
   }
 else
   {
   return OK;
   }
 else
   {

-  DEBUG(D_lookup) debug_printf("%s\n", *errmsg);
+  DEBUG(D_lookup) debug_printf_indent("%s\n", *errmsg);

   return yield;      /* FAIL or DEFER */
   }
 }
   return yield;      /* FAIL or DEFER */
   }
 }


@@ -413,12 +395,6 @@ return lf_sqlperform(US"PostgreSQL", US"pgsql_servers", pgsql_servers, query,
 
 /* The characters that always need to be quoted (with backslash) are newline,
 tab, carriage return, backspace, backslash itself, and the quote characters.
 
 /* The characters that always need to be quoted (with backslash) are newline,
 tab, carriage return, backspace, backslash itself, and the quote characters.

-Percent and underscore are only special in contexts where they can be wild
-cards, and this isn't usually the case for data inserted from messages, since
-that isn't likely to be treated as a pattern of any kind. However, pgsql seems
-to allow escaping "on spec". If you use something like "where id="ab\%cd" it
-does treat the string as "ab%cd". So we can safely quote percent and
-underscore. [This is different to MySQL, where you can't do this.]

 
 The original code quoted single quotes as \' which is documented as valid in
 the O'Reilly book "Practical PostgreSQL" (first edition) as an alternative to
 
 The original code quoted single quotes as \' which is documented as valid in
 the O'Reilly book "Practical PostgreSQL" (first edition) as an alternative to


@@ -448,7 +424,7 @@ uschar *quoted;
 if (opt != NULL) return NULL;     /* No options recognized */
 
 while ((c = *t++) != 0)
 if (opt != NULL) return NULL;     /* No options recognized */
 
 while ((c = *t++) != 0)

-  if (Ustrchr("\n\t\r\b\'\"\\%_", c) != NULL) count++;
+  if (Ustrchr("\n\t\r\b\'\"\\", c) != NULL) count++;

 
 if (count == 0) return s;
 t = quoted = store_get(Ustrlen(s) + count + 1);
 
 if (count == 0) return s;
 t = quoted = store_get(Ustrlen(s) + count + 1);


@@ -460,7 +436,7 @@ while ((c = *s++) != 0)
     *t++ = '\'';
     *t++ = '\'';
     }
     *t++ = '\'';
     *t++ = '\'';
     }

-  else if (Ustrchr("\n\t\r\b\"\\%_", c) != NULL)
+  else if (Ustrchr("\n\t\r\b\"\\", c) != NULL)

     {
     *t++ = '\\';
     switch(c)
     {
     *t++ = '\\';
     switch(c)