Merge branch 'busybox' into merge

Conflicts:
	archival/Config.src
	shell/ash.c

11 files changed, 137 insertions, 23 deletions

diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src
index db79ff62b..adaab92d6 100644
--- a/libbb/Kbuild.src
+++ b/libbb/Kbuild.src
@@ -146,7 +146,7 @@ lib-$(CONFIG_DELUSER) += update_passwd.o
 lib-$(CONFIG_PASSWD) += pw_encrypt.o update_passwd.o obscure.o
 lib-$(CONFIG_CHPASSWD) += pw_encrypt.o update_passwd.o
 lib-$(CONFIG_CRYPTPW) += pw_encrypt.o
-lib-$(CONFIG_SULOGIN) += pw_encrypt.o
+lib-$(CONFIG_SULOGIN) += pw_encrypt.o correct_password.o
 lib-$(CONFIG_VLOCK) += pw_encrypt.o correct_password.o
 lib-$(CONFIG_SU) += pw_encrypt.o correct_password.o
 lib-$(CONFIG_LOGIN) += pw_encrypt.o correct_password.o
diff --git a/libbb/bb_pwd.c b/libbb/bb_pwd.c
index 4829b723a..8250cd446 100644
--- a/libbb/bb_pwd.c
+++ b/libbb/bb_pwd.c
@@ -110,3 +110,51 @@ unsigned long FAST_FUNC get_ug_id(const char *s,
                 return xname2id(s);
         return r;
 }
+
+/* Experimental "mallocing" API.
+ * The goal is nice: "we want to support a case when "guests" group is very large"
+ * but the code is butt-ugly.
+ */
+#if 0
+static char *find_latest(char last, char *cp)
+{
+        if (!cp)
+                return last;
+        cp += strlen(cp) + 1;
+        if (last < cp)
+                last = cp;
+        return last;
+}
+
+struct group* FAST_FUNC xmalloc_getgrnam(const char *name)
+{
+        struct {
+                struct group gr;
+                // May still be not enough!
+                char buf[64*1024 - sizeof(struct group) - 16];
+        } *s;
+        struct group *grp;
+        int r;
+        char *last;
+        char **gr_mem;
+
+        s = xmalloc(sizeof(*s));
+        r = getgrnam_r(name, &s->gr, s->buf, sizeof(s->buf), &grp);
+        if (!grp) {
+                free(s);
+                return grp;
+        }
+        last = find_latest(s->buf, grp->gr_name);
+        last = find_latest(last, grp->gr_passwd);
+        gr_mem = grp->gr_mem;
+        while (*gr_mem)
+                last = find_latest(last, *gr_mem++);
+        gr_mem++; /* points past NULL */
+        if (last < (char*)gr_mem)
+                last = (char*)gr_mem;
+//FIXME: what if we get not only truncated, but also moved here?
+// grp->gr_name pointer and friends are invalid now!!!
+        s = xrealloc(s, last - (char*)s);
+        return grp;
+}
+#endif
diff --git a/libbb/correct_password.c b/libbb/correct_password.c
index 7cabd33d0..acadf3914 100644
--- a/libbb/correct_password.c
+++ b/libbb/correct_password.c
@@ -31,12 +31,15 @@
 #include "libbb.h"
 
 /* Ask the user for a password.
+ * Return 1 without asking if PW has an empty password.
+ * Return -1 on EOF, error while reading input, or timeout.
  * Return 1 if the user gives the correct password for entry PW,
- * 0 if not.  Return 1 without asking if PW has an empty password.
+ * 0 if not.
  *
- * NULL pw means "just fake it for login with bad username" */
-
-int FAST_FUNC correct_password(const struct passwd *pw)
+ * NULL pw means "just fake it for login with bad username"
+ */
+int FAST_FUNC ask_and_check_password_extended(const struct passwd *pw,
+                int timeout, const char *prompt)
 {
         char *unencrypted, *encrypted;
         const char *correct;
@@ -65,13 +68,19 @@ int FAST_FUNC correct_password(const struct passwd *pw)
                 return 1;
 
  fake_it:
-        unencrypted = bb_ask_stdin("Password: ");
+        unencrypted = bb_ask(STDIN_FILENO, timeout, prompt);
         if (!unencrypted) {
-                return 0;
+                /* EOF (such as ^D) or error (such as ^C) or timeout */
+                return -1;
         }
         encrypted = pw_encrypt(unencrypted, correct, 1);
         r = (strcmp(encrypted, correct) == 0);
         free(encrypted);
-        memset(unencrypted, 0, strlen(unencrypted));
+        nuke_str(unencrypted);
         return r;
 }
