diff --git a/release/floppies/bin/dumpnlist/Makefile b/release/floppies/bin/dumpnlist/Makefile index 1149cadbbeb6..7cf75b881d33 100644 --- a/release/floppies/bin/dumpnlist/Makefile +++ b/release/floppies/bin/dumpnlist/Makefile @@ -1,7 +1,8 @@ -# $Id: Makefile,v 1.1 1997/07/16 12:24:19 julian Exp $ +# $Id: Makefile,v 1.1 1997/07/22 02:50:58 julian Exp $ # PROG=dumpnlist NOMAN=yes +.PATH: ${.CURDIR}/../../.. .include diff --git a/release/floppies/bin/dumpnlist/dumpnlist.c b/release/floppies/bin/dumpnlist/dumpnlist.c deleted file mode 100644 index d5bea49c8521..000000000000 --- a/release/floppies/bin/dumpnlist/dumpnlist.c +++ /dev/null @@ -1,45 +0,0 @@ -#include -#include -#include -#include -#include -#include - -struct nlist nl[] = { - {"_isa_devtab_bio"}, - {"_isa_devtab_tty"}, - {"_isa_devtab_net"}, - {"_isa_devtab_null"}, - {"_isa_biotab_wdc"}, - {"_isa_biotab_fdc"}, - {"_eisadriver_set"}, - {"_eisa_dev_list"}, - {"_pcidevice_set"}, - {"_device_list"}, - {"_scbusses"}, - {"_scsi_cinit"}, - {"_scsi_dinit"}, - {"_scsi_tinit"}, - {""}, -}; - -int -main(int ac, char **av) -{ - int i; - - i = nlist(av[1], nl); - if (i == -1) { - fprintf(stderr, "nlist returns error for %s\n", av[1]); - perror("nlist"); - return 1; - } - printf("%d\n", sizeof(nl) / sizeof(struct nlist)); - i=0; - do { - printf("%s\n", nl[i].n_name); - printf("%d %d %d %ld\n", - nl[i].n_type, nl[i].n_other, nl[i].n_desc, nl[i].n_value); - } while(strcmp(nl[i++].n_name,"")!=NULL); - return 0; -} diff --git a/release/floppies/bin/write_mfs_in_kernel/Makefile b/release/floppies/bin/write_mfs_in_kernel/Makefile index cd65a8e75249..f77efb5aa990 100644 --- a/release/floppies/bin/write_mfs_in_kernel/Makefile +++ b/release/floppies/bin/write_mfs_in_kernel/Makefile @@ -1,7 +1,8 @@ -# $Id: Makefile,v 1.1 1997/07/16 12:24:20 julian Exp $ +# $Id: Makefile,v 1.1 1997/07/22 02:50:59 julian Exp $ # PROG=write_mfs_in_kernel NOMAN=yes +.PATH: ${.CURDIR}/../../.. .include diff --git a/release/floppies/bin/write_mfs_in_kernel/write_mfs_in_kernel.c b/release/floppies/bin/write_mfs_in_kernel/write_mfs_in_kernel.c deleted file mode 100644 index b624ed6387d4..000000000000 --- a/release/floppies/bin/write_mfs_in_kernel/write_mfs_in_kernel.c +++ /dev/null @@ -1,70 +0,0 @@ -/* - * ---------------------------------------------------------------------------- - * "THE BEER-WARE LICENSE" (Revision 42): - * wrote this file. As long as you retain this notice you - * can do whatever you want with this stuff. If we meet some day, and you think - * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp - * ---------------------------------------------------------------------------- - * - * $Id: write_mfs_in_kernel.c,v 1.1 1997/07/16 12:24:21 julian Exp $ - * - * This program patches a filesystem into a kernel made with MFS_ROOT - * option. - */ - -#include -#include -#include -#include -#include -#include -#include -#include - -main(int argc, char **argv) -{ - unsigned char *buf_kernel, *buf_fs, *p,*q; - int fd_kernel, fd_fs; - struct stat st_kernel, st_fs; - u_long l; - - if (argc < 3) { - fprintf(stderr,"Usage:\n\t%s kernel fs\n"); - exit(2); - } - fd_kernel = open(argv[1],O_RDWR); - if (fd_kernel < 0) { perror(argv[1]); exit(2); } - fstat(fd_kernel,&st_kernel); - fd_fs = open(argv[2],O_RDONLY); - if (fd_fs < 0) { perror(argv[2]); exit(2); } - fstat(fd_fs,&st_fs); - buf_kernel = malloc(st_kernel.st_size); - if (!buf_kernel) { perror("malloc"); exit(2); } - buf_fs = malloc(st_fs.st_size); - if (!buf_fs) { perror("malloc"); exit(2); } - if (st_kernel.st_size != read(fd_kernel,buf_kernel,st_kernel.st_size)) - { perror(argv[1]); exit(2); } - if (st_fs.st_size != read(fd_fs,buf_fs,st_fs.st_size)) - { perror(argv[2]); exit(2); } - for(l=0,p=buf_kernel; l < st_kernel.st_size - st_fs.st_size ; l++,p++ ) - if(*p == 'M' && !strcmp(p,"MFS Filesystem goes here")) - goto found; - fprintf(stderr,"MFS filesystem signature not found in %s\n",argv[1]); - exit(1); - found: - for(l=0,q= p + SBOFF; l < st_fs.st_size - SBOFF ; l++,q++ ) - if (*q) - goto fail; - memcpy(p+SBOFF,buf_fs+SBOFF,st_fs.st_size-SBOFF); - lseek(fd_kernel,0L,SEEK_SET); - if (st_kernel.st_size != write(fd_kernel,buf_kernel,st_kernel.st_size)) - { perror(argv[1]); exit(2); } - exit(0); - fail: - l += SBOFF; - fprintf(stderr,"Obstruction in kernel after %ld bytes (%ld Kbyte)\n", - l, l/1024); - fprintf(stderr,"Filesystem is %ld bytes (%ld Kbyte)\n", - (u_long)st_fs.st_size, (u_long)st_fs.st_size/1024); - exit(1); -} diff --git a/release/picobsd/tools/dumpnlist/Makefile b/release/picobsd/tools/dumpnlist/Makefile index 22830ddd8b3e..fe5706e1610a 100644 --- a/release/picobsd/tools/dumpnlist/Makefile +++ b/release/picobsd/tools/dumpnlist/Makefile @@ -1,7 +1,8 @@ -# $Id: Makefile,v 1.1.1.1 1998/07/14 07:30:53 abial Exp $ +# $Id: Makefile,v 1.1.1.1 1998/08/27 17:38:45 abial Exp $ # PROG=dumpnlist NOMAN=yes +.PATH: ${.CURDIR}/../../.. .include diff --git a/release/picobsd/tools/dumpnlist/dumpnlist.c b/release/picobsd/tools/dumpnlist/dumpnlist.c deleted file mode 100644 index d5bea49c8521..000000000000 --- a/release/picobsd/tools/dumpnlist/dumpnlist.c +++ /dev/null @@ -1,45 +0,0 @@ -#include -#include -#include -#include -#include -#include - -struct nlist nl[] = { - {"_isa_devtab_bio"}, - {"_isa_devtab_tty"}, - {"_isa_devtab_net"}, - {"_isa_devtab_null"}, - {"_isa_biotab_wdc"}, - {"_isa_biotab_fdc"}, - {"_eisadriver_set"}, - {"_eisa_dev_list"}, - {"_pcidevice_set"}, - {"_device_list"}, - {"_scbusses"}, - {"_scsi_cinit"}, - {"_scsi_dinit"}, - {"_scsi_tinit"}, - {""}, -}; - -int -main(int ac, char **av) -{ - int i; - - i = nlist(av[1], nl); - if (i == -1) { - fprintf(stderr, "nlist returns error for %s\n", av[1]); - perror("nlist"); - return 1; - } - printf("%d\n", sizeof(nl) / sizeof(struct nlist)); - i=0; - do { - printf("%s\n", nl[i].n_name); - printf("%d %d %d %ld\n", - nl[i].n_type, nl[i].n_other, nl[i].n_desc, nl[i].n_value); - } while(strcmp(nl[i++].n_name,"")!=NULL); - return 0; -} diff --git a/release/picobsd/tools/write_mfs_in_kernel/Makefile b/release/picobsd/tools/write_mfs_in_kernel/Makefile index d9bfbf1e0f17..9a871096de48 100644 --- a/release/picobsd/tools/write_mfs_in_kernel/Makefile +++ b/release/picobsd/tools/write_mfs_in_kernel/Makefile @@ -1,8 +1,9 @@ -# $Id: Makefile,v 1.1.1.1 1998/07/14 07:30:54 abial Exp $ +# $Id: Makefile,v 1.1.1.1 1998/08/27 17:38:45 abial Exp $ # PROG=wmik SRCS=write_mfs_in_kernel.c NOMAN=yes +.PATH: ${.CURDIR}/../../.. .include diff --git a/release/picobsd/tools/write_mfs_in_kernel/write_mfs_in_kernel.c b/release/picobsd/tools/write_mfs_in_kernel/write_mfs_in_kernel.c deleted file mode 100644 index 7b4834ad610a..000000000000 --- a/release/picobsd/tools/write_mfs_in_kernel/write_mfs_in_kernel.c +++ /dev/null @@ -1,96 +0,0 @@ -/* - * ---------------------------------------------------------------------------- - * "THE BEER-WARE LICENSE" (Revision 42): - * wrote this file. As long as you retain this notice you - * can do whatever you want with this stuff. If we meet some day, and you think - * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp - * ---------------------------------------------------------------------------- - * - * $Id: write_mfs_in_kernel.c,v 1.1.1.1 1998/07/14 07:30:54 abial Exp $ - * - * This program patches a filesystem into a kernel made with MFS_ROOT - * option. - */ - -#include -#include -#include -#include -#include -#include -#include -#include - -static int force = 0; /* don't check for zeros, may corrupt kernel */ - -int -main(int argc, char **argv) -{ - unsigned char *buf_kernel, *buf_fs, *p,*q, *prog; - int fd_kernel, fd_fs, ch, errs=0; - struct stat st_kernel, st_fs; - u_long l; - - prog= *argv; - while ((ch = getopt(argc, argv, "f")) != EOF) - switch(ch) { - case 'f': - force = 1 - force; - break; - default: - errs++; - } - argc -= optind; - argv += optind; - - if (errs || argc != 2) { - fprintf(stderr,"Usage:\n\t%s [-f] kernel fs\n", prog); - exit(2); - } - --argv; /* original prog did not use getopt(3) */ - fd_kernel = open(argv[1],O_RDWR); - if (fd_kernel < 0) { perror(argv[1]); exit(2); } - fstat(fd_kernel,&st_kernel); - fd_fs = open(argv[2],O_RDONLY); - if (fd_fs < 0) { perror(argv[2]); exit(2); } - fstat(fd_fs,&st_fs); - buf_kernel = malloc(st_kernel.st_size); - if (!buf_kernel) { perror("malloc"); exit(2); } - buf_fs = malloc(st_fs.st_size); - if (!buf_fs) { perror("malloc"); exit(2); } - if (st_kernel.st_size != read(fd_kernel,buf_kernel,st_kernel.st_size)) - { perror(argv[1]); exit(2); } - if (st_fs.st_size != read(fd_fs,buf_fs,st_fs.st_size)) - { perror(argv[2]); exit(2); } - for(l=0,p=buf_kernel; l < st_kernel.st_size - st_fs.st_size ; l++,p++ ) - if(*p == 'M' && !strcmp(p,"MFS Filesystem goes here")) - goto found; - fprintf(stderr,"MFS filesystem signature not found in %s\n",argv[1]); - exit(1); -found: - if (!force) - for(l=0,q= p + SBOFF; l < st_fs.st_size - SBOFF ; l++,q++ ) - if (*q) - goto fail; - memcpy(p+SBOFF,buf_fs+SBOFF,st_fs.st_size-SBOFF); - lseek(fd_kernel,0L,SEEK_SET); - if (st_kernel.st_size != write(fd_kernel,buf_kernel,st_kernel.st_size)) - { perror(argv[1]); exit(2); } - exit(0); -fail: - l += SBOFF; - fprintf(stderr,"Obstruction in kernel after %ld bytes (%ld Kbyte)\n", - l, l/1024); - fprintf(stderr,"Filesystem is %ld bytes (%ld Kbyte)\n", - (u_long)st_fs.st_size, (u_long)st_fs.st_size/1024); - exit(1); -} - -/* - * I added a '-f' option to force writing the image into the kernel, even when - * there is already data (i.e. not zero) in the written area. This is useful - * to rewrite a changed MFS-image. Beware: If the written image is larger than - * the space reserved in the kernel (with option MFS_ROOT) then - * THIS WILL CORRUPT THE KERNEL! - * - */