eddy/tty_term
1
0
Fork 0
mirror of https://github.com/eddyem/tty_term.git synced 2025-12-06 02:25:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

fixed bug with "\0name"

Browse Source
This commit is contained in:
Edward Emelianov 2022-02-02 17:35:00 +03:00
parent 0175cb4a8d
commit 910d9dc512
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ttysocket.c
View File

@ -74,9 +74,15 @@ static int waittoread(int fd){
// substitute all EOL's by '\n' // substitute all EOL's by '\n'
static size_t rmeols(chardevice *d){ static size_t rmeols(chardevice *d){
if(!d) return 0; if(!d){
DBG("d is NULL");
return 0;
}
TTY_descr *D = d->dev; TTY_descr *D = d->dev;
if(!D || D->comfd < 0) return 0; if(!D || D->comfd < 0){
DBG("D bad");
return 0;
}
if(0 == strcmp(d->eol, "\n")){ if(0 == strcmp(d->eol, "\n")){
DBG("No subs need"); DBG("No subs need");
return D->buflen; // don't need to do this return D->buflen; // don't need to do this
@ -144,6 +150,7 @@ static char *getsockdata(chardevice *d, int *len){
if(n > 0){ if(n > 0){
ptr = D->buf; ptr = D->buf;
ptr[n] = 0; ptr[n] = 0;
D->buflen = n;
n = rmeols(d); n = rmeols(d);
DBG("got %d: ..%s..", n, ptr); DBG("got %d: ..%s..", n, ptr);
}else{ }else{
@ -262,7 +269,11 @@ static TTY_descr* opensocket(chardevice *d){
sa = (struct sockaddr*) &saddr; sa = (struct sockaddr*) &saddr;
addrlen = sizeof(saddr); addrlen = sizeof(saddr);
saddr.sun_family = AF_UNIX; saddr.sun_family = AF_UNIX;
strncpy(saddr.sun_path, d->name, 107); // if sun_path[0] == 0 then don't create a file if(strncmp("\\0", d->name, 2) == 0){ // if sun_path[0] == 0 then don't create a file
DBG("convert name");
saddr.sun_path[0] = 0;
strncpy(saddr.sun_path+1, d->name+2, 105);
}else strncpy(saddr.sun_path, d->name, 107);
domain = AF_UNIX; domain = AF_UNIX;
} }
const int *type = socktypes; const int *type = socktypes;