http://www.berklix.com/~jhs/src/bsd/fixes/FreeBSD/src/gen/sbin/mdconfig/mdconfig.c.p3.REL=9.2-RELEASE.diff mdconfig.c.p3.REL=current.diff@ -> mdconfig.c.p3.REL=9.2-RELEASE.diff # 9.2 no longer has a cmdline check so none of this needed # *** 9.2-RELEASE/src/sbin/mdconfig/mdconfig.c Tue Feb 15 18:05:56 2011 # --- new-generic/src/sbin/mdconfig/mdconfig.c Tue Feb 15 19:05:59 2011 # *************** # *** 200,206 **** # errx(1, "Unknown option: %s.", optarg); # break; # case 'S': # ! if (cmdline != 2) # usage(); # mdio.md_sectorsize = strtoul(optarg, &p, 0); # break; # --- 207,213 ---- # errx(1, "Unknown option: %s.", optarg); # break; # case 'S': # ! if (cmdline != 1) // Was 2 # usage(); # mdio.md_sectorsize = strtoul(optarg, &p, 0); # break; # *************** # *** 214,222 **** # /* Imply ``-t swap'' */ # mdio.md_type = MD_SWAP; # mdio.md_options = MD_CLUSTER | MD_AUTOUNIT | MD_COMPRESS; # ! cmdline = 2; # } # ! if (cmdline != 2) # usage(); # mdio.md_mediasize = (off_t)strtoumax(optarg, &p, 0); # if (p == NULL || *p == '\0') # --- 221,229 ---- # /* Imply ``-t swap'' */ # mdio.md_type = MD_SWAP; # mdio.md_options = MD_CLUSTER | MD_AUTOUNIT | MD_COMPRESS; # ! cmdline = 1; // Was 2 # } # ! if (cmdline != 1) // Was 2 # usage(); # mdio.md_mediasize = (off_t)strtoumax(optarg, &p, 0); # if (p == NULL || *p == '\0') # *************** # *** 236,243 **** # errx(1, "Unknown suffix on -s argument"); # break; # case 'u': # ! if (cmdline != 2 && cmdline != 3) # ! usage(); # if (!strncmp(optarg, "/dev/", 5)) # optarg += 5; # if (!strncmp(optarg, MD_NAME, sizeof(MD_NAME) - 1)) # --- 243,250 ---- # errx(1, "Unknown suffix on -s argument"); # break; # case 'u': # ! // if (cmdline != 2 && cmdline != 3) # ! // usage(); # if (!strncmp(optarg, "/dev/", 5)) # optarg += 5; # if (!strncmp(optarg, MD_NAME, sizeof(MD_NAME) - 1)) # *************** # *** 254,265 **** # vflag = OPT_VERBOSE; # break; # case 'x': # ! if (cmdline != 2) # usage(); # mdio.md_fwsectors = strtoul(optarg, &p, 0); # break; # case 'y': # ! if (cmdline != 2) # usage(); # mdio.md_fwheads = strtoul(optarg, &p, 0); # break; # --- 261,272 ---- # vflag = OPT_VERBOSE; # break; # case 'x': # ! if (cmdline != 1) // was 2 # usage(); # mdio.md_fwsectors = strtoul(optarg, &p, 0); # break; # case 'y': # ! if (cmdline != 1) // was 2 # usage(); # mdio.md_fwheads = strtoul(optarg, &p, 0); # break; # *************** # *** 275,285 **** # fd = open("/dev/" MDCTL_NAME, O_RDWR, 0); # if (fd < 0) # err(1, "open(/dev/%s)", MDCTL_NAME); # ! if (cmdline == 2 # && (mdio.md_type == MD_MALLOC || mdio.md_type == MD_SWAP)) # if (mdio.md_mediasize == 0) # errx(1, "must specify -s for -t malloc or -t swap"); # ! if (cmdline == 2 && mdio.md_type == MD_VNODE) # if (mdio.md_file[0] == '\0') # errx(1, "must specify -f for -t vnode"); # if (mdio.md_type == MD_VNODE && # --- 282,292 ---- # fd = open("/dev/" MDCTL_NAME, O_RDWR, 0); # if (fd < 0) # err(1, "open(/dev/%s)", MDCTL_NAME); # ! if (cmdline == 1 // was 2 # && (mdio.md_type == MD_MALLOC || mdio.md_type == MD_SWAP)) # if (mdio.md_mediasize == 0) # errx(1, "must specify -s for -t malloc or -t swap"); # ! if (cmdline == 1 && mdio.md_type == MD_VNODE) // was 2 # if (mdio.md_file[0] == '\0') # errx(1, "must specify -f for -t vnode"); # if (mdio.md_type == MD_VNODE && # *************** # *** 303,309 **** # return (md_query(mdunit)); # } # } else if (action == ATTACH) { # ! if (cmdline < 2) # usage(); # i = ioctl(fd, MDIOCATTACH, &mdio); # if (i < 0) # --- 310,316 ---- # return (md_query(mdunit)); # } # } else if (action == ATTACH) { # ! if (cmdline != 1) // was < 2 # usage(); # i = ioctl(fd, MDIOCATTACH, &mdio); # if (i < 0)