proto: Renamed sdb_proto_get_int to sdb_proto_unmarshal_int.

[sysdb.git] / src / utils / unixsock.c

diff --git a/src/utils/unixsock.c b/src/utils/unixsock.c
index 256cf9f7ba7ed56f8917b9110acee9fefdfded15..6f4d5cc2e090350be92920ed3d074a18adaf091a 100644 (file)
--- a/src/utils/unixsock.c
+++ b/src/utils/unixsock.c
@@ -25,8 +25,12 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_CONFIG_H
+#      include "config.h"
+#endif /* HAVE_CONFIG_H */
+
+#include "utils/error.h"
 #include "utils/unixsock.h"
-#include "core/error.h"
 
 #include <assert.h>
 #include <errno.h>
@@ -87,59 +91,6 @@ sdb_unixsock_get_column_count(const char *string, const char *delim)
        return count;
 } /* sdb_unixsock_get_column_count */
 
-static int
-sdb_unixsock_parse_cell(char *string, int type, sdb_data_t *data)
-{
-       char *endptr = NULL;
-
-       switch (type) {
-               case SDB_TYPE_INTEGER:
-                       errno = 0;
-                       data->data.integer = strtoll(string, &endptr, 0);
-                       break;
-               case SDB_TYPE_DECIMAL:
-                       errno = 0;
-                       data->data.decimal = strtod(string, &endptr);
-                       break;
-               case SDB_TYPE_STRING:
-                       data->data.string = string;
-                       break;
-               case SDB_TYPE_DATETIME:
-                       {
-                               double datetime = strtod(string, &endptr);
-                               data->data.datetime = DOUBLE_TO_SDB_TIME(datetime);
-                       }
-                       break;
-               case SDB_TYPE_BINARY:
-                       /* we don't support any binary information containing 0-bytes */
-                       data->data.binary.length = strlen(string);
-                       data->data.binary.datum = (const unsigned char *)string;
-                       break;
-               default:
-                       sdb_log(SDB_LOG_ERR, "unixsock: Unexpected type %i while "
-                                       "parsing query result.", type);
-                       return -1;
-       }
-
-       if ((type == SDB_TYPE_INTEGER) || (type == SDB_TYPE_DECIMAL)
-                       || (type == SDB_TYPE_DATETIME)) {
-               if (errno || (string == endptr)) {
-                       char errbuf[1024];
-                       sdb_log(SDB_LOG_ERR, "unixsock: Failed to parse string "
-                                       "'%s' as numeric value (type %i): %s", string, type,
-                                       sdb_strerror(errno, errbuf, sizeof(errbuf)));
-                       return -1;
-               }
-               else if (endptr && (*endptr != '\0'))
-                       sdb_log(SDB_LOG_WARNING, "unixsock: Ignoring garbage after "
-                                       "number while parsing numeric value (type %i): %s.",
-                                       type, endptr);
-       }
-
-       data->type = type;
-       return 0;
-} /* sdb_unixsock_parse_cell */
-
 static int
 sdb_unixsock_client_process_one_line(sdb_unixsock_client_t *client,
                char *line, sdb_unixsock_client_data_cb callback,
@@ -174,7 +125,7 @@ sdb_unixsock_client_process_one_line(sdb_unixsock_client_t *client,
                        ++next;
                }
 
-               if (sdb_unixsock_parse_cell(line,
+               if (sdb_data_parse(line,
                                        types ? types[i] : SDB_TYPE_STRING, &data[i]))
                        return -1;
 
@@ -292,26 +243,35 @@ char *
 sdb_unixsock_client_recv(sdb_unixsock_client_t *client,
                char *buffer, size_t buflen)
 {
+       char *tmp;
+
        if ((! client) || (! client->fh) || (! buffer))
                return NULL;
 
        if (client->shutdown & SDB_SHUT_RD) /* reconnect */
                sdb_unixsock_client_connect(client);
 
-       buffer = fgets(buffer, (int)buflen - 1, client->fh);
-       if (! buffer) {
-               if (! feof(client->fh)) {
-                       char errbuf[1024];
-                       sdb_log(SDB_LOG_ERR, "unixsock: Failed to read "
-                                       "from socket (%s): %s", client->path,
-                                       sdb_strerror(errno, errbuf, sizeof(errbuf)));
+       tmp = NULL;
+       while (tmp == NULL) {
+               errno = 0;
+               tmp = fgets(buffer, (int)buflen - 1, client->fh);
+               if (! tmp) {
+                       if ((errno == EAGAIN) || (errno == EINTR))
+                               continue;
+
+                       if (! feof(client->fh)) {
+                               char errbuf[1024];
+                               sdb_log(SDB_LOG_ERR, "unixsock: Failed to read "
+                                               "from socket (%s): %s", client->path,
+                                               sdb_strerror(errno, errbuf, sizeof(errbuf)));
+                       }
+                       return NULL;
                }
-               return buffer;
        }
        buffer[buflen - 1] = '\0';
 
        buflen = strlen(buffer);
-       while ((buffer[buflen - 1] == '\n') || (buffer[buflen - 1] == '\r')) {
+       while (buflen && ((buffer[buflen - 1] == '\n') || (buffer[buflen - 1] == '\r'))) {
                buffer[buflen - 1] = '\0';
                --buflen;
        }