Merge branch 'busybox' into merge

2 files changed, 2 insertions, 26 deletions

diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index b3ae21510..ec0997037 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -1366,8 +1366,7 @@ static void load_history(line_input_t *st_parm)
                 /* fill temp_h[], retaining only last MAX_HISTORY lines */
                 memset(temp_h, 0, sizeof(temp_h));
                 idx = 0;
-                if (!ENABLE_FEATURE_EDITING_SAVE_ON_EXIT)
-                        st_parm->cnt_history_in_file = 0;
+                st_parm->cnt_history_in_file = 0;
                 while ((line = xmalloc_fgetline(fp)) != NULL) {
                         if (line[0] == '\0') {
                                 free(line);
@@ -1375,8 +1374,7 @@ static void load_history(line_input_t *st_parm)
                         }
                         free(temp_h[idx]);
                         temp_h[idx] = line;
-                        if (!ENABLE_FEATURE_EDITING_SAVE_ON_EXIT)
-                                st_parm->cnt_history_in_file++;
+                        st_parm->cnt_history_in_file++;
                         idx++;
                         if (idx == st_parm->max_history)
                                 idx = 0;
diff --git a/libbb/safe_gethostname.c b/libbb/safe_gethostname.c
index bdb989631..cac99ae03 100644
--- a/libbb/safe_gethostname.c
+++ b/libbb/safe_gethostname.c
@@ -50,25 +50,3 @@ char* FAST_FUNC safe_gethostname(void)
         uname(&uts);
         return xstrndup(!uts.nodename[0] ? "?" : uts.nodename, sizeof(uts.nodename));
 }
-
-/*
- * On success return the current malloced and NUL terminated domainname.
- * On error return malloced and NUL terminated string "?".
- * This is an illegal first character for a domainname.
- * The returned malloced string must be freed by the caller.
- */
-char* FAST_FUNC safe_getdomainname(void)
-{
-#if defined(__linux__)
-/* The field domainname of struct utsname is Linux specific. */
-        struct utsname uts;
-        uname(&uts);
-        return xstrndup(!uts.domainname[0] ? "?" : uts.domainname, sizeof(uts.domainname));
-#else
-        /* We really don't care about people with domain names wider than most screens */
-        char buf[256];
-        int r = getdomainname(buf, sizeof(buf));
-        buf[sizeof(buf)-1] = '\0';
-        return xstrdup(r < 0 ? "?" : buf);
-#endif
-}