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

make this fail betterly

Browse Source
This commit is contained in:
tg
2012-03-28 23:07:47 +00:00
parent 25745883a9
commit 1f6ecff829
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
histrap.c
View File

@@ -27,7 +27,7 @@
#include <sys/file.h> #include <sys/file.h>
#endif #endif
__RCSID("$MirOS: src/bin/mksh/histrap.c,v 1.118 2012/03/27 22:36:52 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/histrap.c,v 1.119 2012/03/28 23:07:47 tg Exp $");
Trap sigtraps[NSIG + 1]; Trap sigtraps[NSIG + 1];
static struct sigaction Sigact_ign; static struct sigaction Sigact_ign;
@@ -1451,22 +1451,25 @@ mksh_lockfd(int fd)
do { do {
rv = fcntl(fd, F_SETLKW, &lks); rv = fcntl(fd, F_SETLKW, &lks);
} while (rv == 1 && errno == EINTR); } while (rv == 1 && errno == EINTR);
#else
#error oops
#endif #endif
} }
/* designed to not define mksh_unlkfd if none triggered */
#if HAVE_FLOCK
void void
mksh_unlkfd(int fd) mksh_unlkfd(int fd)
{ {
#if HAVE_FLOCK
(void)flock(fd, LOCK_UN); (void)flock(fd, LOCK_UN);
}
#elif HAVE_LOCK_FCNTL #elif HAVE_LOCK_FCNTL
void
mksh_unlkfd(int fd)
{
struct flock lks; struct flock lks;
memset(&lks, 0, sizeof(lks)); memset(&lks, 0, sizeof(lks));
lks.l_type = F_UNLCK; lks.l_type = F_UNLCK;
(void)fcntl(fd, F_SETLKW, &lks); (void)fcntl(fd, F_SETLKW, &lks);
#endif
} }
#endif #endif
#endif