@@ -31,13 +31,14 @@ __FBSDID("$FreeBSD: src/usr.bin/bsdiff/bsdiff/bsdiff.c,v 1.1 2005/08/06 01:59:05 #include <sys/types.h> #include <bzlib.h> -#include <err.h> #include <fcntl.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <unistd.h> +#include <ruby.h> + #define MIN(x,y) (((x)<(y)) ? (x) : (y)) static void split(off_t *I,off_t *V,off_t start,off_t len,off_t h) @@ -221,10 +222,12 @@ int bsdiff_files(const char *oldfile, const char *newfile, const char *patchfile ((old=malloc(oldsize+1))==NULL) || (lseek(fd,0,SEEK_SET)!=0) || (read(fd,old,oldsize)!=oldsize) || - (close(fd)==-1)) err(1,"%s",oldfile); + (close(fd)==-1)) { + rb_raise(rb_eRuntimeError, "%s",oldfile); + } if(((I=malloc((oldsize+1)*sizeof(off_t)))==NULL) || - ((V=malloc((oldsize+1)*sizeof(off_t)))==NULL)) err(1,NULL); + ((V=malloc((oldsize+1)*sizeof(off_t)))==NULL)) rb_raise(rb_eRuntimeError, "malloc error"); qsufsort(I,V,old,oldsize); @@ -237,16 +240,16 @@ int bsdiff_files(const char *oldfile, const char *newfile, const char *patchfile ((new=malloc(newsize+1))==NULL) || (lseek(fd,0,SEEK_SET)!=0) || (read(fd,new,newsize)!=newsize) || - (close(fd)==-1)) err(1,"%s",newfile); + (close(fd)==-1)) rb_raise(rb_eRuntimeError, "%s",newfile); if(((db=malloc(newsize+1))==NULL) || - ((eb=malloc(newsize+1))==NULL)) err(1,NULL); + ((eb=malloc(newsize+1))==NULL)) rb_raise(rb_eRuntimeError,"malloc error"); dblen=0; eblen=0; /* Create the patch file */ if ((pf = fopen(patchfile, "w")) == NULL) - err(1, "%s", patchfile); + rb_raise(rb_eRuntimeError, "%s", patchfile); /* Header is 0 8 "BSDIFF40" @@ -263,11 +266,11 @@ int bsdiff_files(const char *oldfile, const char *newfile, const char *patchfile offtout(0, header + 16); offtout(newsize, header + 24); if (fwrite(header, 32, 1, pf) != 1) - err(1, "fwrite(%s)", patchfile); + rb_raise(rb_eRuntimeError, "fwrite(%s)", patchfile); /* Compute the differences, writing ctrl as we go */ if ((pfbz2 = BZ2_bzWriteOpen(&bz2err, pf, 9, 0, 0)) == NULL) - errx(1, "BZ2_bzWriteOpen, bz2err = %d", bz2err); + rb_raise(rb_eRuntimeError, "BZ2_bzWriteOpen, bz2err = %d", bz2err); scan=0;len=0; lastscan=0;lastpos=0;lastoffset=0; while(scan<newsize) { @@ -333,17 +336,17 @@ int bsdiff_files(const char *oldfile, const char *newfile, const char *patchfile offtout(lenf,buf); BZ2_bzWrite(&bz2err, pfbz2, buf, 8); if (bz2err != BZ_OK) - errx(1, "BZ2_bzWrite, bz2err = %d", bz2err); + rb_raise(rb_eRuntimeError, "BZ2_bzWrite, bz2err = %d", bz2err); offtout((scan-lenb)-(lastscan+lenf),buf); BZ2_bzWrite(&bz2err, pfbz2, buf, 8); if (bz2err != BZ_OK) - errx(1, "BZ2_bzWrite, bz2err = %d", bz2err); + rb_raise(rb_eRuntimeError, "BZ2_bzWrite, bz2err = %d", bz2err); offtout((pos-lenb)-(lastpos+lenf),buf); BZ2_bzWrite(&bz2err, pfbz2, buf, 8); if (bz2err != BZ_OK) - errx(1, "BZ2_bzWrite, bz2err = %d", bz2err); + rb_raise(rb_eRuntimeError, "BZ2_bzWrite, bz2err = %d", bz2err); lastscan=scan-lenb; lastpos=pos-lenb; @@ -352,45 +355,45 @@ int bsdiff_files(const char *oldfile, const char *newfile, const char *patchfile }; BZ2_bzWriteClose(&bz2err, pfbz2, 0, NULL, NULL); if (bz2err != BZ_OK) - errx(1, "BZ2_bzWriteClose, bz2err = %d", bz2err); + rb_raise(rb_eRuntimeError, "BZ2_bzWriteClose, bz2err = %d", bz2err); /* Compute size of compressed ctrl data */ if ((len = ftello(pf)) == -1) - err(1, "ftello"); + rb_raise(rb_eRuntimeError, "ftello"); offtout(len-32, header + 8); /* Write compressed diff data */ if ((pfbz2 = BZ2_bzWriteOpen(&bz2err, pf, 9, 0, 0)) == NULL) - errx(1, "BZ2_bzWriteOpen, bz2err = %d", bz2err); + rb_raise(rb_eRuntimeError, "BZ2_bzWriteOpen, bz2err = %d", bz2err); BZ2_bzWrite(&bz2err, pfbz2, db, dblen); if (bz2err != BZ_OK) - errx(1, "BZ2_bzWrite, bz2err = %d", bz2err); + rb_raise(rb_eRuntimeError, "BZ2_bzWrite, bz2err = %d", bz2err); BZ2_bzWriteClose(&bz2err, pfbz2, 0, NULL, NULL); if (bz2err != BZ_OK) - errx(1, "BZ2_bzWriteClose, bz2err = %d", bz2err); + rb_raise(rb_eRuntimeError, "BZ2_bzWriteClose, bz2err = %d", bz2err); /* Compute size of compressed diff data */ if ((newsize = ftello(pf)) == -1) - err(1, "ftello"); + rb_raise(rb_eRuntimeError, "ftello"); offtout(newsize - len, header + 16); /* Write compressed extra data */ if ((pfbz2 = BZ2_bzWriteOpen(&bz2err, pf, 9, 0, 0)) == NULL) - errx(1, "BZ2_bzWriteOpen, bz2err = %d", bz2err); + rb_raise(rb_eRuntimeError, "BZ2_bzWriteOpen, bz2err = %d", bz2err); BZ2_bzWrite(&bz2err, pfbz2, eb, eblen); if (bz2err != BZ_OK) - errx(1, "BZ2_bzWrite, bz2err = %d", bz2err); + rb_raise(rb_eRuntimeError, "BZ2_bzWrite, bz2err = %d", bz2err); BZ2_bzWriteClose(&bz2err, pfbz2, 0, NULL, NULL); if (bz2err != BZ_OK) - errx(1, "BZ2_bzWriteClose, bz2err = %d", bz2err); + rb_raise(rb_eRuntimeError, "BZ2_bzWriteClose, bz2err = %d", bz2err); /* Seek to the beginning, write the header, and close the file */ if (fseeko(pf, 0, SEEK_SET)) - err(1, "fseeko"); + rb_raise(rb_eRuntimeError, "fseeko"); if (fwrite(header, 32, 1, pf) != 1) - err(1, "fwrite(%s)", patchfile); + rb_raise(rb_eRuntimeError, "fwrite(%s)", patchfile); if (fclose(pf)) - err(1, "fclose"); + rb_raise(rb_eRuntimeError, "fclose"); /* Free the memory we used */ free(db); ext/bsdiff.c @@ -32,11 +32,10 @@ __FBSDID("$FreeBSD: src/usr.bin/bsdiff/bspatch/bspatch.c,v 1.1 2005/08/06 01:59: #include <stdlib.h> #include <stdio.h> #include <string.h> -#include <err.h> #include <unistd.h> #include <fcntl.h> -const char *foobar = "hello world"; +#include <ruby.h> static off_t offtin(u_char *buf) { @@ -73,7 +72,7 @@ int bspatch_files(const char *oldfile, const char *newfile, const char *patchfil /* Open patch file */ if ((f = fopen(patchfile, "r")) == NULL) - err(1, "fopen(%s)", patchfile); + rb_raise(rb_eRuntimeError, "fopen(%s)", patchfile); /* File format: @@ -92,53 +91,53 @@ int bspatch_files(const char *oldfile, const char *newfile, const char *patchfil /* Read header */ if (fread(header, 1, 32, f) < 32) { if (feof(f)) - errx(1, "Corrupt patch\n"); - err(1, "fread(%s)", patchfile); + rb_raise(rb_eRuntimeError,"Corrupt patch\n"); + rb_raise(rb_eRuntimeError, "fread(%s)", patchfile); } /* Check for appropriate magic */ if (memcmp(header, "BSDIFF40", 8) != 0) - errx(1, "Corrupt patch\n"); + rb_raise(rb_eRuntimeError, "Corrupt patch\n"); /* Read lengths from header */ bzctrllen=offtin(header+8); bzdatalen=offtin(header+16); newsize=offtin(header+24); if((bzctrllen<0) || (bzdatalen<0) || (newsize<0)) - errx(1,"Corrupt patch\n"); + rb_raise(rb_eRuntimeError,"Corrupt patch\n"); /* Close patch file and re-open it via libbzip2 at the right places */ if (fclose(f)) - err(1, "fclose(%s)", patchfile); + rb_raise(rb_eRuntimeError, "fclose(%s)", patchfile); if ((cpf = fopen(patchfile, "r")) == NULL) - err(1, "fopen(%s)", patchfile); + rb_raise(rb_eRuntimeError, "fopen(%s)", patchfile); if (fseeko(cpf, 32, SEEK_SET)) - err(1, "fseeko(%s, %lld)", patchfile, + rb_raise(rb_eRuntimeError, "fseeko(%s, %lld)", patchfile, (long long)32); if ((cpfbz2 = BZ2_bzReadOpen(&cbz2err, cpf, 0, 0, NULL, 0)) == NULL) - errx(1, "BZ2_bzReadOpen, bz2err = %d", cbz2err); + rb_raise(rb_eRuntimeError, "BZ2_bzReadOpen, bz2err = %d", cbz2err); if ((dpf = fopen(patchfile, "r")) == NULL) - err(1, "fopen(%s)", patchfile); + rb_raise(rb_eRuntimeError, "fopen(%s)", patchfile); if (fseeko(dpf, 32 + bzctrllen, SEEK_SET)) - err(1, "fseeko(%s, %lld)", patchfile, + rb_raise(rb_eRuntimeError, "fseeko(%s, %lld)", patchfile, (long long)(32 + bzctrllen)); if ((dpfbz2 = BZ2_bzReadOpen(&dbz2err, dpf, 0, 0, NULL, 0)) == NULL) - errx(1, "BZ2_bzReadOpen, bz2err = %d", dbz2err); + rb_raise(rb_eRuntimeError, "BZ2_bzReadOpen, bz2err = %d", dbz2err); if ((epf = fopen(patchfile, "r")) == NULL) - err(1, "fopen(%s)", patchfile); + rb_raise(rb_eRuntimeError, "fopen(%s)", patchfile); if (fseeko(epf, 32 + bzctrllen + bzdatalen, SEEK_SET)) - err(1, "fseeko(%s, %lld)", patchfile, + rb_raise(rb_eRuntimeError, "fseeko(%s, %lld)", patchfile, (long long)(32 + bzctrllen + bzdatalen)); if ((epfbz2 = BZ2_bzReadOpen(&ebz2err, epf, 0, 0, NULL, 0)) == NULL) - errx(1, "BZ2_bzReadOpen, bz2err = %d", ebz2err); + rb_raise(rb_eRuntimeError, "BZ2_bzReadOpen, bz2err = %d", ebz2err); if(((fd=open(oldfile,O_RDONLY,0))<0) || ((oldsize=lseek(fd,0,SEEK_END))==-1) || ((old=malloc(oldsize+1))==NULL) || (lseek(fd,0,SEEK_SET)!=0) || (read(fd,old,oldsize)!=oldsize) || - (close(fd)==-1)) err(1,"%s",oldfile); - if((new=malloc(newsize+1))==NULL) err(1,NULL); + (close(fd)==-1)) rb_raise(rb_eRuntimeError,"%s",oldfile); + if((new=malloc(newsize+1))==NULL) rb_raise(rb_eRuntimeError,"malloc"); oldpos=0;newpos=0; while(newpos<newsize) { @@ -147,19 +146,19 @@ int bspatch_files(const char *oldfile, const char *newfile, const char *patchfil lenread = BZ2_bzRead(&cbz2err, cpfbz2, buf, 8); if ((lenread < 8) || ((cbz2err != BZ_OK) && (cbz2err != BZ_STREAM_END))) - errx(1, "Corrupt patch\n"); + rb_raise(rb_eRuntimeError, "Corrupt patch\n"); ctrl[i]=offtin(buf); }; /* Sanity-check */ if(newpos+ctrl[0]>newsize) - errx(1,"Corrupt patch\n"); + rb_raise(rb_eRuntimeError,"Corrupt patch\n"); /* Read diff string */ lenread = BZ2_bzRead(&dbz2err, dpfbz2, new + newpos, ctrl[0]); if ((lenread < ctrl[0]) || ((dbz2err != BZ_OK) && (dbz2err != BZ_STREAM_END))) - errx(1, "Corrupt patch\n"); + rb_raise(rb_eRuntimeError, "Corrupt patch\n"); /* Add old data to diff string */ for(i=0;i<ctrl[0];i++) @@ -172,13 +171,13 @@ int bspatch_files(const char *oldfile, const char *newfile, const char *patchfil /* Sanity-check */ if(newpos+ctrl[1]>newsize) - errx(1,"Corrupt patch\n"); + rb_raise(rb_eRuntimeError,"Corrupt patch\n"); /* Read extra string */ lenread = BZ2_bzRead(&ebz2err, epfbz2, new + newpos, ctrl[1]); if ((lenread < ctrl[1]) || ((ebz2err != BZ_OK) && (ebz2err != BZ_STREAM_END))) - errx(1, "Corrupt patch\n"); + rb_raise(rb_eRuntimeError, "Corrupt patch\n"); /* Adjust pointers */ newpos+=ctrl[1]; @@ -190,24 +189,15 @@ int bspatch_files(const char *oldfile, const char *newfile, const char *patchfil BZ2_bzReadClose(&dbz2err, dpfbz2); BZ2_bzReadClose(&ebz2err, epfbz2); if (fclose(cpf) || fclose(dpf) || fclose(epf)) - err(1, "fclose(%s)", patchfile); + rb_raise(rb_eRuntimeError, "fclose(%s)", patchfile); /* Write the new file */ if(((fd=open(newfile,O_CREAT|O_TRUNC|O_WRONLY,0666))<0) || (write(fd,new,newsize)!=newsize) || (close(fd)==-1)) - err(1,"%s",newfile); + rb_raise(rb_eRuntimeError,"%s",newfile); free(new); free(old); return 0; } - -#if 0 -int main(int argc,char * argv[]) -{ - - if(argc!=4) errx(1,"usage: %s oldfile newfile patchfile\n",argv[0]); - -} -#endif ext/bspatch.c @@ -2,7 +2,6 @@ require 'mkmf' dir_config('bsdiff') fail unless have_header('unistd.h') -fail unless have_header('err.h') fail unless have_header('bzlib.h') fail unless have_library('bz2') fail unless have_func('BZ2_bzWrite','bzlib.h') ext/extconf.rb 88f4418f50253fd3b1c807988a0c4a76bdba9ca6 Todd Fisher taf2@spin.localdomain http://github.com/taf2/rb-bsdiff/commit/8bf73f8542093b23d9f7bd43d8948dc3435283f8 8bf73f8542093b23d9f7bd43d8948dc3435283f8 2009-05-24T09:03:01-07:00 2009-05-24T09:03:01-07:00 raise execptions instead of killing the process 2a91f8b6dbf7b9865f0878234fffc2eba609443a Todd Fisher taf2@spin.localdomain