Merge branch 'busybox' into mergemerge

Signed-off-by: Ron Yorston <rmy@pobox.com>

3 files changed, 9 insertions, 8 deletions

diff --git a/miscutils/devfsd.c b/miscutils/devfsd.c
index d57691414..e6f01eb6a 100644
--- a/miscutils/devfsd.c
+++ b/miscutils/devfsd.c
@@ -1016,9 +1016,9 @@ static void restore(char *spath, struct stat source_stat, int rootlen)
         dest_stat.st_mode = 0;
         dpath = concat_path_file(mount_point, spath + rootlen);
         lstat(dpath, &dest_stat);
-        free(dpath);
         if (S_ISLNK(source_stat.st_mode) || (source_stat.st_mode & S_ISVTX))
                 copy_inode(dpath, &dest_stat, (source_stat.st_mode & ~S_ISVTX), spath, &source_stat);
+        free(dpath);
 
         if (S_ISDIR(source_stat.st_mode))
                 dir_operation(RESTORE, spath, rootlen, NULL);
@@ -1271,7 +1271,7 @@ static void dir_operation(int type, const char * dir_name, int var, unsigned lon
 
         while ((de = readdir(dp)) != NULL) {
 
-                if (de->d_name && DOT_OR_DOTDOT(de->d_name))
+                if (DOT_OR_DOTDOT(de->d_name))
                         continue;
                 path = concat_path_file(dir_name, de->d_name);
                 if (lstat(path, &statbuf) == 0) {
diff --git a/miscutils/hdparm.c b/miscutils/hdparm.c
index 8b844717f..e07ee6398 100644
--- a/miscutils/hdparm.c
+++ b/miscutils/hdparm.c
@@ -552,7 +552,7 @@ static void print_ascii(const char *p, int length)
 
         length *= 2;
         /* find first non-space & print it */
-        while (length && p[ofs] != ' ') {
+        while (length && p[ofs] == ' ') {
                 p++;
                 LE_ONLY(ofs = -ofs;)
                 length--;
diff --git a/miscutils/less.c b/miscutils/less.c
index e81130988..521792f2e 100644
--- a/miscutils/less.c
+++ b/miscutils/less.c
@@ -477,7 +477,8 @@ static int at_end(void)
  */
 static void read_lines(void)
 {
-        int ndelay_set, eagain, fdflags;
+        int ndelay_set, eagain;
+        int UNINITIALIZED_VAR(fdflags, fdflags);
         char *current_line, *p;
         int w = width;
         char last_terminated = terminated;
@@ -509,16 +510,16 @@ static void read_lines(void)
         // Consider these cases:
         // "less FILE": can set O_NONBLOCK on open.
         // "true | less": can't.
-        // " { less; cat; } <FILE": can't. And must not confuse cat.
+        // "{ less; cat; } <FILE": can't. And must not confuse cat.
         ndelay_set = -1; // "don't know whether stdin is nonblocking"
         eagain = 0;
 
-        while (1) { /* read lines until we reach cur_fline or wanted_match */
+        while (1) { // read lines until we reach cur_fline or wanted_match
                 *p = '\0';
                 terminated = 0;
-                while (1) { /* read chars until we have a line */
+                while (1) { // read chars until we have a line
                         char c;
-                        /* if no unprocessed chars left, eat more */
+                        // if no unprocessed chars left, eat more
                         if (readpos >= read_size) {
                                 // Read stdin, temporarily make it nonblocking (if it's not already)
                                 if (ndelay_set < 0) {