* archival/dpkg.c (create_list): Use chomp.

* archival/tar.c (append_file_list_to_list): Likewise.


git-svn-id: svn://busybox.net/trunk/busybox@3993 69ca8d6d-28ef-0310-b511-8ec308f3f277

2 files changed, 2 insertions, 10 deletions

diff --git a/archival/dpkg.c b/archival/dpkg.c
index f41363d0f..6dee43f50 100644
--- a/archival/dpkg.c
+++ b/archival/dpkg.c
@@ -1034,7 +1034,6 @@ char **create_list(const char *filename)
         FILE *list_stream;
         char **file_list = xmalloc(sizeof(char *));
         char *line = NULL;
-        char *last_char;
         int length = 0;
         int count = 0;
 
@@ -1047,10 +1046,7 @@ char **create_list(const char *filename)
         while (getline(&line, &length, list_stream) != -1) {
                 /* +2 as we need to include space for the terminating NULL pointer */
                 file_list = xrealloc(file_list, sizeof(char *) * (length + 2));
-                last_char = last_char_is(line, '\n');
-                if (last_char) {
-                        *last_char = '\0';
-                }
+                chomp(line);
                 file_list[count] = xstrdup(line);
                 count++;
         }
diff --git a/archival/tar.c b/archival/tar.c
index 22cbf3ab2..19c84a770 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -516,14 +516,10 @@ void append_file_list_to_list(char *filename, char ***name_list, int *num_of_ent
 {
         FILE *src_stream;
         char *line;
-        char *line_ptr;
         
         src_stream = xfopen(filename, "r");
         while ((line = get_line_from_file(src_stream)) != NULL) {
-                line_ptr = last_char_is(line, '\n');
-                if (line_ptr) {
-                        *line_ptr = '\0';
-                }
+                chomp (line);
                 append_file_to_list(line, name_list, num_of_entries);
                 free(line);
         }