aboutsummaryrefslogtreecommitdiff
path: root/ar.c
diff options
context:
space:
mode:
authorMatt Kraai <kraai@debian.org>2000-09-22 03:36:27 +0000
committerMatt Kraai <kraai@debian.org>2000-09-22 03:36:27 +0000
commitd995493987065846ab8cc7360879e0841826b068 (patch)
treeaadcda8d0b7e84696d6422ae502044419953d8c6 /ar.c
parenta2f2a8f8c0c2c9881f9548c045c19b2b5fb11b5d (diff)
downloadbusybox-d995493987065846ab8cc7360879e0841826b068.tar.gz
Clean up error messages.
Diffstat (limited to 'ar.c')
-rw-r--r--ar.c19
1 files changed, 8 insertions, 11 deletions
diff --git a/ar.c b/ar.c
index 241c1fac2..59c3a7754 100644
--- a/ar.c
+++ b/ar.c
@@ -21,7 +21,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * Last modified 9 September 2000
+ * Last modified 20 September 2000
*/
#include <stdio.h>
#include <string.h>
@@ -158,7 +158,7 @@ static int checkArMagic(int srcFd)
headerStart = lseek(srcFd, 0, SEEK_CUR);
if (fullRead(srcFd, arMagic, 8) != 8) {
- printf("fatal error/n");
+ errorMsg("fatal error\n");
return (FALSE);
}
lseek(srcFd, headerStart, SEEK_SET);
@@ -338,16 +338,13 @@ extern int ar_main(int argc, char **argv)
}
}
- /* check the src filename was specified */
- if (optind == argc) {
- usage(ar_usage);
- return(FALSE);
- }
+ /* check the src filename was specified */
+ if (optind == argc)
+ usage(ar_usage);
- if ( (srcFd = open(argv[optind], O_RDONLY)) < 0) {
- errorMsg("Cannot read %s\n", optarg);
- return (FALSE);
- }
+ if ( (srcFd = open(argv[optind], O_RDONLY)) < 0)
+ fatalError("Cannot read %s\n", argv[optind]);
+
optind++;
entry = (headerL_t *) xmalloc(sizeof(headerL_t));
header = (headerL_t *) xmalloc(sizeof(headerL_t));