Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/e2fsprogs/old_e2fsprogs/blkid
- Timestamp:
- Jan 1, 2014, 12:47:38 AM (10 years ago)
- Location:
- branches/3.2/mindi-busybox/e2fsprogs/old_e2fsprogs/blkid
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/3.2/mindi-busybox/e2fsprogs/old_e2fsprogs/blkid/blkid_getsize.c
r1765 r3232 97 97 #ifdef BLKGETSIZE64 98 98 #ifdef __linux__ 99 if ((uname(&ut) == 0) &&100 101 (ut.release[2] < '6') && (ut.release[3] == '.')) )99 uname(&ut); 100 if ((ut.release[0] == '2') && (ut.release[1] == '.') && 101 (ut.release[2] < '6') && (ut.release[3] == '.')) 102 102 valid_blkgetsize64 = 0; 103 103 #endif -
branches/3.2/mindi-busybox/e2fsprogs/old_e2fsprogs/blkid/probe.c
r2725 r3232 576 576 dev->bid_name, diff)); 577 577 578 if (((fd = open(dev->bid_name, O_RDONLY)) < 0) || 579 (fstat(fd, &st) < 0)) { 578 fd = open(dev->bid_name, O_RDONLY); 579 if (fd < 0 580 || fstat(fd, &st) < 0 581 ) { 582 if (fd >= 0) 583 close(fd); 580 584 if (errno == ENXIO || errno == ENODEV || errno == ENOENT) { 581 585 blkid_free_dev(dev); … … 654 658 if (!dev->bid_type) { 655 659 blkid_free_dev(dev); 660 close(fd); 656 661 return NULL; 657 662 }
Note:
See TracChangeset
for help on using the changeset viewer.