From c7d035ae1a729232579a0fe41ed5affa131d3623 Mon Sep 17 00:00:00 2001 From: Bryan Newbold Date: Mon, 20 Feb 2017 00:05:27 -0800 Subject: Import Upstream version 5d9 --- unix.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'unix.c') diff --git a/unix.c b/unix.c index 3cfc809..ccd24c7 100644 --- a/unix.c +++ b/unix.c @@ -69,6 +69,9 @@ SCM scm_lstat P((SCM str)); # ifdef SVR4 # include # endif +# ifdef __NetBSD__ +# include +# endif # ifdef __OpenBSD__ # include # endif @@ -82,9 +85,9 @@ SCM scm_mknod(path, mode, dev) SCM path, mode, dev; { int val; - ASSERT(NIMP(path) && STRINGP(path), path, ARG1, s_mknod); - ASSERT(INUMP(mode), mode, ARG2, s_mknod); - ASSERT(INUMP(dev), dev, ARG3, s_mknod); + ASRTER(NIMP(path) && STRINGP(path), path, ARG1, s_mknod); + ASRTER(INUMP(mode), mode, ARG2, s_mknod); + ASRTER(INUMP(dev), dev, ARG3, s_mknod); SYSCALL(val = mknod(CHARS(path), INUM(mode), INUM(dev));); return val ? BOOL_F : BOOL_T; } @@ -97,7 +100,7 @@ SCM scm_acct(path) SYSCALL(val = acct(0);); return val ? BOOL_F : BOOL_T; } - ASSERT(NIMP(path) && STRINGP(path), path, ARG1, s_acct); + ASRTER(NIMP(path) && STRINGP(path), path, ARG1, s_acct); SYSCALL(val = acct(CHARS(path));); return val ? BOOL_F : BOOL_T; } @@ -106,7 +109,7 @@ static char s_nice[] = "nice"; SCM scm_nice(incr) SCM incr; { - ASSERT(INUMP(incr), incr, ARG1, s_nice); + ASRTER(INUMP(incr), incr, ARG1, s_nice); return nice(INUM(incr)) ? BOOL_F : BOOL_T; } @@ -121,8 +124,8 @@ SCM scm_symlink(oldpath, newpath) SCM oldpath, newpath; { int val; - ASSERT(NIMP(oldpath) && STRINGP(oldpath), oldpath, ARG1, s_symlink); - ASSERT(NIMP(newpath) && STRINGP(newpath), newpath, ARG2, s_symlink); + ASRTER(NIMP(oldpath) && STRINGP(oldpath), oldpath, ARG1, s_symlink); + ASRTER(NIMP(newpath) && STRINGP(newpath), newpath, ARG2, s_symlink); SYSCALL(val = symlink(CHARS(oldpath), CHARS(newpath));); return val ? BOOL_F : BOOL_T; } @@ -132,7 +135,7 @@ SCM scm_readlink(path) { int i; char buf[1024]; - ASSERT(NIMP(path) && STRINGP(path), path, ARG1, s_readlink); + ASRTER(NIMP(path) && STRINGP(path), path, ARG1, s_readlink); SYSCALL(i = readlink(CHARS(path), buf, (sizet)sizeof(buf));); if (-1==i) return BOOL_F; return makfromstr(buf, (sizet)i); @@ -143,7 +146,7 @@ SCM scm_lstat(str) { int i; struct stat stat_temp; - ASSERT(NIMP(str) && STRINGP(str), str, ARG1, s_lstat); + ASRTER(NIMP(str) && STRINGP(str), str, ARG1, s_lstat); SYSCALL(i = lstat(CHARS(str), &stat_temp);); if (i) return BOOL_F; return stat2scm(&stat_temp); -- cgit v1.2.3