diff options
| author | Eric Andersen <andersen@codepoet.org> | 2001-02-15 00:23:06 +0300 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2001-02-15 00:23:06 +0300 |
| commit | 67991cf824f8df27e74c92d754fb507681c69ce6 (patch) | |
| tree | a0b652f3dc794d1050c1a8de3afb014a621238fa /cp_mv.c | |
| parent | 68be2ab914e1e20fe666bbd22a89a18714be2789 (diff) | |
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 'cp_mv.c')
| -rw-r--r-- | cp_mv.c | 11 |
1 files changed, 3 insertions, 8 deletions
@@ -48,11 +48,6 @@ static const int is_cp = 0; static const int is_mv = 1; static int dz_i; /* index into cp_mv_usage */ -static const char *cp_mv_usage[] = /* .rodata */ -{ - cp_usage, - mv_usage -}; static int recursiveFlag; static int followLinks; @@ -184,7 +179,7 @@ extern int cp_mv_main(int argc, char **argv) else dz_i = is_mv; if (argc < 3) - usage(cp_mv_usage[dz_i]); + show_usage(); if (dz_i == is_cp) { recursiveFlag = preserveFlag = forceFlag = FALSE; @@ -209,11 +204,11 @@ extern int cp_mv_main(int argc, char **argv) forceFlag = TRUE; break; default: - usage(cp_mv_usage[is_cp]); + show_usage(); } } if ((argc - optind) < 2) { - usage(cp_mv_usage[dz_i]); + show_usage(); } } else { /* (dz_i == is_mv) */ /* Initialize optind to 1, since in libc5 optind |