Merge branch 'busybox' into merge

12 files changed, 77 insertions, 70 deletions

diff --git a/miscutils/crond.c b/miscutils/crond.c
index a0b73c774..582dc991a 100644
--- a/miscutils/crond.c
+++ b/miscutils/crond.c
@@ -885,7 +885,7 @@ int crond_main(int argc UNUSED_PARAM, char **argv)
         xsetenv("SHELL", DEFAULT_SHELL); /* once, for all future children */
         crondlog(LVL8 "crond (busybox "BB_VER") started, log level %d", G.log_level);
         rescan_crontab_dir();
-        write_pidfile("/var/run/crond.pid");
+        write_pidfile(CONFIG_PID_FILE_PATH "/crond.pid");
 
         /* Main loop */
         t2 = time(NULL);
diff --git a/miscutils/dc.c b/miscutils/dc.c
index 6903761e4..6bcfbe249 100644
--- a/miscutils/dc.c
+++ b/miscutils/dc.c
@@ -11,11 +11,11 @@
 //usage:
 //usage:#define dc_full_usage "\n\n"
 //usage:       "Tiny RPN calculator. Operations:\n"
-//usage:       "+, add, -, sub, *, mul, /, div, %, mod, "IF_FEATURE_DC_LIBM("**, exp, ")"and, or, not, eor,\n"
+//usage:       "+, add, -, sub, *, mul, /, div, %, mod, "IF_FEATURE_DC_LIBM("**, exp, ")"and, or, not, xor,\n"
 //usage:       "p - print top of the stack (without popping),\n"
 //usage:       "f - print entire stack,\n"
 //usage:       "o - pop the value and set output radix (must be 10, 16, 8 or 2).\n"
-//usage:       "Examples: 'dc 2 2 add p' -> 4, 'dc 8 8 * 2 2 + / p' -> 16"
+//usage:       "Examples: 'dc 2 2 add p' -> 4, 'dc 8 8 mul 2 2 + / p' -> 16"
 //usage:
 //usage:#define dc_example_usage
 //usage:       "$ dc 2 2 + p\n"
@@ -219,29 +219,29 @@ static const struct op operators[] = {
         {"p", print_no_pop},
         {"f", print_stack_no_pop},
         {"o", set_output_base},
-        { "", NULL }
 };
 
 static void stack_machine(const char *argument)
 {
-        char *endPointer;
+        char *end;
         double d;
-        const struct op *o = operators;
+        const struct op *o;
 
-        d = strtod(argument, &endPointer);
-
-        if (endPointer != argument && *endPointer == '\0') {
+        d = strtod(argument, &end);
+        if (end != argument && *end == '\0') {
                 push(d);
                 return;
         }
 
-        while (o->function) {
+        o = operators;
+        do {
                 if (strcmp(o->name, argument) == 0) {
                         o->function();
                         return;
                 }
                 o++;
-        }
+        } while (o != operators + ARRAY_SIZE(operators));
+
         bb_error_msg_and_die("syntax error at '%s'", argument);
 }
 
diff --git a/miscutils/devfsd.c b/miscutils/devfsd.c
index 6493fe4f1..24c953bac 100644
--- a/miscutils/devfsd.c
+++ b/miscutils/devfsd.c
@@ -219,7 +219,7 @@ static void action_execute(const struct devfsd_notify_struct *, const struct con
                                                         const regmatch_t *, unsigned);
 static void action_modload(const struct devfsd_notify_struct *info, const struct config_entry_struct *entry);
 static void action_copy(const struct devfsd_notify_struct *, const struct config_entry_struct *,
-                                                 const regmatch_t *, unsigned);
+                                                const regmatch_t *, unsigned);
 static void action_compat(const struct devfsd_notify_struct *, unsigned);
 static void free_config(void);
 static void restore(char *spath, struct stat source_stat, int rootlen);
@@ -229,12 +229,12 @@ static void signal_handler(int);
 static const char *get_variable(const char *, void *);
 static int make_dir_tree(const char *);
 static int expand_expression(char *, unsigned, const char *, const char *(*)(const char *, void *), void *,
-                                                         const char *, const regmatch_t *, unsigned);
+                                                        const char *, const regmatch_t *, unsigned);
 static void expand_regexp(char *, size_t, const char *, const char *, const regmatch_t *, unsigned);
 static const char *expand_variable(     char *, unsigned, unsigned *, const char *,
                                                                         const char *(*)(const char *, void *), void *);
 static const char *get_variable_v2(const char *, const char *(*)(const char *, void *), void *);
