This patch from Adam Heath <doogie@debian.org>, makes print_file

(used by cat, grep, sed, etc) quite a bit faster.
This commit is contained in:
Eric Andersen 2001-05-15 17:48:09 +00:00
parent c911a4389b
commit 55f9872616
5 changed files with 72 additions and 6 deletions

View File

@ -249,7 +249,7 @@ process_escape_sequence.c read_package_field.c read_text_file_to_buffer.c \
recursive_action.c safe_read.c safe_strncpy.c seek_ared_file.c syscalls.c \
syslog_msg_with_name.c time_string.c trim.c untar.c unzip.c vdprintf.c \
verror_msg.c vperror_msg.c wfopen.c xfuncs.c xgetcwd.c xreadlink.c\
xregcomp.c interface.c remove_file.c last_char_is.c
xregcomp.c interface.c remove_file.c last_char_is.c copyfd.c
LIBBB_OBJS=$(patsubst %.c,$(LIBBB)/%.o, $(LIBBB_CSRC))
LIBBB_CFLAGS = -I$(LIBBB)
ifneq ($(strip $(BB_SRC_DIR)),)

View File

@ -128,6 +128,7 @@ extern pid_t* find_pid_by_name( char* pidName);
extern char *find_real_root_device_name(const char* name);
extern char *get_line_from_file(FILE *file);
extern void print_file(FILE *file);
extern size_t copyfd(int fd1, int fd2);
extern int print_file_by_name(char *filename);
extern char process_escape_sequence(const char **ptr);
extern char *get_last_path_component(char *path);

67
libbb/copyfd.c Normal file
View File

@ -0,0 +1,67 @@
/* vi: set sw=4 ts=4: */
/*
* Utility routines.
*
* Copyright (C) 1999-2001 Erik Andersen <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 <unistd.h>
#include <string.h>
#include <errno.h>
#include "libbb.h"
extern size_t copyfd(int fd1, int fd2)
{
char buf[32768], *writebuf;
int status = TRUE;
size_t totalread = 0, bytesread, byteswritten;
while(status) {
bytesread = read(fd1, &buf, sizeof(buf));
if(bytesread == -1) {
error_msg("read: %s", strerror(errno));
status = FALSE;
break;
}
byteswritten = 0;
writebuf = buf;
while(bytesread) {
byteswritten = write( fd2, &writebuf, bytesread );
if(byteswritten == -1) {
error_msg("write: %s", strerror(errno));
status = FALSE;
break;
}
bytesread -= byteswritten;
writebuf += byteswritten;
}
}
if ( status == TRUE )
return totalread;
else
return -1;
}
/* END CODE */
/*
Local Variables:
c-file-style: "linux"
c-basic-offset: 4
tab-width: 4
End:
*/

View File

@ -128,6 +128,7 @@ extern pid_t* find_pid_by_name( char* pidName);
extern char *find_real_root_device_name(const char* name);
extern char *get_line_from_file(FILE *file);
extern void print_file(FILE *file);
extern size_t copyfd(int fd1, int fd2);
extern int print_file_by_name(char *filename);
extern char process_escape_sequence(const char **ptr);
extern char *get_last_path_component(char *path);

View File

@ -26,12 +26,9 @@
extern void print_file(FILE *file)
{
int c;
while ((c = getc(file)) != EOF)
putc(c, stdout);
fclose(file);
fflush(stdout);
copyfd(fileno(file), fileno(stdout));
fclose(file);
}
extern int print_file_by_name(char *filename)