From 2d5ca60bfb66e0ba7340ab9b4696b872f00adf7c Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Thu, 12 Oct 2006 22:43:20 +0000 Subject: bb_get_[chomped]line_from_file wasn't descriptive enough. Renaming... --- archival/dpkg.c | 2 +- archival/tar.c | 2 +- coreutils/cut.c | 2 +- coreutils/md5_sha1_sum.c | 2 +- coreutils/sort.c | 4 ++-- coreutils/uniq.c | 2 +- coreutils/uudecode.c | 4 ++-- editors/patch.c | 14 +++++++------- editors/sed.c | 4 ++-- findutils/grep.c | 4 ++-- include/libbb.h | 5 +++-- libbb/get_line_from_file.c | 4 ++-- miscutils/dc.c | 2 +- miscutils/makedevs.c | 2 +- networking/dnsd.c | 2 +- networking/ifupdown.c | 2 +- networking/nameif.c | 2 +- shell/cmdedit.c | 2 +- util-linux/hexdump.c | 2 +- util-linux/mount.c | 2 +- 20 files changed, 33 insertions(+), 32 deletions(-) diff --git a/archival/dpkg.c b/archival/dpkg.c index 825a8c1d2..4d0f3fbf3 100644 --- a/archival/dpkg.c +++ b/archival/dpkg.c @@ -1206,7 +1206,7 @@ static char **create_list(const char *filename) return NULL; } - while ((line = bb_get_chomped_line_from_file(list_stream)) != NULL) { + while ((line = xmalloc_getline(list_stream)) != NULL) { file_list = xrealloc(file_list, sizeof(char *) * (count + 2)); file_list[count] = line; count++; diff --git a/archival/tar.c b/archival/tar.c index 5ebb3dff4..5935ccaa3 100644 --- a/archival/tar.c +++ b/archival/tar.c @@ -523,7 +523,7 @@ static llist_t *append_file_list_to_list(llist_t *list) tmp = cur; cur = cur->link; free(tmp); - while ((line = bb_get_chomped_line_from_file(src_stream)) != NULL) { + while ((line = xmalloc_getline(src_stream)) != NULL) { char *filename_ptr = last_char_is(line, '/'); if (filename_ptr > line) *filename_ptr = '\0'; diff --git a/coreutils/cut.c b/coreutils/cut.c index 94e12e609..5dc35434f 100644 --- a/coreutils/cut.c +++ b/coreutils/cut.c @@ -50,7 +50,7 @@ static void cut_file(FILE * file) unsigned int linenum = 0; /* keep these zero-based to be consistent */ /* go through every line in the file */ - while ((line = bb_get_chomped_line_from_file(file)) != NULL) { + while ((line = xmalloc_getline(file)) != NULL) { /* set up a list so we can keep track of what's been printed */ char * printed = xzalloc(strlen(line) * sizeof(char)); diff --git a/coreutils/md5_sha1_sum.c b/coreutils/md5_sha1_sum.c index a99e45864..ca23d8ac4 100644 --- a/coreutils/md5_sha1_sum.c +++ b/coreutils/md5_sha1_sum.c @@ -126,7 +126,7 @@ int md5_sha1_sum_main(int argc, char **argv) pre_computed_stream = xfopen(file_ptr, "r"); } - while ((line = bb_get_chomped_line_from_file(pre_computed_stream)) != NULL) { + while ((line = xmalloc_getline(pre_computed_stream)) != NULL) { char *filename_ptr; count_total++; diff --git a/coreutils/sort.c b/coreutils/sort.c index e789292b9..c23c14226 100644 --- a/coreutils/sort.c +++ b/coreutils/sort.c @@ -124,9 +124,9 @@ static struct sort_key *add_key(void) } #define GET_LINE(fp) (global_flags&FLAG_z) ? bb_get_chunk_from_file(fp,NULL) \ - : bb_get_chomped_line_from_file(fp) + : xmalloc_getline(fp) #else -#define GET_LINE(fp) bb_get_chomped_line_from_file(fp) +#define GET_LINE(fp) xmalloc_getline(fp) #endif /* Iterate through keys list and perform comparisons */ diff --git a/coreutils/uniq.c b/coreutils/uniq.c index 1b201af24..a7b7a8e07 100644 --- a/coreutils/uniq.c +++ b/coreutils/uniq.c @@ -69,7 +69,7 @@ int uniq_main(int argc, char **argv) dups = 0; /* gnu uniq ignores newlines */ - while ((s1 = bb_get_chomped_line_from_file(in)) != NULL) { + while ((s1 = xmalloc_getline(in)) != NULL) { e1 = s1; for (i=skip_fields ; i ; i--) { e1 = skip_whitespace(e1); diff --git a/coreutils/uudecode.c b/coreutils/uudecode.c index 921d29af0..c8152a808 100644 --- a/coreutils/uudecode.c +++ b/coreutils/uudecode.c @@ -18,7 +18,7 @@ static int read_stduu(FILE *src_stream, FILE *dst_stream) { char *line; - while ((line = bb_get_chomped_line_from_file(src_stream)) != NULL) { + while ((line = xmalloc_getline(src_stream)) != NULL) { int length; char *line_ptr = line; @@ -140,7 +140,7 @@ int uudecode_main(int argc, char **argv) } /* Search for the start of the encoding */ - while ((line = bb_get_chomped_line_from_file(src_stream)) != NULL) { + while ((line = xmalloc_getline(src_stream)) != NULL) { int (*decode_fn_ptr)(FILE * src, FILE * dst); char *line_ptr; FILE *dst_stream; diff --git a/editors/patch.c b/editors/patch.c index 9336b275a..545e70b50 100644 --- a/editors/patch.c +++ b/editors/patch.c @@ -32,7 +32,7 @@ static unsigned int copy_lines(FILE *src_stream, FILE *dest_stream, const unsign while (src_stream && (i < lines_count)) { char *line; - line = bb_get_line_from_file(src_stream); + line = xmalloc_fgets(src_stream); if (line == NULL) { break; } @@ -96,7 +96,7 @@ int patch_main(int argc, char **argv) ret = 0; } - patch_line = bb_get_line_from_file(patch_file); + patch_line = xmalloc_fgets(patch_file); while (patch_line) { FILE *src_stream; FILE *dst_stream; @@ -115,14 +115,14 @@ int patch_main(int argc, char **argv) */ while (patch_line && strncmp(patch_line, "--- ", 4) != 0) { free(patch_line); - patch_line = bb_get_line_from_file(patch_file); + patch_line = xmalloc_fgets(patch_file); } /* Extract the filename used before the patch was generated */ original_filename = extract_filename(patch_line, patch_level); free(patch_line); - patch_line = bb_get_line_from_file(patch_file); + patch_line = xmalloc_fgets(patch_file); if (strncmp(patch_line, "+++ ", 4) != 0) { ret = 2; bb_error_msg("Invalid patch"); @@ -166,7 +166,7 @@ int patch_main(int argc, char **argv) printf("patching file %s\n", new_filename); /* Handle each hunk */ - patch_line = bb_get_line_from_file(patch_file); + patch_line = xmalloc_fgets(patch_file); while (patch_line) { unsigned int count; unsigned int src_beg_line; @@ -197,11 +197,11 @@ int patch_main(int argc, char **argv) } hunk_offset_start = src_cur_line; - while ((patch_line = bb_get_line_from_file(patch_file)) != NULL) { + while ((patch_line = xmalloc_fgets(patch_file)) != NULL) { if ((*patch_line == '-') || (*patch_line == ' ')) { char *src_line = NULL; if (src_stream) { - src_line = bb_get_line_from_file(src_stream); + src_line = xmalloc_fgets(src_stream); if (!src_line) { hunk_error++; break; diff --git a/editors/sed.c b/editors/sed.c index 7dba8b456..30f35ce22 100644 --- a/editors/sed.c +++ b/editors/sed.c @@ -904,7 +904,7 @@ restart: if (rfile) { char *line; - while ((line = bb_get_chomped_line_from_file(rfile)) + while ((line = xmalloc_getline(rfile)) != NULL) append(line); xprint_and_close_file(rfile); @@ -1099,7 +1099,7 @@ static void add_files_link(llist_t *opt_f) if (!opt_f) return; add_files_link(opt_f->link); cmdfile = xfopen(opt_f->data, "r"); - while ((line = bb_get_chomped_line_from_file(cmdfile)) != NULL) { + while ((line = xmalloc_getline(cmdfile)) != NULL) { add_cmd(line); free(line); } diff --git a/findutils/grep.c b/findutils/grep.c index ce975e771..c0c495bd1 100644 --- a/findutils/grep.c +++ b/findutils/grep.c @@ -123,7 +123,7 @@ static int grep_file(FILE *file) int idx = 0; /* used for iteration through the circular buffer */ #endif /* ENABLE_FEATURE_GREP_CONTEXT */ - while ((line = bb_get_chomped_line_from_file(file)) != NULL) { + while ((line = xmalloc_getline(file)) != NULL) { llist_t *pattern_ptr = pattern_head; grep_list_data_t * gl; @@ -280,7 +280,7 @@ static void load_regexes_from_file(llist_t *fopt) fopt = cur->link; free(cur); f = xfopen(ffile, "r"); - while ((line = bb_get_chomped_line_from_file(f)) != NULL) { + while ((line = xmalloc_getline(f)) != NULL) { llist_add_to(&pattern_head, new_grep_list_data(line, PATTERN_MEM_A)); } diff --git a/include/libbb.h b/include/libbb.h index ac48411c0..767a3378b 100644 --- a/include/libbb.h +++ b/include/libbb.h @@ -230,8 +230,9 @@ extern void erase_mtab(const char * name); extern long *find_pid_by_name( const char* pidName); extern long *pidlist_reverse(long *pidList); extern char *find_block_device(char *path); -extern char *bb_get_line_from_file(FILE *file); -extern char *bb_get_chomped_line_from_file(FILE *file); +extern char *xmalloc_fgets(FILE *file); +/* Chops off '\n' from the end, unlike fgets: */ +extern char *xmalloc_getline(FILE *file); extern char *bb_get_chunk_from_file(FILE *file, int *end); extern off_t bb_copyfd_size(int fd1, int fd2, off_t size); extern off_t bb_copyfd_eof(int fd1, int fd2); diff --git a/libbb/get_line_from_file.c b/libbb/get_line_from_file.c index 722a904b5..969d808cf 100644 --- a/libbb/get_line_from_file.c +++ b/libbb/get_line_from_file.c @@ -48,7 +48,7 @@ char *bb_get_chunk_from_file(FILE * file, int *end) } /* Get line, including trailing \n if any */ -char *bb_get_line_from_file(FILE * file) +char *xmalloc_fgets(FILE * file) { int i; @@ -56,7 +56,7 @@ char *bb_get_line_from_file(FILE * file) } /* Get line. Remove trailing \n */ -char *bb_get_chomped_line_from_file(FILE * file) +char *xmalloc_getline(FILE * file) { int i; char *c = bb_get_chunk_from_file(file, &i); diff --git a/miscutils/dc.c b/miscutils/dc.c index 8e7a2494c..fd5390143 100644 --- a/miscutils/dc.c +++ b/miscutils/dc.c @@ -208,7 +208,7 @@ int dc_main(int argc, char **argv) char *line = NULL; char *cursor = NULL; char *token = NULL; - while ((line = bb_get_chomped_line_from_file(stdin))) { + while ((line = xmalloc_getline(stdin))) { cursor = line; len = number_of_tokens(line); for (i = 0; i < len; i++) { diff --git a/miscutils/makedevs.c b/miscutils/makedevs.c index e27634add..e4658010c 100644 --- a/miscutils/makedevs.c +++ b/miscutils/makedevs.c @@ -95,7 +95,7 @@ int makedevs_main(int argc, char **argv) printf("table=\n"); } - while ((line = bb_get_chomped_line_from_file(table))) { + while ((line = xmalloc_getline(table))) { char type; unsigned int mode = 0755; unsigned int major = 0; diff --git a/networking/dnsd.c b/networking/dnsd.c index 35f6c1096..6f9dc5d67 100644 --- a/networking/dnsd.c +++ b/networking/dnsd.c @@ -138,7 +138,7 @@ static int getfileentry(FILE * fp, struct dns_entry *s) char *r, *name; restart: - r = bb_get_line_from_file(fp); + r = xmalloc_fgets(fp); if (!r) return -1; while (*r == ' ' || *r == '\t') { diff --git a/networking/ifupdown.c b/networking/ifupdown.c index c1dc1d35d..00eb576f4 100644 --- a/networking/ifupdown.c +++ b/networking/ifupdown.c @@ -649,7 +649,7 @@ static struct interfaces_file_t *read_interfaces(const char *filename) f = xfopen(filename, "r"); - while ((buf = bb_get_chomped_line_from_file(f)) != NULL) { + while ((buf = xmalloc_getline(f)) != NULL) { char *buf_ptr = buf; firstword = next_word(&buf_ptr); diff --git a/networking/nameif.c b/networking/nameif.c index f60a97e8b..385e7fb71 100644 --- a/networking/nameif.c +++ b/networking/nameif.c @@ -91,7 +91,7 @@ int nameif_main(int argc, char **argv) } else { ifh = xfopen(fname, "r"); - while ((line = bb_get_line_from_file(ifh)) != NULL) { + while ((line = xmalloc_fgets(ifh)) != NULL) { char *line_ptr; size_t name_length; diff --git a/shell/cmdedit.c b/shell/cmdedit.c index 7b4d46511..3f44ea013 100644 --- a/shell/cmdedit.c +++ b/shell/cmdedit.c @@ -1205,7 +1205,7 @@ void load_history ( const char *fromfile ) if (( fp = fopen ( fromfile, "r" ))) { for ( hi = 0; hi < MAX_HISTORY; ) { - char * hl = bb_get_chomped_line_from_file(fp); + char * hl = xmalloc_getline(fp); int l; if(!hl) diff --git a/util-linux/hexdump.c b/util-linux/hexdump.c index 03b222dd0..5cb245feb 100644 --- a/util-linux/hexdump.c +++ b/util-linux/hexdump.c @@ -21,7 +21,7 @@ static void bb_dump_addfile(char *name) fp = xfopen(name, "r"); - while ((buf = bb_get_chomped_line_from_file(fp)) != NULL) { + while ((buf = xmalloc_getline(fp)) != NULL) { p = skip_whitespace(buf); if (*p && (*p != '#')) { diff --git a/util-linux/mount.c b/util-linux/mount.c index 5448f1f21..9793b825a 100644 --- a/util-linux/mount.c +++ b/util-linux/mount.c @@ -186,7 +186,7 @@ static llist_t *get_block_backed_filesystems(void) f = fopen(filesystems[i], "r"); if (!f) continue; - while ((buf = bb_get_chomped_line_from_file(f)) != 0) { + while ((buf = xmalloc_getline(f)) != 0) { if (!strncmp(buf, "nodev", 5) && isspace(buf[5])) continue; fs = buf; -- cgit v1.2.3