summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--inotail.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/inotail.c b/inotail.c
index 5917d4a..9000f46 100644
--- a/inotail.c
+++ b/inotail.c
@@ -297,8 +297,6 @@ static int tail_file(struct file_struct *f, unsigned long n_units, char mode, ch
f->st_size = finfo.st_size;
f->st_blksize = finfo.st_blksize; /* TODO: Can this value be 0 or negative? */
- buf = emalloc(f->st_blksize);
-
if (mode == M_LINES)
offset = lines_to_offset(f, n_units);
else
@@ -307,7 +305,6 @@ static int tail_file(struct file_struct *f, unsigned long n_units, char mode, ch
/* We only get negative offsets on errors */
if (unlikely(offset < 0)) {
ignore_file(f);
- free(buf);
return -1;
}
@@ -316,10 +313,11 @@ static int tail_file(struct file_struct *f, unsigned long n_units, char mode, ch
if (lseek(f->fd, offset, SEEK_SET) == (off_t) -1) {
fprintf(stderr, "Error: Could not seek in file '%s' (%s)\n", f->name, strerror(errno));
- free(buf);
return -1;
}
+ buf = emalloc(f->st_blksize);
+
while ((bytes_read = read(f->fd, buf, f->st_blksize)) > 0)
write(STDOUT_FILENO, buf, (size_t) bytes_read);
an>/+3 2012-12-11Revert "sched/autogroup: Fix crash on reboot when autogroup is disabled"Ingo Molnar1-11/+57 2012-10-30sched/autogroup: Fix crash on reboot when autogroup is disabledMike Galbraith1-57/+11 2012-03-02sched: Clean up parameter passing of proc_sched_autogroup_set_nice()Hiroshi Shimamoto1-6/+6 2011-11-17sched: Move all scheduler bits into kernel/sched/Peter Zijlstra1-0/+258