aboutsummaryrefslogtreecommitdiff
path: root/cp_mv.c
diff options
context:
space:
mode:
Diffstat (limited to 'cp_mv.c')
-rw-r--r--cp_mv.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/cp_mv.c b/cp_mv.c
index 9c109b511..8052b41a6 100644
--- a/cp_mv.c
+++ b/cp_mv.c
@@ -48,11 +48,6 @@ static const int is_cp = 0;
48static const int is_mv = 1; 48static const int is_mv = 1;
49static int dz_i; /* index into cp_mv_usage */ 49static int dz_i; /* index into cp_mv_usage */
50 50
51static const char *cp_mv_usage[] = /* .rodata */
52{
53 cp_usage,
54 mv_usage
55};
56 51
57static int recursiveFlag; 52static int recursiveFlag;
58static int followLinks; 53static int followLinks;
@@ -184,7 +179,7 @@ extern int cp_mv_main(int argc, char **argv)
184 else 179 else
185 dz_i = is_mv; 180 dz_i = is_mv;
186 if (argc < 3) 181 if (argc < 3)
187 usage(cp_mv_usage[dz_i]); 182 show_usage();
188 183
189 if (dz_i == is_cp) { 184 if (dz_i == is_cp) {
190 recursiveFlag = preserveFlag = forceFlag = FALSE; 185 recursiveFlag = preserveFlag = forceFlag = FALSE;
@@ -209,11 +204,11 @@ extern int cp_mv_main(int argc, char **argv)
209 forceFlag = TRUE; 204 forceFlag = TRUE;
210 break; 205 break;
211 default: 206 default:
212 usage(cp_mv_usage[is_cp]); 207 show_usage();
213 } 208 }
214 } 209 }
215 if ((argc - optind) < 2) { 210 if ((argc - optind) < 2) {
216 usage(cp_mv_usage[dz_i]); 211 show_usage();
217 } 212 }
218 } else { /* (dz_i == is_mv) */ 213 } else { /* (dz_i == is_mv) */
219 /* Initialize optind to 1, since in libc5 optind 214 /* Initialize optind to 1, since in libc5 optind