Merge branch 'origin/master' (early part)

6 files changed, 33 insertions, 30 deletions

diff --git a/libbb/Config.src b/libbb/Config.src
index 80b1e0d21..9b01757c6 100644
--- a/libbb/Config.src
+++ b/libbb/Config.src
@@ -98,7 +98,7 @@ config FEATURE_USERNAME_COMPLETION
 
 config FEATURE_EDITING_FANCY_PROMPT
         bool "Fancy shell prompts"
-        default n
+        default y
         depends on FEATURE_EDITING
         help
           Setting this option allows for prompts to use things like \w and
@@ -153,6 +153,7 @@ config FEATURE_COPYBUF_KB
 config MONOTONIC_SYSCALL
         bool "Use clock_gettime(CLOCK_MONOTONIC) syscall"
         default n
+        depends on PLATFORM_LINUX
         help
           Use clock_gettime(CLOCK_MONOTONIC) syscall for measuring
           time intervals (time, ping, traceroute etc need this).
diff --git a/libbb/README b/libbb/README
index 4f28f7e34..6e63dc5f2 100644
--- a/libbb/README
+++ b/libbb/README
@@ -8,4 +8,3 @@ that you wrote that is mis-attributed, do let me know so we can fix that up.
 
         Erik Andersen
         <andersen@codepoet.org>
-
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index ab418c0ab..866f9230d 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -53,19 +53,15 @@
 #if ENABLE_FEATURE_EDITING
 
 
-#define ENABLE_FEATURE_GETUSERNAME_AND_HOMEDIR \
+#define ENABLE_USERNAME_OR_HOMEDIR \
         (ENABLE_FEATURE_USERNAME_COMPLETION || ENABLE_FEATURE_EDITING_FANCY_PROMPT)
-#define IF_FEATURE_GETUSERNAME_AND_HOMEDIR(...)
-#if ENABLE_FEATURE_GETUSERNAME_AND_HOMEDIR
-#undef IF_FEATURE_GETUSERNAME_AND_HOMEDIR
-#define IF_FEATURE_GETUSERNAME_AND_HOMEDIR(...) __VA_ARGS__
+#define IF_USERNAME_OR_HOMEDIR(...)
+#if ENABLE_USERNAME_OR_HOMEDIR
+# undef IF_USERNAME_OR_HOMEDIR
+# define IF_USERNAME_OR_HOMEDIR(...) __VA_ARGS__
 #endif
 
 
-#define SEQ_CLEAR_TILL_END_OF_SCREEN "\033[J"
-//#define SEQ_CLEAR_TILL_END_OF_LINE   "\033[K"
-
-
 #undef CHAR_T
 #if ENABLE_UNICODE_SUPPORT
 # define BB_NUL ((wchar_t)0)
@@ -90,14 +86,16 @@ static bool BB_ispunct(CHAR_T c) { return ((unsigned)c < 256 && ispunct(c)); }
 # define BB_isalnum(c) isalnum(c)
 # define BB_ispunct(c) ispunct(c)
 #endif
