projects
/
amt
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b562f16
)
revert enter expansion and simply replace 0x0a with 0x0d
author
Michael Gernoth
<michael@gernoth.net>
Mon, 12 May 2008 14:08:39 +0000
(16:08 +0200)
committer
Michael Gernoth
<michael@gernoth.net>
Mon, 12 May 2008 14:08:39 +0000
(16:08 +0200)
redir.c
patch
|
blob
|
blame
|
history
diff --git
a/redir.c
b/redir.c
index 9c72bf7bc1dac1886743d2328c0dc38d387d5cd0..aed176d2b75cde55dec0ca2dba1a6d7834dd46ec 100644
(file)
--- a/
redir.c
+++ b/
redir.c
@@
-236,27
+236,24
@@
int redir_sol_send(struct redir *r, unsigned char *buf, int blen)
{
int len = 10+blen;
int rc;
{
int len = 10+blen;
int rc;
- int i
,j
;
+ int i;
unsigned char *request;
for (i = 0; i < blen; i++) {
if (buf[i] == 0x0a)
unsigned char *request;
for (i = 0; i < blen; i++) {
if (buf[i] == 0x0a)
-
len++
;
+
buf[i] = 0x0d
;
}
request = malloc(len);
}
request = malloc(len);
+ if (!request) {
+ return -1;
+ }
memset(request, 0, len);
request[0] = SOL_DATA_TO_HOST;
memset(request, 0, len);
request[0] = SOL_DATA_TO_HOST;
- request[8] = (len-10) & 0xff;
- request[9] = (len-10) >> 8;
- for (i=0, j=0; i < blen; i++,j++) {
- if (buf[i] == 0x0a) {
- request[j + 10] = 0x0d;
- j++;
- }
- request[j + 10] = buf[i];
- }
+ request[8] = blen & 0xff;
+ request[9] = blen >> 8;
+ memcpy(request + 10, buf, blen);
rc = redir_write(r, request, len);
free(request);
return rc;
rc = redir_write(r, request, len);
free(request);
return rc;
Impressum
,
Datenschutz