JehanneOS/jehanne
JehanneOS
/
jehanne
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

libposix: cleanups

This commit is contained in:
Giacomo Tesio 2017-05-29 23:27:30 +02:00
parent d1e285f721
commit e525113266
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/src/lib/posix/files.c
View File

@ -143,11 +143,11 @@ POSIX_read(int *errnop, int fd, char *buf, size_t len)
*errnop = __libposix_get_errno(PosixEBADF); *errnop = __libposix_get_errno(PosixEBADF);
return -1; return -1;
} }
SignalReenter: OnIgnoredSignalInterrupt:
r = sys_pread(fd, buf, len, -1); r = sys_pread(fd, buf, len, -1);
if(r < 0){ if(r < 0){
if(__libposix_restart_syscall()) if(__libposix_restart_syscall())
goto SignalReenter; goto OnIgnoredSignalInterrupt;
*errnop = __libposix_translate_errstr((uintptr_t)POSIX_read); *errnop = __libposix_translate_errstr((uintptr_t)POSIX_read);
return -1; return -1;
} }
@ -163,11 +163,11 @@ POSIX_write(int *errnop, int fd, const void *buf, size_t len)
*errnop = __libposix_get_errno(PosixEBADF); *errnop = __libposix_get_errno(PosixEBADF);
return -1; return -1;
} }
SignalReenter: OnIgnoredSignalInterrupt:
w = sys_pwrite(fd, buf, len, -1); w = sys_pwrite(fd, buf, len, -1);
if(w < 0){ if(w < 0){
if(__libposix_restart_syscall()) if(__libposix_restart_syscall())
goto SignalReenter; goto OnIgnoredSignalInterrupt;
*errnop = __libposix_translate_errstr((uintptr_t)POSIX_write); *errnop = __libposix_translate_errstr((uintptr_t)POSIX_write);
return -1; return -1;
} }
@ -275,12 +275,12 @@ POSIX_fstat(int *errnop, int file, void *pstat)
*errnop = __libposix_get_errno(PosixEBADF); *errnop = __libposix_get_errno(PosixEBADF);
return -1; return -1;
} }
SignalReenter: OnIgnoredSignalInterrupt:
d = dirfstat(file); d = dirfstat(file);
if(d == nil) if(d == nil)
{ {
if(__libposix_restart_syscall()) if(__libposix_restart_syscall())
goto SignalReenter; goto OnIgnoredSignalInterrupt;
*errnop = __libposix_translate_errstr((uintptr_t)POSIX_fstat); *errnop = __libposix_translate_errstr((uintptr_t)POSIX_fstat);
return -1; return -1;
} }

8
sys/src/lib/posix/processes.c
View File

@ -204,11 +204,11 @@ POSIX_wait(int *errnop, int *status)
return pid; return pid;
} }
SignalReenter: OnIgnoredSignalInterrupt:
w = wait(); w = wait();
if(w == nil){ if(w == nil){
if(__libposix_restart_syscall()) if(__libposix_restart_syscall())
goto SignalReenter; goto OnIgnoredSignalInterrupt;
*errnop = __libposix_get_errno(PosixECHILD); *errnop = __libposix_get_errno(PosixECHILD);
return -1; return -1;
} }
@ -293,11 +293,11 @@ POSIX_waitpid(int *errnop, int reqpid, int *status, int options)
} }
WaitAgain: WaitAgain:
SignalReenter: OnIgnoredSignalInterrupt:
w = wait(); w = wait();
if(w == nil){ if(w == nil){
if(__libposix_restart_syscall()) if(__libposix_restart_syscall())
goto SignalReenter; goto OnIgnoredSignalInterrupt;
*errnop = __libposix_get_errno(PosixECHILD); *errnop = __libposix_get_errno(PosixECHILD);
return -1; return -1;
} }

4
sys/src/lib/posix/signals.c
View File

@ -271,10 +271,10 @@ __libposix_receive_signal(int sig)
switch(action){ switch(action){
case SignalCatched: case SignalCatched:
return 0; break;
case SignalIgnored: case SignalIgnored:
*__restart_syscall = 1; *__restart_syscall = 1;
return 0; break;
case SignalDefault: case SignalDefault:
disposition = default_signal_disposition(sig); disposition = default_signal_disposition(sig);
if(!execute_disposition(sig, disposition)) if(!execute_disposition(sig, disposition))