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

woops, we needed that function

Browse Source
This commit is contained in:
Glenn L McGrath 2003-11-18 23:56:41 +00:00
parent 0c5d9c27a5
commit 931ae9d2f8
1 changed files with 35 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
coreutils/md5_sha1_sum.c
View File

@ -47,10 +47,43 @@ static unsigned char *hash_bin_to_hex(unsigned char *hash_value,
return (hex_value); return (hex_value);
} }
static uint8_t *hash_file(const char *filename, uint8_t hash_algo)
{
uint8_t *hash_value_bin;
uint8_t *hash_value = NULL;
uint8_t hash_length;
int src_fd;
if (strcmp(filename, "-") == 0) {
src_fd = fileno(stdin);
} else {
src_fd = open(filename, O_RDONLY);
}
if (hash_algo == HASH_MD5) {
hash_length = 16;
} else {
hash_length = 20;
}
hash_value_bin = xmalloc(hash_length);
if ((src_fd != -1) && (hash_fd(src_fd, -1, hash_algo, hash_value_bin) != -2)) {
hash_value = hash_bin_to_hex(hash_value_bin, hash_length);
} else {
bb_perror_msg("%s", filename);
}
close(src_fd);
return(hash_value);
}
/* This could become a common function for md5 as well, by using md5_stream */ /* This could become a common function for md5 as well, by using md5_stream */
extern int hash_files(int argc, char **argv, const uint8_t hash_algo) extern int hash_files(int argc, char **argv, const uint8_t hash_algo)
{ {
int return_value = EXIT_SUCCESS; int return_value = EXIT_SUCCESS;
uint8_t *hash_value;
#ifdef CONFIG_FEATURE_MD5_SHA1_SUM_CHECK #ifdef CONFIG_FEATURE_MD5_SHA1_SUM_CHECK
unsigned int flags; unsigned int flags;
@ -129,7 +162,6 @@ extern int hash_files(int argc, char **argv, const uint8_t hash_algo)
} else } else
#endif #endif
{ {
uint8_t *hash_value_bin;
uint8_t hash_length; uint8_t hash_length;
if (hash_algo == HASH_MD5) { if (hash_algo == HASH_MD5) {
@ -137,27 +169,12 @@ extern int hash_files(int argc, char **argv, const uint8_t hash_algo)
} else { } else {
hash_length = 20; hash_length = 20;
} }
hash_value_bin = xmalloc(hash_length); hash_value = xmalloc(hash_length);
while (optind < argc) { while (optind < argc) {
unsigned char *file_ptr = argv[optind++]; unsigned char *file_ptr = argv[optind++];
uint8_t *hash_value;
int src_fd;
if ((file_ptr[0] == '-') && (file_ptr[1] == '\0')) {
src_fd = fileno(stdin);
} else {
src_fd = open(file_ptr, O_RDONLY);
}
if ((src_fd != -1) && (hash_fd(src_fd, -1, hash_algo, hash_value_bin) != -2)) {
hash_value = hash_bin_to_hex(hash_value_bin, hash_length);
} else {
bb_perror_msg("%s", file_ptr);
continue;
}
close(src_fd);
hash_value = hash_file(file_ptr, hash_algo);
if (hash_value == NULL) { if (hash_value == NULL) {
return_value++; return_value++;
} else { } else {