Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0654191 authored by Johan Redestig's avatar Johan Redestig Committed by Elliott Hughes
Browse files

toolbox: Fixed type mismatch for ioctl(BLKGETSIZE) 

ioctl(BLKGETSIZE) expects unsigned long
(8 bytes on 64 bit environment).

Change-Id: Ic0f1d48e1d4cb890dbf617b3eb6285425cdbf0d0
parent 934102ba

toolbox/newfs_msdos.c

+9 −1
Original line number Diff line number Diff line
@@ -798,6 +798,7 @@ static void getdiskinfo(int fd, const char *fname, const char *dtype, 
                        __unused int oflag,struct bpb *bpb)

{

    struct hd_geometry geom;

    u_long block_size;



    if (ioctl(fd, BLKSSZGET, &bpb->bps)) {

        fprintf(stderr, "Error getting bytes / sector (%s)\n", strerror(errno));
@@ -806,11 +807,18 @@ static void getdiskinfo(int fd, const char *fname, const char *dtype, 


    ckgeom(fname, bpb->bps, "bytes/sector");



    if (ioctl(fd, BLKGETSIZE, &bpb->bsec)) {

    if (ioctl(fd, BLKGETSIZE, &block_size)) {

        fprintf(stderr, "Error getting blocksize (%s)\n", strerror(errno));

        exit(1);

    }



    if (block_size > UINT32_MAX) {

        fprintf(stderr, "Error blocksize too large: %lu\n", block_size);

        exit(1);

    }



    bpb->bsec = (u_int)block_size;



    if (ioctl(fd, HDIO_GETGEO, &geom)) {

        fprintf(stderr, "Error getting gemoetry (%s) - trying sane values\n", strerror(errno));

        geom.heads = 64;