Merge branch 'busybox' into merge

3 files changed, 24 insertions, 11 deletions

diff --git a/miscutils/crond.c b/miscutils/crond.c
index 25e5503c7..b533a3991 100644
--- a/miscutils/crond.c
+++ b/miscutils/crond.c
@@ -181,9 +181,7 @@ static void crondlog(unsigned level, const char *msg, va_list va)
                  * need not touch syslog_level
                  * (they are ok with LOG_ERR default).
                  */
-                syslog_level = LOG_INFO;
-                bb_verror_msg(msg, va, /* strerr: */ NULL);
-                syslog_level = LOG_ERR;
+                bb_vinfo_msg(msg, va);
         }
 }
 
@@ -1108,7 +1106,7 @@ int crond_main(int argc UNUSED_PARAM, char **argv)
                 process_cron_update_file();
                 log5("wakeup dt=%ld", dt);
                 if (dt < -60 * 60 || dt > 60 * 60) {
-                        bb_error_msg("time disparity of %ld minutes detected", dt / 60);
+                        bb_info_msg("time disparity of %ld minutes detected", dt / 60);
                         /* and we do not run any jobs in this case */
                 } else if (dt > 0) {
                         /* Usual case: time advances forward, as expected */
diff --git a/miscutils/dc.c b/miscutils/dc.c
index 0d09f5e2b..c7ce2be0b 100644
--- a/miscutils/dc.c
+++ b/miscutils/dc.c
@@ -35,10 +35,12 @@ enum { STACK_SIZE = (COMMON_BUFSIZE - offsetof(struct globals, stack)) / sizeof(
         base = 10; \
 } while (0)
 
-static void check_under(void)
+static unsigned check_under(void)
 {
-        if (pointer == 0)
+        unsigned p = pointer;
+        if (p == 0)
                 bb_error_msg_and_die("stack underflow");
+        return p - 1;
 }
 
 static void push(double a)
@@ -50,8 +52,9 @@ static void push(double a)
 
 static double pop(void)
 {
-        check_under();
-        return stack[--pointer];
+        unsigned p = check_under();
+        pointer = p;
+        return stack[p];
 }
 
 static void add(void)
@@ -91,6 +94,19 @@ static void mod(void)
 {
         data_t d = pop();
 
+        /* compat with dc (GNU bc 1.07.1) 1.4.1:
+         * $ dc -e '4 0 % p'
+         * dc: remainder by zero
+         * 0
+         */
+        if (d == 0) {
+                bb_error_msg("remainder by zero");
+                pop();
+                push(0);
+                return;
+        }
+        /* ^^^^ without this, we simply get SIGFPE and die */
+
         push((data_t) pop() % d);
 }
 
@@ -171,8 +187,7 @@ static void print_stack_no_pop(void)
 
 static void print_no_pop(void)
 {
-        check_under();
-        print_base(stack[pointer-1]);
+        print_base(stack[check_under()]);
 }
 
 struct op {
diff --git a/miscutils/devfsd.c b/miscutils/devfsd.c
index 3bf06b965..e4d104d0c 100644
--- a/miscutils/devfsd.c
+++ b/miscutils/devfsd.c
@@ -343,7 +343,7 @@ static const char bb_msg_variable_not_found[] ALIGN1 = "variable: %s not found";
 
 /* Busybox stuff */
 #if ENABLE_DEVFSD_VERBOSE || ENABLE_DEBUG
-#define info_logger(p, fmt, args...)                 bb_error_msg(fmt, ## args)
+#define info_logger(p, fmt, args...)                 bb_info_msg(fmt, ## args)
 #define msg_logger(p, fmt, args...)                  bb_error_msg(fmt, ## args)
 #define msg_logger_and_die(p, fmt, args...)          bb_error_msg_and_die(fmt, ## args)
 #define error_logger(p, fmt, args...)                bb_perror_msg(fmt, ## args)