Date: Thu, 27 May 2010 23:46:53 GMT From: Ivan Voras <ivoras@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 178896 for review Message-ID: <201005272346.o4RNkr2d031199@repoman.freebsd.org>
index | next in thread | raw e-mail
http://p4web.freebsd.org/@@178896?ac=10 Change 178896 by ivoras@betelgeuse on 2010/05/27 23:46:51 Cosmetic changes Affected files ... .. //depot/projects/soc2010/pkg_patch/src/patch/Makefile#7 edit .. //depot/projects/soc2010/pkg_patch/src/patch/hashjob.c#6 edit .. //depot/projects/soc2010/pkg_patch/src/patch/hashjob.h#6 edit .. //depot/projects/soc2010/pkg_patch/src/patch/main.c#7 edit .. //depot/projects/soc2010/pkg_patch/src/patch/mkpatch.c#5 edit .. //depot/projects/soc2010/pkg_patch/src/patch/mkpatch.h#5 edit .. //depot/projects/soc2010/pkg_patch/src/patch/pkg_patch.h#5 edit .. //depot/projects/soc2010/pkg_patch/src/patch/support.c#4 edit Differences ... ==== //depot/projects/soc2010/pkg_patch/src/patch/Makefile#7 (text+ko) ==== ==== //depot/projects/soc2010/pkg_patch/src/patch/hashjob.c#6 (text+ko) ==== @@ -32,8 +32,7 @@ assert(job->filename != NULL); job->hash_len = 32; memset(job->hash, 0, HASH_MAX_LEN); - if (MD5File(job->filename, job->hash) == NULL) - err(1, "MD5File failed on: %s", job->filename); + assert(MD5File(job->filename, job->hash) != NULL); return (job); } @@ -46,7 +45,7 @@ assert(job->filename != NULL); job->hash_len = 64; memset(job->hash, 0, HASH_MAX_LEN); - SHA256_File(job->filename, job->hash); + assert(SHA256_File(job->filename, job->hash) != NULL); return (job); } ==== //depot/projects/soc2010/pkg_patch/src/patch/hashjob.h#6 (text+ko) ==== ==== //depot/projects/soc2010/pkg_patch/src/patch/main.c#7 (text+ko) ==== ==== //depot/projects/soc2010/pkg_patch/src/patch/mkpatch.c#5 (text+ko) ==== @@ -124,7 +124,12 @@ assert(access(fcold, R_OK) == 0); snprintf(fcnew, PATH_MAX, "%s/%s", dnew, fl->filename); assert(access(fcnew, R_OK) == 0); - + + /* + * Detect changed files using the traditional FreeBSD method - + * by comparing MD5 and SHA256 checksums. As a note to possible + * improvements: SHA256 is almost 3x slower than MD5. + */ hashjob_start(&hjold_md5, fcold, HASH_MD5); hashjob_start(&hjold_sha256, fcold, HASH_SHA256); hashjob_start(&hjnew_md5, fcnew, HASH_MD5); ==== //depot/projects/soc2010/pkg_patch/src/patch/mkpatch.h#5 (text+ko) ==== ==== //depot/projects/soc2010/pkg_patch/src/patch/pkg_patch.h#5 (text+ko) ==== ==== //depot/projects/soc2010/pkg_patch/src/patch/support.c#4 (text+ko) ====help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201005272346.o4RNkr2d031199>