diff options
| -rw-r--r-- | rc.h | 5 | ||||
| -rw-r--r-- | system-bsd.c | 24 | ||||
| -rw-r--r-- | system.c | 6 |
3 files changed, 33 insertions, 2 deletions
@@ -366,6 +366,10 @@ extern void initparse(void); extern void writeall(int, char *, size_t); extern int rc_read(int, char *, size_t); +#if READLINE +extern char *rc_readline(char *prompt); +#endif + /* redir.c */ extern void doredirs(void); @@ -396,7 +400,6 @@ extern void treefree(Node *); /* utils.c */ extern bool isabsolute(char *); extern int n2u(char *, unsigned int); -extern int rc_read(int, char *, size_t); extern int mvfd(int, int); extern int starstrcmp(const void *, const void *); extern void pr_error(char *); diff --git a/system-bsd.c b/system-bsd.c index 2da4b95..1f62693 100644 --- a/system-bsd.c +++ b/system-bsd.c @@ -31,7 +31,7 @@ extern void writeall(int fd, char *buf, size_t remain) { } extern int rc_read(int fd, char *buf, size_t n) { - long /*ssize_t*/ r; + ssize_t r; interrupt_happened = FALSE; if (!sigsetjmp(slowbuf.j, 1)) { slow = TRUE; @@ -48,3 +48,25 @@ extern int rc_read(int fd, char *buf, size_t n) { } return r; } + +/* signal-safe readline wrapper */ +#if READLINE +extern char *rc_readline(char *prompt) { + char *r; + + interrupt_happened = FALSE; + if (!sigsetjmp(slowbuf.j, 1)) { + slow = TRUE; + if (!interrupt_happened) + r = readline(prompt); + else + r = NULL; + } else + r = NULL; + slow = FALSE; + if (r == NULL) + errno = EINTR; + sigchk(); + return r; +} +#endif /* READLINE */ @@ -12,3 +12,9 @@ extern void writeall(int fd, char *buf, size_t remain) { extern int rc_read(int fd, char *buf, size_t n) { return read(fd, buf, n); } + +#if READLINE +extern char *rc_readline(char *prompt) { + return readline(prompt); +} +#endif |