res->plugin=gras_trp_plugin_get_by_name("file");
if (strcmp("-", path)) {
- res->sd = open(path, O_WRONLY|O_CREAT | O_BINARY, S_IRUSR|S_IWUSR|S_IRGRP );
+ res->sd = open(path, O_TRUNC|O_WRONLY|O_CREAT | O_BINARY, S_IRUSR|S_IWUSR|S_IRGRP );
if ( res->sd < 0) {
THROW2(system_error,0,
res->sd = 1; /* stdout */
}
- res->recv_ok=0;
DEBUG5("sock_client_from_file(%s): sd=%d in=%c out=%c accept=%c",
path,
res->sd,
res->outgoing?'y':'n',
res->accepting?'y':'n');
+ xbt_dynar_push(((gras_trp_procdata_t)
+ gras_libdata_by_id(gras_trp_libdata_id))->sockets,&res);
return res;
}
res->outgoing?'y':'n',
res->accepting?'y':'n');
- res->recv_ok=0;
+ xbt_dynar_push(((gras_trp_procdata_t)
+ gras_libdata_by_id(gras_trp_libdata_id))->sockets,&res);
return res;
}
xbt_assert0(sock->incoming, "Cannot recv on client file socket");
xbt_assert0(size >= 0, "Cannot receive a negative amount of data");
+ if (sock->recvd) {
+ data[0] = sock->recvd_val;
+ sock->recvd = 0;
+ got++;
+ size--;
+ }
+
while (size) {
int status = 0;
status = read(sock->sd, data+got, (long int)size);
DEBUG3("read(%d, %p, %ld);", sock->sd, data+got, size);
- if (status == -1) {
+ if (status < 0) {
THROW4(system_error,0,"read(%d,%p,%d) failed: %s",
sock->sd, data+got, (int)size,
strerror(errno));
size -= status;
got += status;
} else {
- THROW0(system_error,0,"file descriptor closed");
+ THROW1(system_error,errno,"file descriptor closed after %d bytes",got);
}
}
return got;