+
+int FAST_FUNC ask_and_check_password(const struct passwd *pw)
+{
+        return ask_and_check_password_extended(pw, 0, "Password: ");
+}
diff --git a/libbb/fclose_nonstdin.c b/libbb/fclose_nonstdin.c
index 5ce9d5b48..1b1441347 100644
--- a/libbb/fclose_nonstdin.c
+++ b/libbb/fclose_nonstdin.c
@@ -18,7 +18,8 @@ int FAST_FUNC fclose_if_not_stdin(FILE *f)
 {
         /* Some more paranoid applets want ferror() check too */
         int r = ferror(f); /* NB: does NOT set errno! */
-        if (r) errno = EIO; /* so we'll help it */
+        if (r)
+                errno = EIO; /* so we'll help it */
         if (f != stdin)
                 return (r | fclose(f)); /* fclose does set errno on error */
         return r;
diff --git a/libbb/human_readable.c b/libbb/human_readable.c
index 8b22b0cb5..0b2eb777e 100644
--- a/libbb/human_readable.c
+++ b/libbb/human_readable.c
@@ -94,7 +94,7 @@ const char* FAST_FUNC make_human_readable_str(unsigned long long val,
 
 /* Convert unsigned long long value into compact 5-char representation.
  * String is not terminated (buf[5] is untouched) */
-void FAST_FUNC smart_ulltoa5(unsigned long long ul, char buf[5], const char *scale)
+char* FAST_FUNC smart_ulltoa5(unsigned long long ul, char buf[5], const char *scale)
 {
         const char *fmt;
         char c;
@@ -145,12 +145,13 @@ void FAST_FUNC smart_ulltoa5(unsigned long long ul, char buf[5], const char *sca
                 buf[3] = "0123456789"[v];
                 buf[4] = scale[idx]; /* typically scale = " kmgt..." */
         }
+        return buf + 5;
 }
 
 /* Convert unsigned long long value into compact 4-char
  * representation. Examples: "1234", "1.2k", " 27M", "123T"
  * String is not terminated (buf[4] is untouched) */
-void FAST_FUNC smart_ulltoa4(unsigned long long ul, char buf[4], const char *scale)
+char* FAST_FUNC smart_ulltoa4(unsigned long long ul, char buf[4], const char *scale)
 {
         const char *fmt;
         char c;
@@ -194,4 +195,5 @@ void FAST_FUNC smart_ulltoa4(unsigned long long ul, char buf[4], const char *sca
                 buf[2] = "0123456789"[v];
                 buf[3] = scale[idx]; /* typically scale = " kmgt..." */
         }
+        return buf + 4;
 }
diff --git a/libbb/in_ether.c b/libbb/in_ether.c
index dadadbafe..1de383bde 100644
--- a/libbb/in_ether.c
+++ b/libbb/in_ether.c
@@ -3,6 +3,7 @@
  * Utility routines.
  */
 
+//kbuild:lib-$(CONFIG_ARP) += in_ether.o
 //kbuild:lib-$(CONFIG_IFCONFIG) += in_ether.o
 //kbuild:lib-$(CONFIG_IFENSLAVE) += in_ether.o
 
diff --git a/libbb/inet_common.c b/libbb/inet_common.c
index 0f4fca1a2..b3e0802ee 100644
--- a/libbb/inet_common.c
+++ b/libbb/inet_common.c
@@ -175,8 +175,7 @@ int FAST_FUNC INET6_resolve(const char *name, struct sockaddr_in6 *sin6)
                 return -1;
         }
         memcpy(sin6, ai->ai_addr, sizeof(*sin6));
-        if (ai)
-                freeaddrinfo(ai);
+        freeaddrinfo(ai);
         return 0;
 }
 
