summaryrefslogtreecommitdiff
path: root/miscutils
diff options
context:
space:
mode:
Diffstat (limited to 'miscutils')
-rw-r--r--miscutils/less.c8
-rw-r--r--miscutils/rx.c2
2 files changed, 6 insertions, 4 deletions
diff --git a/miscutils/less.c b/miscutils/less.c
index f3be2cf..7351a63 100644
--- a/miscutils/less.c
+++ b/miscutils/less.c
@@ -174,7 +174,9 @@ static void less_exit(int code)
{
bb_putchar('\n');
set_tty_cooked();
- exit(code); /* TODO: "suicide mode" for code == -signal */
+ if (code < 0)
+ kill_myself_with_sig(- code); /* does not return */
+ exit(code);
}
/* Move the cursor to a position (x,y), where (0,0) is the
@@ -1328,9 +1330,9 @@ static void keypress_process(int keypress)
number_process(keypress);
}
-static void sig_catcher(int sig ATTRIBUTE_UNUSED)
+static void sig_catcher(int sig)
{
- less_exit(1) /* TODO: "suicide mode" for code == -signal */
+ less_exit(- sig);
}
int less_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
diff --git a/miscutils/rx.c b/miscutils/rx.c
index 898703c..8ccea49 100644
--- a/miscutils/rx.c
+++ b/miscutils/rx.c
@@ -43,7 +43,7 @@ Cf:
#define TIMEOUT_LONG 10
#define MAXERRORS 10
-static int read_byte(int fd, unsigned int timeout)
+static int read_byte(int fd, unsigned timeout)
{
char buf[1];
int n;