From cc8a66b113dbdf04082b6f7c9b0b58984d433028 Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Mon, 17 Jul 2000 20:18:42 +0000 Subject: Moved functions used by "lsmod" from cat.c to utility.c Adjusted to make lsmod and sh compilable as standalone apps. Comment fixes --- utility.c | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) (limited to 'utility.c') diff --git a/utility.c b/utility.c index c682bf05d..5f890c0ea 100644 --- a/utility.c +++ b/utility.c @@ -483,7 +483,7 @@ const char *timeString(time_t timeVal) return buf; } -#endif /* BB_TAR */ +#endif /* BB_TAR || BB_AR */ #if defined BB_TAR || defined BB_CP_MV || defined BB_AR /* @@ -511,10 +511,10 @@ int fullWrite(int fd, const char *buf, int len) return total; } -#endif /* BB_TAR || BB_CP_MV */ +#endif /* BB_TAR || BB_CP_MV || BB_AR */ -#if defined BB_TAR || defined BB_TAIL || defined BB_AR +#if defined BB_TAR || defined BB_TAIL || defined BB_AR || defined BB_SH /* * Read all of the supplied buffer from a file. * This does multiple reads as necessary. @@ -544,7 +544,7 @@ int fullRead(int fd, char *buf, int len) return total; } -#endif /* BB_TAR || BB_TAIL */ +#endif /* BB_TAR || BB_TAIL || BB_AR || BB_SH */ #if defined (BB_CHMOD_CHOWN_CHGRP) \ @@ -1667,6 +1667,29 @@ extern char *get_line_from_file(FILE *file) return linebuf; } +#if defined BB_CAT || defined BB_LSMOD +extern void print_file(FILE *file) +{ + int c; + + while ((c = getc(file)) != EOF) + putc(c, stdout); + fclose(file); + fflush(stdout); +} + +extern int print_file_by_name(char *filename) +{ + FILE *file; + file = fopen(filename, "r"); + if (file == NULL) { + return FALSE; + } + print_file(file); + return TRUE; +} +#endif /* BB_CAT || BB_LSMOD */ + #if defined BB_ECHO || defined BB_TR char process_escape_sequence(char **ptr) { -- cgit v1.2.3