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

Commit a1e1c1b1 authored by The Android Open Source Project's avatar The Android Open Source Project
Browse files

auto import from //depot/cupcake/@132589

parent c2d26a16

toolbox/mkdosfs.c

+5 −4
Original line number Diff line number Diff line
@@ -387,8 +387,9 @@ mkdosfs_main(int argc, char *argv[]) 
	    exit(1);

	}



    lseek64(fd1, 0, SEEK_SET);

    loff_t length = lseek64(fd1, 0, SEEK_END);

    lseek(fd1, 0, SEEK_SET);

    off_t length = lseek(fd1, 0, SEEK_END);

    fprintf(stderr, "lseek returned %ld\n", length);

    if (length > 0) {

        bpb.bsec = length / bpb.bps;

        bpb.spt = bpb.bsec;
@@ -614,8 +615,8 @@ mkdosfs_main(int argc, char *argv[]) 
		fat == 32 && bpb.bkbs != MAXU16 &&

		bss <= bpb.bkbs && x >= bpb.bkbs) {

		x -= bpb.bkbs;

		if (!x && lseek64(fd1, 0, SEEK_SET))

		    fprintf(stderr, "lseek64 failed for %s\n", bname);

		if (!x && lseek(fd1, 0, SEEK_SET))

		    fprintf(stderr, "lseek failed for %s\n", bname);

	    }

	    if (opt_B && x < bss) {

		if ((n = read(fd1, img, bpb.bps)) == -1)

vold/blkdev.c

+1 −1
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ int blkdev_refresh(blkdev_t *blk) 
                 (blk->type == blkdev_disk ? "Disk" : "Partition"),

                 blk->major, blk->minor,

                 blk->nr_sec,

                 (uint32_t) (((uint64_t) blk->nr_sec * 512) / 1024) / 1024);

                 ((blk->nr_sec * 512) / 1024) / 1024);



    if (blk->type == blkdev_disk) 

        sprintf(tmp2, " %d partitions", blk->nr_parts);

logcat/event-log-tags

+1 −1

File changed.

Contains only whitespace changes.