fix eol, close sock on error, fix include

This commit is contained in:
Dave Murphy 2018-05-16 22:59:33 +01:00
parent c1ad26ca98
commit eb4933694b

View File

@ -1,39 +1,41 @@
#include <switch/runtime/nxlink.h> #include "runtime/nxlink.h"
#include <string.h>
#include <stdio.h> #include <string.h>
#include <sys/socket.h> #include <stdio.h>
#include <sys/errno.h> #include <sys/socket.h>
#include <arpa/inet.h> #include <sys/errno.h>
#include <unistd.h> #include <arpa/inet.h>
#include <unistd.h>
static int sock = -1;
static int sock = -1;
int nxlinkStdio()
{ int nxlinkStdio()
int ret = -1; {
struct sockaddr_in srv_addr; int ret = -1;
struct sockaddr_in srv_addr;
sock = socket(AF_INET, SOCK_STREAM, 0);
if (!sock) { sock = socket(AF_INET, SOCK_STREAM, 0);
return ret; if (!sock) {
} return ret;
}
bzero(&srv_addr, sizeof srv_addr);
srv_addr.sin_family = AF_INET; bzero(&srv_addr, sizeof srv_addr);
srv_addr.sin_addr = __nxlink_host; srv_addr.sin_family = AF_INET;
srv_addr.sin_port = htons(NXLINK_CLIENT_PORT); srv_addr.sin_addr = __nxlink_host;
srv_addr.sin_port = htons(NXLINK_CLIENT_PORT);
ret = connect(sock, (struct sockaddr *) &srv_addr, sizeof(srv_addr));
if (ret != 0) { ret = connect(sock, (struct sockaddr *) &srv_addr, sizeof(srv_addr));
return -1; if (ret != 0) {
} close(sock);
return -1;
// redirect stdout }
fflush(stdout);
dup2(sock, STDOUT_FILENO); // redirect stdout
// redirect stderr fflush(stdout);
fflush(stderr); dup2(sock, STDOUT_FILENO);
dup2(sock, STDERR_FILENO); // redirect stderr
fflush(stderr);
return ret; dup2(sock, STDERR_FILENO);
}
return ret;
}