summaryrefslogtreecommitdiff
path: root/archival
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2001-02-14 21:23:06 +0000
committerEric Andersen <andersen@codepoet.org>2001-02-14 21:23:06 +0000
commit67991cf824f8df27e74c92d754fb507681c69ce6 (patch)
treea0b652f3dc794d1050c1a8de3afb014a621238fa /archival
parent68be2ab914e1e20fe666bbd22a89a18714be2789 (diff)
downloadbusybox-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 'archival')
-rw-r--r--archival/ar.c4
-rw-r--r--archival/dpkg.c4
-rw-r--r--archival/dpkg_deb.c6
-rw-r--r--archival/gunzip.c4
-rw-r--r--archival/gzip.c4
-rw-r--r--archival/tar.c4
6 files changed, 12 insertions, 14 deletions
diff --git a/archival/ar.c b/archival/ar.c
index 7a5169e95..59f51815f 100644
--- a/archival/ar.c
+++ b/archival/ar.c
@@ -163,13 +163,13 @@ extern int ar_main(int argc, char **argv)
163 funct |= extract_to_file; 163 funct |= extract_to_file;
164 break; 164 break;
165 default: 165 default:
166 usage(ar_usage); 166 show_usage();
167 } 167 }
168 } 168 }
169 169
170 /* check the src filename was specified */ 170 /* check the src filename was specified */
171 if (optind == argc) 171 if (optind == argc)
172 usage(ar_usage); 172 show_usage();
173 173
174 if ( (srcFd = open(argv[optind], O_RDONLY)) < 0) 174 if ( (srcFd = open(argv[optind], O_RDONLY)) < 0)
175 error_msg_and_die("Cannot read %s", argv[optind]); 175 error_msg_and_die("Cannot read %s", argv[optind]);
diff --git a/archival/dpkg.c b/archival/dpkg.c
index 4a5c6f4da..6e309eb06 100644
--- a/archival/dpkg.c
+++ b/archival/dpkg.c
@@ -840,7 +840,7 @@ extern int dpkg_main(int argc, char **argv)
840 case 'c': 840 case 'c':
841 return dpkg_configure(packages, status); 841 return dpkg_configure(packages, status);
842 default : 842 default :
843 usage(dpkg_usage); 843 show_usage();
844 return EXIT_FAILURE; 844 return EXIT_FAILURE;
845 } 845 }
846} \ No newline at end of file 846}
diff --git a/archival/dpkg_deb.c b/archival/dpkg_deb.c
index aed0ba368..c08438189 100644
--- a/archival/dpkg_deb.c
+++ b/archival/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 ) {
diff --git a/archival/gunzip.c b/archival/gunzip.c
index 48a46083b..bf8812dbd 100644
--- a/archival/gunzip.c
+++ b/archival/gunzip.c
@@ -1250,7 +1250,7 @@ int gunzip_main(int argc, char **argv)
1250 force = 1; 1250 force = 1;
1251 break; 1251 break;
1252 default: 1252 default:
1253 usage(gunzip_usage); 1253 show_usage();
1254 } 1254 }
1255 } 1255 }
1256 } 1256 }
@@ -1275,7 +1275,7 @@ int gunzip_main(int argc, char **argv)
1275 } else { 1275 } else {
1276 /* Open up the input file */ 1276 /* Open up the input file */
1277 if (argc <= 0) 1277 if (argc <= 0)
1278 usage(gunzip_usage); 1278 show_usage();
1279 if (strlen(*argv) > MAX_PATH_LEN) { 1279 if (strlen(*argv) > MAX_PATH_LEN) {
1280 error_msg(name_too_long); 1280 error_msg(name_too_long);
1281 exit(WARNING); 1281 exit(WARNING);
diff --git a/archival/gzip.c b/archival/gzip.c
index 75f3caa35..3cbef4ec1 100644
--- a/archival/gzip.c
+++ b/archival/gzip.c
@@ -1812,7 +1812,7 @@ int gzip_main(int argc, char **argv)
1812 case 'd': 1812 case 'd':
1813 exit(gunzip_main(argc, argv)); 1813 exit(gunzip_main(argc, argv));
1814 default: 1814 default:
1815 usage(gzip_usage); 1815 show_usage();
1816 } 1816 }
1817 } 1817 }
1818 } 1818 }
@@ -1865,7 +1865,7 @@ int gzip_main(int argc, char **argv)
1865 } else { 1865 } else {
1866 /* Open up the input file */ 1866 /* Open up the input file */
1867 if (argc <= 0) 1867 if (argc <= 0)
1868 usage(gzip_usage); 1868 show_usage();
1869 strncpy(ifname, *argv, MAX_PATH_LEN); 1869 strncpy(ifname, *argv, MAX_PATH_LEN);
1870 1870
1871 /* Open input file */ 1871 /* Open input file */
diff --git a/archival/tar.c b/archival/tar.c
index fb0fcc614..62f1b1d35 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -214,7 +214,7 @@ extern int tar_main(int argc, char **argv)
214 int opt; 214 int opt;
215 215
216 if (argc <= 1) 216 if (argc <= 1)
217 usage(tar_usage); 217 show_usage();
218 218
219 if (argv[1][0] != '-') { 219 if (argv[1][0] != '-') {
220 char *tmp = xmalloc(strlen(argv[1]) + 2); 220 char *tmp = xmalloc(strlen(argv[1]) + 2);
@@ -283,7 +283,7 @@ extern int tar_main(int argc, char **argv)
283 break; 283 break;
284#endif 284#endif
285 default: 285 default:
286 usage(tar_usage); 286 show_usage();
287 } 287 }
288 } 288 }
289 289