[fusl] clang-format fusl
R=viettrungluu@chromium.org
Review URL: https://codereview.chromium.org/1714623002 .
diff --git a/fusl/src/signal/block.c b/fusl/src/signal/block.c
index d7f6100..b0d3fa5 100644
--- a/fusl/src/signal/block.c
+++ b/fusl/src/signal/block.c
@@ -4,41 +4,38 @@
static const unsigned long all_mask[] = {
#if ULONG_MAX == 0xffffffff && _NSIG == 129
- -1UL, -1UL, -1UL, -1UL
+ -1UL, -1UL, -1UL, -1UL
#elif ULONG_MAX == 0xffffffff
- -1UL, -1UL
+ -1UL, -1UL
#else
- -1UL
+ -1UL
#endif
};
static const unsigned long app_mask[] = {
#if ULONG_MAX == 0xffffffff
#if _NSIG == 65
- 0x7fffffff, 0xfffffffc
+ 0x7fffffff, 0xfffffffc
#else
- 0x7fffffff, 0xfffffffc, -1UL, -1UL
+ 0x7fffffff, 0xfffffffc, -1UL, -1UL
#endif
#else
#if _NSIG == 65
- 0xfffffffc7fffffff
+ 0xfffffffc7fffffff
#else
- 0xfffffffc7fffffff, -1UL
+ 0xfffffffc7fffffff, -1UL
#endif
#endif
};
-void __block_all_sigs(void *set)
-{
- __syscall(SYS_rt_sigprocmask, SIG_BLOCK, &all_mask, set, _NSIG/8);
+void __block_all_sigs(void* set) {
+ __syscall(SYS_rt_sigprocmask, SIG_BLOCK, &all_mask, set, _NSIG / 8);
}
-void __block_app_sigs(void *set)
-{
- __syscall(SYS_rt_sigprocmask, SIG_BLOCK, &app_mask, set, _NSIG/8);
+void __block_app_sigs(void* set) {
+ __syscall(SYS_rt_sigprocmask, SIG_BLOCK, &app_mask, set, _NSIG / 8);
}
-void __restore_sigs(void *set)
-{
- __syscall(SYS_rt_sigprocmask, SIG_SETMASK, set, 0, _NSIG/8);
+void __restore_sigs(void* set) {
+ __syscall(SYS_rt_sigprocmask, SIG_SETMASK, set, 0, _NSIG / 8);
}
diff --git a/fusl/src/signal/getitimer.c b/fusl/src/signal/getitimer.c
index 8a8046a..eac53ef 100644
--- a/fusl/src/signal/getitimer.c
+++ b/fusl/src/signal/getitimer.c
@@ -1,7 +1,6 @@
#include <sys/time.h>
#include "syscall.h"
-int getitimer(int which, struct itimerval *old)
-{
- return syscall(SYS_getitimer, which, old);
+int getitimer(int which, struct itimerval* old) {
+ return syscall(SYS_getitimer, which, old);
}
diff --git a/fusl/src/signal/kill.c b/fusl/src/signal/kill.c
index 0580573..1344522 100644
--- a/fusl/src/signal/kill.c
+++ b/fusl/src/signal/kill.c
@@ -1,7 +1,6 @@
#include <signal.h>
#include "syscall.h"
-int kill(pid_t pid, int sig)
-{
- return syscall(SYS_kill, pid, sig);
+int kill(pid_t pid, int sig) {
+ return syscall(SYS_kill, pid, sig);
}
diff --git a/fusl/src/signal/killpg.c b/fusl/src/signal/killpg.c
index 315ed44..56fa17f 100644
--- a/fusl/src/signal/killpg.c
+++ b/fusl/src/signal/killpg.c
@@ -1,11 +1,10 @@
#include <signal.h>
#include <errno.h>
-int killpg(pid_t pgid, int sig)
-{
- if (pgid < 0) {
- errno = EINVAL;
- return -1;
- }
- return kill(-pgid, sig);
+int killpg(pid_t pgid, int sig) {
+ if (pgid < 0) {
+ errno = EINVAL;
+ return -1;
+ }
+ return kill(-pgid, sig);
}
diff --git a/fusl/src/signal/psiginfo.c b/fusl/src/signal/psiginfo.c
index 57be34c..afc99fa 100644
--- a/fusl/src/signal/psiginfo.c
+++ b/fusl/src/signal/psiginfo.c
@@ -2,9 +2,10 @@
#include <string.h>
#include <signal.h>
-void psiginfo(const siginfo_t *si, const char *msg)
-{
- char *s = strsignal(si->si_signo);
- if (msg) fprintf(stderr, "%s: %s\n", msg, s);
- else fprintf(stderr, "%s\n", s);
+void psiginfo(const siginfo_t* si, const char* msg) {
+ char* s = strsignal(si->si_signo);
+ if (msg)
+ fprintf(stderr, "%s: %s\n", msg, s);
+ else
+ fprintf(stderr, "%s\n", s);
}
diff --git a/fusl/src/signal/psignal.c b/fusl/src/signal/psignal.c
index 02f1c76..6d8a0e3 100644
--- a/fusl/src/signal/psignal.c
+++ b/fusl/src/signal/psignal.c
@@ -2,9 +2,10 @@
#include <string.h>
#include <signal.h>
-void psignal(int sig, const char *msg)
-{
- char *s = strsignal(sig);
- if (msg) fprintf(stderr, "%s: %s\n", msg, s);
- else fprintf(stderr, "%s\n", s);
+void psignal(int sig, const char* msg) {
+ char* s = strsignal(sig);
+ if (msg)
+ fprintf(stderr, "%s: %s\n", msg, s);
+ else
+ fprintf(stderr, "%s\n", s);
}
diff --git a/fusl/src/signal/raise.c b/fusl/src/signal/raise.c
index 717b1c9..c4f9dae 100644
--- a/fusl/src/signal/raise.c
+++ b/fusl/src/signal/raise.c
@@ -3,13 +3,12 @@
#include "syscall.h"
#include "pthread_impl.h"
-int raise(int sig)
-{
- int tid, ret;
- sigset_t set;
- __block_app_sigs(&set);
- tid = __syscall(SYS_gettid);
- ret = syscall(SYS_tkill, tid, sig);
- __restore_sigs(&set);
- return ret;
+int raise(int sig) {
+ int tid, ret;
+ sigset_t set;
+ __block_app_sigs(&set);
+ tid = __syscall(SYS_gettid);
+ ret = syscall(SYS_tkill, tid, sig);
+ __restore_sigs(&set);
+ return ret;
}
diff --git a/fusl/src/signal/restore.c b/fusl/src/signal/restore.c
index 873b867..638a67b 100644
--- a/fusl/src/signal/restore.c
+++ b/fusl/src/signal/restore.c
@@ -1,10 +1,6 @@
/* These functions will not work, but suffice for targets where the
* kernel sigaction structure does not actually use sa_restorer. */
-void __restore()
-{
-}
+void __restore() {}
-void __restore_rt()
-{
-}
+void __restore_rt() {}
diff --git a/fusl/src/signal/setitimer.c b/fusl/src/signal/setitimer.c
index 21b1f45..abf872a 100644
--- a/fusl/src/signal/setitimer.c
+++ b/fusl/src/signal/setitimer.c
@@ -1,7 +1,8 @@
#include <sys/time.h>
#include "syscall.h"
-int setitimer(int which, const struct itimerval *restrict new, struct itimerval *restrict old)
-{
- return syscall(SYS_setitimer, which, new, old);
+int setitimer(int which,
+ const struct itimerval* restrict new,
+ struct itimerval* restrict old) {
+ return syscall(SYS_setitimer, which, new, old);
}
diff --git a/fusl/src/signal/sigaction.c b/fusl/src/signal/sigaction.c
index 6eca06f..6d00f0e 100644
--- a/fusl/src/signal/sigaction.c
+++ b/fusl/src/signal/sigaction.c
@@ -7,57 +7,58 @@
#include "ksigaction.h"
static int unmask_done;
-static unsigned long handler_set[_NSIG/(8*sizeof(long))];
+static unsigned long handler_set[_NSIG / (8 * sizeof(long))];
-void __get_handler_set(sigset_t *set)
-{
- memcpy(set, handler_set, sizeof handler_set);
+void __get_handler_set(sigset_t* set) {
+ memcpy(set, handler_set, sizeof handler_set);
}
-int __libc_sigaction(int sig, const struct sigaction *restrict sa, struct sigaction *restrict old)
-{
- struct k_sigaction ksa, ksa_old;
- if (sa) {
- if ((uintptr_t)sa->sa_handler > 1UL) {
- a_or_l(handler_set+(sig-1)/(8*sizeof(long)),
- 1UL<<(sig-1)%(8*sizeof(long)));
+int __libc_sigaction(int sig,
+ const struct sigaction* restrict sa,
+ struct sigaction* restrict old) {
+ struct k_sigaction ksa, ksa_old;
+ if (sa) {
+ if ((uintptr_t)sa->sa_handler > 1UL) {
+ a_or_l(handler_set + (sig - 1) / (8 * sizeof(long)),
+ 1UL << (sig - 1) % (8 * sizeof(long)));
- /* If pthread_create has not yet been called,
- * implementation-internal signals might not
- * yet have been unblocked. They must be
- * unblocked before any signal handler is
- * installed, so that an application cannot
- * receive an illegal sigset_t (with them
- * blocked) as part of the ucontext_t passed
- * to the signal handler. */
- if (!libc.threaded && !unmask_done) {
- __syscall(SYS_rt_sigprocmask, SIG_UNBLOCK,
- SIGPT_SET, 0, _NSIG/8);
- unmask_done = 1;
- }
- }
- ksa.handler = sa->sa_handler;
- ksa.flags = sa->sa_flags | SA_RESTORER;
- ksa.restorer = (sa->sa_flags & SA_SIGINFO) ? __restore_rt : __restore;
- memcpy(&ksa.mask, &sa->sa_mask, sizeof ksa.mask);
- }
- if (syscall(SYS_rt_sigaction, sig, sa?&ksa:0, old?&ksa_old:0, sizeof ksa.mask))
- return -1;
- if (old) {
- old->sa_handler = ksa_old.handler;
- old->sa_flags = ksa_old.flags;
- memcpy(&old->sa_mask, &ksa_old.mask, sizeof ksa_old.mask);
- }
- return 0;
+ /* If pthread_create has not yet been called,
+ * implementation-internal signals might not
+ * yet have been unblocked. They must be
+ * unblocked before any signal handler is
+ * installed, so that an application cannot
+ * receive an illegal sigset_t (with them
+ * blocked) as part of the ucontext_t passed
+ * to the signal handler. */
+ if (!libc.threaded && !unmask_done) {
+ __syscall(SYS_rt_sigprocmask, SIG_UNBLOCK, SIGPT_SET, 0, _NSIG / 8);
+ unmask_done = 1;
+ }
+ }
+ ksa.handler = sa->sa_handler;
+ ksa.flags = sa->sa_flags | SA_RESTORER;
+ ksa.restorer = (sa->sa_flags & SA_SIGINFO) ? __restore_rt : __restore;
+ memcpy(&ksa.mask, &sa->sa_mask, sizeof ksa.mask);
+ }
+ if (syscall(SYS_rt_sigaction, sig, sa ? &ksa : 0, old ? &ksa_old : 0,
+ sizeof ksa.mask))
+ return -1;
+ if (old) {
+ old->sa_handler = ksa_old.handler;
+ old->sa_flags = ksa_old.flags;
+ memcpy(&old->sa_mask, &ksa_old.mask, sizeof ksa_old.mask);
+ }
+ return 0;
}
-int __sigaction(int sig, const struct sigaction *restrict sa, struct sigaction *restrict old)
-{
- if (sig-32U < 3 || sig-1U >= _NSIG-1) {
- errno = EINVAL;
- return -1;
- }
- return __libc_sigaction(sig, sa, old);
+int __sigaction(int sig,
+ const struct sigaction* restrict sa,
+ struct sigaction* restrict old) {
+ if (sig - 32U < 3 || sig - 1U >= _NSIG - 1) {
+ errno = EINVAL;
+ return -1;
+ }
+ return __libc_sigaction(sig, sa, old);
}
weak_alias(__sigaction, sigaction);
diff --git a/fusl/src/signal/sigaddset.c b/fusl/src/signal/sigaddset.c
index 085d1f4..3fae93a 100644
--- a/fusl/src/signal/sigaddset.c
+++ b/fusl/src/signal/sigaddset.c
@@ -1,13 +1,13 @@
#include <signal.h>
#include <errno.h>
-int sigaddset(sigset_t *set, int sig)
-{
- unsigned s = sig-1;
- if (s >= _NSIG-1 || sig-32U < 3) {
- errno = EINVAL;
- return -1;
- }
- set->__bits[s/8/sizeof *set->__bits] |= 1UL<<(s&8*sizeof *set->__bits-1);
- return 0;
+int sigaddset(sigset_t* set, int sig) {
+ unsigned s = sig - 1;
+ if (s >= _NSIG - 1 || sig - 32U < 3) {
+ errno = EINVAL;
+ return -1;
+ }
+ set->__bits[s / 8 / sizeof *set->__bits] |=
+ 1UL << (s & 8 * sizeof *set->__bits - 1);
+ return 0;
}
diff --git a/fusl/src/signal/sigaltstack.c b/fusl/src/signal/sigaltstack.c
index 62cb81a..9329c25 100644
--- a/fusl/src/signal/sigaltstack.c
+++ b/fusl/src/signal/sigaltstack.c
@@ -2,17 +2,16 @@
#include <errno.h>
#include "syscall.h"
-int sigaltstack(const stack_t *restrict ss, stack_t *restrict old)
-{
- if (ss) {
- if (ss->ss_size < MINSIGSTKSZ) {
- errno = ENOMEM;
- return -1;
- }
- if (ss->ss_flags & ~SS_DISABLE) {
- errno = EINVAL;
- return -1;
- }
- }
- return syscall(SYS_sigaltstack, ss, old);
+int sigaltstack(const stack_t* restrict ss, stack_t* restrict old) {
+ if (ss) {
+ if (ss->ss_size < MINSIGSTKSZ) {
+ errno = ENOMEM;
+ return -1;
+ }
+ if (ss->ss_flags & ~SS_DISABLE) {
+ errno = EINVAL;
+ return -1;
+ }
+ }
+ return syscall(SYS_sigaltstack, ss, old);
}
diff --git a/fusl/src/signal/sigandset.c b/fusl/src/signal/sigandset.c
index 974186f..392ec14 100644
--- a/fusl/src/signal/sigandset.c
+++ b/fusl/src/signal/sigandset.c
@@ -1,12 +1,11 @@
#define _GNU_SOURCE
#include <signal.h>
-#define SST_SIZE (_NSIG/8/sizeof(long))
+#define SST_SIZE (_NSIG / 8 / sizeof(long))
-int sigandset(sigset_t *dest, const sigset_t *left, const sigset_t *right)
-{
- unsigned long i = 0, *d = (void*) dest, *l = (void*) left, *r = (void*) right;
- for(; i < SST_SIZE; i++) d[i] = l[i] & r[i];
- return 0;
+int sigandset(sigset_t* dest, const sigset_t* left, const sigset_t* right) {
+ unsigned long i = 0, *d = (void *)dest, *l = (void *)left, *r = (void *)right;
+ for (; i < SST_SIZE; i++)
+ d[i] = l[i] & r[i];
+ return 0;
}
-
diff --git a/fusl/src/signal/sigdelset.c b/fusl/src/signal/sigdelset.c
index ce69280..ceb0156 100644
--- a/fusl/src/signal/sigdelset.c
+++ b/fusl/src/signal/sigdelset.c
@@ -1,13 +1,13 @@
#include <signal.h>
#include <errno.h>
-int sigdelset(sigset_t *set, int sig)
-{
- unsigned s = sig-1;
- if (s >= _NSIG-1 || sig-32U < 3) {
- errno = EINVAL;
- return -1;
- }
- set->__bits[s/8/sizeof *set->__bits] &=~(1UL<<(s&8*sizeof *set->__bits-1));
- return 0;
+int sigdelset(sigset_t* set, int sig) {
+ unsigned s = sig - 1;
+ if (s >= _NSIG - 1 || sig - 32U < 3) {
+ errno = EINVAL;
+ return -1;
+ }
+ set->__bits[s / 8 / sizeof *set->__bits] &=
+ ~(1UL << (s & 8 * sizeof *set->__bits - 1));
+ return 0;
}
diff --git a/fusl/src/signal/sigemptyset.c b/fusl/src/signal/sigemptyset.c
index 1d07471..91b4182 100644
--- a/fusl/src/signal/sigemptyset.c
+++ b/fusl/src/signal/sigemptyset.c
@@ -1,13 +1,13 @@
#include <signal.h>
#include <string.h>
-int sigemptyset(sigset_t *set)
-{
- set->__bits[0] = 0;
- if (sizeof(long)==4 || _NSIG > 65) set->__bits[1] = 0;
- if (sizeof(long)==4 && _NSIG > 65) {
- set->__bits[2] = 0;
- set->__bits[3] = 0;
- }
- return 0;
+int sigemptyset(sigset_t* set) {
+ set->__bits[0] = 0;
+ if (sizeof(long) == 4 || _NSIG > 65)
+ set->__bits[1] = 0;
+ if (sizeof(long) == 4 && _NSIG > 65) {
+ set->__bits[2] = 0;
+ set->__bits[3] = 0;
+ }
+ return 0;
}
diff --git a/fusl/src/signal/sigfillset.c b/fusl/src/signal/sigfillset.c
index 16e7b4f..5e7f703 100644
--- a/fusl/src/signal/sigfillset.c
+++ b/fusl/src/signal/sigfillset.c
@@ -1,18 +1,18 @@
#include <signal.h>
#include <limits.h>
-int sigfillset(sigset_t *set)
-{
+int sigfillset(sigset_t* set) {
#if ULONG_MAX == 0xffffffff
- set->__bits[0] = 0x7ffffffful;
- set->__bits[1] = 0xfffffffcul;
- if (_NSIG > 65) {
- set->__bits[2] = 0xfffffffful;
- set->__bits[3] = 0xfffffffful;
- }
+ set->__bits[0] = 0x7ffffffful;
+ set->__bits[1] = 0xfffffffcul;
+ if (_NSIG > 65) {
+ set->__bits[2] = 0xfffffffful;
+ set->__bits[3] = 0xfffffffful;
+ }
#else
- set->__bits[0] = 0xfffffffc7ffffffful;
- if (_NSIG > 65) set->__bits[1] = 0xfffffffffffffffful;
+ set->__bits[0] = 0xfffffffc7ffffffful;
+ if (_NSIG > 65)
+ set->__bits[1] = 0xfffffffffffffffful;
#endif
- return 0;
+ return 0;
}
diff --git a/fusl/src/signal/sighold.c b/fusl/src/signal/sighold.c
index cfa2306..8a5bdeb 100644
--- a/fusl/src/signal/sighold.c
+++ b/fusl/src/signal/sighold.c
@@ -1,10 +1,10 @@
#include <signal.h>
-int sighold(int sig)
-{
- sigset_t mask;
+int sighold(int sig) {
+ sigset_t mask;
- sigemptyset(&mask);
- if (sigaddset(&mask, sig) < 0) return -1;
- return sigprocmask(SIG_BLOCK, &mask, 0);
+ sigemptyset(&mask);
+ if (sigaddset(&mask, sig) < 0)
+ return -1;
+ return sigprocmask(SIG_BLOCK, &mask, 0);
}
diff --git a/fusl/src/signal/sigignore.c b/fusl/src/signal/sigignore.c
index 5ba05e1..51a5dcd 100644
--- a/fusl/src/signal/sigignore.c
+++ b/fusl/src/signal/sigignore.c
@@ -1,11 +1,10 @@
#include <signal.h>
-int sigignore(int sig)
-{
- struct sigaction sa;
+int sigignore(int sig) {
+ struct sigaction sa;
- sigemptyset(&sa.sa_mask);
- sa.sa_handler = SIG_IGN;
- sa.sa_flags = 0;
- return sigaction(sig, &sa, 0);
+ sigemptyset(&sa.sa_mask);
+ sa.sa_handler = SIG_IGN;
+ sa.sa_flags = 0;
+ return sigaction(sig, &sa, 0);
}
diff --git a/fusl/src/signal/siginterrupt.c b/fusl/src/signal/siginterrupt.c
index 7006340..0f0beb7 100644
--- a/fusl/src/signal/siginterrupt.c
+++ b/fusl/src/signal/siginterrupt.c
@@ -1,12 +1,13 @@
#include <signal.h>
-int siginterrupt(int sig, int flag)
-{
- struct sigaction sa;
+int siginterrupt(int sig, int flag) {
+ struct sigaction sa;
- sigaction(sig, 0, &sa);
- if (flag) sa.sa_flags &= ~SA_RESTART;
- else sa.sa_flags |= SA_RESTART;
+ sigaction(sig, 0, &sa);
+ if (flag)
+ sa.sa_flags &= ~SA_RESTART;
+ else
+ sa.sa_flags |= SA_RESTART;
- return sigaction(sig, &sa, 0);
+ return sigaction(sig, &sa, 0);
}
diff --git a/fusl/src/signal/sigisemptyset.c b/fusl/src/signal/sigisemptyset.c
index 312c66c..f7898d6 100644
--- a/fusl/src/signal/sigisemptyset.c
+++ b/fusl/src/signal/sigisemptyset.c
@@ -2,8 +2,7 @@
#include <signal.h>
#include <string.h>
-int sigisemptyset(const sigset_t *set)
-{
- static const unsigned long zeroset[_NSIG/8/sizeof(long)];
- return !memcmp(set, &zeroset, _NSIG/8);
+int sigisemptyset(const sigset_t* set) {
+ static const unsigned long zeroset[_NSIG / 8 / sizeof(long)];
+ return !memcmp(set, &zeroset, _NSIG / 8);
}
diff --git a/fusl/src/signal/sigismember.c b/fusl/src/signal/sigismember.c
index ab87d62..52c84c3 100644
--- a/fusl/src/signal/sigismember.c
+++ b/fusl/src/signal/sigismember.c
@@ -1,8 +1,9 @@
#include <signal.h>
-int sigismember(const sigset_t *set, int sig)
-{
- unsigned s = sig-1;
- if (s >= _NSIG-1) return 0;
- return !!(set->__bits[s/8/sizeof *set->__bits] & 1UL<<(s&8*sizeof *set->__bits-1));
+int sigismember(const sigset_t* set, int sig) {
+ unsigned s = sig - 1;
+ if (s >= _NSIG - 1)
+ return 0;
+ return !!(set->__bits[s / 8 / sizeof *set->__bits] &
+ 1UL << (s & 8 * sizeof *set->__bits - 1));
}
diff --git a/fusl/src/signal/siglongjmp.c b/fusl/src/signal/siglongjmp.c
index bc317ac..9f36d0c 100644
--- a/fusl/src/signal/siglongjmp.c
+++ b/fusl/src/signal/siglongjmp.c
@@ -3,7 +3,6 @@
#include "syscall.h"
#include "pthread_impl.h"
-_Noreturn void siglongjmp(sigjmp_buf buf, int ret)
-{
- longjmp(buf, ret);
+_Noreturn void siglongjmp(sigjmp_buf buf, int ret) {
+ longjmp(buf, ret);
}
diff --git a/fusl/src/signal/signal.c b/fusl/src/signal/signal.c
index 29e03c8..edf932a 100644
--- a/fusl/src/signal/signal.c
+++ b/fusl/src/signal/signal.c
@@ -2,14 +2,13 @@
#include "syscall.h"
#include "libc.h"
-int __sigaction(int, const struct sigaction *, struct sigaction *);
+int __sigaction(int, const struct sigaction*, struct sigaction*);
-void (*signal(int sig, void (*func)(int)))(int)
-{
- struct sigaction sa_old, sa = { .sa_handler = func, .sa_flags = SA_RESTART };
- if (__sigaction(sig, &sa, &sa_old) < 0)
- return SIG_ERR;
- return sa_old.sa_handler;
+void (*signal(int sig, void (*func)(int)))(int) {
+ struct sigaction sa_old, sa = {.sa_handler = func, .sa_flags = SA_RESTART};
+ if (__sigaction(sig, &sa, &sa_old) < 0)
+ return SIG_ERR;
+ return sa_old.sa_handler;
}
weak_alias(signal, bsd_signal);
diff --git a/fusl/src/signal/sigorset.c b/fusl/src/signal/sigorset.c
index ed48873..8155ca4 100644
--- a/fusl/src/signal/sigorset.c
+++ b/fusl/src/signal/sigorset.c
@@ -1,12 +1,11 @@
#define _GNU_SOURCE
#include <signal.h>
-#define SST_SIZE (_NSIG/8/sizeof(long))
+#define SST_SIZE (_NSIG / 8 / sizeof(long))
-int sigorset(sigset_t *dest, const sigset_t *left, const sigset_t *right)
-{
- unsigned long i = 0, *d = (void*) dest, *l = (void*) left, *r = (void*) right;
- for(; i < SST_SIZE; i++) d[i] = l[i] | r[i];
- return 0;
+int sigorset(sigset_t* dest, const sigset_t* left, const sigset_t* right) {
+ unsigned long i = 0, *d = (void *)dest, *l = (void *)left, *r = (void *)right;
+ for (; i < SST_SIZE; i++)
+ d[i] = l[i] | r[i];
+ return 0;
}
-
diff --git a/fusl/src/signal/sigpause.c b/fusl/src/signal/sigpause.c
index 363d2fe..f3bb5be 100644
--- a/fusl/src/signal/sigpause.c
+++ b/fusl/src/signal/sigpause.c
@@ -1,9 +1,8 @@
#include <signal.h>
-int sigpause(int sig)
-{
- sigset_t mask;
- sigprocmask(0, 0, &mask);
- sigdelset(&mask, sig);
- return sigsuspend(&mask);
+int sigpause(int sig) {
+ sigset_t mask;
+ sigprocmask(0, 0, &mask);
+ sigdelset(&mask, sig);
+ return sigsuspend(&mask);
}
diff --git a/fusl/src/signal/sigpending.c b/fusl/src/signal/sigpending.c
index 3d193df..6f47cc0 100644
--- a/fusl/src/signal/sigpending.c
+++ b/fusl/src/signal/sigpending.c
@@ -1,7 +1,6 @@
#include <signal.h>
#include "syscall.h"
-int sigpending(sigset_t *set)
-{
- return syscall(SYS_rt_sigpending, set, _NSIG/8);
+int sigpending(sigset_t* set) {
+ return syscall(SYS_rt_sigpending, set, _NSIG / 8);
}
diff --git a/fusl/src/signal/sigprocmask.c b/fusl/src/signal/sigprocmask.c
index 297e20c..a8cb8c6 100644
--- a/fusl/src/signal/sigprocmask.c
+++ b/fusl/src/signal/sigprocmask.c
@@ -1,10 +1,10 @@
#include <signal.h>
#include <errno.h>
-int sigprocmask(int how, const sigset_t *restrict set, sigset_t *restrict old)
-{
- int r = pthread_sigmask(how, set, old);
- if (!r) return r;
- errno = r;
- return -1;
+int sigprocmask(int how, const sigset_t* restrict set, sigset_t* restrict old) {
+ int r = pthread_sigmask(how, set, old);
+ if (!r)
+ return r;
+ errno = r;
+ return -1;
}
diff --git a/fusl/src/signal/sigqueue.c b/fusl/src/signal/sigqueue.c
index b75f0c5..2914e5e 100644
--- a/fusl/src/signal/sigqueue.c
+++ b/fusl/src/signal/sigqueue.c
@@ -4,19 +4,18 @@
#include "syscall.h"
#include "pthread_impl.h"
-int sigqueue(pid_t pid, int sig, const union sigval value)
-{
- siginfo_t si;
- sigset_t set;
- int r;
- memset(&si, 0, sizeof si);
- si.si_signo = sig;
- si.si_code = SI_QUEUE;
- si.si_value = value;
- si.si_uid = getuid();
- __block_app_sigs(&set);
- si.si_pid = getpid();
- r = syscall(SYS_rt_sigqueueinfo, pid, sig, &si);
- __restore_sigs(&set);
- return r;
+int sigqueue(pid_t pid, int sig, const union sigval value) {
+ siginfo_t si;
+ sigset_t set;
+ int r;
+ memset(&si, 0, sizeof si);
+ si.si_signo = sig;
+ si.si_code = SI_QUEUE;
+ si.si_value = value;
+ si.si_uid = getuid();
+ __block_app_sigs(&set);
+ si.si_pid = getpid();
+ r = syscall(SYS_rt_sigqueueinfo, pid, sig, &si);
+ __restore_sigs(&set);
+ return r;
}
diff --git a/fusl/src/signal/sigrelse.c b/fusl/src/signal/sigrelse.c
index b4c5a00..6976dc9 100644
--- a/fusl/src/signal/sigrelse.c
+++ b/fusl/src/signal/sigrelse.c
@@ -1,10 +1,10 @@
#include <signal.h>
-int sigrelse(int sig)
-{
- sigset_t mask;
+int sigrelse(int sig) {
+ sigset_t mask;
- sigemptyset(&mask);
- if (sigaddset(&mask, sig) < 0) return -1;
- return sigprocmask(SIG_UNBLOCK, &mask, 0);
+ sigemptyset(&mask);
+ if (sigaddset(&mask, sig) < 0)
+ return -1;
+ return sigprocmask(SIG_UNBLOCK, &mask, 0);
}
diff --git a/fusl/src/signal/sigrtmax.c b/fusl/src/signal/sigrtmax.c
index 44dc88f..4b7738c 100644
--- a/fusl/src/signal/sigrtmax.c
+++ b/fusl/src/signal/sigrtmax.c
@@ -1,6 +1,5 @@
#include <signal.h>
-int __libc_current_sigrtmax()
-{
- return _NSIG-1;
+int __libc_current_sigrtmax() {
+ return _NSIG - 1;
}
diff --git a/fusl/src/signal/sigrtmin.c b/fusl/src/signal/sigrtmin.c
index d0e769b..4b9ae3a 100644
--- a/fusl/src/signal/sigrtmin.c
+++ b/fusl/src/signal/sigrtmin.c
@@ -1,4 +1,3 @@
-int __libc_current_sigrtmin()
-{
- return 35;
+int __libc_current_sigrtmin() {
+ return 35;
}
diff --git a/fusl/src/signal/sigset.c b/fusl/src/signal/sigset.c
index 0d7b456..7273771 100644
--- a/fusl/src/signal/sigset.c
+++ b/fusl/src/signal/sigset.c
@@ -1,27 +1,26 @@
#include <signal.h>
-void (*sigset(int sig, void (*handler)(int)))(int)
-{
- struct sigaction sa, sa_old;
- sigset_t mask;
+void (*sigset(int sig, void (*handler)(int)))(int) {
+ struct sigaction sa, sa_old;
+ sigset_t mask;
- sigemptyset(&mask);
- if (sigaddset(&mask, sig) < 0)
- return SIG_ERR;
-
- if (handler == SIG_HOLD) {
- if (sigaction(sig, 0, &sa_old) < 0)
- return SIG_ERR;
- if (sigprocmask(SIG_BLOCK, &mask, &mask) < 0)
- return SIG_ERR;
- } else {
- sa.sa_handler = handler;
- sa.sa_flags = 0;
- sigemptyset(&sa.sa_mask);
- if (sigaction(sig, &sa, &sa_old) < 0)
- return SIG_ERR;
- if (sigprocmask(SIG_UNBLOCK, &mask, &mask) < 0)
- return SIG_ERR;
- }
- return sigismember(&mask, sig) ? SIG_HOLD : sa_old.sa_handler;
+ sigemptyset(&mask);
+ if (sigaddset(&mask, sig) < 0)
+ return SIG_ERR;
+
+ if (handler == SIG_HOLD) {
+ if (sigaction(sig, 0, &sa_old) < 0)
+ return SIG_ERR;
+ if (sigprocmask(SIG_BLOCK, &mask, &mask) < 0)
+ return SIG_ERR;
+ } else {
+ sa.sa_handler = handler;
+ sa.sa_flags = 0;
+ sigemptyset(&sa.sa_mask);
+ if (sigaction(sig, &sa, &sa_old) < 0)
+ return SIG_ERR;
+ if (sigprocmask(SIG_UNBLOCK, &mask, &mask) < 0)
+ return SIG_ERR;
+ }
+ return sigismember(&mask, sig) ? SIG_HOLD : sa_old.sa_handler;
}
diff --git a/fusl/src/signal/sigsetjmp_tail.c b/fusl/src/signal/sigsetjmp_tail.c
index 78762aa..90903f4 100644
--- a/fusl/src/signal/sigsetjmp_tail.c
+++ b/fusl/src/signal/sigsetjmp_tail.c
@@ -2,10 +2,10 @@
#include <signal.h>
#include "syscall.h"
-__attribute__((__visibility__("hidden")))
-int __sigsetjmp_tail(sigjmp_buf jb, int ret)
-{
- void *p = jb->__ss;
- __syscall(SYS_rt_sigprocmask, SIG_SETMASK, ret?p:0, ret?0:p, _NSIG/8);
- return ret;
+__attribute__((__visibility__("hidden"))) int __sigsetjmp_tail(sigjmp_buf jb,
+ int ret) {
+ void* p = jb->__ss;
+ __syscall(SYS_rt_sigprocmask, SIG_SETMASK, ret ? p : 0, ret ? 0 : p,
+ _NSIG / 8);
+ return ret;
}
diff --git a/fusl/src/signal/sigsuspend.c b/fusl/src/signal/sigsuspend.c
index 0b42725..827157e 100644
--- a/fusl/src/signal/sigsuspend.c
+++ b/fusl/src/signal/sigsuspend.c
@@ -2,7 +2,6 @@
#include "syscall.h"
#include "libc.h"
-int sigsuspend(const sigset_t *mask)
-{
- return syscall_cp(SYS_rt_sigsuspend, mask, _NSIG/8);
+int sigsuspend(const sigset_t* mask) {
+ return syscall_cp(SYS_rt_sigsuspend, mask, _NSIG / 8);
}
diff --git a/fusl/src/signal/sigtimedwait.c b/fusl/src/signal/sigtimedwait.c
index 0739986..3e3b2e6 100644
--- a/fusl/src/signal/sigtimedwait.c
+++ b/fusl/src/signal/sigtimedwait.c
@@ -3,11 +3,12 @@
#include "syscall.h"
#include "libc.h"
-int sigtimedwait(const sigset_t *restrict mask, siginfo_t *restrict si, const struct timespec *restrict timeout)
-{
- int ret;
- do ret = syscall_cp(SYS_rt_sigtimedwait, mask,
- si, timeout, _NSIG/8);
- while (ret<0 && errno==EINTR);
- return ret;
+int sigtimedwait(const sigset_t* restrict mask,
+ siginfo_t* restrict si,
+ const struct timespec* restrict timeout) {
+ int ret;
+ do
+ ret = syscall_cp(SYS_rt_sigtimedwait, mask, si, timeout, _NSIG / 8);
+ while (ret < 0 && errno == EINTR);
+ return ret;
}
diff --git a/fusl/src/signal/sigwait.c b/fusl/src/signal/sigwait.c
index c8822ee..2e12bdf 100644
--- a/fusl/src/signal/sigwait.c
+++ b/fusl/src/signal/sigwait.c
@@ -1,10 +1,9 @@
#include <signal.h>
-int sigwait(const sigset_t *restrict mask, int *restrict sig)
-{
- siginfo_t si;
- if (sigtimedwait(mask, &si, 0) < 0)
- return -1;
- *sig = si.si_signo;
- return 0;
+int sigwait(const sigset_t* restrict mask, int* restrict sig) {
+ siginfo_t si;
+ if (sigtimedwait(mask, &si, 0) < 0)
+ return -1;
+ *sig = si.si_signo;
+ return 0;
}
diff --git a/fusl/src/signal/sigwaitinfo.c b/fusl/src/signal/sigwaitinfo.c
index bb51f8b..2f6eb73 100644
--- a/fusl/src/signal/sigwaitinfo.c
+++ b/fusl/src/signal/sigwaitinfo.c
@@ -1,6 +1,5 @@
#include <signal.h>
-int sigwaitinfo(const sigset_t *restrict mask, siginfo_t *restrict si)
-{
- return sigtimedwait(mask, si, 0);
+int sigwaitinfo(const sigset_t* restrict mask, siginfo_t* restrict si) {
+ return sigtimedwait(mask, si, 0);
}
