minix/commands/padtext/padtext.c
Gianluca Guida cc17b27a2b Build NetBSD libc library in world in ELF mode.
3 sets of libraries are built now:
  . ack: all libraries that ack can compile (/usr/lib/i386/)
  . clang+elf: all libraries with minix headers (/usr/lib/)
  . clang+elf: all libraries with netbsd headers (/usr/netbsd/)

Once everything can be compiled with netbsd libraries and headers, the
/usr/netbsd hierarchy will be obsolete and its libraries compiled with
netbsd headers will be installed in /usr/lib, and its headers
in /usr/include. (i.e. minix libc and current minix headers set
will be gone.)

To use the NetBSD libc system (libraries + headers) before
it is the default libc, see:
   http://wiki.minix3.org/en/DevelopersGuide/UsingNetBSDCode
This wiki page also documents the maintenance of the patch
files of minix-specific changes to imported NetBSD code.

Changes in this commit:
  . libsys: Add NBSD compilation and create a safe NBSD-based libc.
  . Port rest of libraries (except libddekit) to new header system.
  . Enable compilation of libddekit with new headers.
  . Enable kernel compilation with new headers.
  . Enable drivers compilation with new headers.
  . Port legacy commands to new headers and libc.
  . Port servers to new headers.
  . Add <sys/sigcontext.h> in compat library.
  . Remove dependency file in tree.
  . Enable compilation of common/lib/libc/atomic in libsys
  . Do not generate RCSID strings in libc.
  . Temporarily disable zoneinfo as they are incompatible with NetBSD format
  . obj-nbsd for .gitignore
  . Procfs: use only integer arithmetic. (Antoine Leca)
  . Increase ramdisk size to create NBSD-based images.
  . Remove INCSYMLINKS handling hack.
  . Add nbsd_include/sys/exec_elf.h
  . Enable ELF compilation with NBSD libc.
  . Add 'make nbsdsrc' in tools to download reference NetBSD sources.
  . Automate minix-port.patch creation.
  . Avoid using fstavfs() as it is *extremely* slow and unneeded.
  . Set err() as PRIVATE to avoid name clash with libc.
  . [NBSD] servers/vm: remove compilation warnings.
  . u32 is not a long in NBSD headers.
  . UPDATING info on netbsd hierarchy
  . commands fixes for netbsd libc
2011-06-24 11:46:30 +02:00

252 lines
5 KiB
C

