d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't exit early if the device is not character special or if the

Browse Source 
device driver cannot supply a label (real or faked).  This allows
you to practice using fdisk on disposable media (e.g., "dd count=1
<dev/zero >/tmp/junk; fdisk /tmp/junk", "dd count=1 </etc/passwd
>/tmp/fix-up-the-mess; fdisk /tmp/fix-up-the-mess") and allows me
to test DOSpartitioning and labelling on floppies.
This commit is contained in:
bde 1994-09-15 20:19:51 +00:00
parent c6a8288fd5
commit 9bf7a8942d
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sbin/fdisk/fdisk.c
View File

@ -452,11 +452,10 @@ struct stat st;
fprintf(stderr, "%s: Can't get file status of %s\n",
name, disk);
return -1;
} else if ( !(st.st_mode & S_IFCHR) ) {
}
if ( !(st.st_mode & S_IFCHR) )
fprintf(stderr,"%s: Device %s is not character special\n",
name, disk);
return -1;
}
if ((fd = open(disk, u_flag?O_RDWR:O_RDONLY)) == -1) {
fprintf(stderr,"%s: Can't open device %s\n", name, disk);
return -1;
@ -486,7 +485,15 @@ get_params(verbose)
{
if (ioctl(fd, DIOCGDINFO, &disklabel) == -1) {
return -1;
fprintf(stderr,
"%s: Can't get disk parameters on %s; supplying dummy ones\n",
name, disk);
dos_cyls = cyls = 1;
dos_heads = heads = 1;
dos_sectors = sectors = 1;
dos_cylsecs = cylsecs = heads * sectors;
disksecs = cyls * heads * sectors;
return disksecs;
}
dos_cyls = cyls = disklabel.d_ncylinders;

15
sbin/i386/fdisk/fdisk.c
View File

@ -452,11 +452,10 @@ struct stat st;
fprintf(stderr, "%s: Can't get file status of %s\n",
name, disk);
return -1;
} else if ( !(st.st_mode & S_IFCHR) ) {
}
if ( !(st.st_mode & S_IFCHR) )
fprintf(stderr,"%s: Device %s is not character special\n",
name, disk);
return -1;
}
if ((fd = open(disk, u_flag?O_RDWR:O_RDONLY)) == -1) {
fprintf(stderr,"%s: Can't open device %s\n", name, disk);
return -1;
@ -486,7 +485,15 @@ get_params(verbose)
{
if (ioctl(fd, DIOCGDINFO, &disklabel) == -1) {
return -1;
fprintf(stderr,
"%s: Can't get disk parameters on %s; supplying dummy ones\n",
name, disk);
dos_cyls = cyls = 1;
dos_heads = heads = 1;
dos_sectors = sectors = 1;
dos_cylsecs = cylsecs = heads * sectors;
disksecs = cyls * heads * sectors;
return disksecs;
}
dos_cyls = cyls = disklabel.d_ncylinders;