diff --git a/libbb/nuke_str.c b/libbb/nuke_str.c
new file mode 100644
index 000000000..56b808bc7
--- /dev/null
+++ b/libbb/nuke_str.c
@@ -0,0 +1,21 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Utility routines.
+ *
+ * Copyright (C) 2008 Denys Vlasenko
+ *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
+ */
+
+//kbuild:lib-y += nuke_str.o
+
+#include "libbb.h"
+
+void FAST_FUNC nuke_str(char *str)
+{
+        if (str) {
+                while (*str)
+                        *str++ = 0;
+                /* or: memset(str, 0, strlen(str)); - not as small as above */
+        }
+}
diff --git a/libbb/pw_encrypt_md5.c b/libbb/pw_encrypt_md5.c
index 889e09cab..1e52ecaea 100644
--- a/libbb/pw_encrypt_md5.c
+++ b/libbb/pw_encrypt_md5.c
@@ -86,7 +86,7 @@ md5_crypt(char result[MD5_OUT_BUFSIZE], const unsigned char *pw, const unsigned
 
         /* Get the length of the salt including "$1$" */
         sl = 3;
-        while (salt[sl] && salt[sl] != '$' && sl < (3 + 8))
+        while (sl < (3 + 8) && salt[sl] && salt[sl] != '$')
                 sl++;
 
         /* Hash. the password first, since that is what is most unknown */
diff --git a/libbb/xfuncs_printf.c b/libbb/xfuncs_printf.c
index a70683241..e4ac6a002 100644
--- a/libbb/xfuncs_printf.c
+++ b/libbb/xfuncs_printf.c
@@ -140,15 +140,6 @@ int FAST_FUNC xopen(const char *pathname, int flags)
         return xopen3(pathname, flags, 0666);
 }
 
-/* Die if we can't open an existing file readonly with O_NONBLOCK
- * and return the fd.
- * Note that for ioctl O_RDONLY is sufficient.
- */
-int FAST_FUNC xopen_nonblocking(const char *pathname)
-{
-        return xopen(pathname, O_RDONLY | O_NONBLOCK);
-}
-
 // Warn if we can't open a file and return a fd.
 int FAST_FUNC open3_or_warn(const char *pathname, int flags, int mode)
 {
@@ -167,6 +158,32 @@ int FAST_FUNC open_or_warn(const char *pathname, int flags)
         return open3_or_warn(pathname, flags, 0666);
 }
 
+/* Die if we can't open an existing file readonly with O_NONBLOCK
+ * and return the fd.
+ * Note that for ioctl O_RDONLY is sufficient.
+ */
+int FAST_FUNC xopen_nonblocking(const char *pathname)
+{
+        return xopen(pathname, O_RDONLY | O_NONBLOCK);
+}
+
+int FAST_FUNC xopen_as_uid_gid(const char *pathname, int flags, uid_t u, gid_t g)
+{
+        int fd;
+        uid_t old_euid = geteuid();
+        gid_t old_egid = getegid();
+
+        xsetegid(g);
+        xseteuid(u);
+
+        fd = xopen(pathname, flags);
+
+        xseteuid(old_euid);
+        xsetegid(old_egid);
+
+        return fd;
+}
+
 void FAST_FUNC xunlink(const char *pathname)
 {
         if (unlink(pathname))
@@ -351,6 +368,16 @@ void FAST_FUNC xsetuid(uid_t uid)
         if (setuid(uid)) bb_perror_msg_and_die("setuid");
 }
 
+void FAST_FUNC xsetegid(gid_t egid)
+{
+        if (setegid(egid)) bb_perror_msg_and_die("setegid");
+}
+
+void FAST_FUNC xseteuid(uid_t euid)
+{
+        if (seteuid(euid)) bb_perror_msg_and_die("seteuid");
+}
+
 // Die if we can't chdir to a new path.
 void FAST_FUNC xchdir(const char *path)
 {
diff --git a/libbb/xreadlink.c b/libbb/xreadlink.c
index bc1d0e665..ea09f20b8 100644
--- a/libbb/xreadlink.c
+++ b/libbb/xreadlink.c
@@ -8,6 +8,12 @@
 
 #include "libbb.h"
 
+/* some systems (eg Hurd) does not have MAXSYMLINKS definition,
+ * set it to some reasonable value if it isn't defined */
+#ifndef MAXSYMLINKS
+# define MAXSYMLINKS 20
+#endif
+
 /*
  * NOTE: This function returns a malloced char* that you will have to free
  * yourself.