-static char get_old_ide_name(unsigned , unsigned);
+static char get_old_ide_name(unsigned, unsigned);
 static char *write_old_sd_name(char *, unsigned, unsigned, const char *);
 
 /* busybox functions */
@@ -580,9 +580,9 @@ static void process_config_line(const char *line, unsigned long *event_mask)
                         /*This  action will pass "/dev/$devname"(i.e. "/dev/" prefixed to
                         the device name) to the module loading  facility.  In  addition,
                         the /etc/modules.devfs configuration file is used.*/
-                         if (ENABLE_DEVFSD_MODLOAD)
+                        if (ENABLE_DEVFSD_MODLOAD)
                                 new->action.what = AC_MODLOAD;
-                         break;
+                        break;
                 case 6: /* EXECUTE */
                         new->action.what = AC_EXECUTE;
                         num_args -= 3;
@@ -750,7 +750,7 @@ static void action_permissions(const struct devfsd_notify_struct *info,
 }   /*  End Function action_permissions  */
 
 static void action_modload(const struct devfsd_notify_struct *info,
-                            const struct config_entry_struct *entry UNUSED_PARAM)
+                        const struct config_entry_struct *entry UNUSED_PARAM)
 /*  [SUMMARY] Load a module.
     <info> The devfs change.
     <entry> The config file entry.
@@ -771,8 +771,8 @@ static void action_modload(const struct devfsd_notify_struct *info,
 }  /*  End Function action_modload  */
 
 static void action_execute(const struct devfsd_notify_struct *info,
-                            const struct config_entry_struct *entry,
-                            const regmatch_t *regexpr, unsigned int numexpr)
+                        const struct config_entry_struct *entry,
+                        const regmatch_t *regexpr, unsigned int numexpr)
 /*  [SUMMARY] Execute a programme.
     <info> The devfs change.
     <entry> The config file entry.
@@ -803,8 +803,8 @@ static void action_execute(const struct devfsd_notify_struct *info,
 
 
 static void action_copy(const struct devfsd_notify_struct *info,
-                         const struct config_entry_struct *entry,
-                         const regmatch_t *regexpr, unsigned int numexpr)
+                        const struct config_entry_struct *entry,
+                        const regmatch_t *regexpr, unsigned int numexpr)
 /*  [SUMMARY] Copy permissions.
     <info> The devfs change.
     <entry> The config file entry.
@@ -1259,11 +1259,11 @@ static int make_dir_tree(const char *path)
 } /*  End Function make_dir_tree  */
 
 static int expand_expression(char *output, unsigned int outsize,
-                              const char *input,
-                              const char *(*get_variable_func)(const char *variable, void *info),
-                              void *info,
-                              const char *devname,
-                              const regmatch_t *ex, unsigned int numexp)
+                        const char *input,
+                        const char *(*get_variable_func)(const char *variable, void *info),
+                        void *info,
+                        const char *devname,
+                        const regmatch_t *ex, unsigned int numexp)
 /*  [SUMMARY] Expand environment variables and regular subexpressions in string.
     <output> The output expanded expression is written here.
     <length> The size of the output buffer.
@@ -1288,8 +1288,8 @@ static int expand_expression(char *output, unsigned int outsize,
 }   /*  End Function expand_expression  */
 
 static void expand_regexp(char *output, size_t outsize, const char *input,
-                           const char *devname,
-                           const regmatch_t *ex, unsigned int numex)
+                        const char *devname,
+                        const regmatch_t *ex, unsigned int numex)
 /*  [SUMMARY] Expand all occurrences of the regular subexpressions \0 to \9.
     <output> The output expanded expression is written here.
     <outsize> The size of the output buffer.
@@ -1385,7 +1385,7 @@ static struct translate_struct translate_table[] =
 };
 
 const char *get_old_name(const char *devname, unsigned int namelen,
-                          char *buffer, unsigned int major, unsigned int minor)
+                        char *buffer, unsigned int major, unsigned int minor)
 /*  [SUMMARY] Translate a kernel-supplied name into an old name.
     <devname> The device name provided by the kernel.
     <namelen> The length of the name.
@@ -1423,7 +1423,7 @@ const char *get_old_name(const char *devname, unsigned int namelen,
         };
 
         for (trans = translate_table; trans->match != NULL; ++trans) {
-                 len = strlen(trans->match);
+                len = strlen(trans->match);
 
                 if (strncmp(devname, trans->match, len) == 0) {
                         if (trans->format == NULL)
@@ -1549,9 +1549,9 @@ static char *write_old_sd_name(char *buffer,
 /*EXPERIMENTAL_FUNCTION*/
 
 int st_expr_expand(char *output, unsigned int length, const char *input,
-                     const char *(*get_variable_func)(const char *variable,
-                                                  void *info),
-                     void *info)
+                const char *(*get_variable_func)(const char *variable,
+                                                void *info),
+                void *info)
 /*  [SUMMARY] Expand an expression using Borne Shell-like unquoted rules.
     <output> The output expanded expression is written here.
     <length> The size of the output buffer.
@@ -1641,10 +1641,10 @@ st_expr_expand_out:
 /*  Private functions follow  */
 
 static const char *expand_variable(char *buffer, unsigned int length,
-                                    unsigned int *out_pos, const char *input,
-                                    const char *(*func)(const char *variable,
-                                                         void *info),
-                                    void *info)
+                                unsigned int *out_pos, const char *input,
+                                const char *(*func)(const char *variable,
+                                                        void *info),
+                                void *info)
 /*  [SUMMARY] Expand a variable.
     <buffer> The buffer to write to.
     <length> The length of the output buffer.
@@ -1786,8 +1786,8 @@ expand_variable_out:
 
 
 static const char *get_variable_v2(const char *variable,
-                                  const char *(*func)(const char *variable, void *info),
-                                 void *info)
+                                const char *(*func)(const char *variable, void *info),
+                                void *info)
 /*  [SUMMARY] Get a variable from the environment or .
     <variable> The variable name.
     <func> A function which will be used to get the variable. If this returns
diff --git a/miscutils/fbsplash.c b/miscutils/fbsplash.c
index 05a77da23..12a77b70f 100644
--- a/miscutils/fbsplash.c
+++ b/miscutils/fbsplash.c
@@ -150,7 +150,7 @@ static void fb_open(const char *strfb_device)
 
         // map the device in memory
         G.addr = mmap(NULL,
-                        G.scr_var.yres * G.scr_fix.line_length,
+                        G.scr_var.yres * G.scr_fix.line_length,
                         PROT_WRITE, MAP_SHARED, fbfd, 0);
         if (G.addr == MAP_FAILED)
                 bb_perror_msg_and_die("mmap");
diff --git a/miscutils/flashcp.c b/miscutils/flashcp.c
index 81cde9072..b526566a4 100644
--- a/miscutils/flashcp.c
+++ b/miscutils/flashcp.c
@@ -16,6 +16,7 @@
 #include "libbb.h"
 #include <mtd/mtd-user.h>
 
+/* If 1, simulates "flashing" by writing to existing regular file */
 #define MTD_DEBUG 0
 
 #define OPT_v (1 << 0)