/* padtext: pad out the text segment of a separate I&D a.out binary to a
* multiple of CLICK_SIZE, used for mult-boot
*
* author: Erik van der Kouwe, vdkouwe@cs.vu.nl, June 9th 2010
*/
#include <assert.h>
#include <errno.h>
#include <fcntl.h>
#ifdef __NBSD_LIBC
#include <a.out.h>
#else
#include <minix/a.out.h>
#endif
#include <minix/config.h>
#include <minix/const.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
/* padding: x86 opcode int 3 (breakpoint) to ensure a trap if the padding area
* accidentally gets executed
*/
#define PADDING_CHAR ((unsigned char) 0xcc)
static const char *argv0, *pathin, *pathout;
static int fdin, fdout;
static int readfixed(void *buffer, size_t count)
{
ssize_t r;
while (count > 0) {
/* read as many bytes as possible */
r = read(fdin, buffer, count);
if (r <= 0) {
if (r < 0) {
fprintf(stderr,
"%s: %s: error while reading: %s\n",
argv0, pathin, strerror(errno));
} else {
fprintf(stderr,
"%s: %s: premature end of file, "
"expected %u more bytes\n",
argv0, pathin, count);
}
return -1;
}
/* maybe we need to read another block */
buffer = (char *) buffer + r;
count -= r;
}
return 0;
}
static int writefixed(const void *buffer, size_t count)
{
ssize_t r;
while (count > 0) {
/* read as many bytes as possible */
r = write(fdout, buffer, count);
if (r <= 0) {
if (r < 0) {
fprintf(stderr,
"%s: %s: error while writing: %s\n",
argv0, pathout, strerror(errno));
} else {
fprintf(stderr,
"%s: %s: premature end of file\n",
argv0, pathout);
}
return -1;
}
/* maybe we need to read another block */
buffer = (const char *) buffer + r;
count -= r;
}
return 0;
}
static int writepadding(size_t padsize)
{
char buffer[CLICK_SIZE];
/* we never write more than a single click */
assert(padsize <= sizeof(buffer));
memset(buffer, PADDING_CHAR, padsize);
return writefixed(buffer, padsize);
}
static int copyfixed(size_t count)
{
char buffer[4096];
size_t countnow;
while (count > 0) {
/* copying a fixed number of bytes, we expect everything to
* succeed
*/
countnow = (count < sizeof(buffer)) ? count : sizeof(buffer);
if (readfixed(buffer, countnow) < 0 ||
writefixed(buffer, countnow) < 0) {
return -1;
}
count -= countnow;
}
return 0;
}
static int copyall(void)
{
char buffer[4096];
ssize_t r;
for (; ; ) {
/* copy everything until EOF */
r = read(fdin, buffer, sizeof(buffer));
if (r <= 0) {
if (r < 0) {
fprintf(stderr,
"%s: %s: error while reading: %s\n",
argv0, pathin, strerror(errno));
return -1;
} else {
/* EOF, stop copying */
break;
}
}
if (writefixed(buffer, r) < 0) {
return -1;
}
}
return 0;
}
static int padtext(void)
{
struct exec headerin, headerout;
long padsize;
/* read header */
assert(A_MINHDR <= sizeof(headerin));
if (readfixed(&headerin, A_MINHDR) < 0) {
return -1;
}
/* check header sanity */
if (BADMAG(headerin) ||
headerin.a_hdrlen < A_MINHDR ||
(headerin.a_flags & ~(A_NSYM | A_EXEC | A_SEP)) != 0 ||
headerin.a_text < 0 ||
headerin.a_data < 0 ||
headerin.a_bss < 0 ||
headerin.a_entry != 0 ||
headerin.a_total < 0 ||
headerin.a_syms < 0) {
fprintf(stderr, "%s: %s: invalid a.out header\n",
argv0, pathin);
return -1;
}
if (headerin.a_cpu != A_I80386) {
fprintf(stderr, "%s: %s: not an i386 executable\n",
argv0, pathin);
return -1;
}
if ((headerin.a_flags & A_SEP) != A_SEP) {
fprintf(stderr,
"%s: %s: combined I&D, padding text is impossible\n",
argv0, pathin);
return -1;
}
/* adjust header */
headerout = headerin;
padsize = CLICK_SIZE - headerout.a_text % CLICK_SIZE;
if (padsize == CLICK_SIZE) padsize = 0;
printf("%s: %s: adding %ld bytes of padding\n", pathin, argv0, padsize);
headerout.a_text += padsize;
/* write header and copy text segment */
if (writefixed(&headerout, A_MINHDR) < 0 ||
copyfixed(headerin.a_hdrlen - A_MINHDR + headerin.a_text) < 0 ||
writepadding(padsize) < 0 ||
copyall() < 0) {
return -1;
}
return 0;
}
int main(int argc, char **argv)
{
/* check parameters */
argv0 = argv[0];
if (argc > 3) {
printf("usage:\n");
printf(" %s [infile [outfile]]\n", argv0);
return 1;
}
if (argc >= 2) {
/* open specified input file */
pathin = argv[1];
fdin = open(pathin, O_RDONLY);
if (fdin < 0) {
fprintf(stderr,
"%s: cannot open input file \"%s\" "
"for reading: %s\n",
argv0, pathin, strerror(errno));
return -1;
}
} else {
/* input from stdin */
pathin = "-";
fdin = STDIN_FILENO;
}
if (argc >= 3) {
/* open specified output file */
pathout = argv[2];
fdout = creat(pathout, 0644);
if (fdout < 0) {
fprintf(stderr,
"%s: cannot open output file \"%s\" "
"for writing: %s\n",
argv0, pathout, strerror(errno));
return -1;
}
} else {
/* output to stdout */
pathout = "-";
fdout = STDOUT_FILENO;
}
/* now do the job using the file handles */
if (padtext() < 0) {
return -1;
}
return 0;
}