system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-09-21 17:25:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Return an error if the size of the sector is zero. This is for removable

Browse source 
devices that is not inserted any media.

This is MFC candidate.

Submitted by:	ISAKA Yoji <isaka@cory.jp>
This commit is contained in:
Yoshihiro Takahashi 2002-12-26 15:50:45 +00:00
parent cd3edecb19
commit 7a6b06168b
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=108292
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/libdisk/disk.c
View file

@ -166,6 +166,8 @@ Int_Open_Disk(const char *name)
exit (0);
}
if (s == 0)
return (NULL);
d->sector_size = s;
len /= s; /* media size in number of sectors. */
@ -481,6 +483,8 @@ Set_Boot_Mgr(struct disk *d, const u_char *b, const size_t s)
{
#if !defined(__ia64__)
#ifdef PC98
if (d->sector_size == 0)
return;
if (bootipl_size % d->sector_size != 0)
return;
if (d->bootipl)
@ -509,6 +513,8 @@ Set_Boot_Mgr(struct disk *d, const u_char *b, const size_t s)
memcpy(d->bootmenu, bootmenu, bootmenu_size);
}
#else
if (d->sector_size == 0)
return;
if (s % d->sector_size != 0)
return;
if (d->bootmgr)