summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2007-09-25 23:51:29 +0200
committerTobias Klauser <tklauser@xenon.tklauser.home>2007-09-25 23:51:29 +0200
commit21cddfba5f53ed0ad9d8f14bc1555c57cad9790e (patch)
treece353a7ff7d7401a82969b8f7e086582b38b8f50
parent6ec61a62e5a1a586766d46108d5ae7e1aaf3dd8c (diff)
inotail.c: Decrement n_units before calling tail_pipe_from_begin
Saves 2 lines of code
-rw-r--r--inotail.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/inotail.c b/inotail.c
index 483306e..2eef622 100644
--- a/inotail.c
+++ b/inotail.c
@@ -244,9 +244,6 @@ static int tail_pipe_from_begin(struct file_struct *f, unsigned long n_units, co
int bytes_read = 0;
char buf[BUFSIZ];
- if (n_units)
- n_units--;
-
while (n_units > 0) {
if ((bytes_read = read(f->fd, buf, BUFSIZ)) <= 0) {
if (bytes_read < 0 && (errno == EINTR || errno == EAGAIN))
@@ -295,7 +292,7 @@ static int tail_pipe_lines(struct file_struct *f, unsigned long n_lines)
const char *p;
if (from_begin)
- return tail_pipe_from_begin(f, n_lines, M_LINES);
+ return tail_pipe_from_begin(f, n_lines - 1, M_LINES);
if (n_lines == 0)
return 0;
@@ -403,7 +400,7 @@ static int tail_pipe_bytes(struct file_struct *f, unsigned long n_bytes)
unsigned long i = 0; /* Index into buffer */
if (from_begin)
- return tail_pipe_from_begin(f, n_bytes, M_BYTES);
+ return tail_pipe_from_begin(f, n_bytes - 1, M_BYTES);
/* XXX: Needed? */
if (n_bytes == 0)