add support for a -h (help) option

(Portage version: 2.1_pre4-r1)

2 files changed, 46 insertions, 1 deletions

diff --git a/sys-apps/setarch/files/setarch-1.8-help.patch b/sys-apps/setarch/files/setarch-1.8-help.patch
new file mode 100644
index 000000000000..7b09c64ed2b1
--- /dev/null
+++ b/sys-apps/setarch/files/setarch-1.8-help.patch
@@ -0,0 +1,44 @@
+--- setarch.c
++++ setarch.c
+@@ -120,17 +121,27 @@
+   return 0;
+ }
+ 
++void show_usage(const char *progname)
++{
++  int f;
++  printf("Usage: %s%s [options] <program> [program arguments]\n\n", progname,
++         (!strcmp(progname,"setarch")?" <arch>":""));
++  printf("Options:\n");
++  for (f=0; f<sizeof(flags)/sizeof(flags[0]); f++)
++    printf("\t-%c\tEnable %s\n", flags[f].c, flags[f].name);
++}
++
+ int main(int argc, char *argv[])
+ {
++  char *real_argv0;
+   char *p = strrchr(argv[0], '/');
+   unsigned long options = 0;
+   int got_arch = 0, verbose = 0;
+ 
+-  p = p ? p + 1 : argv[0];
++  real_argv0 = p = p ? p + 1 : argv[0];
+ 
+   if(argc <= 1) {
+-    fprintf(stderr, "Usage: %s %s program arguments\n",
+-	    p, !strcmp(p, "setarch")?"arch":"");
++    show_usage(real_argv0);
+     return 1;
+   }
+   
+@@ -155,6 +166,10 @@
+         verbose = 1;
+         continue;
+       }
++      if (arg[n] == 'h') {
++        show_usage(real_argv0);
++        return 0;
++      }
+     
+       for (f = 0; f < sizeof(flags)/sizeof(flags[0]); f++) {
+         if (arg[n] == flags[f].c) {
diff --git a/sys-apps/setarch/setarch-1.8.ebuild b/sys-apps/setarch/setarch-1.8.ebuild
index 2848b7a45e8e..b0d6b89f9ca1 100644
--- a/sys-apps/setarch/setarch-1.8.ebuild
+++ b/sys-apps/setarch/setarch-1.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/setarch/setarch-1.8.ebuild,v 1.1 2006/02/21 03:36:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/setarch/setarch-1.8.ebuild,v 1.2 2006/02/21 05:31:21 vapier Exp $
 
 inherit eutils
 
@@ -27,6 +27,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-sparc.patch
 	epatch "${FILESDIR}"/${P}-better-error.patch
 	epatch "${FILESDIR}"/${P}-links.patch
+	epatch "${FILESDIR}"/${P}-help.patch
 }
 
 src_install() {