X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Futils%2Funixsock.c;h=1a4373abb4ee92bc38b0cb23982f36d93b61f490;hb=ed920688e7cdc9fd497044379c8d14da0dfaebeb;hp=08233f8fb23f757a987422e73cd99f5d3dd58817;hpb=848efadda124a4778f08a84a082ff2436504d22c;p=sysdb.git diff --git a/src/utils/unixsock.c b/src/utils/unixsock.c index 08233f8..1a4373a 100644 --- a/src/utils/unixsock.c +++ b/src/utils/unixsock.c @@ -25,9 +25,12 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "utils/unixsock.h" +#if HAVE_CONFIG_H +# include "config.h" +#endif /* HAVE_CONFIG_H */ + #include "utils/error.h" -#include "utils/string.h" +#include "utils/unixsock.h" #include #include @@ -114,11 +117,11 @@ sdb_unixsock_parse_cell(char *string, int type, sdb_data_t *data) 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; + data->data.binary.datum = (unsigned char *)string; break; default: sdb_log(SDB_LOG_ERR, "unixsock: Unexpected type %i while " - "parsing query result.\n", type); + "parsing query result.", type); return -1; } @@ -127,13 +130,13 @@ sdb_unixsock_parse_cell(char *string, int type, sdb_data_t *data) if (errno || (string == endptr)) { char errbuf[1024]; sdb_log(SDB_LOG_ERR, "unixsock: Failed to parse string " - "'%s' as numeric value (type %i): %s\n", string, type, + "'%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.\n", + "number while parsing numeric value (type %i): %s.", type, endptr); } @@ -160,7 +163,7 @@ sdb_unixsock_client_process_one_line(sdb_unixsock_client_t *client, if (! line) { /* this must no happen */ sdb_log(SDB_LOG_ERR, "unixsock: Unexpected EOL while " "parsing line (expected %i columns delimited by '%s'; " - "got %i): %s\n", column_count, delim, + "got %i): %s", column_count, delim, /* last line number */ i, orig_line); return -1; } @@ -232,7 +235,7 @@ sdb_unixsock_client_connect(sdb_unixsock_client_t *client) fd = socket(AF_UNIX, SOCK_STREAM, /* protocol = */ 0); if (fd < 0) { char errbuf[1024]; - sdb_log(SDB_LOG_ERR, "unixsock: Failed to open socket: %s\n", + sdb_log(SDB_LOG_ERR, "unixsock: Failed to open socket: %s", sdb_strerror(errno, errbuf, sizeof(errbuf))); return -1; } @@ -243,7 +246,7 @@ sdb_unixsock_client_connect(sdb_unixsock_client_t *client) if (connect(fd, (struct sockaddr *)&sa, sizeof(sa))) { char errbuf[1024]; - sdb_log(SDB_LOG_ERR, "unixsock: Failed to connect to %s: %s\n", + sdb_log(SDB_LOG_ERR, "unixsock: Failed to connect to %s: %s", sa.sun_path, sdb_strerror(errno, errbuf, sizeof(errbuf))); close(fd); return -1; @@ -253,12 +256,15 @@ sdb_unixsock_client_connect(sdb_unixsock_client_t *client) if (! client->fh) { char errbuf[1024]; sdb_log(SDB_LOG_ERR, "unixsock: Failed to open I/O " - "stream for %s: %s\n", sa.sun_path, + "stream for %s: %s", sa.sun_path, sdb_strerror(errno, errbuf, sizeof(errbuf))); close(fd); return -1; } + /* enable line-buffering */ + setvbuf(client->fh, NULL, _IOLBF, 0); + client->shutdown = 0; return 0; } /* sdb_unixsock_client_connect */ @@ -279,7 +285,7 @@ sdb_unixsock_client_send(sdb_unixsock_client_t *client, if (status < 0) { char errbuf[1024]; sdb_log(SDB_LOG_ERR, "unixsock: Failed to write to " - "socket (%s): %s\n", client->path, + "socket (%s): %s", client->path, sdb_strerror(errno, errbuf, sizeof(errbuf))); return status; } @@ -290,26 +296,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\n", 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; } @@ -343,7 +358,7 @@ sdb_unixsock_client_process_lines(sdb_unixsock_client_t *client, if ((types[i] < 1) || (types[i] > SDB_TYPE_BINARY)) { sdb_log(SDB_LOG_ERR, "unixsock: Unknown column " "type %i while processing response from the " - "UNIX socket @ %s.\n", types[i], client->path); + "UNIX socket @ %s.", types[i], client->path); va_end(ap); free(types); return -1; @@ -376,8 +391,8 @@ sdb_unixsock_client_process_lines(sdb_unixsock_client_t *client, if ((n_cols >= 0) && (n_cols != column_count)) { sdb_log(SDB_LOG_ERR, "unixsock: number of columns (%i) " "does not match the number of requested columns (%i) " - "while processing response from the UNIX socket @ %s: " - "%s\n", column_count, n_cols, client->path, line); + "while processing response from the UNIX socket @ %s: %s", + column_count, n_cols, client->path, line); continue; } @@ -396,7 +411,7 @@ sdb_unixsock_client_process_lines(sdb_unixsock_client_t *client, || sdb_unixsock_client_error(client)) { char errbuf[1024]; sdb_log(SDB_LOG_ERR, "unixsock: Unexpected end of data while " - "reading from socket (%s): %s\n", client->path, + "reading from socket (%s): %s", client->path, sdb_strerror(errno, errbuf, sizeof(errbuf))); return -1; }