Deleted Added
full compact
setup.c (23844) setup.c (32622)
1/*
2 * Copyright (c) 1980, 1986, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 447 unchanged lines hidden (view full) ---

456 else
457 pp = &lp->d_partitions[*cp - 'a'];
458 if (pp->p_fstype != FS_BSDFFS) {
459 pfatal("%s: NOT LABELED AS A BSD FILE SYSTEM (%s)\n",
460 dev, pp->p_fstype < FSMAXTYPES ?
461 fstypenames[pp->p_fstype] : "unknown");
462 return (0);
463 }
1/*
2 * Copyright (c) 1980, 1986, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 447 unchanged lines hidden (view full) ---

456 else
457 pp = &lp->d_partitions[*cp - 'a'];
458 if (pp->p_fstype != FS_BSDFFS) {
459 pfatal("%s: NOT LABELED AS A BSD FILE SYSTEM (%s)\n",
460 dev, pp->p_fstype < FSMAXTYPES ?
461 fstypenames[pp->p_fstype] : "unknown");
462 return (0);
463 }
464 if (pp->p_fsize == 0 || pp->p_frag == 0) {
465 pfatal("%s: LABELED AS A %s FILE SYSTEM, BUT BLOCK SIZE IS 0\n",
466 dev, fstypenames[pp->p_fstype]);
467 return (0);
468 }
464 memset(fs, 0, sizeof(struct fs));
465 fs->fs_fsize = pp->p_fsize;
466 fs->fs_frag = pp->p_frag;
467 fs->fs_cpg = pp->p_cpg;
468 fs->fs_size = pp->p_size;
469 fs->fs_ntrak = lp->d_ntracks;
470 fs->fs_nsect = lp->d_nsectors;
471 fs->fs_spc = lp->d_secpercyl;

--- 34 unchanged lines hidden ---
469 memset(fs, 0, sizeof(struct fs));
470 fs->fs_fsize = pp->p_fsize;
471 fs->fs_frag = pp->p_frag;
472 fs->fs_cpg = pp->p_cpg;
473 fs->fs_size = pp->p_size;
474 fs->fs_ntrak = lp->d_ntracks;
475 fs->fs_nsect = lp->d_nsectors;
476 fs->fs_spc = lp->d_secpercyl;

--- 34 unchanged lines hidden ---