@@ -32,7 +33,7 @@ static void progress(int mode, uoff_t count, uoff_t total)
         if (total)
                 percent = (unsigned) (percent / total);
         printf("\r%s: %"OFF_FMT"u/%"OFF_FMT"u (%u%%) ",
-                (mode == 0) ? "Erasing block" : ((mode == 1) ? "Writing kb" : "Verifying kb"),
+                (mode < 0) ? "Erasing block" : ((mode == 0) ? "Writing kb" : "Verifying kb"),
                 count, total, (unsigned)percent);
         fflush_all();
 }
@@ -97,8 +98,7 @@ int flashcp_main(int argc UNUSED_PARAM, char **argv)
 #endif
         e.start = 0;
         for (i = 1; i <= erase_count; i++) {
-                progress(0, i, erase_count);
-                errno = 0;
+                progress(-1, i, erase_count);
 #if !MTD_DEBUG
                 if (ioctl(fd_d, MEMERASE, &e) < 0) {
                         bb_perror_msg_and_die("erase error at 0x%llx on %s",
@@ -113,7 +113,7 @@ int flashcp_main(int argc UNUSED_PARAM, char **argv)
 
         /* doing this outer loop gives significantly smaller code
          * than doing two separate loops for writing and verifying */
-        for (i = 1; i <= 2; i++) {
+        for (i = 0; i <= 1; i++) {
                 uoff_t done;
                 unsigned count;
 
@@ -122,25 +122,29 @@ int flashcp_main(int argc UNUSED_PARAM, char **argv)
                 done = 0;
                 count = BUFSIZE;
                 while (1) {
-                        uoff_t rem = statb.st_size - done;
+                        uoff_t rem;
+
+                        progress(i, done / 1024, (uoff_t)statb.st_size / 1024);
+                        rem = statb.st_size - done;
                         if (rem == 0)
                                 break;
                         if (rem < BUFSIZE)
                                 count = rem;
-                        progress(i, done / 1024, (uoff_t)statb.st_size / 1024);
                         xread(fd_f, buf, count);
-                        if (i == 1) {
+                        if (i == 0) {
                                 int ret;
+                                if (count < BUFSIZE)
+                                        memset((char*)buf + count, 0, BUFSIZE - count);
                                 errno = 0;
-                                ret = full_write(fd_d, buf, count);
-                                if (ret != count) {
+                                ret = full_write(fd_d, buf, BUFSIZE);
+                                if (ret != BUFSIZE) {
                                         bb_perror_msg_and_die("write error at 0x%"OFF_FMT"x on %s, "
                                                 "write returned %d",
                                                 done, devicename, ret);
                                 }
-                        } else { /* i == 2 */
+                        } else { /* i == 1 */
                                 xread(fd_d, buf2, count);
-                                if (memcmp(buf, buf2, count)) {
+                                if (memcmp(buf, buf2, count) != 0) {
                                         bb_error_msg_and_die("verification mismatch at 0x%"OFF_FMT"x", done);
                                 }
                         }
diff --git a/miscutils/hdparm.c b/miscutils/hdparm.c
index a97f3e7b5..69726ae72 100644
--- a/miscutils/hdparm.c
+++ b/miscutils/hdparm.c
@@ -1022,8 +1022,8 @@ static void identify(uint16_t *val)
                 }
                 if ((like_std > 3) && (val[CMDS_SUPP_1] & 0x0008)) {
                         /* We print out elsewhere whether the APM feature is enabled or
-                           not.  If it's not enabled, let's not repeat the info; just print
-                           nothing here. */
+                         * not.  If it's not enabled, let's not repeat the info; just print
+                         * nothing here. */
                         printf("\tAdvancedPM level: ");
                         if ((val[ADV_PWR] & 0xFF00) == 0x4000) {
                                 uint8_t apm_level = val[ADV_PWR] & 0x00FF;
@@ -1038,7 +1038,7 @@ static void identify(uint16_t *val)
                                 val[ACOUSTIC] & 0x00ff);
                 }
         } else {
-                 /* ATAPI */
+                /* ATAPI */
                 if (eqpt != CDROM && (val[CAPAB_0] & SWRST_REQ))
                         printf("\tATA sw reset required\n");
 
diff --git a/miscutils/last.c b/miscutils/last.c
index d52780374..24f6e1c78 100644
--- a/miscutils/last.c
+++ b/miscutils/last.c
@@ -71,7 +71,7 @@ int last_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
         file = xopen(bb_path_wtmp_file, O_RDONLY);
 
         printf("%-10s %-14s %-18s %-12.12s %s\n",
-               "USER", "TTY", "HOST", "LOGIN", "TIME");
+                "USER", "TTY", "HOST", "LOGIN", "TIME");
         /* yikes. We reverse over the file and that is a not too elegant way */
         pos = xlseek(file, 0, SEEK_END);
         pos = lseek(file, pos - sizeof(ut), SEEK_SET);
@@ -131,7 +131,7 @@ int last_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
                  * but some systems have it wrong */
                 t_tmp = (time_t)ut.ut_tv.tv_sec;
                 printf("%-10s %-14s %-18s %-12.12s\n",
-                       ut.ut_user, ut.ut_line, ut.ut_host, ctime(&t_tmp) + 4);
+                        ut.ut_user, ut.ut_line, ut.ut_host, ctime(&t_tmp) + 4);
  next:
                 pos -= sizeof(ut);
                 if (pos <= 0)
diff --git a/miscutils/last_fancy.c b/miscutils/last_fancy.c
index dc09b65fb..f687d7e16 100644
--- a/miscutils/last_fancy.c
+++ b/miscutils/last_fancy.c
@@ -93,14 +93,14 @@ static void show_entry(struct utmp *ut, int state, time_t dur_secs)
         }
 
         printf(HEADER_FORMAT,
-                   ut->ut_user,
-                   ut->ut_line,
-                   show_wide ? INET6_ADDRSTRLEN : INET_ADDRSTRLEN,
-                   show_wide ? INET6_ADDRSTRLEN : INET_ADDRSTRLEN,
-                   ut->ut_host,
-                   login_time,
-                   logout_str,
-                   duration_str);
+                ut->ut_user,
+                ut->ut_line,
+                show_wide ? INET6_ADDRSTRLEN : INET_ADDRSTRLEN,
+                show_wide ? INET6_ADDRSTRLEN : INET_ADDRSTRLEN,
+                ut->ut_host,
+                login_time,
+                logout_str,
+                duration_str);
 }
 
 static int get_ut_type(struct utmp *ut)
diff --git a/miscutils/less.c b/miscutils/less.c
index f0187bf8a..5ce0a1203 100644
--- a/miscutils/less.c
+++ b/miscutils/less.c
@@ -709,9 +709,9 @@ static void print_found(const char *line)
         /* buf[] holds quarantined version of str */
 
         /* Each part of the line that matches has the HIGHLIGHT
-           and NORMAL escape sequences placed around it.
-           NB: we regex against line, but insert text
-           from quarantined copy (buf[]) */
+         * and NORMAL escape sequences placed around it.
+         * NB: we regex against line, but insert text
+         * from quarantined copy (buf[]) */
         str = buf;
         growline = NULL;
         eflags = 0;
diff --git a/miscutils/rx.c b/miscutils/rx.c
index af597320c..1dffb593a 100644
--- a/miscutils/rx.c
+++ b/miscutils/rx.c
@@ -193,8 +193,8 @@ static int receive(/*int read_fd, */int file_fd)
                 }
                 if (cksum_or_crc != expected) {
                         bb_error_msg(do_crc ? "crc error, expected 0x%04x, got 0x%04x"
-                                           : "checksum error, expected 0x%02x, got 0x%02x",
-                                        expected, cksum_or_crc);
+                                        : "checksum error, expected 0x%02x, got 0x%02x",
+                                expected, cksum_or_crc);
                         goto error;
                 }
 
diff --git a/miscutils/time.c b/miscutils/time.c
index ffed38632..19b0b44c9 100644
--- a/miscutils/time.c
+++ b/miscutils/time.c
@@ -70,7 +70,7 @@ static void resuse_end(pid_t pid, resource_t *resp)
         pid_t caught;
 
         /* Ignore signals, but don't ignore the children.  When wait3
-           returns the child process, set the time the command finished. */
+         * returns the child process, set the time the command finished. */
         while ((caught = wait3(&resp->waitstatus, 0, &resp->ru)) != pid) {
                 if (caught == -1 && errno != EINTR) {
                         bb_perror_msg("wait");
diff --git a/miscutils/watchdog.c b/miscutils/watchdog.c
index ee28dc30d..d3a76edf0 100644
--- a/miscutils/watchdog.c
+++ b/miscutils/watchdog.c
@@ -31,6 +31,7 @@ static void watchdog_shutdown(int sig UNUSED_PARAM)
 {
         static const char V = 'V';
 
+        remove_pidfile(CONFIG_PID_FILE_PATH "/watchdog.pid");
         write(3, &V, 1);  /* Magic, see watchdog-api.txt in kernel */
         if (ENABLE_FEATURE_CLEAN_UP)
                 close(3);
@@ -95,6 +96,8 @@ int watchdog_main(int argc, char **argv)
                 stimer_duration, htimer_duration * 1000);
 #endif
 
+        write_pidfile(CONFIG_PID_FILE_PATH "/watchdog.pid");
+
         while (1) {
                 /*
                  * Make sure we clear the counter before sleeping,