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

quick patchs: drop founded memory leak, more libbb, more C-compatibility, size reduction

Browse Source
This commit is contained in:
"Vladimir N. Oleynik" 2005-09-19 10:28:43 +00:00
parent 4cbe45934e
commit a0ae6de848
1 changed files with 90 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
miscutils/less.c
View File

@ -77,7 +77,7 @@
#define NORMAL "\033[0m" #define NORMAL "\033[0m"
/* The escape code to clear the screen */ /* The escape code to clear the screen */
#define CLEAR "\033[2J" #define CLEAR "\033[H\033[J"
/* Maximum number of lines in a file */ /* Maximum number of lines in a file */
#define MAXLINES 10000 #define MAXLINES 10000
@ -142,13 +142,6 @@ static void set_tty_cooked(void) {
/* Set terminal input to raw mode (taken from vi.c) */ /* Set terminal input to raw mode (taken from vi.c) */
static void set_tty_raw(void) { 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(0, TCSANOW, &term_vi);
} }
@ -169,36 +162,34 @@ static void tless_exit(int code) {
special return codes. Note that this function works best with raw input. */ special return codes. Note that this function works best with raw input. */
static int tless_getch(void) { static int tless_getch(void) {
set_tty_raw(); int input;
char input_key[3];
input_key[0] = getc(inp); set_tty_raw();
input = getc(inp);
/* Detect escape sequences (i.e. arrow keys) and handle /* Detect escape sequences (i.e. arrow keys) and handle
them accordingly */ them accordingly */
if (input_key[0] == '\033') { if (input == '\033' && getc(inp) == '[') {
input_key[1] = getc(inp); input = getc(inp);
input_key[2] = getc(inp);
set_tty_cooked(); set_tty_cooked();
if (input_key[1] == '[') { if (input == REAL_KEY_UP)
if (input_key[2] == REAL_KEY_UP)
return KEY_UP; return KEY_UP;
else if (input_key[2] == REAL_KEY_DOWN) else if (input == REAL_KEY_DOWN)
return KEY_DOWN; return KEY_DOWN;
else if (input_key[2] == REAL_KEY_RIGHT) else if (input == REAL_KEY_RIGHT)
return KEY_RIGHT; return KEY_RIGHT;
else if (input_key[2] == REAL_KEY_LEFT) else if (input == REAL_KEY_LEFT)
return KEY_LEFT; return KEY_LEFT;
else if (input_key[2] == REAL_PAGE_UP) else if (input == REAL_PAGE_UP)
return PAGE_UP; return PAGE_UP;
else if (input_key[2] == REAL_PAGE_DOWN) else if (input == REAL_PAGE_DOWN)
return PAGE_DOWN; return PAGE_DOWN;
} }
}
/* The input is a normal ASCII value */ /* The input is a normal ASCII value */
else { else {
set_tty_cooked(); set_tty_cooked();
return input_key[0]; return input;
} }
return 0; return 0;
} }
@ -222,8 +213,7 @@ static void add_linenumbers(void) {
for (i = 0; i <= num_flines; i++) { for (i = 0; i <= num_flines; i++) {
safe_strncpy(current_line, flines[i], 256); safe_strncpy(current_line, flines[i], 256);
flines[i] = xrealloc(flines[i], strlen(current_line) + 7); bb_xasprintf(&flines[i],"%5d %s", i + 1, current_line);
sprintf(flines[i],"%5d %s", i + 1, current_line);
} }
} }
@ -246,7 +236,7 @@ static void data_readlines(void) {
strcpy(current_line, ""); strcpy(current_line, "");
fgets(current_line, 256, fp); fgets(current_line, 256, fp);
bb_xferror(fp, filename); bb_xferror(fp, filename);
flines[i] = (char *) bb_xstrndup(current_line, (strlen(current_line) + 1) * sizeof(char)); flines[i] = bb_xstrdup(current_line);
} }
num_flines = i - 2; num_flines = i - 2;
@ -307,7 +297,7 @@ static void m_status_print(void) {
} }
else { else {
percentage = calc_percent(); percentage = calc_percent();
printf("%i%s %s", percentage, "%", NORMAL); printf("%i%% %s", percentage, NORMAL);
} }
} }
else { else {
@ -325,11 +315,11 @@ static void medium_status_print(void) {
percentage = calc_percent(); percentage = calc_percent();
if (!line_pos) 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) else if (line_pos == num_flines - height + 2)
printf("%s(END)%s", HIGHLIGHT, NORMAL); printf("%s(END)%s", HIGHLIGHT, NORMAL);
else else
printf("%s%i%s%s", HIGHLIGHT, percentage, "%", NORMAL); printf("%s%i%%%s", HIGHLIGHT, percentage, NORMAL);
} }
#endif #endif
@ -368,15 +358,12 @@ static void buffer_print(void) {
int i; int i;
if (num_flines >= height - 2) {
printf("%s", CLEAR); printf("%s", CLEAR);
move_cursor(0,0); if (num_flines >= height - 2) {
for (i = 0; i < height - 1; i++) for (i = 0; i < height - 1; i++)
printf("%s", buffer[i]); printf("%s", buffer[i]);
} }
else { else {
printf("%s", CLEAR);
move_cursor(0,0);
for (i = 1; i < (height - 1 - num_flines); i++) for (i = 1; i < (height - 1 - num_flines); i++)
putchar('\n'); putchar('\n');
for (i = 0; i < height - 1; i++) for (i = 0; i < height - 1; i++)
@ -391,8 +378,13 @@ static void buffer_init(void) {
int i; int i;
if(buffer == NULL) {
/* malloc the number of lines needed for the buffer */ /* malloc the number of lines needed for the buffer */
buffer = xrealloc(buffer, height * sizeof(char *)); 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 /* Fill the buffer until the end of the file or the
end of the buffer is reached */ end of the buffer is reached */
@ -402,7 +394,7 @@ static void buffer_init(void) {
/* If the buffer still isn't full, fill it with blank lines */ /* If the buffer still isn't full, fill it with blank lines */
for (; i < (height - 1); i++) { for (; i < (height - 1); i++) {
buffer[i] = ""; buffer[i] = bb_xstrdup("");
} }
} }
@ -414,18 +406,22 @@ static void buffer_down(int nlines) {
if (!past_eof) { if (!past_eof) {
if (line_pos + (height - 3) + nlines < num_flines) { if (line_pos + (height - 3) + nlines < num_flines) {
line_pos += nlines; line_pos += nlines;
for (i = 0; i < (height - 1); i++) for (i = 0; i < (height - 1); i++) {
free(buffer[i]);
buffer[i] = (char *) bb_xstrdup(flines[line_pos + i]); buffer[i] = (char *) bb_xstrdup(flines[line_pos + i]);
} }
}
else { else {
/* As the number of lines requested was too large, we just move /* As the number of lines requested was too large, we just move
to the end of the file */ to the end of the file */
while (line_pos + (height - 3) + 1 < num_flines) { while (line_pos + (height - 3) + 1 < num_flines) {
line_pos += 1; line_pos += 1;
for (i = 0; i < (height - 1); i++) for (i = 0; i < (height - 1); i++) {
free(buffer[i]);
buffer[i] = (char *) bb_xstrdup(flines[line_pos + i]); buffer[i] = (char *) bb_xstrdup(flines[line_pos + i]);
} }
} }
}
/* We exit if the -E flag has been set */ /* We exit if the -E flag has been set */
if ((flags & FLAG_E) && (line_pos + (height - 2) == num_flines)) if ((flags & FLAG_E) && (line_pos + (height - 2) == num_flines))
@ -441,19 +437,23 @@ static void buffer_up(int nlines) {
if (!past_eof) { if (!past_eof) {
if (line_pos - nlines >= 0) { if (line_pos - nlines >= 0) {
line_pos -= nlines; line_pos -= nlines;
for (i = 0; i < (height - 1); i++) for (i = 0; i < (height - 1); i++) {
free(buffer[i]);
buffer[i] = (char *) bb_xstrdup(flines[line_pos + i]); buffer[i] = (char *) bb_xstrdup(flines[line_pos + i]);
} }
}
else { else {
/* As the requested number of lines to move was too large, we /* As the requested number of lines to move was too large, we
move one line up at a time until we can't. */ move one line up at a time until we can't. */
while (line_pos != 0) { while (line_pos != 0) {
line_pos -= 1; line_pos -= 1;
for (i = 0; i < (height - 1); i++) for (i = 0; i < (height - 1); i++) {
free(buffer[i]);
buffer[i] = (char *) bb_xstrdup(flines[line_pos + i]); buffer[i] = (char *) bb_xstrdup(flines[line_pos + i]);
} }
} }
} }
}
else { else {
/* Work out where the tildes start */ /* Work out where the tildes start */
tilde_line = num_flines - line_pos + 3; tilde_line = num_flines - line_pos + 3;
@ -469,11 +469,12 @@ static void buffer_up(int nlines) {
/* We only move part of the buffer, as the rest /* We only move part of the buffer, as the rest
is past the EOF */ is past the EOF */
for (i = 0; i < (height - 1); i++) { for (i = 0; i < (height - 1); i++) {
free(buffer[i]);
if (i < tilde_line - nlines + 1) if (i < tilde_line - nlines + 1)
buffer[i] = (char *) bb_xstrdup(flines[line_pos + i]); buffer[i] = (char *) bb_xstrdup(flines[line_pos + i]);
else { else {
if (line_pos >= num_flines - height + 2) if (line_pos >= num_flines - height + 2)
buffer[i] = "~\n"; buffer[i] = bb_xstrdup("~\n");
} }
} }
} }
@ -491,12 +492,15 @@ static void buffer_line(int linenum) {
printf("%s%s%i%s", HIGHLIGHT, "Cannot seek to line number ", linenum, NORMAL); printf("%s%s%i%s", HIGHLIGHT, "Cannot seek to line number ", linenum, NORMAL);
} }
else if (linenum < (num_flines - height - 2)) { else if (linenum < (num_flines - height - 2)) {
for (i = 0; i < (height - 1); i++) for (i = 0; i < (height - 1); i++) {
free(buffer[i]);
buffer[i] = (char *) bb_xstrdup(flines[linenum + i]); buffer[i] = (char *) bb_xstrdup(flines[linenum + i]);
}
line_pos = linenum; line_pos = linenum;
} }
else { else {
for (i = 0; i < (height - 1); i++) { for (i = 0; i < (height - 1); i++) {
free(buffer[i]);
if (linenum + i < num_flines + 2) if (linenum + i < num_flines + 2)
buffer[i] = (char *) bb_xstrdup(flines[linenum + i]); buffer[i] = (char *) bb_xstrdup(flines[linenum + i]);
else else
@ -629,15 +633,10 @@ static void colon_process(void) {
static char *insert_highlights (char *line, int start, int end) { static char *insert_highlights (char *line, int start, int end) {
char *new_line = (char *) malloc((sizeof(char) * (strlen(line) + 1)) + 10); char *new_line;
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);
bb_xasprintf(&new_line, "%.*s%s%.*s%s%s", start, line, HIGHLIGHT,
end - start, line + start, NORMAL, line + end);
return new_line; return new_line;
} }
@ -869,7 +868,7 @@ static void show_flag_status(void) {
} }
clear_line(); 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 #endif
@ -1168,6 +1167,14 @@ int less_main(int argc, char **argv) {
strcpy(filename, (inp_stdin) ? "stdin" : files[0]); strcpy(filename, (inp_stdin) ? "stdin" : files[0]);
tty_width_height(); tty_width_height();
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;
data_readlines(); data_readlines();
buffer_init(); buffer_init();
buffer_print(); buffer_print();