emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up error messages.

Browse Source
This commit is contained in:
Matt Kraai
2000-09-22 03:36:27 +00:00
parent a2f2a8f8c0
commit d995493987
2 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ar.c
View File

@@ -21,7 +21,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * 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 <stdio.h>
#include <string.h> #include <string.h>
@@ -158,7 +158,7 @@ static int checkArMagic(int srcFd)
headerStart = lseek(srcFd, 0, SEEK_CUR); headerStart = lseek(srcFd, 0, SEEK_CUR);
if (fullRead(srcFd, arMagic, 8) != 8) { if (fullRead(srcFd, arMagic, 8) != 8) {
printf("fatal error/n"); errorMsg("fatal error\n");
return (FALSE); return (FALSE);
} }
lseek(srcFd, headerStart, SEEK_SET); lseek(srcFd, headerStart, SEEK_SET);
@@ -338,16 +338,13 @@ extern int ar_main(int argc, char **argv)
} }
} }
/* check the src filename was specified */ /* check the src filename was specified */
if (optind == argc) { if (optind == argc)
usage(ar_usage); usage(ar_usage);
return(FALSE);
}
if ( (srcFd = open(argv[optind], O_RDONLY)) < 0) { if ( (srcFd = open(argv[optind], O_RDONLY)) < 0)
errorMsg("Cannot read %s\n", optarg); fatalError("Cannot read %s\n", argv[optind]);
return (FALSE);
}
optind++; optind++;
entry = (headerL_t *) xmalloc(sizeof(headerL_t)); entry = (headerL_t *) xmalloc(sizeof(headerL_t));
header = (headerL_t *) xmalloc(sizeof(headerL_t)); header = (headerL_t *) xmalloc(sizeof(headerL_t));

19
archival/ar.c
View File

@@ -21,7 +21,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * 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 <stdio.h>
#include <string.h> #include <string.h>
@@ -158,7 +158,7 @@ static int checkArMagic(int srcFd)
headerStart = lseek(srcFd, 0, SEEK_CUR); headerStart = lseek(srcFd, 0, SEEK_CUR);
if (fullRead(srcFd, arMagic, 8) != 8) { if (fullRead(srcFd, arMagic, 8) != 8) {
printf("fatal error/n"); errorMsg("fatal error\n");
return (FALSE); return (FALSE);
} }
lseek(srcFd, headerStart, SEEK_SET); lseek(srcFd, headerStart, SEEK_SET);
@@ -338,16 +338,13 @@ extern int ar_main(int argc, char **argv)
} }
} }
/* check the src filename was specified */ /* check the src filename was specified */
if (optind == argc) { if (optind == argc)
usage(ar_usage); usage(ar_usage);
return(FALSE);
}
if ( (srcFd = open(argv[optind], O_RDONLY)) < 0) { if ( (srcFd = open(argv[optind], O_RDONLY)) < 0)
errorMsg("Cannot read %s\n", optarg); fatalError("Cannot read %s\n", argv[optind]);
return (FALSE);
}
optind++; optind++;
entry = (headerL_t *) xmalloc(sizeof(headerL_t)); entry = (headerL_t *) xmalloc(sizeof(headerL_t));
header = (headerL_t *) xmalloc(sizeof(headerL_t)); header = (headerL_t *) xmalloc(sizeof(headerL_t));