bspatch: apply style(9)
Make style changes (and trivial refactoring of open calls) now in order to reduce noise in diffs for future capsicum changes. Reviewed by: oshogbo No objection: cperciva Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D7610
This commit is contained in:
parent
e0a66c6379
commit
ce437beff1
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=304691
@ -28,12 +28,12 @@
|
|||||||
__FBSDID("$FreeBSD$");
|
__FBSDID("$FreeBSD$");
|
||||||
|
|
||||||
#include <bzlib.h>
|
#include <bzlib.h>
|
||||||
#include <stdlib.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <err.h>
|
#include <err.h>
|
||||||
#include <unistd.h>
|
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
|
||||||
#ifndef O_BINARY
|
#ifndef O_BINARY
|
||||||
#define O_BINARY 0
|
#define O_BINARY 0
|
||||||
@ -43,18 +43,19 @@ static off_t offtin(u_char *buf)
|
|||||||
{
|
{
|
||||||
off_t y;
|
off_t y;
|
||||||
|
|
||||||
y=buf[7]&0x7F;
|
y = buf[7] & 0x7F;
|
||||||
y=y*256;y+=buf[6];
|
y = y * 256; y += buf[6];
|
||||||
y=y*256;y+=buf[5];
|
y = y * 256; y += buf[5];
|
||||||
y=y*256;y+=buf[4];
|
y = y * 256; y += buf[4];
|
||||||
y=y*256;y+=buf[3];
|
y = y * 256; y += buf[3];
|
||||||
y=y*256;y+=buf[2];
|
y = y * 256; y += buf[2];
|
||||||
y=y*256;y+=buf[1];
|
y = y * 256; y += buf[1];
|
||||||
y=y*256;y+=buf[0];
|
y = y * 256; y += buf[0];
|
||||||
|
|
||||||
if(buf[7]&0x80) y=-y;
|
if (buf[7] & 0x80)
|
||||||
|
y = -y;
|
||||||
|
|
||||||
return y;
|
return (y);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
@ -65,17 +66,17 @@ usage(void)
|
|||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
int main(int argc,char * argv[])
|
int main(int argc, char *argv[])
|
||||||
{
|
{
|
||||||
FILE * f, * cpf, * dpf, * epf;
|
FILE *f, *cpf, *dpf, *epf;
|
||||||
BZFILE * cpfbz2, * dpfbz2, * epfbz2;
|
BZFILE *cpfbz2, *dpfbz2, *epfbz2;
|
||||||
int cbz2err, dbz2err, ebz2err;
|
int cbz2err, dbz2err, ebz2err;
|
||||||
int fd;
|
int newfd, oldfd;
|
||||||
ssize_t oldsize,newsize;
|
ssize_t oldsize, newsize;
|
||||||
ssize_t bzctrllen,bzdatalen;
|
ssize_t bzctrllen, bzdatalen;
|
||||||
u_char header[32],buf[8];
|
u_char header[32], buf[8];
|
||||||
u_char *old, *new;
|
u_char *old, *new;
|
||||||
off_t oldpos,newpos;
|
off_t oldpos, newpos;
|
||||||
off_t ctrl[3];
|
off_t ctrl[3];
|
||||||
off_t lenread;
|
off_t lenread;
|
||||||
off_t i;
|
off_t i;
|
||||||
@ -113,11 +114,11 @@ int main(int argc,char * argv[])
|
|||||||
errx(1, "Corrupt patch\n");
|
errx(1, "Corrupt patch\n");
|
||||||
|
|
||||||
/* Read lengths from header */
|
/* Read lengths from header */
|
||||||
bzctrllen=offtin(header+8);
|
bzctrllen = offtin(header + 8);
|
||||||
bzdatalen=offtin(header+16);
|
bzdatalen = offtin(header + 16);
|
||||||
newsize=offtin(header+24);
|
newsize = offtin(header + 24);
|
||||||
if((bzctrllen<0) || (bzdatalen<0) || (newsize<0))
|
if ((bzctrllen < 0) || (bzdatalen < 0) || (newsize < 0))
|
||||||
errx(1,"Corrupt patch\n");
|
errx(1, "Corrupt patch\n");
|
||||||
|
|
||||||
/* Close patch file and re-open it via libbzip2 at the right places */
|
/* Close patch file and re-open it via libbzip2 at the right places */
|
||||||
if (fclose(f))
|
if (fclose(f))
|
||||||
@ -144,32 +145,37 @@ int main(int argc,char * argv[])
|
|||||||
if ((epfbz2 = BZ2_bzReadOpen(&ebz2err, epf, 0, 0, NULL, 0)) == NULL)
|
if ((epfbz2 = BZ2_bzReadOpen(&ebz2err, epf, 0, 0, NULL, 0)) == NULL)
|
||||||
errx(1, "BZ2_bzReadOpen, bz2err = %d", ebz2err);
|
errx(1, "BZ2_bzReadOpen, bz2err = %d", ebz2err);
|
||||||
|
|
||||||
if(((fd=open(argv[1],O_RDONLY|O_BINARY,0))<0) ||
|
oldfd = open(argv[1], O_RDONLY | O_BINARY, 0);
|
||||||
((oldsize=lseek(fd,0,SEEK_END))==-1) ||
|
if (oldfd < 0)
|
||||||
((old=malloc(oldsize+1))==NULL) ||
|
err(1, "%s", argv[1]);
|
||||||
(lseek(fd,0,SEEK_SET)!=0) ||
|
if ((oldsize = lseek(oldfd, 0, SEEK_END)) == -1 ||
|
||||||
(read(fd,old,oldsize)!=oldsize) ||
|
(old = malloc(oldsize+1)) == NULL ||
|
||||||
(close(fd)==-1)) err(1,"%s",argv[1]);
|
lseek(oldfd, 0, SEEK_SET) != 0 ||
|
||||||
if((new=malloc(newsize+1))==NULL) err(1,NULL);
|
read(oldfd, old, oldsize) != oldsize ||
|
||||||
|
close(oldfd) == -1)
|
||||||
|
err(1, "%s", argv[1]);
|
||||||
|
if ((new = malloc(newsize + 1)) == NULL)
|
||||||
|
err(1, NULL);
|
||||||
|
|
||||||
oldpos=0;newpos=0;
|
oldpos = 0;
|
||||||
while(newpos<newsize) {
|
newpos = 0;
|
||||||
|
while (newpos < newsize) {
|
||||||
/* Read control data */
|
/* Read control data */
|
||||||
for(i=0;i<=2;i++) {
|
for (i = 0; i <= 2; i++) {
|
||||||
lenread = BZ2_bzRead(&cbz2err, cpfbz2, buf, 8);
|
lenread = BZ2_bzRead(&cbz2err, cpfbz2, buf, 8);
|
||||||
if ((lenread < 8) || ((cbz2err != BZ_OK) &&
|
if ((lenread < 8) || ((cbz2err != BZ_OK) &&
|
||||||
(cbz2err != BZ_STREAM_END)))
|
(cbz2err != BZ_STREAM_END)))
|
||||||
errx(1, "Corrupt patch\n");
|
errx(1, "Corrupt patch\n");
|
||||||
ctrl[i]=offtin(buf);
|
ctrl[i] = offtin(buf);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Sanity-check */
|
/* Sanity-check */
|
||||||
if ((ctrl[0] < 0) || (ctrl[1] < 0))
|
if ((ctrl[0] < 0) || (ctrl[1] < 0))
|
||||||
errx(1,"Corrupt patch\n");
|
errx(1, "Corrupt patch\n");
|
||||||
|
|
||||||
/* Sanity-check */
|
/* Sanity-check */
|
||||||
if(newpos+ctrl[0]>newsize)
|
if (newpos + ctrl[0] > newsize)
|
||||||
errx(1,"Corrupt patch\n");
|
errx(1, "Corrupt patch\n");
|
||||||
|
|
||||||
/* Read diff string */
|
/* Read diff string */
|
||||||
lenread = BZ2_bzRead(&dbz2err, dpfbz2, new + newpos, ctrl[0]);
|
lenread = BZ2_bzRead(&dbz2err, dpfbz2, new + newpos, ctrl[0]);
|
||||||
@ -178,17 +184,17 @@ int main(int argc,char * argv[])
|
|||||||
errx(1, "Corrupt patch\n");
|
errx(1, "Corrupt patch\n");
|
||||||
|
|
||||||
/* Add old data to diff string */
|
/* Add old data to diff string */
|
||||||
for(i=0;i<ctrl[0];i++)
|
for (i = 0; i < ctrl[0]; i++)
|
||||||
if((oldpos+i>=0) && (oldpos+i<oldsize))
|
if ((oldpos + i >= 0) && (oldpos + i < oldsize))
|
||||||
new[newpos+i]+=old[oldpos+i];
|
new[newpos + i] += old[oldpos + i];
|
||||||
|
|
||||||
/* Adjust pointers */
|
/* Adjust pointers */
|
||||||
newpos+=ctrl[0];
|
newpos += ctrl[0];
|
||||||
oldpos+=ctrl[0];
|
oldpos += ctrl[0];
|
||||||
|
|
||||||
/* Sanity-check */
|
/* Sanity-check */
|
||||||
if(newpos+ctrl[1]>newsize)
|
if (newpos + ctrl[1] > newsize)
|
||||||
errx(1,"Corrupt patch\n");
|
errx(1, "Corrupt patch\n");
|
||||||
|
|
||||||
/* Read extra string */
|
/* Read extra string */
|
||||||
lenread = BZ2_bzRead(&ebz2err, epfbz2, new + newpos, ctrl[1]);
|
lenread = BZ2_bzRead(&ebz2err, epfbz2, new + newpos, ctrl[1]);
|
||||||
@ -209,12 +215,14 @@ 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|O_BINARY,0666))<0) ||
|
newfd = open(argv[2], O_CREAT | O_TRUNC | O_WRONLY | O_BINARY, 0666);
|
||||||
(write(fd,new,newsize)!=newsize) || (close(fd)==-1))
|
if (newfd < 0)
|
||||||
err(1,"%s",argv[2]);
|
err(1, "%s", argv[2]);
|
||||||
|
if (write(newfd, new, newsize) != newsize || close(newfd) == -1)
|
||||||
|
err(1, "%s", argv[2]);
|
||||||
|
|
||||||
free(new);
|
free(new);
|
||||||
free(old);
|
free(old);
|
||||||
|
|
||||||
return 0;
|
return (0);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user