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

less: a few fixes for cases where we overflow status line

Browse Source
This commit is contained in:
Denis Vlasenko 2006-12-21 17:03:20 +00:00
parent f65d1338dc
commit f1282a8792
1 changed files with 31 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
miscutils/less.c
View File

@ -148,7 +148,7 @@ static int tless_getch(void)
return input; return input;
} }
static char* tless_gets(void) static char* tless_gets(int sz)
{ {
int c; int c;
int i = 0; int i = 0;
@ -164,11 +164,12 @@ static char* tless_gets(void)
} }
if (c < ' ') if (c < ' ')
continue; continue;
if (i >= width - sz - 1)
continue; /* len limit */
putchar(c); putchar(c);
result[i++] = c; result[i++] = c;
result = xrealloc(result, i+1); result = xrealloc(result, i+1);
result[i] = '\0'; result[i] = '\0';
if (i >= width-1) return result;
} }
} }
@ -189,6 +190,12 @@ static void print_hilite(const char *str)
printf(HIGHLIGHT"%s"NORMAL, str); printf(HIGHLIGHT"%s"NORMAL, str);
} }
static void print_statusline(const char *str)
{
clear_line();
printf(HIGHLIGHT"%.*s"NORMAL, width-1, str);
}
static void data_readlines(void) static void data_readlines(void)
{ {
unsigned i, pos; unsigned i, pos;
@ -277,6 +284,7 @@ static void m_status_print(void)
{ {
int percentage; int percentage;
clear_line();
printf(HIGHLIGHT"%s", filename); printf(HIGHLIGHT"%s", filename);
if (num_files > 1) if (num_files > 1)
printf(" (file %i of %i)", current_file, num_files); printf(" (file %i of %i)", current_file, num_files);
@ -293,22 +301,6 @@ static void m_status_print(void)
printf("%i%% "NORMAL, percentage); printf("%i%% "NORMAL, percentage);
} }
#if 0
/* Print a status line if -m was specified */
static void medium_status_print(void)
{
int percentage;
percentage = calc_percent();
if (!line_pos)
printf(HIGHLIGHT"%s %i%% "NORMAL, filename, percentage);
else if (line_pos >= num_flines - height + 2)
print_hilite("(END)");
else
printf(HIGHLIGHT"%i%% "NORMAL, percentage);
}
#endif
#endif #endif
/* Print the status line */ /* Print the status line */
@ -322,12 +314,10 @@ static void status_print(void)
m_status_print(); m_status_print();
return; return;
} }
//if (option_mask32 & FLAG_m) {
// medium_status_print();
// return;
//}
/* No flags set */ /* No flags set */
#endif #endif
clear_line();
if (line_pos && line_pos < num_flines - height + 2) { if (line_pos && line_pos < num_flines - height + 2) {
putchar(':'); putchar(':');
return; return;
@ -458,7 +448,6 @@ static void buffer_print(void)
print_found(buffer[i]); print_found(buffer[i]);
else else
print_ascii(buffer[i]); print_ascii(buffer[i]);
fputs(CLEAR_2_EOL, stdout); /* clears status line */
status_print(); status_print();
} }
@ -557,10 +546,9 @@ static void reinitialise(void)
static void examine_file(void) static void examine_file(void)
{ {
clear_line(); print_statusline("Examine: ");
printf("Examine: ");
free(filename); free(filename);
filename = tless_gets(); filename = tless_gets(sizeof("Examine: ")-1);
/* files start by = argv. why we assume that argv is infinitely long?? /* files start by = argv. why we assume that argv is infinitely long??
files[num_files] = filename; files[num_files] = filename;
current_file = num_files + 1; current_file = num_files + 1;
@ -583,8 +571,7 @@ static void change_file(int direction)
filename = xstrdup(files[current_file - 1]); filename = xstrdup(files[current_file - 1]);
reinitialise(); reinitialise();
} else { } else {
clear_line(); print_statusline(direction > 0 ? "No next file" : "No previous file");
print_hilite(direction > 0 ? "No next file" : "No previous file");
} }
} }
@ -613,8 +600,7 @@ static void colon_process(void)
int keypress; int keypress;
/* Clear the current line and print a prompt */ /* Clear the current line and print a prompt */
clear_line(); print_statusline(" :");
printf(" :");
keypress = tless_getch(); keypress = tless_getch();
switch (keypress) { switch (keypress) {
@ -626,7 +612,6 @@ static void colon_process(void)
break; break;
#if ENABLE_FEATURE_LESS_FLAGS #if ENABLE_FEATURE_LESS_FLAGS
case 'f': case 'f':
clear_line();
m_status_print(); m_status_print();
break; break;
#endif #endif
@ -681,7 +666,7 @@ static void regex_process(void)
/* Get the uncompiled regular expression from the user */ /* Get the uncompiled regular expression from the user */
clear_line(); clear_line();
putchar((option_mask32 & LESS_STATE_MATCH_BACKWARDS) ? '?' : '/'); putchar((option_mask32 & LESS_STATE_MATCH_BACKWARDS) ? '?' : '/');
uncomp_regex = tless_gets(); uncomp_regex = tless_gets(1);
if (/*!uncomp_regex ||*/ !uncomp_regex[0]) { if (/*!uncomp_regex ||*/ !uncomp_regex[0]) {
free(uncomp_regex); free(uncomp_regex);
buffer_print(); buffer_print();
@ -692,8 +677,7 @@ static void regex_process(void)
err = regcomp_or_errmsg(&pattern, uncomp_regex, 0); err = regcomp_or_errmsg(&pattern, uncomp_regex, 0);
free(uncomp_regex); free(uncomp_regex);
if (err) { if (err) {
clear_line(); print_statusline(err);
fputs(err, stdout);
free(err); free(err);
return; return;
} }
@ -862,14 +846,13 @@ static void save_input_to_file(void)
int i; int i;
FILE *fp; FILE *fp;
clear_line(); print_statusline("Log file: ");
printf("Log file: "); current_line = tless_gets(sizeof("Log file: ")-1);
current_line = tless_gets();
if (strlen(current_line) > 0) { if (strlen(current_line) > 0) {
fp = fopen(current_line, "w"); fp = fopen(current_line, "w");
free(current_line); free(current_line);
if (!fp) { if (!fp) {
print_hilite("Error opening log file"); print_statusline("Error opening log file");
return; return;
} }
for (i = 0; i < num_flines; i++) for (i = 0; i < num_flines; i++)
@ -879,7 +862,7 @@ static void save_input_to_file(void)
return; return;
} }
free(current_line); free(current_line);
print_hilite("No log file"); print_statusline("No log file");
} }
#if ENABLE_FEATURE_LESS_MARKS #if ENABLE_FEATURE_LESS_MARKS
@ -887,8 +870,7 @@ static void add_mark(void)
{ {
int letter; int letter;
clear_line(); print_statusline("Mark: ");
printf("Mark: ");
letter = tless_getch(); letter = tless_getch();
if (isalpha(letter)) { if (isalpha(letter)) {
@ -901,8 +883,7 @@ static void add_mark(void)
mark_lines[num_marks][1] = line_pos; mark_lines[num_marks][1] = line_pos;
num_marks++; num_marks++;
} else { } else {
clear_line(); print_statusline("Invalid mark letter");
print_hilite("Invalid mark letter");
} }
} }
@ -911,8 +892,7 @@ static void goto_mark(void)
int letter; int letter;
int i; int i;
clear_line(); print_statusline("Go to mark: ");
printf("Go to mark: ");
letter = tless_getch(); letter = tless_getch();
clear_line(); clear_line();
@ -923,9 +903,9 @@ static void goto_mark(void)
break; break;
} }
if (num_marks == 14 && letter != mark_lines[14][0]) if (num_marks == 14 && letter != mark_lines[14][0])
print_hilite("Mark not set"); print_statusline("Mark not set");
} else } else
print_hilite("Invalid mark letter"); print_statusline("Invalid mark letter");
} }
#endif #endif
@ -953,10 +933,8 @@ static void match_right_bracket(char bracket)
int bracket_line = -1; int bracket_line = -1;
int i; int i;
clear_line();
if (strchr(flines[line_pos], bracket) == NULL) { if (strchr(flines[line_pos], bracket) == NULL) {
print_hilite("No bracket in top line"); print_statusline("No bracket in top line");
return; return;
} }
for (i = line_pos + 1; i < num_flines; i++) { for (i = line_pos + 1; i < num_flines; i++) {
@ -966,7 +944,7 @@ static void match_right_bracket(char bracket)
} }
} }
if (bracket_line == -1) if (bracket_line == -1)
print_hilite("No matching bracket found"); print_statusline("No matching bracket found");
buffer_line(bracket_line - height + 2); buffer_line(bracket_line - height + 2);
} }
@ -975,13 +953,8 @@ static void match_left_bracket(char bracket)
int bracket_line = -1; int bracket_line = -1;
int i; int i;
clear_line();
if (strchr(flines[line_pos + height - 2], bracket) == NULL) { if (strchr(flines[line_pos + height - 2], bracket) == NULL) {
print_hilite("No bracket in bottom line"); print_statusline("No bracket in bottom line");
/* ?? */
/*printf("%s", flines[line_pos + height]);*/
/*sleep(4);*/
return; return;
} }
@ -992,7 +965,7 @@ static void match_left_bracket(char bracket)
} }
} }
if (bracket_line == -1) if (bracket_line == -1)
print_hilite("No matching bracket found"); print_statusline("No matching bracket found");
buffer_line(bracket_line); buffer_line(bracket_line);
} }
@ -1058,7 +1031,6 @@ static void keypress_process(int keypress)
break; break;
#if ENABLE_FEATURE_LESS_FLAGS #if ENABLE_FEATURE_LESS_FLAGS
case '=': case '=':
clear_line();
m_status_print(); m_status_print();
break; break;
#endif #endif