s = socket(AF_UNIX, SOCK_STREAM, 0);
if (s < 0) {
fprintf(stderr, "Can't create socket[%s]: %s\n", sockpath, strerror(errno));
- return(-1);
+ return (-1);
}
if (connect(s, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
fprintf(stderr, "Can't connect [%s]: %s\n", sockpath, strerror(errno));
close(s);
- return(-1);
+ return (-1);
}
return s;
*/
int sock_read_to(int sock, char *buf, int bytes, int timeout, int keep_reading_until_full)
{
- int len,rlen;
+ int len, rlen;
fd_set rfds;
struct timeval tv;
int retval;
len = 0;
- while (len<bytes) {
+ while (len < bytes) {
FD_ZERO(&rfds);
FD_SET(sock, &rfds);
tv.tv_sec = timeout;
tv.tv_usec = 0;
- retval = select(sock+1, &rfds, NULL, NULL, &tv);
+ retval = select(sock + 1, &rfds, NULL, NULL, &tv);
if (FD_ISSET(sock, &rfds) == 0) { /* timed out */
fprintf(stderr, "sock_read() timed out.\n");
- return(-1);
+ return (-1);
}
- rlen = read(sock, &buf[len], bytes-len);
- if (rlen<1) {
- fprintf(stderr, "sock_read() failed: %s\n",
- strerror(errno));
- return(-1);
+ rlen = read(sock, &buf[len], bytes - len);
+ if (rlen < 1) {
+ fprintf(stderr, "sock_read() failed: %s\n", strerror(errno));
+ return (-1);
}
len = len + rlen;
- if (!keep_reading_until_full) return(len);
+ if (!keep_reading_until_full)
+ return (len);
}
- return(bytes);
+ return (bytes);
}
int bytes_written = 0;
int retval;
while (bytes_written < nbytes) {
- retval = write(sock, &buf[bytes_written],
- nbytes - bytes_written);
+ retval = write(sock, &buf[bytes_written], nbytes - bytes_written);
if (retval < 1) {
return (-1);
}
/* Read one character at a time.
*/
for (i = 0;; i++) {
- if (sock_read(sock, &buf[i], 1, 1) < 0) return(-1);
- if (buf[i] == '\n' || i == (bufsize-1))
+ if (sock_read(sock, &buf[i], 1, 1) < 0)
+ return (-1);
+ if (buf[i] == '\n' || i == (bufsize - 1))
break;
}
/* If we got a long line, discard characters until the newline.
*/
- if (i == (bufsize-1))
+ if (i == (bufsize - 1))
while (buf[i] != '\n')
- if (sock_read(sock, &buf[i], 1, 1) < 0) return(-1);
+ if (sock_read(sock, &buf[i], 1, 1) < 0)
+ return (-1);
/* Strip any trailing CR and LF characters.
*/
buf[i] = 0;
- while ( (i > 0)
- && ( (buf[i - 1]==13)
- || ( buf[i - 1]==10)) ) {
+ while ((i > 0)
+ && ((buf[i - 1] == 13)
+ || (buf[i - 1] == 10))) {
i--;
buf[i] = 0;
}
- return(i);
+ return (i);
}
int i, j;
i = sock_write(sock, buf, strlen(buf));
- if (i<0) return(i);
+ if (i < 0)
+ return (i);
j = sock_write(sock, "\n", 1);
- if (j<0) return(j);
- return(i+j);
+ if (j < 0)
+ return (j);
+ return (i + j);
}
/*
* Write a formatted string to the server - implemented in terms of sock_write()
*/
-void sock_printf(int sock, const char *format,...)
+void sock_printf(int sock, const char *format, ...)
{
va_list arg_ptr;
char buf[4096];