fix ring buffer
このコミットが含まれているのは:
コミット
dd32ab8251
20
uttt.c
20
uttt.c
|
@ -312,10 +312,10 @@ int ut_socket_buffer_size(struct ut_socket_buffer *sockbuf) {
|
|||
/* Copies up to (and including) first '\n' in socket buffer, otherwise whole buffer */
|
||||
int ut_readline_buffer(struct ut_socket_buffer *sockbuf, char *line, size_t len) {
|
||||
int size = ut_socket_buffer_size(sockbuf);
|
||||
for (int i = sockbuf->start; i < sockbuf->start + size; i++) {
|
||||
if (i > len) {return -1;}
|
||||
line[i] = sockbuf->buf[i % sockbuf->len];
|
||||
if (sockbuf->buf[i] == '\n') {
|
||||
for (int i = 0; i < size; i++) {
|
||||
if (i > len) {return -2;}
|
||||
line[i] = sockbuf->buf[(sockbuf->start + i) % sockbuf->len];
|
||||
if (line[i] == '\n') {
|
||||
sockbuf->start = (sockbuf->start + i + 1) % sockbuf->len;
|
||||
return i + 1;
|
||||
}
|
||||
|
@ -329,17 +329,17 @@ int ut_readline_socket(struct ut_socket_buffer *sockbuf, char *line, size_t len)
|
|||
int r = read(sockbuf->fd, line, len);
|
||||
if (r < 0) {
|
||||
if (errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR) {continue;}
|
||||
else {return -2;}
|
||||
else {return -1;}
|
||||
}
|
||||
else if (r == 0) {return -2;}
|
||||
else if (r == 0) {return -1;}
|
||||
for (int i = 0; i < r; i++) {
|
||||
if (line[i] == '\n') {
|
||||
int size = ut_socket_buffer_size(sockbuf);
|
||||
if (r - i >= sockbuf->len - size) {return -1;}
|
||||
for (int j = 0; j < r - i; j++) {
|
||||
sockbuf->buf[(sockbuf->stop + j) % sockbuf->len] = line[i + j];
|
||||
if (r - (i + 1) >= sockbuf->len - size) {return -2;}
|
||||
for (int j = 0; j < r - (i + 1); j++) {
|
||||
sockbuf->buf[(sockbuf->stop + j) % sockbuf->len] = line[i + 1 + j];
|
||||
}
|
||||
sockbuf->stop = (sockbuf->stop + r - i) % sockbuf->len;
|
||||
sockbuf->stop = (sockbuf->stop + r - (i + 1)) % sockbuf->len;
|
||||
return i;
|
||||
}
|
||||
}
|
||||
|
|
読み込み中…
新しいイシューから参照