aboutsummaryrefslogtreecommitdiff
path: root/ar.c
diff options
context:
space:
mode:
authorkraai <kraai@69ca8d6d-28ef-0310-b511-8ec308f3f277>2000-07-12 17:02:35 +0000
committerkraai <kraai@69ca8d6d-28ef-0310-b511-8ec308f3f277>2000-07-12 17:02:35 +0000
commit6a0c1de213cb8475ee435ff216f4037080926378 (patch)
tree088bc5b6e06d693ad8ca3eba078c0f3a8e302a24 /ar.c
parent7b40def2e7abcaa81d71d4bc7717d184c329eb2d (diff)
downloadbusybox-w32-6a0c1de213cb8475ee435ff216f4037080926378.tar.gz
busybox-w32-6a0c1de213cb8475ee435ff216f4037080926378.tar.bz2
busybox-w32-6a0c1de213cb8475ee435ff216f4037080926378.zip
Always report the applet name when doing error reporting.
git-svn-id: svn://busybox.net/trunk/busybox@831 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'ar.c')
-rw-r--r--ar.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/ar.c b/ar.c
index 27dfadd1d..a43cc1dff 100644
--- a/ar.c
+++ b/ar.c
@@ -158,12 +158,12 @@ static int copySubFile(int srcFd, int dstFd, int copySize)
158 readSize = copySize; 158 readSize = copySize;
159 writeSize = fullRead(srcFd, buffer, readSize); 159 writeSize = fullRead(srcFd, buffer, readSize);
160 if (writeSize <= 0) { 160 if (writeSize <= 0) {
161 errorMsg(io_error, "copySubFile :", strerror(errno)); 161 errorMsg(io_error, "copySubFile", strerror(errno));
162 return (FALSE); 162 return (FALSE);
163 } 163 }
164 doneSize = fullWrite(dstFd, buffer, writeSize); 164 doneSize = fullWrite(dstFd, buffer, writeSize);
165 if (doneSize <= 0) { 165 if (doneSize <= 0) {
166 errorMsg(io_error, "copySubFile :", strerror(errno)); 166 errorMsg(io_error, "copySubFile", strerror(errno));
167 return (FALSE); 167 return (FALSE);
168 } 168 }
169 copySize -= doneSize; 169 copySize -= doneSize;
@@ -220,7 +220,7 @@ static int getArFd(char *filename)
220 return (FALSE); 220 return (FALSE);
221 } 221 }
222 if (fullRead(arFd, arVersion, 8) <= 0) { 222 if (fullRead(arFd, arVersion, 8) <= 0) {
223 errorMsg( "ar: Unexpected EOF in archive\n"); 223 errorMsg( "Unexpected EOF in archive\n");
224 return (FALSE); 224 return (FALSE);
225 } 225 }
226 if (strncmp(arVersion,"!<arch>",7) != 0) { 226 if (strncmp(arVersion,"!<arch>",7) != 0) {