diff --git a/src/bin/Makefile b/src/bin/Makefile index e6a4bda..f0c6b9b 100644 --- a/src/bin/Makefile +++ b/src/bin/Makefile @@ -1,7 +1,7 @@ # $Id$ # The System Makefile (C) 2002 The UbixOS Project -all: init-bin login-bin shell-bin ls-bin clock-bin muffin-bin cp-bin #fdisk-bin +all: init-bin login-bin shell-bin ls-bin clock-bin muffin-bin cp-bin fdisk-bin # test-bin pwd-bin cat-bin ld-dyn-bin de-bin goofball-bin init-bin: init diff --git a/src/bin/fdisk/Makefile b/src/bin/fdisk/Makefile index cc698d4..3af5d2e 100644 --- a/src/bin/fdisk/Makefile +++ b/src/bin/fdisk/Makefile @@ -18,7 +18,7 @@ REMOVE = rm -f #Objects -OBJS = fdisk.o +OBJS = main.o #Startup File STARTUP = ../../lib/ubix/startup.o diff --git a/src/bin/fdisk/fdisk.c b/src/bin/fdisk/fdisk.c deleted file mode 100644 index 7d81f74..0000000 --- a/src/bin/fdisk/fdisk.c +++ /dev/null @@ -1,1397 +0,0 @@ -/* - * Mach Operating System - * Copyright (c) 1992 Carnegie Mellon University - * All Rights Reserved. - * - * Permission to use, copy, modify and distribute this software and its - * documentation is hereby granted, provided that both the copyright - * notice and this permission notice appear in all copies of the - * software, derivative works or modified versions, and any portions - * thereof, and that both notices appear in supporting documentation. - * - * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" - * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR - * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * - * Carnegie Mellon requests users of this software to return to - * - * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU - * School of Computer Science - * Carnegie Mellon University - * Pittsburgh PA 15213-3890 - * - * any improvements or extensions that they make and grant Carnegie Mellon - * the rights to redistribute these changes. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/* -#include -*/ - -int iotest; - -#define LBUF 100 -static char lbuf[LBUF]; - -#define MBRSIGOFF 510 - -/* - * - * Ported to 386bsd by Julian Elischer Thu Oct 15 20:26:46 PDT 1992 - * - * 14-Dec-89 Robert Baron (rvb) at Carnegie-Mellon University - * Copyright (c) 1989 Robert. V. Baron - * Created. - */ - -#define Decimal(str, ans, tmp) if (decimal(str, &tmp, ans)) ans = tmp - -#define RoundCyl(x) ((((x) + cylsecs - 1) / cylsecs) * cylsecs) - -#define MAX_SEC_SIZE 2048 /* maximum section size that is supported */ -#define MIN_SEC_SIZE 512 /* the sector size to start sensing at */ -static int secsize = 0; /* the sensed sector size */ - -static char *disk; - -static int cyls, sectors, heads, cylsecs, disksecs; - -struct mboot { - unsigned char padding[2]; /* force the longs to be long aligned */ - unsigned char *bootinst; /* boot code */ - off_t bootinst_size; - struct dos_partition parts[NDOSPART]; -}; - -static struct mboot mboot; -static int fd, fdw; - - -#define ACTIVE 0x80 - -static uInt32 dos_cyls; -static uInt32 dos_heads; -static uInt32 dos_sectors; -static uInt32 dos_cylsecs; - -#define DOSSECT(s,c) ((s & 0x3f) | ((c >> 2) & 0xc0)) -#define DOSCYL(c) (c & 0xff) - -#define MAX_ARGS 10 - -static int current_line_number; - -static int geom_processed = 0; -static int part_processed = 0; -static int active_processed = 0; - -typedef struct cmd { - char cmd; - int n_args; - struct arg { - char argtype; - int arg_val; - } args[MAX_ARGS]; -} CMD; - -static int B_flag = 0; /* replace boot code */ -static int I_flag = 0; /* use entire disk for FreeBSD */ -static int a_flag = 0; /* set active partition */ -static char *b_flag = NULL; /* path to boot code */ -static int i_flag = 0; /* replace partition data */ -static int u_flag = 0; /* update partition data */ -static int s_flag = 0; /* Print a summary and exit */ -static int t_flag = 0; /* test only */ -static char *f_flag = NULL; /* Read config info from file */ -static int v_flag = 0; /* Be verbose */ - -static struct part_type -{ - unsigned char type; - const char *name; -} part_types[] = { - {0x00, "unused"} - ,{0x01, "Primary DOS with 12 bit FAT"} - ,{0x02, "XENIX / file system"} - ,{0x03, "XENIX /usr file system"} - ,{0x04, "Primary DOS with 16 bit FAT (< 32MB)"} - ,{0x05, "Extended DOS"} - ,{0x06, "Primary 'big' DOS (>= 32MB)"} - ,{0x07, "OS/2 HPFS, NTFS, QNX-2 (16 bit) or Advanced UNIX"} - ,{0x08, "AIX file system or SplitDrive"} - ,{0x09, "AIX boot partition or Coherent"} - ,{0x0A, "OS/2 Boot Manager, OPUS or Coherent swap"} - ,{0x0B, "DOS or Windows 95 with 32 bit FAT"} - ,{0x0C, "DOS or Windows 95 with 32 bit FAT (LBA)"} - ,{0x0E, "Primary 'big' DOS (>= 32MB, LBA)"} - ,{0x0F, "Extended DOS (LBA)"} - ,{0x10, "OPUS"} - ,{0x11, "OS/2 BM: hidden DOS with 12-bit FAT"} - ,{0x12, "Compaq diagnostics"} - ,{0x14, "OS/2 BM: hidden DOS with 16-bit FAT (< 32MB)"} - ,{0x16, "OS/2 BM: hidden DOS with 16-bit FAT (>= 32MB)"} - ,{0x17, "OS/2 BM: hidden IFS (e.g. HPFS)"} - ,{0x18, "AST Windows swapfile"} - ,{0x24, "NEC DOS"} - ,{0x3C, "PartitionMagic recovery"} - ,{0x39, "plan9"} - ,{0x40, "VENIX 286"} - ,{0x41, "Linux/MINIX (sharing disk with DRDOS)"} - ,{0x42, "SFS or Linux swap (sharing disk with DRDOS)"} - ,{0x43, "Linux native (sharing disk with DRDOS)"} - ,{0x4D, "QNX 4.2 Primary"} - ,{0x4E, "QNX 4.2 Secondary"} - ,{0x4F, "QNX 4.2 Tertiary"} - ,{0x50, "DM (disk manager)"} - ,{0x51, "DM6 Aux1 (or Novell)"} - ,{0x52, "CP/M or Microport SysV/AT"} - ,{0x53, "DM6 Aux3"} - ,{0x54, "DM6"} - ,{0x55, "EZ-Drive (disk manager)"} - ,{0x56, "Golden Bow (disk manager)"} - ,{0x5c, "Priam Edisk (disk manager)"} /* according to S. Widlake */ - ,{0x61, "SpeedStor"} - ,{0x63, "System V/386 (such as ISC UNIX), GNU HURD or Mach"} - ,{0x64, "Novell Netware/286 2.xx"} - ,{0x65, "Novell Netware/386 3.xx"} - ,{0x70, "DiskSecure Multi-Boot"} - ,{0x75, "PCIX"} - ,{0x77, "QNX4.x"} - ,{0x78, "QNX4.x 2nd part"} - ,{0x79, "QNX4.x 3rd part"} - ,{0x80, "Minix until 1.4a"} - ,{0x81, "Minix since 1.4b, early Linux partition or Mitac disk manager"} - ,{0x82, "Linux swap or Solaris x86"} - ,{0x83, "Linux native"} - ,{0x84, "OS/2 hidden C: drive"} - ,{0x85, "Linux extended"} - ,{0x86, "NTFS volume set??"} - ,{0x87, "NTFS volume set??"} - ,{0x93, "Amoeba file system"} - ,{0x94, "Amoeba bad block table"} - ,{0x9F, "BSD/OS"} - ,{0xA0, "Suspend to Disk"} - ,{0xA5, "FreeBSD/NetBSD/386BSD"} - ,{0xA6, "OpenBSD"} - ,{0xA7, "NeXTSTEP"} - ,{0xA9, "NetBSD"} - ,{0xAC, "IBM JFS"} - ,{0xB7, "BSDI BSD/386 file system"} - ,{0xB8, "BSDI BSD/386 swap"} - ,{0xBE, "Solaris x86 boot"} - ,{0xC1, "DRDOS/sec with 12-bit FAT"} - ,{0xC4, "DRDOS/sec with 16-bit FAT (< 32MB)"} - ,{0xC6, "DRDOS/sec with 16-bit FAT (>= 32MB)"} - ,{0xC7, "Syrinx"} - ,{0xDB, "CP/M, Concurrent CP/M, Concurrent DOS or CTOS"} - ,{0xE1, "DOS access or SpeedStor with 12-bit FAT extended partition"} - ,{0xE3, "DOS R/O or SpeedStor"} - ,{0xE4, "SpeedStor with 16-bit FAT extended partition < 1024 cyl."} - ,{0xEB, "BeOS file system"} - ,{0xEE, "EFI GPT"} - ,{0xEF, "EFI System Partition"} - ,{0xF1, "SpeedStor"} - ,{0xF2, "DOS 3.3+ Secondary"} - ,{0xF4, "SpeedStor large partition"} - ,{0xFE, "SpeedStor >1024 cyl. or LANstep"} - ,{0xFF, "Xenix bad blocks table"} -}; - -static void print_s0(int which); -static void print_part(int i); -static void init_sector0(unsigned long start); -static void init_boot(void); -static void change_part(int i); -static void print_params(void); -static void change_active(int which); -static void change_code(void); -static void get_params_to_use(void); -static char *get_rootdisk(void); -static void dos(struct dos_partition *partp); -static int open_disk(int flag); -static ssize_t read_disk(off_t sector, void *buf); -static ssize_t write_disk(off_t sector, void *buf); -static int get_params(void); -static int read_s0(void); -static int write_s0(void); -static int ok(const char *str); -static int decimal(const char *str, int *num, int deflt); -static const char *get_type(int type); -static int read_config(char *config_file); -static void reset_boot(void); -static int sanitize_partition(struct dos_partition *); -static void usage(void); - -int -main(int argc, char *argv[]) -{ - struct stat sb; - int c, i; - int partition = -1; - struct dos_partition *partp; - - while ((c = getopt(argc, argv, "BIab:f:istuv1234")) != -1) - switch (c) { - case 'B': - B_flag = 1; - break; - case 'I': - I_flag = 1; - break; - case 'a': - a_flag = 1; - break; - case 'b': - b_flag = optarg; - break; - case 'f': - f_flag = optarg; - break; - case 'i': - i_flag = 1; - break; - case 's': - s_flag = 1; - break; - case 't': - t_flag = 1; - break; - case 'u': - u_flag = 1; - break; - case 'v': - v_flag = 1; - break; - case '1': - case '2': - case '3': - case '4': - partition = c - '0'; - break; - default: - usage(); - } - if (f_flag || i_flag) - u_flag = 1; - if (t_flag) - v_flag = 1; - argc -= optind; - argv += optind; - - if (argc == 0) { - disk = get_rootdisk(); - } else { - if (stat(argv[0], &sb) == 0) { - /* OK, full pathname given */ - disk = argv[0]; - } else if (errno == ENOENT) { - /* Try prepending "/dev" */ - asprintf(&disk, "%s%s", _PATH_DEV, argv[0]); - if (disk == NULL) - errx(1, "out of memory"); - } else { - /* other stat error, let it fail below */ - disk = argv[0]; - } - } - if (open_disk(u_flag) < 0) - err(1, "cannot open disk %s", disk); - - /* (abu)use mboot.bootinst to probe for the sector size */ - if ((mboot.bootinst = malloc(MAX_SEC_SIZE)) == NULL) - err(1, "cannot allocate buffer to determine disk sector size"); - read_disk(0, mboot.bootinst); - free(mboot.bootinst); - mboot.bootinst = NULL; - - if (s_flag) { - if (read_s0()) - err(1, "read_s0"); - printf("%s: %d cyl %d hd %d sec\n", disk, dos_cyls, dos_heads, - dos_sectors); - printf("Part %11s %11s Type Flags\n", "Start", "Size"); - for (i = 0; i < NDOSPART; i++) { - partp = ((struct dos_partition *) &mboot.parts) + i; - if (partp->dp_start == 0 && partp->dp_size == 0) - continue; - printf("%4d: %11lu %11lu 0x%02x 0x%02x\n", i + 1, - (uInt32) partp->dp_start, - (uInt32) partp->dp_size, partp->dp_typ, - partp->dp_flag); - } - exit(0); - } - - printf("******* Working on device %s *******\n",disk); - - if (I_flag) { - read_s0(); - reset_boot(); - partp = (struct dos_partition *) (&mboot.parts[0]); - partp->dp_typ = DOSPTYP_386BSD; - partp->dp_flag = ACTIVE; - partp->dp_start = dos_sectors; - partp->dp_size = (disksecs / dos_cylsecs) * dos_cylsecs - - dos_sectors; - dos(partp); - if (v_flag) - print_s0(-1); - if (!t_flag) - write_s0(); - exit(0); - } - if (f_flag) { - if (read_s0() || i_flag) - reset_boot(); - if (!read_config(f_flag)) - exit(1); - if (v_flag) - print_s0(-1); - if (!t_flag) - write_s0(); - } else { - if(u_flag) - get_params_to_use(); - else - print_params(); - - if (read_s0()) - init_sector0(dos_sectors); - - printf("Media sector size is %d\n", secsize); - printf("Warning: BIOS sector numbering starts with sector 1\n"); - printf("Information from DOS bootblock is:\n"); - if (partition == -1) - for (i = 1; i <= NDOSPART; i++) - change_part(i); - else - change_part(partition); - - if (u_flag || a_flag) - change_active(partition); - - if (B_flag) - change_code(); - - if (u_flag || a_flag || B_flag) { - if (!t_flag) { - printf("\nWe haven't changed the partition table yet. "); - printf("This is your last chance.\n"); - } - print_s0(-1); - if (!t_flag) { - if (ok("Should we write new partition table?")) - write_s0(); - } else { - printf("\n-t flag specified -- partition table not written.\n"); - } - } - } - - exit(0); -} - -static void -usage() -{ - fprintf(stderr, "%s%s", - "usage: fdisk [-BIaistu] [-b bootcode] [-1234] [disk]\n", - " fdisk -f configfile [-itv] [disk]\n"); - exit(1); -} - -static void -print_s0(int which) -{ - int i; - - print_params(); - printf("Information from DOS bootblock is:\n"); - if (which == -1) - for (i = 1; i <= NDOSPART; i++) - printf("%d: ", i), print_part(i); - else - print_part(which); -} - -static struct dos_partition mtpart; - -static void -print_part(int i) -{ - struct dos_partition *partp; - uInt64 part_mb; - - partp = ((struct dos_partition *) &mboot.parts) + i - 1; - - if (!bcmp(partp, &mtpart, sizeof (struct dos_partition))) { - printf("\n"); - return; - } - /* - * Be careful not to overflow. - */ - part_mb = partp->dp_size; - part_mb *= secsize; - part_mb /= (1024 * 1024); - printf("sysid %d (%#04x),(%s)\n", partp->dp_typ, partp->dp_typ, - get_type(partp->dp_typ)); - printf(" start %lu, size %lu (%ju Meg), flag %x%s\n", - (uInt32)partp->dp_start, - (uInt32)partp->dp_size, - (uintmax_t)part_mb, - partp->dp_flag, - partp->dp_flag == ACTIVE ? " (active)" : ""); - printf("\tbeg: cyl %d/ head %d/ sector %d;\n\tend: cyl %d/ head %d/ sector %d\n" - ,DPCYL(partp->dp_scyl, partp->dp_ssect) - ,partp->dp_shd - ,DPSECT(partp->dp_ssect) - ,DPCYL(partp->dp_ecyl, partp->dp_esect) - ,partp->dp_ehd - ,DPSECT(partp->dp_esect)); -} - - -static void -init_boot(void) -{ -#ifndef __ia64__ - const char *fname; - int fdesc, n; - struct stat sb; - - fname = b_flag ? b_flag : "/boot/mbr"; - if ((fdesc = open(fname, O_RDONLY)) == -1 || - fstat(fdesc, &sb) == -1) - err(1, "%s", fname); - if ((mboot.bootinst_size = sb.st_size) % secsize != 0) - errx(1, "%s: length must be a multiple of sector size", fname); - if (mboot.bootinst != NULL) - free(mboot.bootinst); - if ((mboot.bootinst = malloc(mboot.bootinst_size = sb.st_size)) == NULL) - errx(1, "%s: unable to allocate read buffer", fname); - if ((n = read(fdesc, mboot.bootinst, mboot.bootinst_size)) == -1 || - close(fdesc)) - err(1, "%s", fname); - if (n != mboot.bootinst_size) - errx(1, "%s: short read", fname); -#else - if (mboot.bootinst != NULL) - free(mboot.bootinst); - mboot.bootinst_size = secsize; - if ((mboot.bootinst = malloc(mboot.bootinst_size)) == NULL) - errx(1, "unable to allocate boot block buffer"); - memset(mboot.bootinst, 0, mboot.bootinst_size); - le16enc(&mboot.bootinst[DOSMAGICOFFSET], DOSMAGIC); -#endif -} - - -static void -init_sector0(unsigned long start) -{ - struct dos_partition *partp = (struct dos_partition *) (&mboot.parts[3]); - - init_boot(); - - partp->dp_typ = DOSPTYP_386BSD; - partp->dp_flag = ACTIVE; - start = ((start + dos_sectors - 1) / dos_sectors) * dos_sectors; - if(start == 0) - start = dos_sectors; - partp->dp_start = start; - partp->dp_size = (disksecs / dos_cylsecs) * dos_cylsecs - start; - - dos(partp); -} - -static void -change_part(int i) -{ - struct dos_partition *partp = ((struct dos_partition *) &mboot.parts) + i - 1; - - printf("The data for partition %d is:\n", i); - print_part(i); - - if (u_flag && ok("Do you want to change it?")) { - int tmp; - - if (i_flag) { - bzero((char *)partp, sizeof (struct dos_partition)); - if (i == 4) { - init_sector0(1); - printf("\nThe static data for the DOS partition 4 has been reinitialized to:\n"); - print_part(i); - } - } - - do { - Decimal("sysid (165=FreeBSD)", partp->dp_typ, tmp); - Decimal("start", partp->dp_start, tmp); - Decimal("size", partp->dp_size, tmp); - if (!sanitize_partition(partp)) { - warnx("ERROR: failed to adjust; setting sysid to 0"); - partp->dp_typ = 0; - } - - if (ok("Explicitly specify beg/end address ?")) - { - int tsec,tcyl,thd; - tcyl = DPCYL(partp->dp_scyl,partp->dp_ssect); - thd = partp->dp_shd; - tsec = DPSECT(partp->dp_ssect); - Decimal("beginning cylinder", tcyl, tmp); - Decimal("beginning head", thd, tmp); - Decimal("beginning sector", tsec, tmp); - partp->dp_scyl = DOSCYL(tcyl); - partp->dp_ssect = DOSSECT(tsec,tcyl); - partp->dp_shd = thd; - - tcyl = DPCYL(partp->dp_ecyl,partp->dp_esect); - thd = partp->dp_ehd; - tsec = DPSECT(partp->dp_esect); - Decimal("ending cylinder", tcyl, tmp); - Decimal("ending head", thd, tmp); - Decimal("ending sector", tsec, tmp); - partp->dp_ecyl = DOSCYL(tcyl); - partp->dp_esect = DOSSECT(tsec,tcyl); - partp->dp_ehd = thd; - } else - dos(partp); - - print_part(i); - } while (!ok("Are we happy with this entry?")); - } - } - -static void -print_params() -{ - printf("parameters extracted from in-core disklabel are:\n"); - printf("cylinders=%d heads=%d sectors/track=%d (%d blks/cyl)\n\n" - ,cyls,heads,sectors,cylsecs); - if((dos_sectors > 63) || (dos_cyls > 1023) || (dos_heads > 255)) - printf("Figures below won't work with BIOS for partitions not in cyl 1\n"); - printf("parameters to be used for BIOS calculations are:\n"); - printf("cylinders=%d heads=%d sectors/track=%d (%d blks/cyl)\n\n" - ,dos_cyls,dos_heads,dos_sectors,dos_cylsecs); -} - -static void -change_active(int which) -{ - struct dos_partition *partp = &mboot.parts[0]; - int active, i, new, tmp; - - active = -1; - for (i = 0; i < NDOSPART; i++) { - if ((partp[i].dp_flag & ACTIVE) == 0) - continue; - printf("Partition %d is marked active\n", i + 1); - if (active == -1) - active = i + 1; - } - if (a_flag && which != -1) - active = which; - else if (active == -1) - active = 1; - - if (!ok("Do you want to change the active partition?")) - return; -setactive: - do { - new = active; - Decimal("active partition", new, tmp); - if (new < 1 || new > 4) { - printf("Active partition number must be in range 1-4." - " Try again.\n"); - goto setactive; - } - active = new; - } while (!ok("Are you happy with this choice")); - for (i = 0; i < NDOSPART; i++) - partp[i].dp_flag = 0; - if (active > 0 && active <= NDOSPART) - partp[active-1].dp_flag = ACTIVE; -} - -static void -change_code() -{ - if (ok("Do you want to change the boot code?")) - init_boot(); -} - -void -get_params_to_use() -{ - int tmp; - print_params(); - if (ok("Do you want to change our idea of what BIOS thinks ?")) - { - do - { - Decimal("BIOS's idea of #cylinders", dos_cyls, tmp); - Decimal("BIOS's idea of #heads", dos_heads, tmp); - Decimal("BIOS's idea of #sectors", dos_sectors, tmp); - dos_cylsecs = dos_heads * dos_sectors; - print_params(); - } - while(!ok("Are you happy with this choice")); - } -} - - -/***********************************************\ -* Change real numbers into strange dos numbers * -\***********************************************/ -static void -dos(struct dos_partition *partp) -{ - int cy, sec; - uInt32 end; - - if (partp->dp_typ == 0 && partp->dp_start == 0 && partp->dp_size == 0) { - memcpy(partp, &mtpart, sizeof(*partp)); - return; - } - - /* Start c/h/s. */ - partp->dp_shd = partp->dp_start % dos_cylsecs / dos_sectors; - cy = partp->dp_start / dos_cylsecs; - sec = partp->dp_start % dos_sectors + 1; - partp->dp_scyl = DOSCYL(cy); - partp->dp_ssect = DOSSECT(sec, cy); - - /* End c/h/s. */ - end = partp->dp_start + partp->dp_size - 1; - partp->dp_ehd = end % dos_cylsecs / dos_sectors; - cy = end / dos_cylsecs; - sec = end % dos_sectors + 1; - partp->dp_ecyl = DOSCYL(cy); - partp->dp_esect = DOSSECT(sec, cy); -} - -static int -open_disk(int flag) -{ - struct stat st; - int rwmode, p; - char *s; - - fdw = -1; - if (stat(disk, &st) == -1) { - if (errno == ENOENT) - return -2; - warnx("can't get file status of %s", disk); - return -1; - } - if ( !(st.st_mode & S_IFCHR) ) - warnx("device %s is not character special", disk); - rwmode = a_flag || I_flag || B_flag || flag ? O_RDWR : O_RDONLY; - fd = open(disk, rwmode); - if (fd == -1 && errno == ENXIO) - return -2; - if (fd == -1 && errno == EPERM && rwmode == O_RDWR) { - fd = open(disk, O_RDONLY); - if (fd == -1) - return -3; - for (p = 1; p < 5; p++) { - asprintf(&s, "%ss%d", disk, p); - fdw = open(s, O_RDONLY); - free(s); - if (fdw == -1) - continue; - break; - } - if (fdw == -1) - return -4; - } - if (fd == -1) { - warnx("can't open device %s", disk); - return -1; - } - if (get_params() == -1) { - warnx("can't get disk parameters on %s", disk); - return -1; - } - return fd; -} - -static ssize_t -read_disk(off_t sector, void *buf) -{ - lseek(fd,(sector * 512), 0); - if( secsize == 0 ) - for( secsize = MIN_SEC_SIZE; secsize <= MAX_SEC_SIZE; secsize *= 2 ) - { - /* try the read */ - int size = read(fd, buf, secsize); - if( size == secsize ) - /* it worked so return */ - return secsize; - } - else - return read( fd, buf, secsize ); - - /* we failed to read at any of the sizes */ - return -1; -} - -static ssize_t -write_disk(off_t sector, void *buf) -{ - - if (fdw != -1) { - return ioctl(fdw, DIOCSMBR, buf); - } else { - lseek(fd,(sector * 512), 0); - /* write out in the size that the read_disk found worked */ - return write(fd, buf, secsize); - } -} - -static int -get_params() -{ - int error; - uInt32 u; - off_t o; - - error = ioctl(fd, DIOCGFWSECTORS, &u); - if (error == 0) - sectors = dos_sectors = u; - else - sectors = dos_sectors = 63; - - error = ioctl(fd, DIOCGFWHEADS, &u); - if (error == 0) - heads = dos_heads = u; - else - heads = dos_heads = 255; - - dos_cylsecs = cylsecs = heads * sectors; - disksecs = cyls * heads * sectors; - - error = ioctl(fd, DIOCGSECTORSIZE, &u); - if (error != 0 || u == 0) - u = 512; - - error = ioctl(fd, DIOCGMEDIASIZE, &o); - if (error == 0) { - disksecs = o / u; - cyls = dos_cyls = o / (u * dos_heads * dos_sectors); - } - - return (disksecs); -} - - -static int -read_s0() -{ - int i; - - mboot.bootinst_size = secsize; - if (mboot.bootinst != NULL) - free(mboot.bootinst); - if ((mboot.bootinst = malloc(mboot.bootinst_size)) == NULL) { - warnx("unable to allocate buffer to read fdisk " - "partition table"); - return -1; - } - if (read_disk(0, mboot.bootinst) == -1) { - warnx("can't read fdisk partition table"); - return -1; - } - if (le16dec(&mboot.bootinst[DOSMAGICOFFSET]) != DOSMAGIC) { - warnx("invalid fdisk partition table found"); - /* So should we initialize things */ - return -1; - } - for (i = 0; i < NDOSPART; i++) - dos_partition_dec( - &mboot.bootinst[DOSPARTOFF + i * DOSPARTSIZE], - &mboot.parts[i]); - return 0; -} - -static int -write_s0() -{ - int sector, i; - - if (iotest) { - print_s0(-1); - return 0; - } - for(i = 0; i < NDOSPART; i++) - dos_partition_enc(&mboot.bootinst[DOSPARTOFF + i * DOSPARTSIZE], - &mboot.parts[i]); - le16enc(&mboot.bootinst[DOSMAGICOFFSET], DOSMAGIC); - for(sector = 0; sector < mboot.bootinst_size / secsize; sector++) - if (write_disk(sector, - &mboot.bootinst[sector * secsize]) == -1) { - warn("can't write fdisk partition table"); - return -1; - } - return(0); -} - - -static int -ok(const char *str) -{ - printf("%s [n] ", str); - fflush(stdout); - if (fgets(lbuf, LBUF, stdin) == NULL) - exit(1); - lbuf[strlen(lbuf)-1] = 0; - - if (*lbuf && - (!strcmp(lbuf, "yes") || !strcmp(lbuf, "YES") || - !strcmp(lbuf, "y") || !strcmp(lbuf, "Y"))) - return 1; - else - return 0; -} - -static int -decimal(const char *str, int *num, int deflt) -{ - int acc = 0, c; - char *cp; - - while (1) { - printf("Supply a decimal value for \"%s\" [%d] ", str, deflt); - fflush(stdout); - if (fgets(lbuf, LBUF, stdin) == NULL) - exit(1); - lbuf[strlen(lbuf)-1] = 0; - - if (!*lbuf) - return 0; - - cp = lbuf; - while ((c = *cp) && (c == ' ' || c == '\t')) cp++; - if (!c) - return 0; - while ((c = *cp++)) { - if (c <= '9' && c >= '0') - acc = acc * 10 + c - '0'; - else - break; - } - if (c == ' ' || c == '\t') - while ((c = *cp) && (c == ' ' || c == '\t')) cp++; - if (!c) { - *num = acc; - return 1; - } else - printf("%s is an invalid decimal number. Try again.\n", - lbuf); - } - -} - -static const char * -get_type(int type) -{ - int numentries = (sizeof(part_types)/sizeof(struct part_type)); - int counter = 0; - struct part_type *ptr = part_types; - - - while(counter < numentries) { - if(ptr->type == type) - return(ptr->name); - ptr++; - counter++; - } - return("unknown"); -} - - -static void -parse_config_line(char *line, CMD *command) -{ - char *cp, *end; - - cp = line; - while (1) { - memset(command, 0, sizeof(*command)); - - while (isspace(*cp)) ++cp; - if (*cp == '\0' || *cp == '#') - break; - command->cmd = *cp++; - - /* - * Parse args - */ - while (1) { - while (isspace(*cp)) ++cp; - if (*cp == '#') - break; /* found comment */ - if (isalpha(*cp)) - command->args[command->n_args].argtype = *cp++; - if (!isdigit(*cp)) - break; /* assume end of line */ - end = NULL; - command->args[command->n_args].arg_val = strtol(cp, &end, 0); - if (cp == end) - break; /* couldn't parse number */ - cp = end; - command->n_args++; - } - break; - } -} - - -static int -process_geometry(CMD *command) -{ - int status = 1, i; - - while (1) { - geom_processed = 1; - if (part_processed) { - warnx( - "ERROR line %d: the geometry specification line must occur before\n\ - all partition specifications", - current_line_number); - status = 0; - break; - } - if (command->n_args != 3) { - warnx("ERROR line %d: incorrect number of geometry args", - current_line_number); - status = 0; - break; - } - dos_cyls = 0; - dos_heads = 0; - dos_sectors = 0; - for (i = 0; i < 3; ++i) { - switch (command->args[i].argtype) { - case 'c': - dos_cyls = command->args[i].arg_val; - break; - case 'h': - dos_heads = command->args[i].arg_val; - break; - case 's': - dos_sectors = command->args[i].arg_val; - break; - default: - warnx( - "ERROR line %d: unknown geometry arg type: '%c' (0x%02x)", - current_line_number, command->args[i].argtype, - command->args[i].argtype); - status = 0; - break; - } - } - if (status == 0) - break; - - dos_cylsecs = dos_heads * dos_sectors; - - /* - * Do sanity checks on parameter values - */ - if (dos_cyls == 0) { - warnx("ERROR line %d: number of cylinders not specified", - current_line_number); - status = 0; - } - if (dos_cyls > 1024) { - warnx( - "WARNING line %d: number of cylinders (%d) may be out-of-range\n\ - (must be within 1-1024 for normal BIOS operation, unless the entire disk\n\ - is dedicated to FreeBSD)", - current_line_number, dos_cyls); - } - - if (dos_heads == 0) { - warnx("ERROR line %d: number of heads not specified", - current_line_number); - status = 0; - } else if (dos_heads > 256) { - warnx("ERROR line %d: number of heads must be within (1-256)", - current_line_number); - status = 0; - } - - if (dos_sectors == 0) { - warnx("ERROR line %d: number of sectors not specified", - current_line_number); - status = 0; - } else if (dos_sectors > 63) { - warnx("ERROR line %d: number of sectors must be within (1-63)", - current_line_number); - status = 0; - } - - break; - } - return (status); -} - - -static int -process_partition(CMD *command) -{ - int status = 0, partition; - uInt32 prev_head_boundary, prev_cyl_boundary; - uInt32 adj_size, max_end; - struct dos_partition *partp; - - while (1) { - part_processed = 1; - if (command->n_args != 4) { - warnx("ERROR line %d: incorrect number of partition args", - current_line_number); - break; - } - partition = command->args[0].arg_val; - if (partition < 1 || partition > 4) { - warnx("ERROR line %d: invalid partition number %d", - current_line_number, partition); - break; - } - partp = ((struct dos_partition *) &mboot.parts) + partition - 1; - bzero((char *)partp, sizeof (struct dos_partition)); - partp->dp_typ = command->args[1].arg_val; - partp->dp_start = command->args[2].arg_val; - partp->dp_size = command->args[3].arg_val; - max_end = partp->dp_start + partp->dp_size; - - if (partp->dp_typ == 0) { - /* - * Get out, the partition is marked as unused. - */ - /* - * Insure that it's unused. - */ - bzero((char *)partp, sizeof (struct dos_partition)); - status = 1; - break; - } - - /* - * Adjust start upwards, if necessary, to fall on a head boundary. - */ - if (partp->dp_start % dos_sectors != 0) { - prev_head_boundary = partp->dp_start / dos_sectors * dos_sectors; - if (max_end < dos_sectors || - prev_head_boundary > max_end - dos_sectors) { - /* - * Can't go past end of partition - */ - warnx( - "ERROR line %d: unable to adjust start of partition %d to fall on\n\ - a head boundary", - current_line_number, partition); - break; - } - warnx( - "WARNING: adjusting start offset of partition %d\n\ - from %u to %u, to fall on a head boundary", - partition, (uInt32)partp->dp_start, - (uInt32)(prev_head_boundary + dos_sectors)); - partp->dp_start = prev_head_boundary + dos_sectors; - } - - /* - * Adjust size downwards, if necessary, to fall on a cylinder - * boundary. - */ - prev_cyl_boundary = - ((partp->dp_start + partp->dp_size) / dos_cylsecs) * dos_cylsecs; - if (prev_cyl_boundary > partp->dp_start) - adj_size = prev_cyl_boundary - partp->dp_start; - else { - warnx( - "ERROR: could not adjust partition to start on a head boundary\n\ - and end on a cylinder boundary."); - return (0); - } - if (adj_size != partp->dp_size) { - warnx( - "WARNING: adjusting size of partition %d from %u to %u\n\ - to end on a cylinder boundary", - partition, (uInt32)partp->dp_size, (uInt32)adj_size); - partp->dp_size = adj_size; - } - if (partp->dp_size == 0) { - warnx("ERROR line %d: size of partition %d is zero", - current_line_number, partition); - break; - } - - dos(partp); - status = 1; - break; - } - return (status); -} - - -static int -process_active(CMD *command) -{ - int status = 0, partition, i; - struct dos_partition *partp; - - while (1) { - active_processed = 1; - if (command->n_args != 1) { - warnx("ERROR line %d: incorrect number of active args", - current_line_number); - status = 0; - break; - } - partition = command->args[0].arg_val; - if (partition < 1 || partition > 4) { - warnx("ERROR line %d: invalid partition number %d", - current_line_number, partition); - break; - } - /* - * Reset active partition - */ - partp = ((struct dos_partition *) &mboot.parts); - for (i = 0; i < NDOSPART; i++) - partp[i].dp_flag = 0; - partp[partition-1].dp_flag = ACTIVE; - - status = 1; - break; - } - return (status); -} - - -static int -process_line(char *line) -{ - CMD command; - int status = 1; - - while (1) { - parse_config_line(line, &command); - switch (command.cmd) { - case 0: - /* - * Comment or blank line - */ - break; - case 'g': - /* - * Set geometry - */ - status = process_geometry(&command); - break; - case 'p': - status = process_partition(&command); - break; - case 'a': - status = process_active(&command); - break; - default: - status = 0; - break; - } - break; - } - return (status); -} - - -static int -read_config(char *config_file) -{ - FILE *fp = NULL; - int status = 1; - char buf[1010]; - - while (1) { - if (strcmp(config_file, "-") != 0) { - /* - * We're not reading from stdin - */ - if ((fp = fopen(config_file, "r")) == NULL) { - status = 0; - break; - } - } else { - fp = stdin; - } - current_line_number = 0; - while (!feof(fp)) { - if (fgets(buf, sizeof(buf), fp) == NULL) - break; - ++current_line_number; - status = process_line(buf); - if (status == 0) - break; - } - break; - } - if (fp) { - /* - * It doesn't matter if we're reading from stdin, as we've reached EOF - */ - fclose(fp); - } - return (status); -} - - -static void -reset_boot(void) -{ - int i; - struct dos_partition *partp; - - init_boot(); - for (i = 0; i < 4; ++i) { - partp = ((struct dos_partition *) &mboot.parts) + i; - bzero((char *)partp, sizeof (struct dos_partition)); - } -} - -static int -sanitize_partition(struct dos_partition *partp) -{ - uInt32 prev_head_boundary, prev_cyl_boundary; - uInt32 max_end, size, start; - - start = partp->dp_start; - size = partp->dp_size; - max_end = start + size; - /* Only allow a zero size if the partition is being marked unused. */ - if (size == 0) { - if (start == 0 && partp->dp_typ == 0) - return (1); - warnx("ERROR: size of partition is zero"); - return (0); - } - /* Return if no adjustment is necessary. */ - if (start % dos_sectors == 0 && (start + size) % dos_sectors == 0) - return (1); - - if (start == 0) { - warnx("WARNING: partition overlaps with partition table"); - if (ok("Correct this automatically?")) - start = dos_sectors; - } - if (start % dos_sectors != 0) - warnx("WARNING: partition does not start on a head boundary"); - if ((start +size) % dos_sectors != 0) - warnx("WARNING: partition does not end on a cylinder boundary"); - warnx("WARNING: this may confuse the BIOS or some operating systems"); - if (!ok("Correct this automatically?")) - return (1); - - /* - * Adjust start upwards, if necessary, to fall on a head boundary. - */ - if (start % dos_sectors != 0) { - prev_head_boundary = start / dos_sectors * dos_sectors; - if (max_end < dos_sectors || - prev_head_boundary >= max_end - dos_sectors) { - /* - * Can't go past end of partition - */ - warnx( - "ERROR: unable to adjust start of partition to fall on a head boundary"); - return (0); - } - start = prev_head_boundary + dos_sectors; - } - - /* - * Adjust size downwards, if necessary, to fall on a cylinder - * boundary. - */ - prev_cyl_boundary = ((start + size) / dos_cylsecs) * dos_cylsecs; - if (prev_cyl_boundary > start) - size = prev_cyl_boundary - start; - else { - warnx("ERROR: could not adjust partition to start on a head boundary\n\ - and end on a cylinder boundary."); - return (0); - } - - /* Finally, commit any changes to partp and return. */ - if (start != partp->dp_start) { - warnx("WARNING: adjusting start offset of partition to %u", - (uInt32)start); - partp->dp_start = start; - } - if (size != partp->dp_size) { - warnx("WARNING: adjusting size of partition to %u", (uInt32)size); - partp->dp_size = size; - } - - return (1); -} - -/* - * Try figuring out the root device's canonical disk name. - * The following choices are considered: - * /dev/ad0s1a => /dev/ad0 - * /dev/da0a => /dev/da0 - * /dev/vinum/root => /dev/vinum/root - */ -static char * -get_rootdisk(void) -{ - struct statfs rootfs; - regex_t re; -#define NMATCHES 2 - regmatch_t rm[NMATCHES]; - char *s; - int rv; - - if (statfs("/", &rootfs) == -1) - err(1, "statfs(\"/\")"); - - if ((rv = regcomp(&re, "^(/dev/[a-z]+[0-9]+)([sp][0-9]+)?[a-h]?$", - REG_EXTENDED)) != 0) - errx(1, "regcomp() failed (%d)", rv); - if ((rv = regexec(&re, rootfs.f_mntfromname, NMATCHES, rm, 0)) != 0) - errx(1, -"mounted root fs resource doesn't match expectations (regexec returned %d)", - rv); - if ((s = malloc(rm[1].rm_eo - rm[1].rm_so + 1)) == NULL) - errx(1, "out of memory"); - memcpy(s, rootfs.f_mntfromname + rm[1].rm_so, - rm[1].rm_eo - rm[1].rm_so); - s[rm[1].rm_eo - rm[1].rm_so] = 0; - - return s; -} diff --git a/src/bin/fdisk/main.c b/src/bin/fdisk/main.c new file mode 100644 index 0000000..6d61d39 --- /dev/null +++ b/src/bin/fdisk/main.c @@ -0,0 +1,42 @@ +/************************************************************************************** + Copyright (c) 2002 The UbixOS Project + All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + +Redistributions of source code must retain the above copyright notice, this list of conditions, the following disclaimer and the list of authors. +Redistributions in binary form must reproduce the above copyright notice, this list of conditions, the following disclaimer and the list of authors +in the documentation and/or other materials provided with the distribution. Neither the name of the UbixOS Project nor the names of its +contributors may be used to endorse or promote products derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE +GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + $Id$ + +**************************************************************************************/ + +#include +#include +#include +#include +#include + + +int main(int argc,char **argv) { + printf("Ubix Disk Editor Version 1.0\n"); + printf("(c) 2004 Ubix Corp \n\n"); + + if (argc >= 2) { + printf("Drive Info (%s):\n",argv[1]); + } + else { + printf("Drive Info (hd0):\n"); + } + exit(0); + } diff --git a/src/bin/shell/main.c b/src/bin/shell/main.c index 01a980f..99d2bad 100644 --- a/src/bin/shell/main.c +++ b/src/bin/shell/main.c @@ -33,7 +33,8 @@ char *cwc = 0x0; int main() { - unsigned char buffer[256],*data; + char *data = 0x0; + char *buffer = (char *)malloc(512); inputBuffer *inBuf = (inputBuffer *)malloc(sizeof(inputBuffer)); machine = (char *)malloc(8); @@ -46,8 +47,8 @@ while (1) { printf("%s:%s@%s> ",machine,cwd,cwc); - gets((char *)&buffer); - data = (uInt8 *)&buffer; + gets((char *)buffer); + data = (uInt8 *)buffer; parseInput(inBuf,data); if (inBuf->args->arg != 0x0) { if (!commands(inBuf)) execProgram(inBuf);