mirror of
https://github.com/sheumann/hush.git
synced 2024-09-12 00:55:11 +00:00
Fix some bitrot.
-Erik
This commit is contained in:
parent
83e85f6a08
commit
cc10a5b42b
@ -251,7 +251,7 @@ static int pipe_lines(int fd, long int n_lines)
|
||||
If `forever' is nonzero, keep reading from the end of the file
|
||||
until killed. Return the number of bytes read from the file. */
|
||||
|
||||
static long dump_remainder(int fd)
|
||||
static long dump_remainder(const char *filename,, int fd)
|
||||
{
|
||||
char buffer[BUFSIZ];
|
||||
int bytes_read;
|
||||
@ -582,7 +582,7 @@ file_lines(const char *filename, int fd, long int n_lines, off_t pos)
|
||||
Buffer the text as a linked list of LBUFFERs, adding them as needed.
|
||||
Return 0 if successful, 1 if an error occured. */
|
||||
|
||||
static int pipe_lines(int fd, long int n_lines)
|
||||
static int pipe_lines(const char *filename, int fd, long int n_lines)
|
||||
{
|
||||
struct linebuffer {
|
||||
int nbytes, nlines;
|
||||
@ -816,7 +816,7 @@ static int start_lines(const char *filename, int fd, long int n_lines)
|
||||
If `forever' is nonzero, keep reading from the end of the file
|
||||
until killed. Return the number of bytes read from the file. */
|
||||
|
||||
static long dump_remainder(int fd)
|
||||
static long dump_remainder(const char *filename, int fd)
|
||||
{
|
||||
char buffer[BUFSIZ];
|
||||
int bytes_read;
|
||||
@ -891,7 +891,7 @@ static void tail_forever(char **names, int nfiles)
|
||||
write_header(names[i], NULL);
|
||||
last = i;
|
||||
}
|
||||
file_sizes[i] += dump_remainder(file_descs[i]);
|
||||
file_sizes[i] += dump_remainder(names[i], file_descs[i]);
|
||||
}
|
||||
|
||||
/* If none of the files changed size, sleep. */
|
||||
@ -921,7 +921,7 @@ static int tail_bytes(const char *filename, int fd, off_t n_bytes)
|
||||
lseek(fd, n_bytes, SEEK_CUR);
|
||||
else if (start_bytes(filename, fd, n_bytes))
|
||||
return 1;
|
||||
dump_remainder(fd);
|
||||
dump_remainder(filename, fd);
|
||||
} else {
|
||||
if (S_ISREG(stats.st_mode)) {
|
||||
off_t current_pos, end_pos;
|
||||
@ -987,9 +987,9 @@ static int tail_lines(const char *filename, int fd, long int n_lines)
|
||||
length = lseek(fd, (off_t) 0, SEEK_END);
|
||||
if (length != 0 && file_lines(filename, fd, n_lines, length))
|
||||
return 1;
|
||||
dump_remainder(fd);
|
||||
dump_remainder(filename, fd);
|
||||
} else
|
||||
return pipe_lines(fd, n_lines);
|
||||
return pipe_lines(filename, fd, n_lines);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
14
tail.c
14
tail.c
@ -251,7 +251,7 @@ static int pipe_lines(int fd, long int n_lines)
|
||||
If `forever' is nonzero, keep reading from the end of the file
|
||||
until killed. Return the number of bytes read from the file. */
|
||||
|
||||
static long dump_remainder(int fd)
|
||||
static long dump_remainder(const char *filename,, int fd)
|
||||
{
|
||||
char buffer[BUFSIZ];
|
||||
int bytes_read;
|
||||
@ -582,7 +582,7 @@ file_lines(const char *filename, int fd, long int n_lines, off_t pos)
|
||||
Buffer the text as a linked list of LBUFFERs, adding them as needed.
|
||||
Return 0 if successful, 1 if an error occured. */
|
||||
|
||||
static int pipe_lines(int fd, long int n_lines)
|
||||
static int pipe_lines(const char *filename, int fd, long int n_lines)
|
||||
{
|
||||
struct linebuffer {
|
||||
int nbytes, nlines;
|
||||
@ -816,7 +816,7 @@ static int start_lines(const char *filename, int fd, long int n_lines)
|
||||
If `forever' is nonzero, keep reading from the end of the file
|
||||
until killed. Return the number of bytes read from the file. */
|
||||
|
||||
static long dump_remainder(int fd)
|
||||
static long dump_remainder(const char *filename, int fd)
|
||||
{
|
||||
char buffer[BUFSIZ];
|
||||
int bytes_read;
|
||||
@ -891,7 +891,7 @@ static void tail_forever(char **names, int nfiles)
|
||||
write_header(names[i], NULL);
|
||||
last = i;
|
||||
}
|
||||
file_sizes[i] += dump_remainder(file_descs[i]);
|
||||
file_sizes[i] += dump_remainder(names[i], file_descs[i]);
|
||||
}
|
||||
|
||||
/* If none of the files changed size, sleep. */
|
||||
@ -921,7 +921,7 @@ static int tail_bytes(const char *filename, int fd, off_t n_bytes)
|
||||
lseek(fd, n_bytes, SEEK_CUR);
|
||||
else if (start_bytes(filename, fd, n_bytes))
|
||||
return 1;
|
||||
dump_remainder(fd);
|
||||
dump_remainder(filename, fd);
|
||||
} else {
|
||||
if (S_ISREG(stats.st_mode)) {
|
||||
off_t current_pos, end_pos;
|
||||
@ -987,9 +987,9 @@ static int tail_lines(const char *filename, int fd, long int n_lines)
|
||||
length = lseek(fd, (off_t) 0, SEEK_END);
|
||||
if (length != 0 && file_lines(filename, fd, n_lines, length))
|
||||
return 1;
|
||||
dump_remainder(fd);
|
||||
dump_remainder(filename, fd);
|
||||
} else
|
||||
return pipe_lines(fd, n_lines);
|
||||
return pipe_lines(filename, fd, n_lines);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user