Mercurial > pidgin
comparison src/proxy.c @ 13288:b68897cff861
[gaim-migrate @ 15654]
apparently I put the -1 on the wrong line. Mark Kalmanczhelyi noticed this.
committer: Tailor Script <tailor@pidgin.im>
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Tue, 14 Feb 2006 18:38:45 +0000 |
| parents | de4f1fb08088 |
| children | ce9f249e897b |
comparison
equal
deleted
inserted
replaced
| 13287:9ee92b9cbf5d | 13288:b68897cff861 |
|---|---|
| 1102 phb->read_buf_len = 8192; | 1102 phb->read_buf_len = 8192; |
| 1103 phb->read_buffer = g_malloc(phb->read_buf_len); | 1103 phb->read_buffer = g_malloc(phb->read_buf_len); |
| 1104 phb->read_len = 0; | 1104 phb->read_len = 0; |
| 1105 } | 1105 } |
| 1106 | 1106 |
| 1107 p = phb->read_buffer + phb->read_len - 1; | 1107 p = phb->read_buffer + phb->read_len; |
| 1108 max_read = phb->read_buf_len - phb->read_len; | 1108 max_read = phb->read_buf_len - phb->read_len - 1; |
| 1109 | 1109 |
| 1110 len = read(source, p, max_read); | 1110 len = read(source, p, max_read); |
| 1111 if(len < 0 && errno == EAGAIN) | 1111 if(len < 0 && errno == EAGAIN) |
| 1112 return; | 1112 return; |
| 1113 else if(len < 0) { | 1113 else if(len < 0) { |
| 1482 phb->read_buf_len = 12; | 1482 phb->read_buf_len = 12; |
| 1483 phb->read_buffer = g_malloc(phb->read_buf_len); | 1483 phb->read_buffer = g_malloc(phb->read_buf_len); |
| 1484 phb->read_len = 0; | 1484 phb->read_len = 0; |
| 1485 } | 1485 } |
| 1486 | 1486 |
| 1487 buf = phb->read_buffer + phb->read_len - 1; | 1487 buf = phb->read_buffer + phb->read_len; |
| 1488 max_read = phb->read_buf_len - phb->read_len; | 1488 max_read = phb->read_buf_len - phb->read_len; |
| 1489 | 1489 |
| 1490 len = read(source, buf, max_read); | 1490 len = read(source, buf, max_read); |
| 1491 | 1491 |
| 1492 if ((len < 0 && errno == EAGAIN) || len + phb->read_len < 4) | 1492 if ((len < 0 && errno == EAGAIN) || len + phb->read_len < 4) |