+#if ENABLE_UNICODE_PRESERVE_BROKEN
+# define unicode_mark_raw_byte(wc)   ((wc) | 0x20000000)
+# define unicode_is_raw_byte(wc)     ((wc) & 0x20000000)
+#else
+# define unicode_is_raw_byte(wc)     0
+#endif
 
 
-# if ENABLE_UNICODE_PRESERVE_BROKEN
-#  define unicode_mark_raw_byte(wc)   ((wc) | 0x20000000)
-#  define unicode_is_raw_byte(wc)     ((wc) & 0x20000000)
-# else
-#  define unicode_is_raw_byte(wc)     0
-# endif
+#define SEQ_CLEAR_TILL_END_OF_SCREEN "\033[J"
+//#define SEQ_CLEAR_TILL_END_OF_LINE   "\033[K"
 
 
 enum {
@@ -107,7 +105,7 @@ enum {
                       : 0x7ff0
 };
 
-#if ENABLE_FEATURE_GETUSERNAME_AND_HOMEDIR
+#if ENABLE_USERNAME_OR_HOMEDIR
 static const char null_str[] ALIGN1 = "";
 #endif
 
@@ -134,7 +132,7 @@ struct lineedit_statics {
         int num_ok_lines; /* = 1; */
 #endif
 
-#if ENABLE_FEATURE_GETUSERNAME_AND_HOMEDIR
+#if ENABLE_USERNAME_OR_HOMEDIR
         char *user_buf;
         char *home_pwd_buf; /* = (char*)null_str; */
 #endif
@@ -145,7 +143,7 @@ struct lineedit_statics {
 #endif
 
 #if ENABLE_FEATURE_EDITING_VI
-#define DELBUFSIZ 128
+# define DELBUFSIZ 128
         CHAR_T *delptr;
         smallint newdelflag;     /* whether delbuf should be reused yet */
         CHAR_T delbuf[DELBUFSIZ];  /* a place to store deleted characters */
@@ -191,7 +189,7 @@ extern struct lineedit_statics *const lineedit_ptr_to_statics;
         barrier(); \
         cmdedit_termw = 80; \
         IF_FEATURE_EDITING_FANCY_PROMPT(num_ok_lines = 1;) \
-        IF_FEATURE_GETUSERNAME_AND_HOMEDIR(home_pwd_buf = (char*)null_str;) \
+        IF_USERNAME_OR_HOMEDIR(home_pwd_buf = (char*)null_str;) \
 } while (0)
 static void deinit_S(void)
 {
@@ -200,7 +198,7 @@ static void deinit_S(void)
          * (otherwise it points to verbatim prompt (NOT malloced) */
         free((char*)cmdedit_prompt);
 #endif
-#if ENABLE_FEATURE_GETUSERNAME_AND_HOMEDIR
+#if ENABLE_USERNAME_OR_HOMEDIR
         free(user_buf);
         if (home_pwd_buf != null_str)
                 free(home_pwd_buf);
@@ -1677,7 +1675,7 @@ static void parse_and_put_prompt(const char *prmt_ptr)
                                 c = *prmt_ptr++;
 
                                 switch (c) {
-# if ENABLE_FEATURE_GETUSERNAME_AND_HOMEDIR
+# if ENABLE_USERNAME_OR_HOMEDIR
                                 case 'u':
                                         pbuf = user_buf ? user_buf : (char*)"";
                                         break;
@@ -1689,7 +1687,7 @@ static void parse_and_put_prompt(const char *prmt_ptr)
                                 case '$':
                                         c = (geteuid() == 0 ? '#' : '$');
                                         break;
-# if ENABLE_FEATURE_GETUSERNAME_AND_HOMEDIR
+# if ENABLE_USERNAME_OR_HOMEDIR
                                 case 'w':
                                         /* /home/user[/something] -> ~[/something] */
                                         pbuf = cwd_buf;
@@ -1773,11 +1771,13 @@ static void cmdedit_setwidth(unsigned w, int redraw_flg)
 
 static void win_changed(int nsig)
 {
+        int sv_errno = errno;
         unsigned width;
         get_terminal_width_height(0, &width, NULL);
         cmdedit_setwidth(width, nsig /* - just a yes/no flag */);
         if (nsig == SIGWINCH)
                 signal(SIGWINCH, win_changed); /* rearm ourself */
+        errno = sv_errno;
 }
 
 static int lineedit_read_key(char *read_key_buffer)
@@ -1967,7 +1967,7 @@ int FAST_FUNC read_line_input(const char *prompt, char *command, int maxsize, li
         /* Now initialize things */
         previous_SIGWINCH_handler = signal(SIGWINCH, win_changed);
         win_changed(0); /* do initial resizing */
-#if ENABLE_FEATURE_GETUSERNAME_AND_HOMEDIR
+#if ENABLE_USERNAME_OR_HOMEDIR
         {
                 struct passwd *entry;
 
@@ -2389,7 +2389,7 @@ int FAST_FUNC read_line_input(const char *prompt, char *command, int maxsize, li
         }
 #endif
 
-/* Stop bug catching using "command_must_not_be_used" trick */
+/* End of bug-catching "command_must_not_be_used" trick */
 #undef command
 
 #if ENABLE_UNICODE_SUPPORT
@@ -2423,7 +2423,7 @@ int FAST_FUNC read_line_input(const char *prompt, char *command, int maxsize, li
         return len; /* can't return command_len, DEINIT_S() destroys it */
 }
 
-#else
+#else  /* !FEATURE_EDITING */
 
 #undef read_line_input
 int FAST_FUNC read_line_input(const char* prompt, char* command, int maxsize)
@@ -2434,7 +2434,7 @@ int FAST_FUNC read_line_input(const char* prompt, char* command, int maxsize)
         return strlen(command);
 }
 
-#endif  /* FEATURE_EDITING */
+#endif  /* !FEATURE_EDITING */
 
 
 /*
diff --git a/libbb/make_directory.c b/libbb/make_directory.c
index 1eb8a8a49..4bb79bdf6 100644
--- a/libbb/make_directory.c
+++ b/libbb/make_directory.c
@@ -93,7 +93,7 @@ int FAST_FUNC bb_make_directory(char *path, long mode, int flags)
                 if (mkdir(path, 0777) < 0) {
                         /* If we failed for any other reason than the directory
                          * already exists, output a diagnostic and return -1 */
-                        if (errno != EEXIST
+                        if ((errno != EEXIST && errno != EISDIR)
                          || !(flags & FILEUTILS_RECUR)
                          || ((stat(path, &st) < 0) || !S_ISDIR(st.st_mode))
                         ) {
diff --git a/libbb/selinux_common.c b/libbb/selinux_common.c
index 7b5696754..2acb50e96 100644
--- a/libbb/selinux_common.c
+++ b/libbb/selinux_common.c
@@ -53,4 +53,3 @@ void FAST_FUNC selinux_preserve_fcontext(int fdesc)
         setfscreatecon_or_die(context);
         freecon(context);
 }
-
diff --git a/libbb/xfuncs_printf.c b/libbb/xfuncs_printf.c
index 3e189c2d1..31a6d8e3c 100644
--- a/libbb/xfuncs_printf.c
+++ b/libbb/xfuncs_printf.c
@@ -401,8 +401,12 @@ int FAST_FUNC xsocket(int domain, int type, int protocol)
                 /* Hijack vaguely related config option */
 #if ENABLE_VERBOSE_RESOLUTION_ERRORS
                 const char *s = "INET";
+# ifdef AF_PACKET
                 if (domain == AF_PACKET) s = "PACKET";
+# endif
+# ifdef AF_NETLINK
                 if (domain == AF_NETLINK) s = "NETLINK";
+# endif
 IF_FEATURE_IPV6(if (domain == AF_INET6) s = "INET6";)
                 bb_perror_msg_and_die("socket(AF_%s,%d,%d)", s, type, protocol);
 #else