maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* Print a better error message when writing the patched file (e.g.,

Browse source 
"No space left on device" instead of "Success").  Reported by Karina
  Olmos.
This commit is contained in:
Eelco Dolstra 2006-02-01 17:28:13 +00:00
parent d9d6ff9f8e
commit 6e2eaaec96
1 changed files with 21 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/bsdiff-4.3/bspatch.c
View file

@ -33,6 +33,7 @@ __FBSDID("$FreeBSD: src/usr.bin/bsdiff/bspatch/bspatch.c,v 1.1 2005/08/06 01:59:
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <err.h> #include <err.h>
#include <errno.h>
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
@ -54,6 +55,22 @@ static off_t offtin(u_char *buf)
return y; return y;
} }
void writeFull(const char * name, int fd,
const unsigned char * buf, size_t count)
{
while (count) {
ssize_t res = write(fd, (char *) buf, count);
if (res == -1) {
if (errno == EINTR) continue;
err(1,"writing to %s",name);
}
count -= res;
buf += res;
}
}
int main(int argc,char * argv[]) int main(int argc,char * argv[])
{ {
FILE * f, * cpf, * dpf, * epf; FILE * f, * cpf, * dpf, * epf;
@ -193,8 +210,10 @@ int main(int argc,char * argv[])
err(1, "fclose(%s)", argv[3]); err(1, "fclose(%s)", argv[3]);
/* Write the new file */ /* Write the new file */
if(((fd=open(argv[2],O_CREAT|O_TRUNC|O_WRONLY,0666))<0) || if((fd=open(argv[2],O_CREAT|O_TRUNC|O_WRONLY,0666))<0)
(write(fd,new,newsize)!=newsize) || (close(fd)==-1)) err(1,"%s",argv[2]);
writeFull(argv[2], fd, new, newsize);
if(close(fd)==-1)
err(1,"%s",argv[2]); err(1,"%s",argv[2]);
free(new); free(new);