emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tail: work correctly on /proc files (Kazuo TAKADA <kztakada@sm.sony.co.jp>)

Browse Source
This commit is contained in:
Denis Vlasenko 2007-10-02 10:17:56 +00:00
parent ebeaea04dc
commit 368a12efc2
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
coreutils/tail.c
View File

@ -47,13 +47,16 @@ static void tail_xprint_header(const char *fmt, const char *filename)
static ssize_t tail_read(int fd, char *buf, size_t count) static ssize_t tail_read(int fd, char *buf, size_t count)
{ {
ssize_t r; ssize_t r;
off_t current, end; off_t current;
struct stat sbuf; struct stat sbuf;
end = current = lseek(fd, 0, SEEK_CUR); /* (A good comment is missing here) */
if (!fstat(fd, &sbuf)) current = lseek(fd, 0, SEEK_CUR);
end = sbuf.st_size; /* /proc files report zero st_size, don't lseek them. */
lseek(fd, end < current ? 0 : current, SEEK_SET); if (fstat(fd, &sbuf) == 0 && sbuf.st_size)
if (sbuf.st_size < current)
lseek(fd, 0, SEEK_SET);
r = safe_read(fd, buf, count); r = safe_read(fd, buf, count);
if (r < 0) { if (r < 0) {
bb_perror_msg(bb_msg_read_error); bb_perror_msg(bb_msg_read_error);
@ -67,8 +70,12 @@ static const char header_fmt[] ALIGN1 = "\n==> %s <==\n";
static unsigned eat_num(const char *p) static unsigned eat_num(const char *p)
{ {
if (*p == '-') p++; if (*p == '-')
else if (*p == '+') { p++; G.status = EXIT_FAILURE; } p++;
else if (*p == '+') {
p++;
G.status = EXIT_FAILURE;
}
return xatou_sfx(p, tail_suffixes); return xatou_sfx(p, tail_suffixes);
} }