Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

LibCore/Userland: Introduce a simple tail implementation #48

Merged
merged 1 commit into from
May 17, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions LibCore/CIODevice.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -174,15 +174,31 @@ bool CIODevice::close()
return true;
}

bool CIODevice::seek(signed_qword offset)
bool CIODevice::seek(signed_qword offset, SeekMode mode, off_t *pos)
{
int rc = lseek(m_fd, offset, SEEK_SET);
int m = SEEK_SET;
switch (mode) {
case SeekMode::SetPosition:
m = SEEK_SET;
break;
case SeekMode::FromCurrentPosition:
m = SEEK_CUR;
break;
case SeekMode::FromEndPosition:
m = SEEK_END;
break;
}
off_t rc = lseek(m_fd, offset, m);
if (rc < 0) {
rburchell marked this conversation as resolved.
Show resolved Hide resolved
perror("CIODevice::seek: lseek");
set_error(errno);
if (pos)
*pos = -1;
return false;
}
m_buffered_data.clear();
m_eof = false;
if (pos)
*pos = rc;
return true;
}

Expand Down
8 changes: 7 additions & 1 deletion LibCore/CIODevice.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,13 @@ class CIODevice : public CObject {

bool can_read() const;

bool seek(signed_qword);
enum class SeekMode {
SetPosition,
FromCurrentPosition,
FromEndPosition,
};

bool seek(signed_qword, SeekMode = SeekMode::SetPosition, off_t* = nullptr);

virtual bool open(CIODevice::OpenMode) = 0;
virtual bool close();
Expand Down
117 changes: 117 additions & 0 deletions Userland/tail.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <errno.h>
#include <getopt.h>
#include <unistd.h>
#include <AK/Assertions.h>
#include <LibCore/CFile.h>

static void print_usage_and_exit()
{
printf("usage: tail [-f, -n <linecount>] <filename>\n");
exit(1);
}

int tail_from_pos(CFile& file, off_t startline, bool want_follow)
{
if (!file.seek(startline + 1))
return -1;

while (true) {
const auto& b = file.read(4096);
if (b.is_empty()) {
if (!want_follow) {
break;
} else {
while (!file.can_read()) {
// FIXME: would be nice to have access to can_read_from_fd with an infinite timeout
usleep(100);
}
continue;
}
}

if (write(STDOUT_FILENO, b.pointer(), b.size()) < 0) {
return -1;
}
}

return 0;
}

off_t find_seek_pos(CFile& file, int wanted_lines)
{
// Rather than reading the whole file, start at the end and work backwards,
// stopping when we've found the number of lines we want.
off_t pos = 0;
if (!file.seek(0, CIODevice::SeekMode::FromEndPosition, &pos)) {
fprintf(stderr, "Failed to find end of file: %s\n", file.error_string());
return -1;
}

off_t end = pos;
int lines = 0;

// FIXME: Reading char-by-char is only OK if CIODevice's read buffer
// is smart enough to not read char-by-char. Fix it there, or fix it here :)
for(; pos >= 0; pos--) {
rburchell marked this conversation as resolved.
Show resolved Hide resolved
file.seek(pos);
const auto& ch = file.read(1);
if (ch.is_empty()) {
// Presumably the file got truncated?
// Keep trying to read backwards...
} else {
if (*ch.pointer() == '\n' && (end - pos) > 1) {
lines++;
if (lines == wanted_lines)
break;
}
}
}

return pos;
}

static void exit_because_we_wanted_lines()
{
fprintf(stderr, "Expected a line count after -n");
exit(-1);
}

int main(int argc, char *argv[])
{
int line_count = 0;
bool flag_follow = false;
int opt;
while ((opt = getopt(argc, argv, "fn:")) != -1) {
switch (opt) {
case 'f':
flag_follow = true;
break;
case 'n':
line_count = strtol(optarg, NULL, 10);
if (errno == EINVAL) {
exit_because_we_wanted_lines();
}
break;
default:
print_usage_and_exit();
}
}
const char *path = nullptr;
if (optind >= argc) {
print_usage_and_exit();
}

path = argv[optind];

CFile f(path);
if (!f.open(CIODevice::ReadOnly)) {
fprintf(stderr, "Error opening file %s: %s\n", path, strerror(errno));
exit(-1);
}

auto pos = find_seek_pos(f, line_count);
return tail_from_pos(f, pos, flag_follow);
}