- document -h

- (re)organise the page a little
- zap second "usage:" string from usage()

diff --git a/usr.sbin/crunchgen/crunchgen.8 b/usr.sbin/crunchgen/crunchgen.8
index 2f3f282..3c37ebf 100644 (file)
--- a/usr.sbin/crunchgen/crunchgen.8
+++ b/usr.sbin/crunchgen/crunchgen.8
@@ -1,4 +1,4 @@
-.\"    $OpenBSD: crunchgen.8,v 1.1 2008/08/22 16:08:12 deraadt Exp $
+.\"    $OpenBSD: crunchgen.8,v 1.2 2008/08/23 07:24:06 jmc Exp $
 .\"
 .\"
 .\" Copyright (c) 1994 University of Maryland
@@ -25,7 +25,7 @@
 .\"                       Computer Science Department
 .\"                       University of Maryland at College Park
 .\"
-.Dd $Mdocdate: August 22 2008 $
+.Dd $Mdocdate: August 23 2008 $
 .Dt CRUNCHGEN 8
 .Os
 .Sh NAME
@@ -88,16 +88,6 @@ symbols, so to keep the C function ``foo'' visible, the option
 .Dq -k _foo
 must be used.
 .Pp
-.Sh NOTES
-The ELF version of
-.Fl h
-mangles the symbol table beyond recognition.
-It is therefore not advisable to try to run
-.Xr nm 1
-on a crunched object file.
-This is due to the nature of the ELF symbol table
-and how some arches uses the symbol attributes for their GOT build.
-.Pp
 After
 .Nm
 is run, the crunched binary can be built by running
@@ -133,6 +123,16 @@ The default name is
 .It Fl f
 Flush cache.
 Forces the recalculation of cached parameters.
+.It Fl h
+Hide all unnecessary symbols.
+Note that the ELF version of
+.Fl h
+mangles the symbol table beyond recognition.
+It is therefore not advisable to try to run
+.Xr nm 1
+on a crunched object file.
+This is due to the nature of the ELF symbol table
+and how some architectures use the symbol attributes for their GOT build.
 .It Fl L Ar lib-dir
 Try to obtain libraries from
 .Ar lib-dir .

diff --git a/usr.sbin/crunchgen/crunchgen.c b/usr.sbin/crunchgen/crunchgen.c
index 60105ff..88a82d5 100644 (file)
--- a/usr.sbin/crunchgen/crunchgen.c
+++ b/usr.sbin/crunchgen/crunchgen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: crunchgen.c,v 1.2 2008/08/22 15:38:37 deraadt Exp $        */
+/* $OpenBSD: crunchgen.c,v 1.3 2008/08/23 07:24:06 jmc Exp $    */
 
 /*
  * Copyright (c) 1994 University of Maryland
@@ -215,7 +215,7 @@ usage(void)
            "usage: crunchgen [-Efq] [-c c-file-name] [-D src-root] [-e exec-file-name]\n"
            "\t[-L lib-dir] [-m makefile-name] [-O objdir-name] conf-file\n");
        fprintf(stderr,
-           "usage: crunchgen -h [-f keep-list-file] [-k keep-symbol] object-file ...\n");
+           "       crunchgen -h [-f keep-list-file] [-k keep-symbol] object-file ...\n");
        exit(1);
 }