diff options
author | Eric Andersen <andersen@codepoet.org> | 2001-02-14 21:23:06 +0000 |
---|---|---|
committer | Eric Andersen <andersen@codepoet.org> | 2001-02-14 21:23:06 +0000 |
commit | 67991cf824f8df27e74c92d754fb507681c69ce6 (patch) | |
tree | a0b652f3dc794d1050c1a8de3afb014a621238fa /dpkg_deb.c | |
parent | 68be2ab914e1e20fe666bbd22a89a18714be2789 (diff) | |
download | busybox-w32-67991cf824f8df27e74c92d754fb507681c69ce6.tar.gz busybox-w32-67991cf824f8df27e74c92d754fb507681c69ce6.tar.bz2 busybox-w32-67991cf824f8df27e74c92d754fb507681c69ce6.zip |
This patch, put together by Manuel Novoa III, is a merge of work
done by Evin Robertson (bug#1105) and work from Manuel to make
usage messages occupy less space and simplify how usage messages
are displayed.
Diffstat (limited to 'dpkg_deb.c')
-rw-r--r-- | dpkg_deb.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/dpkg_deb.c b/dpkg_deb.c index aed0ba368..c08438189 100644 --- a/dpkg_deb.c +++ b/dpkg_deb.c | |||
@@ -141,14 +141,12 @@ extern int dpkg_deb_main(int argc, char **argv) | |||
141 | break; | 141 | break; |
142 | */ | 142 | */ |
143 | default: | 143 | default: |
144 | usage(dpkg_deb_usage); | 144 | show_usage(); |
145 | return EXIT_FAILURE; | ||
146 | } | 145 | } |
147 | } | 146 | } |
148 | 147 | ||
149 | if (((optind + 1 ) > argc) || (optflag == 0)) { | 148 | if (((optind + 1 ) > argc) || (optflag == 0)) { |
150 | usage(dpkg_deb_usage); | 149 | show_usage(); |
151 | return(EXIT_FAILURE); | ||
152 | } | 150 | } |
153 | if ((optflag & dpkg_deb_control) || (optflag & dpkg_deb_extract) || (optflag & dpkg_deb_verbose_extract)) { | 151 | if ((optflag & dpkg_deb_control) || (optflag & dpkg_deb_extract) || (optflag & dpkg_deb_verbose_extract)) { |
154 | if ( (optind + 1) == argc ) { | 152 | if ( (optind + 1) == argc ) { |