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

less: further tweaks to regular file detection

Browse Source 
Test explicitly for REOPEN flags:  update_num_lines is called
unconditionally so (num_lines != NOT_REGULAR_FILE) is also true when
num_lines contains a valid number of lines.

The call to fstat doesn't need to be in #if ENABLE_FEATURE_LESS_FLAGS:
the whole function is already in such a test.

Signed-off-by: Ron Yorston <rmy@pobox.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Ron Yorston 2015-07-31 17:33:24 +01:00 committed by Denys Vlasenko
parent ad27a6d326
commit b27cf31003
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
miscutils/less.c
View File

@ -615,11 +615,12 @@ static int safe_lineno(int fline)
static void update_num_lines(void)
{
int count, fd;
struct stat stbuf;
ssize_t len, i;
char buf[4096];
/* only do this for regular files */
if (num_lines != NOT_REGULAR_FILE) {
if (num_lines == REOPEN_AND_COUNT || num_lines == REOPEN_STDIN) {
count = 0;
fd = open("/proc/self/fd/0", O_RDONLY);
if (fd < 0 && num_lines == REOPEN_AND_COUNT) {
@ -631,17 +632,10 @@ static void update_num_lines(void)
num_lines = NOT_REGULAR_FILE;
return;
}
#if ENABLE_FEATURE_LESS_FLAGS
{
struct stat stbuf;
if (fstat(fd, &stbuf) != 0
|| !S_ISREG(stbuf.st_mode)
) {
num_lines = NOT_REGULAR_FILE;
goto do_close;
}
if (fstat(fd, &stbuf) != 0 || !S_ISREG(stbuf.st_mode)) {
num_lines = NOT_REGULAR_FILE;
goto do_close;
}
#endif
while ((len = safe_read(fd, buf, sizeof(buf))) > 0) {
for (i = 0; i < len; ++i) {
if (buf[i] == '\n' && ++count == MAXLINES)