emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xbps_file_hash: simplify and use read(2).

Browse Source
This commit is contained in:
Juan RP 2013-11-26 13:08:44 +01:00
parent a30623c65c
commit 4e427ded92
1 changed files with 9 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
lib/util_hash.c
View File

@ -23,10 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#define _BSD_SOURCE /* for madvise(2) */
#include <sys/mman.h>
#undef _BSD_SOURCE
#include <stdio.h> #include <stdio.h>
#include <stdbool.h> #include <stdbool.h>
#include <stdlib.h> #include <stdlib.h>
@ -65,12 +61,9 @@ char *
xbps_file_hash(const char *file) xbps_file_hash(const char *file)
{ {
struct stat st; struct stat st;
size_t pgsize = (size_t)sysconf(_SC_PAGESIZE);
size_t pgmask = pgsize - 1, mapsize;
char hash[SHA256_DIGEST_LENGTH * 2 + 1]; char hash[SHA256_DIGEST_LENGTH * 2 + 1];
unsigned char *buf = NULL, digest[SHA256_DIGEST_LENGTH]; unsigned char *buf = NULL, digest[SHA256_DIGEST_LENGTH];
int fd; int fd;
bool need_guard = false;
assert(file != NULL); assert(file != NULL);
@ -88,31 +81,20 @@ xbps_file_hash(const char *file)
return NULL; return NULL;
} }
mapsize = ((size_t)st.st_size + pgmask) & ~pgmask; buf = malloc(st.st_size);
if (mapsize < (size_t)st.st_size) { assert(buf);
(void)close(fd);
return NULL;
}
/*
* If the file length is an integral number of pages, then we
* need to map a guard page at the end in order to provide the
* necessary NUL-termination of the buffer.
*/
if ((st.st_size & pgmask) == 0)
need_guard = true;
buf = mmap(NULL, need_guard ? mapsize + pgsize : mapsize, if (read(fd, buf, st.st_size) != st.st_size) {
PROT_READ, MAP_PRIVATE, fd, 0); free(buf);
(void)close(fd);
return NULL;
}
(void)close(fd); (void)close(fd);
if (buf == MAP_FAILED)
return NULL;
if (SHA256(buf, st.st_size, digest) == NULL) { if (SHA256(buf, st.st_size, digest) == NULL) {
munmap(buf, mapsize); free(buf);
return NULL; return NULL;
} }
munmap(buf, mapsize); free(buf);
digest2string(digest, hash, SHA256_DIGEST_LENGTH); digest2string(digest, hash, SHA256_DIGEST_LENGTH);
return strdup(hash); return strdup(hash);