Merge branch 'busybox' into merge

2 files changed, 10 insertions, 8 deletions

diff --git a/miscutils/devfsd.c b/miscutils/devfsd.c
index 36b491595..642cd3637 100644
--- a/miscutils/devfsd.c
+++ b/miscutils/devfsd.c
@@ -306,7 +306,7 @@ static struct config_entry_struct *last_config = NULL;
 static char *mount_point = NULL;
 static volatile int caught_signal = FALSE;
 static volatile int caught_sighup = FALSE;
-static struct initial_symlink_struct {
+static const struct initial_symlink_struct {
         const char *dest;
         const char *name;
 } initial_symlinks[] = {
@@ -413,7 +413,7 @@ int devfsd_main(int argc, char **argv)
         int fd, proto_rev, count;
         unsigned long event_mask = 0;
         struct sigaction new_action;
-        struct initial_symlink_struct *curr;
+        const struct initial_symlink_struct *curr;
 
         if (argc < 2)
                 bb_show_usage();
@@ -1072,8 +1072,8 @@ static int copy_inode(const char *destpath, const struct stat *dest_stat,
                         if (fd < 0)
                                 break;
                         un_addr.sun_family = AF_UNIX;
-                        snprintf(un_addr.sun_path, sizeof(un_addr.sun_path), "%s", destpath);
-                        val = bind(fd, (struct sockaddr *) &un_addr, (int) sizeof un_addr);
+                        strncpy(un_addr.sun_path, destpath, sizeof(un_addr.sun_path));
+                        val = bind(fd, (struct sockaddr *) &un_addr, (int)sizeof(un_addr));
                         close(fd);
                         if (val != 0 || chmod(destpath, new_mode & ~S_IFMT) != 0)
                                 break;
diff --git a/miscutils/hdparm.c b/miscutils/hdparm.c
index 83e2f8d53..8b844717f 100644
--- a/miscutils/hdparm.c
+++ b/miscutils/hdparm.c
@@ -1464,15 +1464,17 @@ static void read_big_block(/*int fd,*/ char *buf)
 static unsigned dev_size_mb(/*int fd*/ void)
 {
         union {
-                unsigned long long blksize64;
-                unsigned blksize32;
+                /* BLKGETSIZE64 takes pointer to uint64_t, not ullong */
+                uint64_t blksize64;
+                unsigned long blksize_long;
         } u;
 
         if (0 == ioctl(fd, BLKGETSIZE64, &u.blksize64)) { // bytes
                 u.blksize64 /= (1024 * 1024);
         } else {
-                xioctl(fd, BLKGETSIZE, &u.blksize32); // sectors
-                u.blksize64 = u.blksize32 / (2 * 1024);
+                /* returns size in 512 blocks (not ioctl(BLKSSZ) sized blocks!) */
+                xioctl(fd, BLKGETSIZE, &u.blksize_long);
+                u.blksize64 = u.blksize_long / (2 * 1024);
         }
         if (u.blksize64 > UINT_MAX)
                 return UINT_MAX;