diff options
| -rw-r--r-- | Changelog | 9 | ||||
| -rw-r--r-- | TODO | 1 | ||||
| -rw-r--r-- | applets/busybox.c | 10 | ||||
| -rw-r--r-- | busybox.c | 10 | ||||
| -rw-r--r-- | busybox.def.h | 4 | ||||
| -rw-r--r-- | cat.c | 5 | ||||
| -rw-r--r-- | coreutils/cat.c | 5 | ||||
| -rw-r--r-- | coreutils/tail.c | 955 | ||||
| -rw-r--r-- | free.c | 35 | ||||
| -rw-r--r-- | hostname.c | 2 | ||||
| -rw-r--r-- | internal.h | 2 | ||||
| -rw-r--r-- | kill.c | 112 | ||||
| -rw-r--r-- | networking/hostname.c | 2 | ||||
| -rw-r--r-- | networking/ping.c | 3 | ||||
| -rw-r--r-- | ping.c | 3 | ||||
| -rw-r--r-- | procps/free.c | 35 | ||||
| -rw-r--r-- | procps/kill.c | 112 | ||||
| -rw-r--r-- | regexp.c | 2 | ||||
| -rw-r--r-- | tail.c | 955 | ||||
| -rw-r--r-- | utility.c | 1 |
20 files changed, 2188 insertions, 75 deletions
@@ -1,9 +1,14 @@ -0.38 +0.39 * New Apps: ping and hostname contributed by Randolph Chung - <tausq@debian.org> + <tausq@debian.org>. 2 items off the TODO list! + * I wrote free (just calls "cat /proc/meminfo"). * on reboot, init called 'umount -a -n', which caused errors when BB_MTAB was not enabled. Changed to 'umount -a', which does the right thing. + * init will now try to run /sbin/getty if it is present (for easy + integration with the about-to-be-released tinylogin.) + * kill now behaves itself properly, added 'kill -l' to list signals + * Began to add tail, butit doesn't work yet. -Erik Andrsen @@ -19,7 +19,6 @@ around to it some time. If you have any good ideas, please let me know. * rdate * hwclock * login/getty -* free * killall * tee * stty diff --git a/applets/busybox.c b/applets/busybox.c index 95c294425..67a606cc4 100644 --- a/applets/busybox.c +++ b/applets/busybox.c @@ -27,6 +27,9 @@ static const struct Applet applets[] = { #ifdef BB_CLEAR //usr/bin {"clear", clear_main}, #endif +#ifdef BB_CHVT //usr/bin + {"chvt", chvt_main}, +#endif #ifdef BB_CP //bin {"cp", cp_main}, #endif @@ -51,8 +54,8 @@ static const struct Applet applets[] = { #ifdef BB_FIND //usr/bin {"find", find_main}, #endif -#ifdef BB_CHVT //usr/bin - {"chvt", chvt_main}, +#ifdef BB_FREE //usr/bin + {"free", free_main}, #endif #ifdef BB_DEALLOCVT //usr/bin {"deallocvt", deallocvt_main}, @@ -170,6 +173,9 @@ static const struct Applet applets[] = { {"swapon", swap_on_off_main}, {"swapoff", swap_on_off_main}, #endif +#ifdef BB_TAIL //usr/bin + {"tail", tail_main}, +#endif #ifdef BB_TAR //bin {"tar", tar_main}, #endif @@ -27,6 +27,9 @@ static const struct Applet applets[] = { #ifdef BB_CLEAR //usr/bin {"clear", clear_main}, #endif +#ifdef BB_CHVT //usr/bin + {"chvt", chvt_main}, +#endif #ifdef BB_CP //bin {"cp", cp_main}, #endif @@ -51,8 +54,8 @@ static const struct Applet applets[] = { #ifdef BB_FIND //usr/bin {"find", find_main}, #endif -#ifdef BB_CHVT //usr/bin - {"chvt", chvt_main}, +#ifdef BB_FREE //usr/bin + {"free", free_main}, #endif #ifdef BB_DEALLOCVT //usr/bin {"deallocvt", deallocvt_main}, @@ -170,6 +173,9 @@ static const struct Applet applets[] = { {"swapon", swap_on_off_main}, {"swapoff", swap_on_off_main}, #endif +#ifdef BB_TAIL //usr/bin + {"tail", tail_main}, +#endif #ifdef BB_TAR //bin {"tar", tar_main}, #endif diff --git a/busybox.def.h b/busybox.def.h index ac7a9b76f..786f98119 100644 --- a/busybox.def.h +++ b/busybox.def.h @@ -16,6 +16,7 @@ //#define BB_DUTMP //#define BB_FDFLUSH #define BB_FIND +#define BB_FREE #define BB_FSCK_MINIX #define BB_MKFS_MINIX #define BB_CHVT @@ -58,6 +59,7 @@ #define BB_SYNC #define BB_SYSLOGD #define BB_TAR +#define BB_TAIL #define BB_TOUCH #define BB_TRUE_FALSE #define BB_UMOUNT @@ -76,7 +78,7 @@ // pretty/useful). // // -// enable a second console on VT2 in init +// enable a second console on TTY2 in init #define BB_FEATURE_INIT_SECOND_CONSOLE // enable features that use the /proc filesystem #define BB_FEATURE_USE_PROCFS @@ -46,10 +46,9 @@ extern int cat_main(int argc, char **argv) usage ("cat [file ...]\n"); } argc--; - argv++; - while (argc-- > 0) { - file = fopen(*(argv++), "r"); + while (argc-- > 0 && *(argv++) != '\0' && strlen(*argv) ) { + file = fopen(*argv, "r"); if (file == NULL) { perror(*argv); exit(FALSE); diff --git a/coreutils/cat.c b/coreutils/cat.c index 758a83e6b..0d32efe84 100644 --- a/coreutils/cat.c +++ b/coreutils/cat.c @@ -46,10 +46,9 @@ extern int cat_main(int argc, char **argv) usage ("cat [file ...]\n"); } argc--; - argv++; - while (argc-- > 0) { - file = fopen(*(argv++), "r"); + while (argc-- > 0 && *(argv++) != '\0' && strlen(*argv) ) { + file = fopen(*argv, "r"); if (file == NULL) { perror(*argv); exit(FALSE); diff --git a/coreutils/tail.c b/coreutils/tail.c new file mode 100644 index 000000000..058d462a5 --- /dev/null +++ b/coreutils/tail.c @@ -0,0 +1,955 @@ +/* tail -- output the last part of file(s) + Copyright (C) 89, 90, 91, 95, 1996 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +/* Can display any amount of data, unlike the Unix version, which uses + a fixed size buffer and therefore can only deliver a limited number + of lines. + + Options: + -b Tail by N 512-byte blocks. + -c, --bytes=N[bkm] Tail by N bytes + [or 512-byte blocks, kilobytes, or megabytes]. + -f, --follow Loop forever trying to read more characters at the + end of the file, on the assumption that the file + is growing. Ignored if reading from a pipe. + -n, --lines=N Tail by N lines. + -q, --quiet, --silent Never print filename headers. + -v, --verbose Always print filename headers. + + If a number (N) starts with a `+', begin printing with the Nth item + from the start of each file, instead of from the end. + + Reads from standard input if no files are given or when a filename of + ``-'' is encountered. + By default, filename headers are printed only more than one file + is given. + By default, prints the last 10 lines (tail -n 10). + + Original version by Paul Rubin <phr@ocf.berkeley.edu>. + Extensions by David MacKenzie <djm@gnu.ai.mit.edu>. + tail -f for multiple files by Ian Lance Taylor <ian@airs.com>. */ + +#include "internal.h" + +#include <stdio.h> +#include <assert.h> +#include <errno.h> +#include <sys/types.h> + + +/* Disable assertions. Some systems have broken assert macros. */ +#define NDEBUG 1 + + +static void error(int i, int errnum, char* fmt, const char *msg) +{ + fprintf(stderr, fmt, msg); + perror( errnum); + exit(i); +} + + +#define XWRITE(fd, buffer, n_bytes) \ + do \ + { \ + assert ((fd) == 1); \ + assert ((n_bytes) >= 0); \ + if (n_bytes > 0 && fwrite ((buffer), 1, (n_bytes), stdout) == 0) \ + error (EXIT_FAILURE, errno, "write error", NULL); \ + } \ + while (0) + +/* Number of items to tail. */ +#define DEFAULT_N_LINES 10 + +/* Size of atomic reads. */ +#ifndef BUFSIZ +#define BUFSIZ (512 * 8) +#endif + +/* If nonzero, interpret the numeric argument as the number of lines. + Otherwise, interpret it as the number of bytes. */ +static int count_lines; + +/* If nonzero, read from the end of one file until killed. */ +static int forever; + +/* If nonzero, read from the end of multiple files until killed. */ +static int forever_multiple; + +/* Array of file descriptors if forever_multiple is 1. */ +static int *file_descs; + +/* Array of file sizes if forever_multiple is 1. */ +static off_t *file_sizes; + +/* If nonzero, count from start of file instead of end. */ +static int from_start; + +/* If nonzero, print filename headers. */ +static int print_headers; + +/* When to print the filename banners. */ +enum header_mode +{ + multiple_files, always, never +}; + +char *xmalloc (); +int safe_read (); + +/* The name this program was run with. */ +char *program_name; + +/* Nonzero if we have ever read standard input. */ +static int have_read_stdin; + +/* If nonzero, display usage information and exit. */ +static int show_help; + +/* If nonzero, print the version on standard output then exit. */ +static int show_version; + +static const char tail_usage[] = +"tail [OPTION]... [FILE]...\n\ +Print last 10 lines of each FILE to standard output.\n\ +With more than one FILE, precede each with a header giving the file name.\n\ +With no FILE, or when FILE is -, read standard input.\n\ +\n\ + -c, --bytes=N output the last N bytes\n\ + -f, --follow output appended data as the file grows\n\ + -n, --lines=N output the last N lines, instead of last 10\n\ + -q, --quiet, --silent never output headers giving file names\n\ + -v, --verbose always output headers giving file names\n\ + --help display this help and exit\n\ + --version output version information and exit\n\ +\n\ +If the first character of N (the number of bytes or lines) is a `+',\n\ +print beginning with the Nth item from the start of each file, otherwise,\n\ +print the last N items in the file. N may have a multiplier suffix:\n\ +b for 512, k for 1024, m for 1048576 (1 Meg). A first OPTION of -VALUE\n\ +or +VALUE is treated like -n VALUE or -n +VALUE unless VALUE has one of\n\ +the [bkm] suffix multipliers, in which case it is treated like -c VALUE\n\ +or -c +VALUE.\n"; + +static void +write_header (const char *filename, const char *comment) +{ + static int first_file = 1; + + printf ("%s==> %s%s%s <==\n", (first_file ? "" : "\n"), filename, + (comment ? ": " : ""), + (comment ? comment : "")); + first_file = 0; +} + +/* Print the last N_LINES lines from the end of file FD. + Go backward through the file, reading `BUFSIZ' bytes at a time (except + probably the first), until we hit the start of the file or have + read NUMBER newlines. + POS starts out as the length of the file (the offset of the last + byte of the file + 1). + Return 0 if successful, 1 if an error occurred. */ + +static int +file_lines (const char *filename, int fd, long int n_lines, off_t pos) +{ + char buffer[BUFSIZ]; + int bytes_read; + int i; /* Index into `buffer' for scanning. */ + + if (n_lines == 0) + return 0; + + /* Set `bytes_read' to the size of the last, probably partial, buffer; + 0 < `bytes_read' <= `BUFSIZ'. */ + bytes_read = pos % BUFSIZ; + if (bytes_read == 0) + bytes_read = BUFSIZ; + /* Make `pos' a multiple of `BUFSIZ' (0 if the file is short), so that all + reads will be on block boundaries, which might increase efficiency. */ + pos -= bytes_read; + lseek (fd, pos, SEEK_SET); + bytes_read = safe_read (fd, buffer, bytes_read); + if (bytes_read == -1) + { + error (0, errno, "%s", filename); + return 1; + } + + /* Count the incomplete line on files that don't end with a newline. */ + if (bytes_read && buffer[bytes_read - 1] != '\n') + --n_lines; + + do + { + /* Scan backward, counting the newlines in this bufferfull. */ + for (i = bytes_read - 1; i >= 0; i--) + { + /* Have we counted the requested number of newlines yet? */ + if (buffer[i] == '\n' && n_lines-- == 0) + { + /* If this newline wasn't the last character in the buffer, + print the text after it. */ + if (i != bytes_read - 1) + XWRITE (STDOUT_FILENO, &buffer[i + 1], bytes_read - (i + 1)); + return 0; + } + } + /* Not enough newlines in that bufferfull. */ + if (pos == 0) + { + /* Not enough lines in the file; print the entire file. */ + lseek (fd, (off_t) 0, SEEK_SET); + return 0; + } + pos -= BUFSIZ; + lseek (fd, pos, SEEK_SET); + } + while ((bytes_read = safe_read (fd, buffer, BUFSIZ)) > 0); + if (bytes_read == -1) + { + error (0, errno, "%s", filename); + return 1; + } + return 0; +} + +/* Print the last N_LINES lines from the end of the standard input, + open for reading as pipe FD. + 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 (const char *filename, int fd, long int n_lines) +{ + struct linebuffer + { + int nbytes, nlines; + char buffer[BUFSIZ]; + struct linebuffer *next; + }; + typedef struct linebuffer LBUFFER; + LBUFFER *first, *last, *tmp; + int i; /* Index into buffers. */ + int total_lines = 0; /* Total number of newlines in all buffers. */ + int errors = 0; + + first = last = (LBUFFER *) xmalloc (sizeof (LBUFFER)); + first->nbytes = first->nlines = 0; + first->next = NULL; + tmp = (LBUFFER *) xmalloc (sizeof (LBUFFER)); + + /* Input is always read into a fresh buffer. */ + while ((tmp->nbytes = safe_read (fd, tmp->buffer, BUFSIZ)) > 0) + { + tmp->nlines = 0; + tmp->next = NULL; + + /* Count the number of newlines just read. */ + for (i = 0; i < tmp->nbytes; i++) + if (tmp->buffer[i] == '\n') + ++tmp->nlines; + total_lines += tmp->nlines; + + /* If there is enough room in the last buffer read, just append the new + one to it. This is because when reading from a pipe, `nbytes' can + often be very small. */ + if (tmp->nbytes + last->nbytes < BUFSIZ) + { + memcpy (&last->buffer[last->nbytes], tmp->buffer, tmp->nbytes); + last->nbytes += tmp->nbytes; + last->nlines += tmp->nlines; + } + else + { + /* If there's not enough room, link the new buffer onto the end of + the list, then either free up the oldest buffer for the next + read if that would leave enough lines, or else malloc a new one. + Some compaction mechanism is possible but probably not + worthwhile. */ + last = last->next = tmp; + if (total_lines - first->nlines > n_lines) + { + tmp = first; + total_lines -= first->nlines; + first = first->next; + } + else + tmp = (LBUFFER *) xmalloc (sizeof (LBUFFER)); + } + } + if (tmp->nbytes == -1) + { + error (0, errno, "%s", filename); + errors = 1; + free ((char *) tmp); + goto free_lbuffers; + } + + free ((char *) tmp); + + /* This prevents a core dump when the pipe contains no newlines. */ + if (n_lines == 0) + goto free_lbuffers; + + /* Count the incomplete line on files that don't end with a newline. */ + if (last->buffer[last->nbytes - 1] != '\n') + { + ++last->nlines; + ++total_lines; + } + + /* Run through the list, printing lines. First, skip over unneeded + buffers. */ + for (tmp = first; total_lines - tmp->nlines > n_lines; tmp = tmp->next) + total_lines -= tmp->nlines; + + /* Find the correct beginning, then print the rest of the file. */ + if (total_lines > n_lines) + { + char *cp; + + /* Skip `total_lines' - `n_lines' newlines. We made sure that + `total_lines' - `n_lines' <= `tmp->nlines'. */ + cp = tmp->buffer; + for (i = total_lines - n_lines; i; --i) + while (*cp++ != '\n') + /* Do nothing. */ ; + i = cp - tmp->buffer; + } + else + i = 0; + XWRITE (STDOUT_FILENO, &tmp->buffer[i], tmp->nbytes - i); + + for (tmp = tmp->next; tmp; tmp = tmp->next) + XWRITE (STDOUT_FILENO, tmp->buffer, tmp->nbytes); + +free_lbuffers: + while (first) + { + tmp = first->next; + free ((char *) first); + first = tmp; + } + return errors; +} + +/* Print the last N_BYTES characters from the end of pipe FD. + This is a stripped down version of pipe_lines. + Return 0 if successful, 1 if an error occurred. */ + +static int +pipe_bytes (const char *filename, int fd, off_t n_bytes) +{ + struct charbuffer + { + int nbytes; + char buffer[BUFSIZ]; + struct charbuffer *next; + }; + typedef struct charbuffer CBUFFER; + CBUFFER *first, *last, *tmp; + int i; /* Index into buffers. */ + int total_bytes = 0; /* Total characters in all buffers. */ + int errors = 0; + + first = last = (CBUFFER *) xmalloc (sizeof (CBUFFER)); + first->nbytes = 0; + first->next = NULL; + tmp = (CBUFFER *) xmalloc (sizeof (CBUFFER)); + + /* Input is always read into a fresh buffer. */ + while ((tmp->nbytes = safe_read (fd, tmp->buffer, BUFSIZ)) > 0) + { + tmp->next = NULL; + + total_bytes += tmp->nbytes; + /* If there is enough room in the last buffer read, just append the new + one to it. This is because when reading from a pipe, `nbytes' can + often be very small. */ + if (tmp->nbytes + last->nbytes < BUFSIZ) + { + memcpy (&last->buffer[last->nbytes], tmp->buffer, tmp->nbytes); + last->nbytes += tmp->nbytes; + } + else + { + /* If there's not enough room, link the new buffer onto the end of + the list, then either free up the oldest buffer for the next + read if that would leave enough characters, or else malloc a new + one. Some compaction mechanism is possible but probably not + worthwhile. */ + last = last->next = tmp; + if (total_bytes - first->nbytes > n_bytes) + { + tmp = first; + total_bytes -= first->nbytes; + first = first->next; + } + else + { + tmp = (CBUFFER *) xmalloc (sizeof (CBUFFER)); + } + } + } + if (tmp->nbytes == -1) + { + error (0, errno, "%s", filename); + errors = 1; + free ((char *) tmp); + goto free_cbuffers; + } + + free ((char *) tmp); + + /* Run through the list, printing characters. First, skip over unneeded + buffers. */ + for (tmp = first; total_bytes - tmp->nbytes > n_bytes; tmp = tmp->next) + total_bytes -= tmp->nbytes; + + /* Find the correct beginning, then print the rest of the file. + We made sure that `total_bytes' - `n_bytes' <= `tmp->nbytes'. */ + if (total_bytes > n_bytes) + i = total_bytes - n_bytes; + else + i = 0; + XWRITE (STDOUT_FILENO, &tmp->buffer[i], tmp->nbytes - i); + + for (tmp = tmp->next; tmp; tmp = tmp->next) + XWRITE (STDOUT_FILENO, tmp->buffer, tmp->nbytes); + +free_cbuffers: + while (first) + { + tmp = first->next; + free ((char *) first); + first = tmp; + } + return errors; +} + +/* Skip N_BYTES characters from the start of pipe FD, and print + any extra characters that were read beyond that. + Return 1 on error, 0 if ok. */ + +static int +start_bytes (const char *filename, int fd, off_t n_bytes) +{ + char buffer[BUFSIZ]; + int bytes_read = 0; + + while (n_bytes > 0 && (bytes_read = safe_read (fd, buffer, BUFSIZ)) > 0) + n_bytes -= bytes_read; + if (bytes_read == -1) + { + error (0, errno, "%s", filename); + return 1; + } + else if (n_bytes < 0) + XWRITE (STDOUT_FILENO, &buffer[bytes_read + n_bytes], -n_bytes); + return 0; +} + +/* Skip N_LINES lines at the start of file or pipe FD, and print + any extra characters that were read beyond that. + Return 1 on error, 0 if ok. */ + +static int +start_lines (const char *filename, int fd, long int n_lines) +{ + char buffer[BUFSIZ]; + int bytes_read = 0; + int bytes_to_skip = 0; + + while (n_lines && (bytes_read = safe_read (fd, buffer, BUFSIZ)) > 0) + { + bytes_to_skip = 0; + while (bytes_to_skip < bytes_read) + if (buffer[bytes_to_skip++] == '\n' && --n_lines == 0) + break; + } + if (bytes_read == -1) + { + error (0, errno, "%s", filename); + return 1; + } + else if (bytes_to_skip < bytes_read) + { + XWRITE (STDOUT_FILENO, &buffer[bytes_to_skip], + bytes_read - bytes_to_skip); + } + return 0; +} + +/* Display file FILENAME from the current position in FD to the end. + 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 (const char *filename, int fd) +{ + char buffer[BUFSIZ]; + int bytes_read; + long total; + + total = 0; +output: + while ((bytes_read = safe_read (fd, buffer, BUFSIZ)) > 0) + { + XWRITE (STDOUT_FILENO, buffer, bytes_read); + total += bytes_read; + } + if (bytes_read == -1) + error (EXIT_FAILURE, errno, "%s", filename); + if (forever) + { + fflush (stdout); + sleep (1); + goto output; + } + else + { + if (forever_multiple) + fflush (stdout); + } + + return total; +} + +/* Tail NFILES (>1) files forever until killed. The file names are in + NAMES. The open file descriptors are in `file_descs', and the size + at which we stopped tailing them is in `file_sizes'. We loop over + each of them, doing an fstat to see if they have changed size. If + none of them have changed size in one iteration, we sleep for a + second and try again. We do this until the user interrupts us. */ + +static void +tail_forever (char **names, int nfiles) +{ + int last; + + last = -1; + + while (1) + { + int i; + int changed; + + changed = 0; + for (i = 0; i < nfiles; i++) + { + struct stat stats; + + if (file_descs[i] < 0) + continue; + if (fstat (file_descs[i], &stats) < 0) + { + error (0, errno, "%s", names[i]); + file_descs[i] = -1; + continue; + } + if (stats.st_size == file_sizes[i]) + continue; + + /* This file has changed size. Print out what we can, and + then keep looping. */ + + changed = 1; + + if (stats.st_size < file_sizes[i]) + { + write_header (names[i], "file truncated"); + last = i; + lseek (file_descs[i], stats.st_size, SEEK_SET); + file_sizes[i] = stats.st_size; + continue; + } + + if (i != last) + { + if (print_headers) + write_header (names[i], NULL); + last = i; + } + file_sizes[i] += dump_remainder (names[i], file_descs[i]); + } + + /* If none of the files changed size, sleep. */ + if (! changed) + sleep (1); + } +} + +/* Output the last N_BYTES bytes of file FILENAME open for reading in FD. + Return 0 if successful, 1 if an error occurred. */ + +static int +tail_bytes (const char *filename, int fd, off_t n_bytes) +{ + struct stat stats; + + /* FIXME: resolve this like in dd.c. */ + /* Use fstat instead of checking for errno == ESPIPE because + lseek doesn't work on some special files but doesn't return an + error, either. */ + if (fstat (fd, &stats)) + { + error (0, errno, "%s", filename); + return 1; + } + + if (from_start) + { + if (S_ISREG (stats.st_mode)) + lseek (fd, n_bytes, SEEK_CUR); + else if (start_bytes (filename, fd, n_bytes)) + return 1; + dump_remainder (filename, fd); + } + else + { + if (S_ISREG (stats.st_mode)) + { + off_t current_pos, end_pos; + size_t bytes_remaining; + + if ((current_pos = lseek (fd, (off_t) 0, SEEK_CUR)) != -1 + && (end_pos = lseek (fd, (off_t) 0, SEEK_END)) != -1) + { + off_t diff; + /* Be careful here. The current position may actually be + beyond the end of the file. */ + bytes_remaining = (diff = end_pos - current_pos) < 0 ? 0 : diff; + } + else + { + error (0, errno, "%s", filename); + return 1; + } + + if (bytes_remaining <= n_bytes) + { + /* From the current position to end of file, there are no + more bytes than have been requested. So reposition the + file pointer to the incoming current position and print + everything after that. */ + lseek (fd, current_pos, SEEK_SET); + } + else + { + /* There are more bytes remaining than were requested. + Back up. */ + lseek (fd, -n_bytes, SEEK_END); + } + dump_remainder (filename, fd); + } + else + return pipe_bytes (filename, fd, n_bytes); + } + return 0; +} + +/* Output the last N_LINES lines of file FILENAME open for reading in FD. + Return 0 if successful, 1 if an error occurred. */ + +static int +tail_lines (const char *filename, int fd, long int n_lines) +{ + struct stat stats; + off_t length; + + if (fstat (fd, &stats)) + { + error (0, errno, "%s", filename); + return 1; + } + + if (from_start) + { + if (start_lines (filename, fd, n_lines)) + return 1; + dump_remainder (filename, fd); + } + else + { + /* Use file_lines only if FD refers to a regular file with + its file pointer positioned at beginning of file. */ + /* FIXME: adding the lseek conjunct is a kludge. + Once there's a reasonable test suite, fix the true culprit: + file_lines. file_lines shouldn't presume that the input + file pointer is initially positioned to beginning of file. */ + if (S_ISREG (stats.st_mode) + && lseek (fd, (off_t) 0, SEEK_CUR) == (off_t) 0) + { + length = lseek (fd, (off_t) 0, SEEK_END); + if (length != 0 && file_lines (filename, fd, n_lines, length)) + return 1; + dump_remainder (filename, fd); + } + else + return pipe_lines (filename, fd, n_lines); + } + return 0; +} + +/* Display the last N_UNITS units of file FILENAME, open for reading + in FD. + Return 0 if successful, 1 if an error occurred. */ + +static int +tail (const char *filename, int fd, off_t n_units) +{ + if (count_lines) + return tail_lines (filename, fd, (long) n_units); + else + return tail_bytes (filename, fd, n_units); +} + +/* Display the last N_UNITS units of file FILENAME. + "-" for FILENAME means the standard input. + FILENUM is this file's index in the list of files the user gave. + Return 0 if successful, 1 if an error occurred. */ + +static int +tail_file (const char *filename, off_t n_units, int filenum) +{ + int fd, errors; + struct stat stats; + + if (!strcmp (filename, "-") + { + have_read_stdin = 1; + filename = "standard input"; + if (print_headers) + write_header (filename, NULL); + errors = tail (filename, 0, n_units); + if (forever_multiple) + { + if (fstat (0, &stats) < 0) + { + error (0, errno, "standard input"); + errors = 1; + } + else if (!S_ISREG (stats.st_mode)) + { + error (0, 0, + "standard input: cannot follow end of non-regular file"); + errors = 1; + } + if (errors) + file_descs[filenum] = -1; + else + { + file_descs[filenum] = 0; + file_sizes[filenum] = stats.st_size; + } + } + } + else + { + /* Not standard input. */ + fd = open (filename, O_RDONLY); + if (fd == -1) + { + if (forever_multiple) + file_descs[filenum] = -1; + error (0, errno, "%s", filename); + errors = 1; + } + else + { + if (print_headers) + write_header (filename, NULL); + errors = tail (filename, fd, n_units); + if (forever_multiple) + { + if (fstat (fd, &stats) < 0) + { + error (0, errno, "%s", filename); + errors = 1; + } + else if (!S_ISREG (stats.st_mode)) + { + error (0, 0, "%s: cannot follow end of non-regular file", + filename); + errors = 1; + } + if (errors) + { + close (fd); + file_descs[filenum] = -1; + } + else + { + file_descs[filenum] = fd; + file_sizes[filenum] = stats.st_size; + } + } + else + { + if (close (fd)) + { + error (0, errno, "%s", filename); + errors = 1; + } + } + } + } + + return errors; +} + +extern int +tai_main (int argc, char **argv) +{ + enum header_mode header_mode = multiple_files; + int exit_status = 0; + /* If from_start, the number of items to skip before printing; otherwise, + the number of items at the end of the file to print. Initially, -1 + means the value has not been set. */ + off_t n_units = -1; + long int tmp_long; + int c; /* Option character. */ + int n_files; + char **file; + + program_name = argv[0]; + have_read_stdin = 0; + count_lines = 1; + forever = forever_multiple = from_start = print_headers = 0; + + if (argc > 1 + && ((argv[1][0] == '-' && ISDIGIT (argv[1][1])) + || (argv[1][0] == '+' && (ISDIGIT (argv[1][1]) + || argv[1][1] == 0)))) + { + /* Old option syntax: a dash or plus, one or more digits (zero digits + are acceptable with a plus), and one or more option letters. */ + if (argv[1][0] == '+') + from_start = 1; + if (argv[1][1] != '\0') + { + strtol_error s_err; + char *p; + + s_err = xstrtol (++argv[1], &p, 0, &tmp_long, "bkm"); + n_units = tmp_long; + if (s_err == LONGINT_OVERFLOW) + { + STRTOL_FATAL_ERROR (argv[1], "argument", s_err); + } + + /* If a [bkm] suffix was given then count bytes, not lines. */ + if (p[-1] == 'b' || p[-1] == 'k' || p[-1] == 'm') + count_lines = 0; + + /* Parse any appended option letters. */ + while (*p) + { + switch (*p) + { + case 'c': + /* Interpret N_UNITS as # of bytes. */ + count_lines = 0; + break; + + case 'f': + forever = 1; + break; + + case 'l': + count_lines = 1; + break; + + case 'q': + header_mode = never; + break; + + case 'v': + header_mode = always; + break; + + default: + error (0, 0, "unrecognized option '%c'", *p); + usage (tail_usage); + } + ++p; + } + } + /* Make the options we just parsed invisible to getopt. */ + argv[1] = argv[0]; + argv++; + argc--; + } + + if (show_version) + { + printf ("tail - %s\n", PACKAGE_VERSION); + exit (EXIT_SUCCESS); + } + + if (show_help) + usage (tail_usage); + + if (n_units == -1) + n_units = DEFAULT_N_LINES; + + /* To start printing with item N_UNITS from the start of the file, skip + N_UNITS - 1 items. `tail +0' is actually meaningless, but for Unix + compatibility it's treated the same as `tail +1'. */ + if (from_start) + { + if (n_units) + --n_units; + } + + n_files = argc - optind; + file = argv + optind; + + if (n_files > 1 && forever) + { + forever_multiple = 1; + forever = 0; + file_descs = (int *) xmalloc (n_files * sizeof (int)); + file_sizes = (off_t *) xmalloc (n_files * sizeof (off_t)); + } + + if (header_mode == always + || (header_mode == multiple_files && n_files > 1)) + print_headers = 1; + + if (n_files == 0) + { + exit_status |= tail_file ("-", n_units, 0); + } + else + { + int i; + for (i = 0; i < n_files; i++) + exit_status |= tail_file (file[i], n_units, i); + + if (forever_multiple) + tail_forever (file, n_files); + } + + if (have_read_stdin && close (0) < 0) + error (EXIT_FAILURE, errno, "-"); + if (fclose (stdout) == EOF) + error (EXIT_FAILURE, errno, "write error"); + exit (exit_status == 0 ? EXIT_SUCCESS : EXIT_FAILURE); +} @@ -0,0 +1,35 @@ +/* + * Mini free implementation for busybox + * + * Copyright (C) 1999 by Lineo, inc. + * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#include "internal.h" +#include <stdio.h> + + +#if ! defined BB_FEATURE_USE_PROCFS +#error Sorry, I depend on the /proc filesystem right now. +#endif + +extern int free_main(int argc, char **argv) +{ + char* cmd[] = { "cat", "/proc/meminfo", "\0" }; + exit(cat_main( 3, cmd)); +} diff --git a/hostname.c b/hostname.c index 6d9de1ec5..be49de395 100644 --- a/hostname.c +++ b/hostname.c @@ -1,5 +1,5 @@ /* - * $Id: hostname.c,v 1.3 1999/12/08 04:23:30 andersen Exp $ + * $Id: hostname.c,v 1.4 1999/12/08 23:19:36 andersen Exp $ * Mini hostname implementation for busybox * * Copyright (C) 1999 by Randolph Chung <tausq@debian.org> diff --git a/internal.h b/internal.h index 2e7d48d46..48bad0c69 100644 --- a/internal.h +++ b/internal.h @@ -70,6 +70,7 @@ extern int fdflush_main(int argc, char **argv); extern int fsck_minix_main(int argc, char **argv); extern int mkfs_minix_main(int argc, char **argv); extern int find_main(int argc, char** argv); +extern int free_main(int argc, char** argv); extern int grep_main(int argc, char** argv); extern int halt_main(int argc, char** argv); extern int hostname_main(int argc, char** argv); @@ -109,6 +110,7 @@ extern int sync_main(int argc, char** argv); extern int syslogd_main(int argc, char **argv); extern int logger_main(int argc, char **argv); extern int tar_main(int argc, char** argv); +extern int tail_main(int argc, char** argv); extern int touch_main(int argc, char** argv); extern int tput_main(int argc, char** argv); extern int true_main(int argc, char** argv); @@ -26,8 +26,14 @@ #include <unistd.h> #include <signal.h> #include <ctype.h> +#include <sys/stat.h> +#include <unistd.h> + +static const char* kill_usage = "kill [-signal] process-id [process-id ...]\n\n" +"Send a signal (default is SIGTERM) to the specified process(es).\n\n" +"Options:\n" +"\t-l\tList all signal names and numbers.\n\n"; -const char kill_usage[] = "kill [-signal] process-id [process-id ...]\n"; struct signal_name { const char *name; @@ -114,42 +120,92 @@ const struct signal_name signames[] = { extern int kill_main (int argc, char **argv) { int sig = SIGTERM; + + argc--; + argv++; + /* Parse any options */ + if (argc < 1) + usage(kill_usage); - if ( argc < 2 ) - usage (kill_usage); + while (argc > 0 && **argv == '-') { + while (*++(*argv)) { + switch (**argv) { + case 'l': + { + int col=0; + const struct signal_name *s = signames; - if ( **(argv+1) == '-' ) { - if (isdigit( *(*(++argv)+1) )) { - sig = atoi (*argv); - if (sig < 0 || sig >= NSIG) - goto end; - } - else { - const struct signal_name *s = signames; - while (s->name != 0) { - if (strcasecmp (s->name, *argv+1) == 0) { - sig = s->number; - break; + while (s->name != 0) { + col+=fprintf(stderr, "%2d) %-8s", s->number, (s++)->name); + if (col>60) { + fprintf(stderr, "\n"); + col=0; + } + } + fprintf(stderr, "\n\n"); + exit( TRUE); + } + break; + case '-': + usage(kill_usage); + default: + { + if (isdigit( **argv)) { + sig = atoi (*argv); + if (sig < 0 || sig >= NSIG) + goto end; + else { + argc--; + argv++; + goto do_it_now; + } + } + else { + const struct signal_name *s = signames; + while (s->name != 0) { + if (strcasecmp (s->name, *argv) == 0) { + sig = s->number; + argc--; + argv++; + goto do_it_now; + } + s++; + } + if (s->name == 0) + goto end; + } } - s++; } - if (s->name == 0) - goto end; + argc--; + argv++; } } - while (--argc > 1) { - int pid; - if (! isdigit( **(++argv))) { - fprintf(stderr, "bad PID: %s\n", *argv); - exit( FALSE); - } - pid = atoi (*argv); - if (kill (pid, sig) != 0) { - perror (*argv); - exit ( FALSE); +do_it_now: + + while (argc >= 1) { + int pid; + struct stat statbuf; + char pidpath[20]="/proc/"; + + if (! isdigit( **argv)) { + fprintf(stderr, "bad PID: %s\n", *argv); + exit( FALSE); + } + pid = atoi (*argv); + snprintf(pidpath, 20, "/proc/%s/stat", *argv); + if (stat( pidpath, &statbuf)!=0) { + fprintf(stderr, "kill: (%d) - No such pid\n", pid); + exit( FALSE); } + if (kill (pid, sig) != 0) { + perror (*argv); + exit ( FALSE); + } + argv++; } + exit ( TRUE); + end: fprintf(stderr, "bad signal name: %s\n", *argv); diff --git a/networking/hostname.c b/networking/hostname.c index 6d9de1ec5..be49de395 100644 --- a/networking/hostname.c +++ b/networking/hostname.c @@ -1,5 +1,5 @@ /* - * $Id: hostname.c,v 1.3 1999/12/08 04:23:30 andersen Exp $ + * $Id: hostname.c,v 1.4 1999/12/08 23:19:36 andersen Exp $ * Mini hostname implementation for busybox * * Copyright (C) 1999 by Randolph Chung <tausq@debian.org> diff --git a/networking/ping.c b/networking/ping.c index fd5e33c03..45f3c20aa 100644 --- a/networking/ping.c +++ b/networking/ping.c @@ -1,5 +1,5 @@ /* - * $Id: ping.c,v 1.3 1999/12/08 04:23:30 andersen Exp $ + * $Id: ping.c,v 1.4 1999/12/08 23:19:36 andersen Exp $ * Mini ping implementation for busybox * * Copyright (C) 1999 by Randolph Chung <tausq@debian.org> @@ -63,6 +63,7 @@ #define TST(bit) (A(bit) & B(bit)) static const char* ping_usage = "ping [OPTION]... host\n\n" +"Send ICMP ECHO_REQUEST packets to network hosts.\n\n" "Options:\n" "\t-q\t\tQuiet mode, only displays output at start and when finished.\n" "\t-c COUNT\tSend only COUNT pings.\n"; @@ -1,5 +1,5 @@ /* - * $Id: ping.c,v 1.3 1999/12/08 04:23:30 andersen Exp $ + * $Id: ping.c,v 1.4 1999/12/08 23:19:36 andersen Exp $ * Mini ping implementation for busybox * * Copyright (C) 1999 by Randolph Chung <tausq@debian.org> @@ -63,6 +63,7 @@ #define TST(bit) (A(bit) & B(bit)) static const char* ping_usage = "ping [OPTION]... host\n\n" +"Send ICMP ECHO_REQUEST packets to network hosts.\n\n" "Options:\n" "\t-q\t\tQuiet mode, only displays output at start and when finished.\n" "\t-c COUNT\tSend only COUNT pings.\n"; diff --git a/procps/free.c b/procps/free.c new file mode 100644 index 000000000..36d357522 --- /dev/null +++ b/procps/free.c @@ -0,0 +1,35 @@ +/* + * Mini free implementation for busybox + * + * Copyright (C) 1999 by Lineo, inc. + * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#include "internal.h" +#include <stdio.h> + + +#if ! defined BB_FEATURE_USE_PROCFS +#error Sorry, I depend on the /proc filesystem right now. +#endif + +extern int free_main(int argc, char **argv) +{ + char* cmd[] = { "cat", "/proc/meminfo", "\0" }; + exit(cat_main( 3, cmd)); +} diff --git a/procps/kill.c b/procps/kill.c index 8cc2b044e..0ba6d76ce 100644 --- a/procps/kill.c +++ b/procps/kill.c @@ -26,8 +26,14 @@ #include <unistd.h> #include <signal.h> #include <ctype.h> +#include <sys/stat.h> +#include <unistd.h> + +static const char* kill_usage = "kill [-signal] process-id [process-id ...]\n\n" +"Send a signal (default is SIGTERM) to the specified process(es).\n\n" +"Options:\n" +"\t-l\tList all signal names and numbers.\n\n"; -const char kill_usage[] = "kill [-signal] process-id [process-id ...]\n"; struct signal_name { const char *name; @@ -114,42 +120,92 @@ const struct signal_name signames[] = { extern int kill_main (int argc, char **argv) { int sig = SIGTERM; + + argc--; + argv++; + /* Parse any options */ + if (argc < 1) + usage(kill_usage); - if ( argc < 2 ) - usage (kill_usage); + while (argc > 0 && **argv == '-') { + while (*++(*argv)) { + switch (**argv) { + case 'l': + { + int col=0; + const struct signal_name *s = signames; - if ( **(argv+1) == '-' ) { - if (isdigit( *(*(++argv)+1) )) { - sig = atoi (*argv); - if (sig < 0 || sig >= NSIG) - goto end; - } - else { - const struct signal_name *s = signames; - while (s->name != 0) { - if (strcasecmp (s->name, *argv+1) == 0) { - sig = s->number; - break; + while (s->name != 0) { + col+=fprintf(stderr, "%2d) %-8s", s->number, (s++)->name); + if (col>60) { + fprintf(stderr, "\n"); + col=0; + } + } + fprintf(stderr, "\n\n"); + exit( TRUE); + } + break; + case '-': + usage(kill_usage); + default: + { + if (isdigit( **argv)) { + sig = atoi (*argv); + if (sig < 0 || sig >= NSIG) + goto end; + else { + argc--; + argv++; + goto do_it_now; + } + } + else { + const struct signal_name *s = signames; + while (s->name != 0) { + if (strcasecmp (s->name, *argv) == 0) { + sig = s->number; + argc--; + argv++; + goto do_it_now; + } + s++; + } + if (s->name == 0) + goto end; + } } - s++; } - if (s->name == 0) - goto end; + argc--; + argv++; } } - while (--argc > 1) { - int pid; - if (! isdigit( **(++argv))) { - fprintf(stderr, "bad PID: %s\n", *argv); - exit( FALSE); - } - pid = atoi (*argv); - if (kill (pid, sig) != 0) { - perror (*argv); - exit ( FALSE); +do_it_now: + + while (argc >= 1) { + int pid; + struct stat statbuf; + char pidpath[20]="/proc/"; + + if (! isdigit( **argv)) { + fprintf(stderr, "bad PID: %s\n", *argv); + exit( FALSE); + } + pid = atoi (*argv); + snprintf(pidpath, 20, "/proc/%s/stat", *argv); + if (stat( pidpath, &statbuf)!=0) { + fprintf(stderr, "kill: (%d) - No such pid\n", pid); + exit( FALSE); } + if (kill (pid, sig) != 0) { + perror (*argv); + exit ( FALSE); + } + argv++; } + exit ( TRUE); + end: fprintf(stderr, "bad signal name: %s\n", *argv); @@ -98,7 +98,9 @@ extern int replace_match(char *haystack, char *needle, char *newNeedle, int igno static char *previous; /* the previous regexp, used when null regexp is given */ +#if defined BB_SED static char *previous1; /* a copy of the text from the previous substitution for regsub()*/ +#endif /* These are used to classify or recognize meta-characters */ @@ -0,0 +1,955 @@ +/* tail -- output the last part of file(s) + Copyright (C) 89, 90, 91, 95, 1996 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +/* Can display any amount of data, unlike the Unix version, which uses + a fixed size buffer and therefore can only deliver a limited number + of lines. + + Options: + -b Tail by N 512-byte blocks. + -c, --bytes=N[bkm] Tail by N bytes + [or 512-byte blocks, kilobytes, or megabytes]. + -f, --follow Loop forever trying to read more characters at the + end of the file, on the assumption that the file + is growing. Ignored if reading from a pipe. + -n, --lines=N Tail by N lines. + -q, --quiet, --silent Never print filename headers. + -v, --verbose Always print filename headers. + + If a number (N) starts with a `+', begin printing with the Nth item + from the start of each file, instead of from the end. + + Reads from standard input if no files are given or when a filename of + ``-'' is encountered. + By default, filename headers are printed only more than one file + is given. + By default, prints the last 10 lines (tail -n 10). + + Original version by Paul Rubin <phr@ocf.berkeley.edu>. + Extensions by David MacKenzie <djm@gnu.ai.mit.edu>. + tail -f for multiple files by Ian Lance Taylor <ian@airs.com>. */ + +#include "internal.h" + +#include <stdio.h> +#include <assert.h> +#include <errno.h> +#include <sys/types.h> + + +/* Disable assertions. Some systems have broken assert macros. */ +#define NDEBUG 1 + + +static void error(int i, int errnum, char* fmt, const char *msg) +{ + fprintf(stderr, fmt, msg); + perror( errnum); + exit(i); +} + + +#define XWRITE(fd, buffer, n_bytes) \ + do \ + { \ + assert ((fd) == 1); \ + assert ((n_bytes) >= 0); \ + if (n_bytes > 0 && fwrite ((buffer), 1, (n_bytes), stdout) == 0) \ + error (EXIT_FAILURE, errno, "write error", NULL); \ + } \ + while (0) + +/* Number of items to tail. */ +#define DEFAULT_N_LINES 10 + +/* Size of atomic reads. */ +#ifndef BUFSIZ +#define BUFSIZ (512 * 8) +#endif + +/* If nonzero, interpret the numeric argument as the number of lines. + Otherwise, interpret it as the number of bytes. */ +static int count_lines; + +/* If nonzero, read from the end of one file until killed. */ +static int forever; + +/* If nonzero, read from the end of multiple files until killed. */ +static int forever_multiple; + +/* Array of file descriptors if forever_multiple is 1. */ +static int *file_descs; + +/* Array of file sizes if forever_multiple is 1. */ +static off_t *file_sizes; + +/* If nonzero, count from start of file instead of end. */ +static int from_start; + +/* If nonzero, print filename headers. */ +static int print_headers; + +/* When to print the filename banners. */ +enum header_mode +{ + multiple_files, always, never +}; + +char *xmalloc (); +int safe_read (); + +/* The name this program was run with. */ +char *program_name; + +/* Nonzero if we have ever read standard input. */ +static int have_read_stdin; + +/* If nonzero, display usage information and exit. */ +static int show_help; + +/* If nonzero, print the version on standard output then exit. */ +static int show_version; + +static const char tail_usage[] = +"tail [OPTION]... [FILE]...\n\ +Print last 10 lines of each FILE to standard output.\n\ +With more than one FILE, precede each with a header giving the file name.\n\ +With no FILE, or when FILE is -, read standard input.\n\ +\n\ + -c, --bytes=N output the last N bytes\n\ + -f, --follow output appended data as the file grows\n\ + -n, --lines=N output the last N lines, instead of last 10\n\ + -q, --quiet, --silent never output headers giving file names\n\ + -v, --verbose always output headers giving file names\n\ + --help display this help and exit\n\ + --version output version information and exit\n\ +\n\ +If the first character of N (the number of bytes or lines) is a `+',\n\ +print beginning with the Nth item from the start of each file, otherwise,\n\ +print the last N items in the file. N may have a multiplier suffix:\n\ +b for 512, k for 1024, m for 1048576 (1 Meg). A first OPTION of -VALUE\n\ +or +VALUE is treated like -n VALUE or -n +VALUE unless VALUE has one of\n\ +the [bkm] suffix multipliers, in which case it is treated like -c VALUE\n\ +or -c +VALUE.\n"; + +static void +write_header (const char *filename, const char *comment) +{ + static int first_file = 1; + + printf ("%s==> %s%s%s <==\n", (first_file ? "" : "\n"), filename, + (comment ? ": " : ""), + (comment ? comment : "")); + first_file = 0; +} + +/* Print the last N_LINES lines from the end of file FD. + Go backward through the file, reading `BUFSIZ' bytes at a time (except + probably the first), until we hit the start of the file or have + read NUMBER newlines. + POS starts out as the length of the file (the offset of the last + byte of the file + 1). + Return 0 if successful, 1 if an error occurred. */ + +static int +file_lines (const char *filename, int fd, long int n_lines, off_t pos) +{ + char buffer[BUFSIZ]; + int bytes_read; + int i; /* Index into `buffer' for scanning. */ + + if (n_lines == 0) + return 0; + + /* Set `bytes_read' to the size of the last, probably partial, buffer; + 0 < `bytes_read' <= `BUFSIZ'. */ + bytes_read = pos % BUFSIZ; + if (bytes_read == 0) + bytes_read = BUFSIZ; + /* Make `pos' a multiple of `BUFSIZ' (0 if the file is short), so that all + reads will be on block boundaries, which might increase efficiency. */ + pos -= bytes_read; + lseek (fd, pos, SEEK_SET); + bytes_read = safe_read (fd, buffer, bytes_read); + if (bytes_read == -1) + { + error (0, errno, "%s", filename); + return 1; + } + + /* Count the incomplete line on files that don't end with a newline. */ + if (bytes_read && buffer[bytes_read - 1] != '\n') + --n_lines; + + do + { + /* Scan backward, counting the newlines in this bufferfull. */ + for (i = bytes_read - 1; i >= 0; i--) + { + /* Have we counted the requested number of newlines yet? */ + if (buffer[i] == '\n' && n_lines-- == 0) + { + /* If this newline wasn't the last character in the buffer, + print the text after it. */ + if (i != bytes_read - 1) + XWRITE (STDOUT_FILENO, &buffer[i + 1], bytes_read - (i + 1)); + return 0; + } + } + /* Not enough newlines in that bufferfull. */ + if (pos == 0) + { + /* Not enough lines in the file; print the entire file. */ + lseek (fd, (off_t) 0, SEEK_SET); + return 0; + } + pos -= BUFSIZ; + lseek (fd, pos, SEEK_SET); + } + while ((bytes_read = safe_read (fd, buffer, BUFSIZ)) > 0); + if (bytes_read == -1) + { + error (0, errno, "%s", filename); + return 1; + } + return 0; +} + +/* Print the last N_LINES lines from the end of the standard input, + open for reading as pipe FD. + 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 (const char *filename, int fd, long int n_lines) +{ + struct linebuffer + { + int nbytes, nlines; + char buffer[BUFSIZ]; + struct linebuffer *next; + }; + typedef struct linebuffer LBUFFER; + LBUFFER *first, *last, *tmp; + int i; /* Index into buffers. */ + int total_lines = 0; /* Total number of newlines in all buffers. */ + int errors = 0; + + first = last = (LBUFFER *) xmalloc (sizeof (LBUFFER)); + first->nbytes = first->nlines = 0; + first->next = NULL; + tmp = (LBUFFER *) xmalloc (sizeof (LBUFFER)); + + /* Input is always read into a fresh buffer. */ + while ((tmp->nbytes = safe_read (fd, tmp->buffer, BUFSIZ)) > 0) + { + tmp->nlines = 0; + tmp->next = NULL; + + /* Count the number of newlines just read. */ + for (i = 0; i < tmp->nbytes; i++) + if (tmp->buffer[i] == '\n') + ++tmp->nlines; + total_lines += tmp->nlines; + + /* If there is enough room in the last buffer read, just append the new + one to it. This is because when reading from a pipe, `nbytes' can + often be very small. */ + if (tmp->nbytes + last->nbytes < BUFSIZ) + { + memcpy (&last->buffer[last->nbytes], tmp->buffer, tmp->nbytes); + last->nbytes += tmp->nbytes; + last->nlines += tmp->nlines; + } + else + { + /* If there's not enough room, link the new buffer onto the end of + the list, then either free up the oldest buffer for the next + read if that would leave enough lines, or else malloc a new one. + Some compaction mechanism is possible but probably not + worthwhile. */ + last = last->next = tmp; + if (total_lines - first->nlines > n_lines) + { + tmp = first; + total_lines -= first->nlines; + first = first->next; + } + else + tmp = (LBUFFER *) xmalloc (sizeof (LBUFFER)); + } + } + if (tmp->nbytes == -1) + { + error (0, errno, "%s", filename); + errors = 1; + free ((char *) tmp); + goto free_lbuffers; + } + + free ((char *) tmp); + + /* This prevents a core dump when the pipe contains no newlines. */ + if (n_lines == 0) + goto free_lbuffers; + + /* Count the incomplete line on files that don't end with a newline. */ + if (last->buffer[last->nbytes - 1] != '\n') + { + ++last->nlines; + ++total_lines; + } + + /* Run through the list, printing lines. First, skip over unneeded + buffers. */ + for (tmp = first; total_lines - tmp->nlines > n_lines; tmp = tmp->next) + total_lines -= tmp->nlines; + + /* Find the correct beginning, then print the rest of the file. */ + if (total_lines > n_lines) + { + char *cp; + + /* Skip `total_lines' - `n_lines' newlines. We made sure that + `total_lines' - `n_lines' <= `tmp->nlines'. */ + cp = tmp->buffer; + for (i = total_lines - n_lines; i; --i) + while (*cp++ != '\n') + /* Do nothing. */ ; + i = cp - tmp->buffer; + } + else + i = 0; + XWRITE (STDOUT_FILENO, &tmp->buffer[i], tmp->nbytes - i); + + for (tmp = tmp->next; tmp; tmp = tmp->next) + XWRITE (STDOUT_FILENO, tmp->buffer, tmp->nbytes); + +free_lbuffers: + while (first) + { + tmp = first->next; + free ((char *) first); + first = tmp; + } + return errors; +} + +/* Print the last N_BYTES characters from the end of pipe FD. + This is a stripped down version of pipe_lines. + Return 0 if successful, 1 if an error occurred. */ + +static int +pipe_bytes (const char *filename, int fd, off_t n_bytes) +{ + struct charbuffer + { + int nbytes; + char buffer[BUFSIZ]; + struct charbuffer *next; + }; + typedef struct charbuffer CBUFFER; + CBUFFER *first, *last, *tmp; + int i; /* Index into buffers. */ + int total_bytes = 0; /* Total characters in all buffers. */ + int errors = 0; + + first = last = (CBUFFER *) xmalloc (sizeof (CBUFFER)); + first->nbytes = 0; + first->next = NULL; + tmp = (CBUFFER *) xmalloc (sizeof (CBUFFER)); + + /* Input is always read into a fresh buffer. */ + while ((tmp->nbytes = safe_read (fd, tmp->buffer, BUFSIZ)) > 0) + { + tmp->next = NULL; + + total_bytes += tmp->nbytes; + /* If there is enough room in the last buffer read, just append the new + one to it. This is because when reading from a pipe, `nbytes' can + often be very small. */ + if (tmp->nbytes + last->nbytes < BUFSIZ) + { + memcpy (&last->buffer[last->nbytes], tmp->buffer, tmp->nbytes); + last->nbytes += tmp->nbytes; + } + else + { + /* If there's not enough room, link the new buffer onto the end of + the list, then either free up the oldest buffer for the next + read if that would leave enough characters, or else malloc a new + one. Some compaction mechanism is possible but probably not + worthwhile. */ + last = last->next = tmp; + if (total_bytes - first->nbytes > n_bytes) + { + tmp = first; + total_bytes -= first->nbytes; + first = first->next; + } + else + { + tmp = (CBUFFER *) xmalloc (sizeof (CBUFFER)); + } + } + } + if (tmp->nbytes == -1) + { + error (0, errno, "%s", filename); + errors = 1; + free ((char *) tmp); + goto free_cbuffers; + } + + free ((char *) tmp); + + /* Run through the list, printing characters. First, skip over unneeded + buffers. */ + for (tmp = first; total_bytes - tmp->nbytes > n_bytes; tmp = tmp->next) + total_bytes -= tmp->nbytes; + + /* Find the correct beginning, then print the rest of the file. + We made sure that `total_bytes' - `n_bytes' <= `tmp->nbytes'. */ + if (total_bytes > n_bytes) + i = total_bytes - n_bytes; + else + i = 0; + XWRITE (STDOUT_FILENO, &tmp->buffer[i], tmp->nbytes - i); + + for (tmp = tmp->next; tmp; tmp = tmp->next) + XWRITE (STDOUT_FILENO, tmp->buffer, tmp->nbytes); + +free_cbuffers: + while (first) + { + tmp = first->next; + free ((char *) first); + first = tmp; + } + return errors; +} + +/* Skip N_BYTES characters from the start of pipe FD, and print + any extra characters that were read beyond that. + Return 1 on error, 0 if ok. */ + +static int +start_bytes (const char *filename, int fd, off_t n_bytes) +{ + char buffer[BUFSIZ]; + int bytes_read = 0; + + while (n_bytes > 0 && (bytes_read = safe_read (fd, buffer, BUFSIZ)) > 0) + n_bytes -= bytes_read; + if (bytes_read == -1) + { + error (0, errno, "%s", filename); + return 1; + } + else if (n_bytes < 0) + XWRITE (STDOUT_FILENO, &buffer[bytes_read + n_bytes], -n_bytes); + return 0; +} + +/* Skip N_LINES lines at the start of file or pipe FD, and print + any extra characters that were read beyond that. + Return 1 on error, 0 if ok. */ + +static int +start_lines (const char *filename, int fd, long int n_lines) +{ + char buffer[BUFSIZ]; + int bytes_read = 0; + int bytes_to_skip = 0; + + while (n_lines && (bytes_read = safe_read (fd, buffer, BUFSIZ)) > 0) + { + bytes_to_skip = 0; + while (bytes_to_skip < bytes_read) + if (buffer[bytes_to_skip++] == '\n' && --n_lines == 0) + break; + } + if (bytes_read == -1) + { + error (0, errno, "%s", filename); + return 1; + } + else if (bytes_to_skip < bytes_read) + { + XWRITE (STDOUT_FILENO, &buffer[bytes_to_skip], + bytes_read - bytes_to_skip); + } + return 0; +} + +/* Display file FILENAME from the current position in FD to the end. + 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 (const char *filename, int fd) +{ + char buffer[BUFSIZ]; + int bytes_read; + long total; + + total = 0; +output: + while ((bytes_read = safe_read (fd, buffer, BUFSIZ)) > 0) + { + XWRITE (STDOUT_FILENO, buffer, bytes_read); + total += bytes_read; + } + if (bytes_read == -1) + error (EXIT_FAILURE, errno, "%s", filename); + if (forever) + { + fflush (stdout); + sleep (1); + goto output; + } + else + { + if (forever_multiple) + fflush (stdout); + } + + return total; +} + +/* Tail NFILES (>1) files forever until killed. The file names are in + NAMES. The open file descriptors are in `file_descs', and the size + at which we stopped tailing them is in `file_sizes'. We loop over + each of them, doing an fstat to see if they have changed size. If + none of them have changed size in one iteration, we sleep for a + second and try again. We do this until the user interrupts us. */ + +static void +tail_forever (char **names, int nfiles) +{ + int last; + + last = -1; + + while (1) + { + int i; + int changed; + + changed = 0; + for (i = 0; i < nfiles; i++) + { + struct stat stats; + + if (file_descs[i] < 0) + continue; + if (fstat (file_descs[i], &stats) < 0) + { + error (0, errno, "%s", names[i]); + file_descs[i] = -1; + continue; + } + if (stats.st_size == file_sizes[i]) + continue; + + /* This file has changed size. Print out what we can, and + then keep looping. */ + + changed = 1; + + if (stats.st_size < file_sizes[i]) + { + write_header (names[i], "file truncated"); + last = i; + lseek (file_descs[i], stats.st_size, SEEK_SET); + file_sizes[i] = stats.st_size; + continue; + } + + if (i != last) + { + if (print_headers) + write_header (names[i], NULL); + last = i; + } + file_sizes[i] += dump_remainder (names[i], file_descs[i]); + } + + /* If none of the files changed size, sleep. */ + if (! changed) + sleep (1); + } +} + +/* Output the last N_BYTES bytes of file FILENAME open for reading in FD. + Return 0 if successful, 1 if an error occurred. */ + +static int +tail_bytes (const char *filename, int fd, off_t n_bytes) +{ + struct stat stats; + + /* FIXME: resolve this like in dd.c. */ + /* Use fstat instead of checking for errno == ESPIPE because + lseek doesn't work on some special files but doesn't return an + error, either. */ + if (fstat (fd, &stats)) + { + error (0, errno, "%s", filename); + return 1; + } + + if (from_start) + { + if (S_ISREG (stats.st_mode)) + lseek (fd, n_bytes, SEEK_CUR); + else if (start_bytes (filename, fd, n_bytes)) + return 1; + dump_remainder (filename, fd); + } + else + { + if (S_ISREG (stats.st_mode)) + { + off_t current_pos, end_pos; + size_t bytes_remaining; + + if ((current_pos = lseek (fd, (off_t) 0, SEEK_CUR)) != -1 + && (end_pos = lseek (fd, (off_t) 0, SEEK_END)) != -1) + { + off_t diff; + /* Be careful here. The current position may actually be + beyond the end of the file. */ + bytes_remaining = (diff = end_pos - current_pos) < 0 ? 0 : diff; + } + else + { + error (0, errno, "%s", filename); + return 1; + } + + if (bytes_remaining <= n_bytes) + { + /* From the current position to end of file, there are no + more bytes than have been requested. So reposition the + file pointer to the incoming current position and print + everything after that. */ + lseek (fd, current_pos, SEEK_SET); + } + else + { + /* There are more bytes remaining than were requested. + Back up. */ + lseek (fd, -n_bytes, SEEK_END); + } + dump_remainder (filename, fd); + } + else + return pipe_bytes (filename, fd, n_bytes); + } + return 0; +} + +/* Output the last N_LINES lines of file FILENAME open for reading in FD. + Return 0 if successful, 1 if an error occurred. */ + +static int +tail_lines (const char *filename, int fd, long int n_lines) +{ + struct stat stats; + off_t length; + + if (fstat (fd, &stats)) + { + error (0, errno, "%s", filename); + return 1; + } + + if (from_start) + { + if (start_lines (filename, fd, n_lines)) + return 1; + dump_remainder (filename, fd); + } + else + { + /* Use file_lines only if FD refers to a regular file with + its file pointer positioned at beginning of file. */ + /* FIXME: adding the lseek conjunct is a kludge. + Once there's a reasonable test suite, fix the true culprit: + file_lines. file_lines shouldn't presume that the input + file pointer is initially positioned to beginning of file. */ + if (S_ISREG (stats.st_mode) + && lseek (fd, (off_t) 0, SEEK_CUR) == (off_t) 0) + { + length = lseek (fd, (off_t) 0, SEEK_END); + if (length != 0 && file_lines (filename, fd, n_lines, length)) + return 1; + dump_remainder (filename, fd); + } + else + return pipe_lines (filename, fd, n_lines); + } + return 0; +} + +/* Display the last N_UNITS units of file FILENAME, open for reading + in FD. + Return 0 if successful, 1 if an error occurred. */ + +static int +tail (const char *filename, int fd, off_t n_units) +{ + if (count_lines) + return tail_lines (filename, fd, (long) n_units); + else + return tail_bytes (filename, fd, n_units); +} + +/* Display the last N_UNITS units of file FILENAME. + "-" for FILENAME means the standard input. + FILENUM is this file's index in the list of files the user gave. + Return 0 if successful, 1 if an error occurred. */ + +static int +tail_file (const char *filename, off_t n_units, int filenum) +{ + int fd, errors; + struct stat stats; + + if (!strcmp (filename, "-") + { + have_read_stdin = 1; + filename = "standard input"; + if (print_headers) + write_header (filename, NULL); + errors = tail (filename, 0, n_units); + if (forever_multiple) + { + if (fstat (0, &stats) < 0) + { + error (0, errno, "standard input"); + errors = 1; + } + else if (!S_ISREG (stats.st_mode)) + { + error (0, 0, + "standard input: cannot follow end of non-regular file"); + errors = 1; + } + if (errors) + file_descs[filenum] = -1; + else + { + file_descs[filenum] = 0; + file_sizes[filenum] = stats.st_size; + } + } + } + else + { + /* Not standard input. */ + fd = open (filename, O_RDONLY); + if (fd == -1) + { + if (forever_multiple) + file_descs[filenum] = -1; + error (0, errno, "%s", filename); + errors = 1; + } + else + { + if (print_headers) + write_header (filename, NULL); + errors = tail (filename, fd, n_units); + if (forever_multiple) + { + if (fstat (fd, &stats) < 0) + { + error (0, errno, "%s", filename); + errors = 1; + } + else if (!S_ISREG (stats.st_mode)) + { + error (0, 0, "%s: cannot follow end of non-regular file", + filename); + errors = 1; + } + if (errors) + { + close (fd); + file_descs[filenum] = -1; + } + else + { + file_descs[filenum] = fd; + file_sizes[filenum] = stats.st_size; + } + } + else + { + if (close (fd)) + { + error (0, errno, "%s", filename); + errors = 1; + } + } + } + } + + return errors; +} + +extern int +tai_main (int argc, char **argv) +{ + enum header_mode header_mode = multiple_files; + int exit_status = 0; + /* If from_start, the number of items to skip before printing; otherwise, + the number of items at the end of the file to print. Initially, -1 + means the value has not been set. */ + off_t n_units = -1; + long int tmp_long; + int c; /* Option character. */ + int n_files; + char **file; + + program_name = argv[0]; + have_read_stdin = 0; + count_lines = 1; + forever = forever_multiple = from_start = print_headers = 0; + + if (argc > 1 + && ((argv[1][0] == '-' && ISDIGIT (argv[1][1])) + || (argv[1][0] == '+' && (ISDIGIT (argv[1][1]) + || argv[1][1] == 0)))) + { + /* Old option syntax: a dash or plus, one or more digits (zero digits + are acceptable with a plus), and one or more option letters. */ + if (argv[1][0] == '+') + from_start = 1; + if (argv[1][1] != '\0') + { + strtol_error s_err; + char *p; + + s_err = xstrtol (++argv[1], &p, 0, &tmp_long, "bkm"); + n_units = tmp_long; + if (s_err == LONGINT_OVERFLOW) + { + STRTOL_FATAL_ERROR (argv[1], "argument", s_err); + } + + /* If a [bkm] suffix was given then count bytes, not lines. */ + if (p[-1] == 'b' || p[-1] == 'k' || p[-1] == 'm') + count_lines = 0; + + /* Parse any appended option letters. */ + while (*p) + { + switch (*p) + { + case 'c': + /* Interpret N_UNITS as # of bytes. */ + count_lines = 0; + break; + + case 'f': + forever = 1; + break; + + case 'l': + count_lines = 1; + break; + + case 'q': + header_mode = never; + break; + + case 'v': + header_mode = always; + break; + + default: + error (0, 0, "unrecognized option '%c'", *p); + usage (tail_usage); + } + ++p; + } + } + /* Make the options we just parsed invisible to getopt. */ + argv[1] = argv[0]; + argv++; + argc--; + } + + if (show_version) + { + printf ("tail - %s\n", PACKAGE_VERSION); + exit (EXIT_SUCCESS); + } + + if (show_help) + usage (tail_usage); + + if (n_units == -1) + n_units = DEFAULT_N_LINES; + + /* To start printing with item N_UNITS from the start of the file, skip + N_UNITS - 1 items. `tail +0' is actually meaningless, but for Unix + compatibility it's treated the same as `tail +1'. */ + if (from_start) + { + if (n_units) + --n_units; + } + + n_files = argc - optind; + file = argv + optind; + + if (n_files > 1 && forever) + { + forever_multiple = 1; + forever = 0; + file_descs = (int *) xmalloc (n_files * sizeof (int)); + file_sizes = (off_t *) xmalloc (n_files * sizeof (off_t)); + } + + if (header_mode == always + || (header_mode == multiple_files && n_files > 1)) + print_headers = 1; + + if (n_files == 0) + { + exit_status |= tail_file ("-", n_units, 0); + } + else + { + int i; + for (i = 0; i < n_files; i++) + exit_status |= tail_file (file[i], n_units, i); + + if (forever_multiple) + tail_forever (file, n_files); + } + + if (have_read_stdin && close (0) < 0) + error (EXIT_FAILURE, errno, "-"); + if (fclose (stdout) == EOF) + error (EXIT_FAILURE, errno, "write error"); + exit (exit_status == 0 ? EXIT_SUCCESS : EXIT_FAILURE); +} @@ -49,7 +49,6 @@ const char mtab_file[] = "/etc/mtab"; #endif -/* volatile so gcc knows this is the end of the line */ extern void usage(const char *usage) { fprintf(stderr, "BusyBox v%s (%s) multi-call binary -- GPL2\n\n", BB_VER, BB_BT); |