* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
* 02111-1307 USA
*
- * This program needs a lot of development, so consider it in a beta stage
- * at best.
+ * This program needs a lot of development, so consider it in a beta stage
+ * at best.
*
- * TODO:
- * - Add more regular expression support - search modifiers, certain matches, etc.
- * - Add more complex bracket searching - currently, nested brackets are
- * not considered.
- * - Add support for "F" as an input. This causes less to act in
- * a similar way to tail -f.
- * - Check for binary files, and prompt the user if a binary file
- * is detected.
- * - Allow horizontal scrolling. Currently, lines simply continue onto
- * the next line, per the terminal's discretion
+ * TODO:
+ * - Add more regular expression support - search modifiers, certain matches, etc.
+ * - Add more complex bracket searching - currently, nested brackets are
+ * not considered.
+ * - Add support for "F" as an input. This causes less to act in
+ * a similar way to tail -f.
+ * - Check for binary files, and prompt the user if a binary file
+ * is detected.
+ * - Allow horizontal scrolling. Currently, lines simply continue onto
+ * the next line, per the terminal's discretion
*
- * Notes:
- * - filename is an array and not a pointer because that avoids all sorts
- * of complications involving the fact that something that is pointed to
- * will be changed if the pointer is changed.
- * - the inp file pointer is used so that keyboard input works after
- * redirected input has been read from stdin
+ * Notes:
+ * - filename is an array and not a pointer because that avoids all sorts
+ * of complications involving the fact that something that is pointed to
+ * will be changed if the pointer is changed.
+ * - the inp file pointer is used so that keyboard input works after
+ * redirected input has been read from stdin
*/
#include <stdio.h>
#define NORMAL "\033[0m"
/* The escape code to clear the screen */
-#define CLEAR "\033[2J"
+#define CLEAR "\033[H\033[J"
/* Maximum number of lines in a file */
#define MAXLINES 10000
/* This is needed so that program behaviour changes when input comes from
stdin */
static int inp_stdin;
-/* This is required so that when a file is requested to be examined after
- input has come from stdin (e.g. dmesg | less), the input stream from
- the keyboard still stays the same. If it switched back to stdin, keyboard
- input wouldn't work. */
-static int ea_inp_stdin;
#ifdef CONFIG_FEATURE_LESS_MARKS
static int mark_lines[15][2];
/* Reset terminal input to normal */
static void set_tty_cooked(void) {
fflush(stdout);
- tcsetattr(0, TCSANOW, &term_orig);
+ tcsetattr(fileno(inp), TCSANOW, &term_orig);
}
/* Set terminal input to raw mode (taken from vi.c) */
static void set_tty_raw(void) {
- tcgetattr(0, &term_orig);
- term_vi = term_orig;
- term_vi.c_lflag &= (~ICANON & ~ECHO);
- term_vi.c_iflag &= (~IXON & ~ICRNL);
- term_vi.c_oflag &= (~ONLCR);
- term_vi.c_cc[VMIN] = 1;
- term_vi.c_cc[VTIME] = 0;
- tcsetattr(0, TCSANOW, &term_vi);
+ tcsetattr(fileno(inp), TCSANOW, &term_vi);
}
/* Exit the program gracefully */
special return codes. Note that this function works best with raw input. */
static int tless_getch(void) {
+ int input;
+
set_tty_raw();
- char input_key[3];
- input_key[0] = getc(inp);
+ input = getc(inp);
/* Detect escape sequences (i.e. arrow keys) and handle
them accordingly */
- if (input_key[0] == '\033') {
- input_key[1] = getc(inp);
- input_key[2] = getc(inp);
+ if (input == '\033' && getc(inp) == '[') {
+ input = getc(inp);
set_tty_cooked();
- if (input_key[1] == '[') {
- if (input_key[2] == REAL_KEY_UP)
- return KEY_UP;
- else if (input_key[2] == REAL_KEY_DOWN)
- return KEY_DOWN;
- else if (input_key[2] == REAL_KEY_RIGHT)
- return KEY_RIGHT;
- else if (input_key[2] == REAL_KEY_LEFT)
- return KEY_LEFT;
- else if (input_key[2] == REAL_PAGE_UP)
- return PAGE_UP;
- else if (input_key[2] == REAL_PAGE_DOWN)
- return PAGE_DOWN;
- }
+ if (input == REAL_KEY_UP)
+ return KEY_UP;
+ else if (input == REAL_KEY_DOWN)
+ return KEY_DOWN;
+ else if (input == REAL_KEY_RIGHT)
+ return KEY_RIGHT;
+ else if (input == REAL_KEY_LEFT)
+ return KEY_LEFT;
+ else if (input == REAL_PAGE_UP)
+ return PAGE_UP;
+ else if (input == REAL_PAGE_DOWN)
+ return PAGE_DOWN;
}
/* The input is a normal ASCII value */
else {
set_tty_cooked();
- return input_key[0];
+ return input;
}
return 0;
}
for (i = 0; i <= num_flines; i++) {
safe_strncpy(current_line, flines[i], 256);
- flines[i] = xrealloc(flines[i], strlen(current_line) + 7);
- sprintf(flines[i],"%5d %s", i + 1, current_line);
+ flines[i] = bb_xasprintf("%5d %s", i + 1, current_line);
}
}
FILE *fp;
fp = (inp_stdin) ? stdin : bb_xfopen(filename, "rt");
-
- /* First of all, we need to know the number of lines so that flines can be initialised. */
- for (i = 0; (!feof(fp)) && (i <= MAXLINES); i++)
- fgets(current_line, 256, fp);
- rewind(fp);
- /* Initialise fp */
- flines = malloc(i * sizeof(char *));
-
- for (i = 0; (!feof(fp)) && (i <= MAXLINES); i++) {
+ flines = NULL;
+ for (i = 0; (feof(fp)==0) && (i <= MAXLINES); i++) {
strcpy(current_line, "");
fgets(current_line, 256, fp);
- bb_xferror(fp, filename);
- flines[i] = (char *) bb_xstrndup(current_line, (strlen(current_line) + 1) * sizeof(char));
+ if(fp != stdin)
+ bb_xferror(fp, filename);
+ flines = xrealloc(flines, (i+1) * sizeof(char *));
+ flines[i] = bb_xstrdup(current_line);
}
num_flines = i - 2;
-/* Reset variables for a new file */
+ /* Reset variables for a new file */
line_pos = 0;
past_eof = 0;
fclose(fp);
- inp = (inp_stdin) ? fopen(CURRENT_TTY, "r") : stdin;
-
- if (ea_inp_stdin) {
- fclose(inp);
- inp = fopen(CURRENT_TTY, "r");
- }
+ if(inp == NULL)
+ inp = (inp_stdin) ? fopen(CURRENT_TTY, "r") : stdin;
if (flags & FLAG_N)
add_linenumbers();
}
else {
percentage = calc_percent();
- printf("%i%s %s", percentage, "%", NORMAL);
+ printf("%i%% %s", percentage, NORMAL);
}
}
else {
percentage = calc_percent();
if (!line_pos)
- printf("%s%s %i%s%s", HIGHLIGHT, filename, percentage, "%", NORMAL);
+ printf("%s%s %i%%%s", HIGHLIGHT, filename, percentage, NORMAL);
else if (line_pos == num_flines - height + 2)
printf("%s(END)%s", HIGHLIGHT, NORMAL);
else
- printf("%s%i%s%s", HIGHLIGHT, percentage, "%", NORMAL);
+ printf("%s%i%%%s", HIGHLIGHT, percentage, NORMAL);
}
#endif
printf("%s%s%s%s", HIGHLIGHT, "- Next: ", files[current_file], NORMAL);
}
else {
- printf("%c", ':');
+ putchar(':');
}
#ifdef CONFIG_FEATURE_LESS_FLAGS
}
int i;
+ printf("%s", CLEAR);
if (num_flines >= height - 2) {
- printf("%s", CLEAR);
- move_cursor(0,0);
for (i = 0; i < height - 1; i++)
printf("%s", buffer[i]);
}
else {
- printf("%s", CLEAR);
- move_cursor(0,0);
for (i = 1; i < (height - 1 - num_flines); i++)
putchar('\n');
for (i = 0; i < height - 1; i++)
int i;
- /* malloc the number of lines needed for the buffer */
- buffer = xrealloc(buffer, height * sizeof(char *));
-
+ if(buffer == NULL) {
+ /* malloc the number of lines needed for the buffer */
+ buffer = xrealloc(buffer, height * sizeof(char *));
+ } else {
+ for (i = 0; i < (height - 1); i++)
+ free(buffer[i]);
+ }
+
/* Fill the buffer until the end of the file or the
end of the buffer is reached */
for (i = 0; (i < (height - 1)) && (i <= num_flines); i++) {
- buffer[i] = (char *) bb_xstrdup(flines[i]);
+ buffer[i] = bb_xstrdup(flines[i]);
}
/* If the buffer still isn't full, fill it with blank lines */
for (; i < (height - 1); i++) {
- buffer[i] = "";
+ buffer[i] = bb_xstrdup("");
}
}
if (!past_eof) {
if (line_pos + (height - 3) + nlines < num_flines) {
line_pos += nlines;
- for (i = 0; i < (height - 1); i++)
- buffer[i] = (char *) bb_xstrdup(flines[line_pos + i]);
+ for (i = 0; i < (height - 1); i++) {
+ free(buffer[i]);
+ buffer[i] = bb_xstrdup(flines[line_pos + i]);
+ }
}
else {
/* As the number of lines requested was too large, we just move
to the end of the file */
while (line_pos + (height - 3) + 1 < num_flines) {
line_pos += 1;
- for (i = 0; i < (height - 1); i++)
- buffer[i] = (char *) bb_xstrdup(flines[line_pos + i]);
+ for (i = 0; i < (height - 1); i++) {
+ free(buffer[i]);
+ buffer[i] = bb_xstrdup(flines[line_pos + i]);
+ }
}
}
if (!past_eof) {
if (line_pos - nlines >= 0) {
line_pos -= nlines;
- for (i = 0; i < (height - 1); i++)
- buffer[i] = (char *) bb_xstrdup(flines[line_pos + i]);
+ for (i = 0; i < (height - 1); i++) {
+ free(buffer[i]);
+ buffer[i] = bb_xstrdup(flines[line_pos + i]);
+ }
}
else {
/* As the requested number of lines to move was too large, we
move one line up at a time until we can't. */
while (line_pos != 0) {
line_pos -= 1;
- for (i = 0; i < (height - 1); i++)
- buffer[i] = (char *) bb_xstrdup(flines[line_pos + i]);
+ for (i = 0; i < (height - 1); i++) {
+ free(buffer[i]);
+ buffer[i] = bb_xstrdup(flines[line_pos + i]);
+ }
}
}
}
/* We only move part of the buffer, as the rest
is past the EOF */
for (i = 0; i < (height - 1); i++) {
+ free(buffer[i]);
if (i < tilde_line - nlines + 1)
- buffer[i] = (char *) bb_xstrdup(flines[line_pos + i]);
+ buffer[i] = bb_xstrdup(flines[line_pos + i]);
else {
if (line_pos >= num_flines - height + 2)
- buffer[i] = "~\n";
+ buffer[i] = bb_xstrdup("~\n");
}
}
}
printf("%s%s%i%s", HIGHLIGHT, "Cannot seek to line number ", linenum, NORMAL);
}
else if (linenum < (num_flines - height - 2)) {
- for (i = 0; i < (height - 1); i++)
- buffer[i] = (char *) bb_xstrdup(flines[linenum + i]);
+ for (i = 0; i < (height - 1); i++) {
+ free(buffer[i]);
+ buffer[i] = bb_xstrdup(flines[linenum + i]);
+ }
line_pos = linenum;
}
else {
for (i = 0; i < (height - 1); i++) {
+ free(buffer[i]);
if (linenum + i < num_flines + 2)
- buffer[i] = (char *) bb_xstrdup(flines[linenum + i]);
+ buffer[i] = bb_xstrdup(flines[linenum + i]);
else
- buffer[i] = (char *) bb_xstrdup((flags & FLAG_TILDE) ? "\n" : "~\n");
+ buffer[i] = bb_xstrdup((flags & FLAG_TILDE) ? "\n" : "~\n");
}
line_pos = linenum;
/* Set past_eof so buffer_down and buffer_up act differently */
for (i = 0; i <= num_flines; i++)
free(flines[i]);
free(flines);
-
+
data_readlines();
buffer_init();
buffer_print();
newline_offset = strlen(filename) - 1;
filename[newline_offset] = '\0';
- files[num_files] = bb_xstrndup(filename, (strlen(filename) + 1) * sizeof(char));
+ files[num_files] = bb_xstrdup(filename);
current_file = num_files + 1;
num_files++;
inp_stdin = 0;
- ea_inp_stdin = 1;
reinitialise();
}
static char *insert_highlights (char *line, int start, int end) {
- char *new_line = (char *) malloc((sizeof(char) * (strlen(line) + 1)) + 10);
-
- memset(new_line, 0, ((sizeof(char) * (strlen(line) + 1)) + 10));
- strncat(new_line, line, start);
- strcat(new_line, HIGHLIGHT);
- strncat(new_line, line + start, end - start);
- strcat(new_line, NORMAL);
- strncat(new_line, line + end, strlen(line) - end);
-
- return new_line;
+ return bb_xasprintf("%.*s%s%.*s%s%s", start, line, HIGHLIGHT,
+ end - start, line + start, NORMAL, line + end);
}
static char *process_regex_on_line(char *line, regex_t *pattern) {
char sub_line[256];
int prev_eo = 0;
regmatch_t match_structs;
-
+
memset(sub_line, 0, 256);
strcpy(line2, line);
/* Get the uncompiled regular expression from the user */
clear_line();
putchar((match_backwards) ? '?' : '/');
- scanf("%s", uncomp_regex);
+ uncomp_regex[0] = 0;
+ fgets(uncomp_regex, sizeof(uncomp_regex), stdin);
+ i = strlen(uncomp_regex);
+ if(i > 0) {
+ if(uncomp_regex[i-1] == '\n')
+ uncomp_regex[i-1] = '\0';
+ else
+ while((i = getchar()) != '\n' && i != EOF);
+ }
/* Compile the regex and check for errors */
xregcomp(pattern, uncomp_regex, 0);
/* Run the regex on each line of the current file here */
for (i = 0; i <= num_flines; i++) {
strcpy(current_line, process_regex_on_line(flines[i], pattern));
- flines[i] = (char *) bb_xstrndup(current_line, sizeof(char) * (strlen(current_line)+1));
+ flines[i] = bb_xstrdup(current_line);
if (match_found) {
match_lines[j] = i;
j++;
}
num_matches = j;
-
if ((match_lines[0] != -1) && (num_flines > height - 2))
buffer_line(match_lines[0]);
else
int num;
char num_input[80];
char keypress;
+ char *endptr;
+
num_input[0] = first_digit;
/* Clear the current line, print a prompt, and then print the digit */
clear_line();
printf(":%c", first_digit);
- /* Receive input until a letter is given */
- while((num_input[i] = tless_getch()) && isdigit(num_input[i])) {
- printf("%c", num_input[i]);
+ /* Receive input until a letter is given (max 80 chars)*/
+ while((i < 80) && (num_input[i] = tless_getch()) && isdigit(num_input[i])) {
+ putchar(num_input[i]);
i++;
}
/* Take the final letter out of the digits string */
keypress = num_input[i];
num_input[i] = '\0';
- i--;
- num = atoi(num_input);
+ num = strtol(num_input, &endptr, 10);
+ if (endptr==num_input || *endptr!='\0' || num < 1 || num > MAXLINES)
+ goto END;
/* We now know the number and the letter entered, so we process them */
switch (keypress) {
default:
break;
}
-
+END:
buffer_print();
}
switch (keypress) {
case 'M':
- flags &= ~FLAG_M;
+ flags ^= FLAG_M;
break;
case 'm':
- flags &= ~FLAG_m;
+ flags ^= FLAG_m;
break;
case 'E':
- flags &= ~FLAG_E;
+ flags ^= FLAG_E;
break;
case '~':
- flags &= ~FLAG_TILDE;
+ flags ^= FLAG_TILDE;
break;
default:
break;
}
clear_line();
- printf("%s%s%i%s", HIGHLIGHT, "The status of the flag is: ", flag_val, NORMAL);
+ printf("%s%s%i%s", HIGHLIGHT, "The status of the flag is: ", flag_val != 0, NORMAL);
}
#endif
printf("Go to mark: ");
letter = tless_getch();
clear_line();
-
+
if (isalpha(letter)) {
for (i = 0; i <= num_marks; i++)
if (letter == mark_lines[i][0]) {
int i;
clear_line();
-
+
if (strchr(flines[line_pos], bracket) == NULL)
printf("%s%s%s", HIGHLIGHT, "No bracket in top line", NORMAL);
else {
int i;
clear_line();
-
+
if (strchr(flines[line_pos + height - 2], bracket) == NULL) {
printf("%s%s%s", HIGHLIGHT, "No bracket in bottom line", NORMAL);
printf("%s", flines[line_pos + height]);
}
}
- strcpy(filename, (inp_stdin) ? "stdin" : files[0]);
+ strcpy(filename, (inp_stdin) ? bb_msg_standard_input : files[0]);
tty_width_height();
data_readlines();
+ tcgetattr(fileno(inp), &term_orig);
+ term_vi = term_orig;
+ term_vi.c_lflag &= (~ICANON & ~ECHO);
+ term_vi.c_iflag &= (~IXON & ~ICRNL);
+ term_vi.c_oflag &= (~ONLCR);
+ term_vi.c_cc[VMIN] = 1;
+ term_vi.c_cc[VTIME] = 0;
buffer_init();
buffer_print();