bb_get_[chomped]line_from_file wasn't descriptive enough.

[oweals/busybox.git] / shell / cmdedit.c

diff --git a/shell/cmdedit.c b/shell/cmdedit.c
index 9a57f750e18645a50164b9e94b2b406df707a1ab..3f44ea0135cd7d3db8e842e9b6e9d55b1d7e83fe 100644 (file)
--- a/shell/cmdedit.c
+++ b/shell/cmdedit.c
@@ -79,11 +79,6 @@
 #define CONFIG_FEATURE_GETUSERNAME_AND_HOMEDIR
 #endif
 
-#ifdef CONFIG_FEATURE_GETUSERNAME_AND_HOMEDIR
-#include "pwd_.h"
-#endif  /* advanced FEATURES */
-
-
 /* Maximum length of the linked list for the command line history */
 #ifndef CONFIG_FEATURE_COMMAND_HISTORY
 #define MAX_HISTORY   15
@@ -1210,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)
@@ -1892,7 +1887,7 @@ rewrite_line:
 
 #ifdef TEST
 
-const char *bb_applet_name = "debug stuff usage";
+const char *applet_name = "debug stuff usage";
 
 #ifdef CONFIG_FEATURE_NONPRINTABLE_INVERSE_PUT
 #include <locale.h>