summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--distrib/crunch/README10
-rw-r--r--distrib/crunch/crunchgen/crunchgen.16
-rw-r--r--distrib/crunch/crunchgen/crunchgen.c24
-rw-r--r--distrib/crunch/crunchide/crunchide.c12
-rw-r--r--distrib/crunch/crunchide/elf_hide.c6
-rw-r--r--distrib/crunch/examples/really-big.conf2
6 files changed, 30 insertions, 30 deletions
diff --git a/distrib/crunch/README b/distrib/crunch/README
index 845a8c40a79..c5914813081 100644
--- a/distrib/crunch/README
+++ b/distrib/crunch/README
@@ -45,7 +45,7 @@ on its own boot floppy). A more reasonable subset can be made to fit
easily with a kernel for a decent one-disk fixit filesystem.
The linking together of different programs by hand is an old
-space-saving technique. Crunch automates the process by building the
+space-saving technique. Crunch automates the process by building the
necessary stub files and makefile for you (via the crunchgen program),
and by doctoring the symbol tables of the component .o files to allow
them to link without "symbol multiply defined" conflicts (via the
@@ -76,14 +76,14 @@ Crunch was written for the Maruti Hard Real-Time Operating System
project at the University of Maryland, to help make for better install
and recovery procedures for our NetBSD-based development environment. It
is copyright (c) 1994 by the University of Maryland under a UCB-style
-freely- redistributable notice. See the file COPYRIGHT for details.
+freely- redistributable notice. See the file COPYRIGHT for details.
Please let me know of any problems or of enhancements you make to this
package. I'm particularly interested in the details of what you found
-was good to put on your fixit or install disks. Thanks!
+was good to put on your fixit or install disks. Thanks!
Share and Enjoy,
Jaime
............................................................................
-: Stand on my shoulders, : jds@cs.umd.edu : James da Silva
-: not on my toes. : uunet!mimsy!jds : http://www.cs.umd.edu/users/jds
+: Stand on my shoulders, : jds@cs.umd.edu : James da Silva
+: not on my toes. : uunet!mimsy!jds : http://www.cs.umd.edu/users/jds
diff --git a/distrib/crunch/crunchgen/crunchgen.1 b/distrib/crunch/crunchgen/crunchgen.1
index 0e3f4bf4c2f..65ff774c762 100644
--- a/distrib/crunch/crunchgen/crunchgen.1
+++ b/distrib/crunch/crunchgen/crunchgen.1
@@ -244,9 +244,9 @@ The crunched binary ``kcopy'' can be built as follows:
.Pp
.nf
% crunchgen -m Makefile kcopy.conf # gen Makefile and kcopy.c
- % make objs # build the component progams' .o files
- % make # build the crunched binary kcopy
- % kcopy sh # test that this invokes a sh shell
+ % make objs # build the component progams' .o files
+ % make # build the crunched binary kcopy
+ % kcopy sh # test that this invokes a sh shell
$ # it works!
.fi
.Pp
diff --git a/distrib/crunch/crunchgen/crunchgen.c b/distrib/crunch/crunchgen/crunchgen.c
index 76dcfa0928d..ba9af72048d 100644
--- a/distrib/crunch/crunchgen/crunchgen.c
+++ b/distrib/crunch/crunchgen/crunchgen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: crunchgen.c,v 1.10 1997/04/04 21:52:40 mickey Exp $ */
+/* $OpenBSD: crunchgen.c,v 1.11 1997/07/23 19:31:51 kstailey Exp $ */
/*
* Copyright (c) 1994 University of Maryland
* All Rights Reserved.
@@ -520,21 +520,21 @@ void fillin_program(prog_t *p)
if(is_dir(path))
p->objdir = strdup(path);
else
- p->objdir = p->srcdir;
- }
+ p->objdir = p->srcdir;
+ }
}
/* We have a sourcedir and no explict objs, try */
/* to find makefile and get objs from it. */
if (p->srcdir && !p->objs) {
- for (i = 0; mf_name[i] != NULL; i++) {
- sprintf(path, "%s/%s", p->srcdir, mf_name[i]);
- if (is_nonempty_file(path)) {
+ for (i = 0; mf_name[i] != NULL; i++) {
+ sprintf(path, "%s/%s", p->srcdir, mf_name[i]);
+ if (is_nonempty_file(path)) {
p->mf_name = mf_name[i];
- fillin_program_objs(p, path);
- break;
- }
- }
+ fillin_program_objs(p, path);
+ break;
+ }
+ }
}
@@ -826,8 +826,8 @@ void prog_makefile_rules(FILE *outmk, prog_t *p)
fprintf(outmk, "%s_stub.c:\n", p->name);
fprintf(outmk, "\techo \""
- "int _crunched_%s_stub(int argc, char **argv, char **envp)"
- "{return main(argc,argv,envp);}\" >%s_stub.c\n",
+ "int _crunched_%s_stub(int argc, char **argv, char **envp)"
+ "{return main(argc,argv,envp);}\" >%s_stub.c\n",
p->ident, p->name);
fprintf(outmk, "%s.lo: %s_stub.o $(%s_OBJPATHS)\n",
p->name, p->name, p->ident);
diff --git a/distrib/crunch/crunchide/crunchide.c b/distrib/crunch/crunchide/crunchide.c
index bece34ce6ff..281bc13fd2f 100644
--- a/distrib/crunch/crunchide/crunchide.c
+++ b/distrib/crunch/crunchide/crunchide.c
@@ -209,7 +209,7 @@ struct nlist *symbase;
/* is the symbol a global symbol defined in the current file? */
#define IS_GLOBAL_DEFINED(sp) \
- (((sp)->n_type & N_EXT) && ((sp)->n_type & N_TYPE) != N_UNDF)
+ (((sp)->n_type & N_EXT) && ((sp)->n_type & N_TYPE) != N_UNDF)
#ifdef __sparc
/* is the relocation entry dependent on a symbol? */
@@ -220,7 +220,7 @@ struct nlist *symbase;
#else
/* is the relocation entry dependent on a symbol? */
#define IS_SYMBOL_RELOC(rp) \
- ((rp)->r_extern||(rp)->r_baserel||(rp)->r_jmptable)
+ ((rp)->r_extern||(rp)->r_baserel||(rp)->r_jmptable)
#endif
void check_reloc(char *filename, struct relocation_info *relp);
@@ -256,9 +256,9 @@ void hide_syms(char *filename)
if((buf = mmap(NULL, infstat.st_size, PROT_READ|PROT_WRITE,
MAP_FILE|MAP_SHARED, inf, 0)) == (char *)-1) {
- fprintf(stderr, "%s: cannot map\n", filename);
- close(inf);
- return;
+ fprintf(stderr, "%s: cannot map\n", filename);
+ close(inf);
+ return;
}
#ifdef _NLIST_DO_ELF
@@ -272,7 +272,7 @@ void hide_syms(char *filename)
#ifdef _NLIST_DO_ECOFF
if(!ECOFF_BADMAG((struct ecoff_exechdr *)buf)) {
- printf("processing ecoff file\n");
+ printf("processing ecoff file\n");
ecoff_hide(inf, buf);
return;
}
diff --git a/distrib/crunch/crunchide/elf_hide.c b/distrib/crunch/crunchide/elf_hide.c
index 5bb9f0ae70e..562f0ae331f 100644
--- a/distrib/crunch/crunchide/elf_hide.c
+++ b/distrib/crunch/crunchide/elf_hide.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: elf_hide.c,v 1.4 1997/05/19 09:24:39 pefo Exp $ */
+/* $OpenBSD: elf_hide.c,v 1.5 1997/07/23 19:31:53 kstailey Exp $ */
/*
* Copyright (c) 1997 Dale Rahn. All rights reserved.
@@ -187,7 +187,7 @@ load_symtab(Elf32_Ehdr *pehdr, char *pexe)
{
Elf32_Sym *symtab;
Elf32_Shdr *symsect;
- int symtabsize;
+ int symtabsize;
Elf32_Shdr *pshdr;
Elf32_Shdr *psymshdr;
char *shname;
@@ -340,7 +340,7 @@ hide_sym(Elf32_Ehdr *ehdr, Elf32_Shdr *symsect,
/* XXX Because MIPS needs global symbols to stay global (has to do with GOT) */
/* XXX we mess around with the symbol names instead. For most uses this */
/* XXX will be no problem, symbols are stripped anyway. However, if many */
-/* XXX one character symbols exist, names may clash. */
+/* XXX one character symbols exist, names may clash. */
{
char *p;
int n, z;
diff --git a/distrib/crunch/examples/really-big.conf b/distrib/crunch/examples/really-big.conf
index ce5083f7051..a753fe310f0 100644
--- a/distrib/crunch/examples/really-big.conf
+++ b/distrib/crunch/examples/really-big.conf
@@ -52,7 +52,7 @@ progs whois window write xargs xinstall xstr yacc yes ypcat ypmatch ypwhich
# shell scripts: lorder mkdep shar which
# problems: rdist uses libcompat.a(regex.o), which conflicts with
-# libedit(readline.o) over regerror().
+# libedit(readline.o) over regerror().
# special requirements
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 04:51:41 +0000