Index: head/usr.bin/kzip/kzip.8 =================================================================== --- head/usr.bin/kzip/kzip.8 (revision 27495) +++ head/usr.bin/kzip/kzip.8 (revision 27496) @@ -1,73 +1,73 @@ .\" .\" Copyright (c) 1996 David E. O'Brien .\" .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: .\" 1. Redistributions of source code must retain the above copyright .\" notice, this list of conditions and the following disclaimer. .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. .\" .\" THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``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 DEVELOPERS 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$ +.\" $Id: kzip.8,v 1.3 1997/02/22 19:55:30 peter Exp $ .\" .Dd August 15, 1996 .Os .Dt KZIP 8 .Sh NAME .Nm kzip .Nd compresses kernels .Sh SYNOPSIS -.Nm kzip +.Nm .Op Fl v .Op Fl l Ar loadaddr .Sh DESCRIPTION This program compresses a kernel using .Xr gzip 1 to reduce its disk storage requirements. It does not reduce the memory footprint once loaded into memory. You lose all the symbols, so usability is limited. Its main usage is making kernels for install and fixit floppies, etc. .Pp The following options are available: .Bl -tag -width flag .It Fl v Verbose mode, reports how much memory is being used by the kernel after compression. Also allows you to check to make sure your kernel is not going past the 4MB boundary. .It Fl l Ar loadaddr Specify the address to load the kernel into memory at. .Sh DIAGNOSTICS The .Nm utility returns with exit code 1 if given invalid arguments. Exit code two means .Nm was unable to read or process the kernel file. .Sh SEE ALSO .Xr gzip 1 .\" .Sh STANDARDS .Sh HISTORY The .Nm command appeared in .Fx 2.0.5 . Obtained from Linux via 386BSD -- based on tools/build.c by Linus Torvalds, and ported to 386BSD by Serge Vakulenko. .Sh AUTHORS This man page was written by David E. O'Brien. .\" .Sh BUGS Index: head/usr.bin/kzip/kzip.c =================================================================== --- head/usr.bin/kzip/kzip.c (revision 27495) +++ head/usr.bin/kzip/kzip.c (revision 27496) @@ -1,348 +1,334 @@ /* * ---------------------------------------------------------------------------- * "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 * ---------------------------------------------------------------------------- * * Copyright (C) 1993 Hannu Savolainen * Ported to 386bsd by Serge Vakulenko * based on tools/build.c by Linus Torvalds - * $Id: kzip.c,v 1.8 1997/03/29 04:30:19 imp Exp $ - * */ +#ifndef lint +static const char rcsid[] = + "$Id$"; +#endif /* not lint */ + +#include #include #include #include #include #include #include #include #include #include #include #define MAXIMAGE (2*1024*1024) /* This is the limit because a kzip'ed kernel loads at 3Mb and * ends up at 1Mb */ -void -Usage(char *prog) +static void +usage() { - fprintf(stderr,"usage:\n\t%s [-v] [ -l loadaddr] kernel\n", prog); + fprintf(stderr, "usage: kzip [-v] [ -l loadaddr] kernel\n"); exit(1); } int main(int argc, char **argv) { pid_t Pext, Pgzip, Ppiggy, Pld; int pipe1[2], pipe2[2]; int status, fdi, fdo, fdn, c, verbose; int size; struct exec hdr; int zip_size, offset; struct stat st; - u_long forceaddr = 0, addr, entry; + u_long forceaddr = 0, entry; char *kernname; char obj[BUFSIZ]; char out[BUFSIZ]; char base[32]; while ((c = getopt(argc, argv, "l:v")) != -1) { switch (c) { case 'l': forceaddr = strtoul(optarg, NULL, 0); - if (forceaddr == 0) { - fprintf(stderr, "Invalid load address!\n"); - exit(1); - } + if (forceaddr == 0) + errx(1, "invalid load address"); break; case 'v': verbose++; break; default: - Usage(argv[0]); - break; + usage(); } } if ((argc - optind) != 1) - Usage(argv[0]); + usage(); argc -= optind; argv += optind; kernname = argv[0]; strcpy(obj, kernname); strcat(obj,".o"); strcpy(out, kernname); strcat(out,".kz"); fdi = open(kernname ,O_RDONLY); if(fdi<0) { - perror(kernname); + warn(kernname); return 2; } /* figure out how big the uncompressed image will be */ - if (read (fdi, (char *)&hdr, sizeof(hdr)) != sizeof(hdr)) { - perror(argv[1]); - exit(2); - } + if (read (fdi, (char *)&hdr, sizeof(hdr)) != sizeof(hdr)) + err(2, argv[1]); size = hdr.a_text + hdr.a_data + hdr.a_bss; entry = hdr.a_entry & 0x00FFFFFF; lseek (fdi, 0, SEEK_SET); if (verbose) { printf("real kernel start address will be: 0x%x\n", entry); printf("real kernel end address will be: 0x%x\n", entry+size); } fdo = open(obj,O_WRONLY|O_TRUNC|O_CREAT,0666); if(fdo<0) { - perror(obj); + warn(obj); return 2; } if (pipe(pipe1) < 0) { perror("pipe()"); return 1; } if (pipe(pipe2) < 0) { perror("pipe()"); return 1; } Pext = fork(); if (Pext < 0) { perror("fork()"); return 1; } if (!Pext) { dup2(fdi,0); dup2(pipe1[1],1); close(pipe1[0]); close(pipe1[1]); close(pipe2[0]); close(pipe2[1]); close(fdi); close(fdo); extract(kernname); exit(0); } Pgzip = fork(); if (Pgzip < 0) { perror("fork()"); return 1; } if (!Pgzip) { dup2(pipe1[0],0); dup2(pipe2[1],1); close(pipe1[0]); close(pipe1[1]); close(pipe2[0]); close(pipe2[1]); close(fdi); close(fdo); execlp("gzip", "gzip", "-9", "-n", 0); exit (0); } Ppiggy = fork(); - if (Ppiggy < 0) { perror("fork()"); return 1; } + if (Ppiggy < 0) { warn("fork()"); return 1; } if (!Ppiggy) { dup2(pipe2[0],0); dup2(fdo,1); close(pipe1[0]); close(pipe1[1]); close(pipe2[0]); close(pipe2[1]); close(fdi); close(fdo); piggyback(obj); exit(0); } close(pipe1[0]); close(pipe1[1]); close(pipe2[0]); close(pipe2[1]); close(fdi); close(fdo); if (waitpid(Pext, &status,0) < 0) - { perror("waitpid(Pextract)"); return 1; } + { warn("waitpid(Pextract)"); return 1; } if(status) { - fprintf(stderr,"extract returned %x\n",status); + warnx("extract returned %x",status); return 3; } if (waitpid(Pgzip, &status,0) < 0) { perror("waitpid(Pgzip)"); return 1; } if(status) { - fprintf(stderr,"gzip returned %x\n",status); + warnx("gzip returned %x",status); return 3; } if (waitpid(Ppiggy, &status,0) < 0) - { perror("waitpid(Ppiggy)"); return 1; } + { warn("waitpid(Ppiggy)"); return 1; } if(status) { - fprintf(stderr,"piggyback returned %x\n",status); + warnx("piggyback returned %x",status); return 3; } if (forceaddr) offset = forceaddr; else { /* a kludge to dynamically figure out where to start it */ if (stat (obj, &st) < 0) { - perror("cannot get size of compressed data"); + warn("cannot get size of compressed data"); return 3; } zip_size = (int)st.st_size; offset = entry + size - zip_size + 0x8000; /* fudge factor */ } sprintf(base, "0x%x", roundup(offset, 4096)); Pld = fork(); - if (Pld < 0) { perror("fork()"); return 1; } + if (Pld < 0) { warn("fork()"); return 1; } if (!Pld) { execlp("ld", "ld", "-Bstatic", "-Z", "-T", base, "-o", out, "/usr/lib/kzhead.o", obj, "/usr/lib/kztail.o", 0); exit(2); } if (waitpid(Pld, &status,0) < 0) - { perror("waitpid(Pld)"); return 1; } + { warn("waitpid(Pld)"); return 1; } if(status) { - fprintf(stderr,"ld returned %x\n",status); + warnx("ld returned %x",status); return 3; } if (verbose) { fdn = open(obj ,O_RDONLY); if(fdn<0) { - perror(obj); + warn(obj); return 3; } /* figure out how big the compressed image is */ if (read (fdn, (char *)&hdr, sizeof(hdr)) != sizeof(hdr)) { - perror(obj); + warn(obj); return 3; } close(fdn); size = hdr.a_text + hdr.a_data + hdr.a_bss; printf("kzip data start address will be: 0x%x\n",offset); printf("kzip data end address will be: 0x%x\n",offset+size); } unlink(obj); exit(0); } int extract (char *file) { int sz; char buf[BUFSIZ]; struct exec hdr; - if (read (0, (char *)&hdr, sizeof(hdr)) != sizeof(hdr)) { - perror(file); - exit(2); - } - if (hdr.a_magic != ZMAGIC) { - fprintf(stderr,"Bad magic in file %s, probably not a kernel\n", - file); - exit(2); - } - if (lseek (0, N_TXTOFF(hdr), 0) < 0) { - perror(file); - exit(2); - } + if (read (0, (char *)&hdr, sizeof(hdr)) != sizeof(hdr)) + err(2, file); + if (hdr.a_magic != ZMAGIC) + errx(2, "bad magic in file %s, probably not a kernel", file); + if (lseek (0, N_TXTOFF(hdr), 0) < 0) + err(2, file); sz = N_SYMOFF (hdr) - N_TXTOFF (hdr); while (sz) { int l, n; l = sz; if (l > sizeof(buf)) l = sizeof(buf); n = read (0, buf, l); if (n != l) { if (n == -1) - perror (file); + err(1, file); else - fprintf (stderr, "Unexpected EOF\n"); - - exit(1); + errx(1, "unexpected EOF"); } write (1, buf, l); sz -= l; } exit(0); } char string_names[] = {"_input_data\0_input_len\0"}; struct nlist var_names[2] = { /* Symbol table */ { { (char*) 4 }, N_EXT|N_TEXT, 0, 0, 0 }, /* _input_data */ { { (char*) 16 }, N_EXT|N_TEXT, 0, 0, 0 }, /* _input_len */ }; int piggyback(char *file) { int n, len; struct exec hdr; /* object header */ char image[MAXIMAGE]; /* kernel image buffer */ len = 0; while ((n = read (0, &image[len], sizeof(image)-len+1)) > 0) len += n; - if (n < 0) { - perror ("stdin"); - exit (1); - } + if (n < 0) + err(1, "stdin"); - if (len >= sizeof(image)) { - fprintf (stderr,"Input too large\n"); - exit (1); - } + if (len >= sizeof(image)) + errx(1, "input too large"); /* * Output object header */ memset(&hdr,0,sizeof hdr); hdr.a_magic = OMAGIC; hdr.a_text = len + sizeof(long); hdr.a_syms = sizeof(var_names); write (1, (char *)&hdr, sizeof(hdr)); /* * Output text segment (compressed system & len) */ write (1, image, len); write (1, (char *)&len, sizeof(len)); /* * Output symbol table */ var_names[1].n_value = len; write (1, (char *)&var_names, sizeof(var_names)); /* * Output string table */ len = sizeof(string_names) + sizeof(len); write (1, (char *)&len, sizeof(len)); write (1, string_names, sizeof(string_names)); return (0); }