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

Fix some bitrot.

Browse Source 
-Erik
This commit is contained in:
Eric Andersen 2000-07-26 00:52:04 +00:00
parent 83e85f6a08
commit cc10a5b42b
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
coreutils/tail.c
View File

@ -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 If `forever' is nonzero, keep reading from the end of the file
until killed. Return the number of bytes read from 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]; char buffer[BUFSIZ];
int bytes_read; 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. Buffer the text as a linked list of LBUFFERs, adding them as needed.
Return 0 if successful, 1 if an error occured. */ 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 { struct linebuffer {
int nbytes, nlines; 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 If `forever' is nonzero, keep reading from the end of the file
until killed. Return the number of bytes read from 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]; char buffer[BUFSIZ];
int bytes_read; int bytes_read;
@ -891,7 +891,7 @@ static void tail_forever(char **names, int nfiles)
write_header(names[i], NULL); write_header(names[i], NULL);
last = i; 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. */ /* 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); lseek(fd, n_bytes, SEEK_CUR);
else if (start_bytes(filename, fd, n_bytes)) else if (start_bytes(filename, fd, n_bytes))
return 1; return 1;
dump_remainder(fd); dump_remainder(filename, fd);
} else { } else {
if (S_ISREG(stats.st_mode)) { if (S_ISREG(stats.st_mode)) {
off_t current_pos, end_pos; 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); length = lseek(fd, (off_t) 0, SEEK_END);
if (length != 0 && file_lines(filename, fd, n_lines, length)) if (length != 0 && file_lines(filename, fd, n_lines, length))
return 1; return 1;
dump_remainder(fd); dump_remainder(filename, fd);
} else } else
return pipe_lines(fd, n_lines); return pipe_lines(filename, fd, n_lines);
} }
return 0; return 0;
} }

14
tail.c
View File

@ -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 If `forever' is nonzero, keep reading from the end of the file
until killed. Return the number of bytes read from 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]; char buffer[BUFSIZ];
int bytes_read; 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. Buffer the text as a linked list of LBUFFERs, adding them as needed.
Return 0 if successful, 1 if an error occured. */ 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 { struct linebuffer {
int nbytes, nlines; 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 If `forever' is nonzero, keep reading from the end of the file
until killed. Return the number of bytes read from 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]; char buffer[BUFSIZ];
int bytes_read; int bytes_read;
@ -891,7 +891,7 @@ static void tail_forever(char **names, int nfiles)
write_header(names[i], NULL); write_header(names[i], NULL);
last = i; 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. */ /* 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); lseek(fd, n_bytes, SEEK_CUR);
else if (start_bytes(filename, fd, n_bytes)) else if (start_bytes(filename, fd, n_bytes))
return 1; return 1;
dump_remainder(fd); dump_remainder(filename, fd);
} else { } else {
if (S_ISREG(stats.st_mode)) { if (S_ISREG(stats.st_mode)) {
off_t current_pos, end_pos; 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); length = lseek(fd, (off_t) 0, SEEK_END);
if (length != 0 && file_lines(filename, fd, n_lines, length)) if (length != 0 && file_lines(filename, fd, n_lines, length))
return 1; return 1;
dump_remainder(fd); dump_remainder(filename, fd);
} else } else
return pipe_lines(fd, n_lines); return pipe_lines(filename, fd, n_lines);
} }
return 0; return 0;
} }