X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=skein_cli.c;h=c8ae45b48ff37219fd4369ba9011ae10dd5979ca;hb=6ec116da3188186d71484164c2ce430ac5a08966;hp=f2bc2e27caeec23d8e638d239ae83161d20e8c86;hpb=1b927ec68d534a14e2d47ec625dbbd7d734a371e;p=skeinsum.git

diff --git a/skein_cli.c b/skein_cli.c
index f2bc2e2..c8ae45b 100644
--- a/skein_cli.c
+++ b/skein_cli.c
@@ -233,7 +233,8 @@ int HashMatch(const char StoredDigest[], const char *filename, int quiet)
 
 int VerifyHashesFromFile(FILE *fp, int status, int warn, int quiet)
 {
-	char hash[500], MsgDigest_tmp[hashbitlen/2];
+	char hash[PATH_MAX + hashbitlen/4 + 4];
+	char MsgDigest_tmp[hashbitlen/2];
 	int NoMatch = 0, NotProper = 0, Computed = 0;
 	int line = 0;
 
@@ -242,7 +243,7 @@ int VerifyHashesFromFile(FILE *fp, int status, int warn, int quiet)
 		char file_tmp[PATH_MAX];
 		line ++;
 		Computed++;
-		unsigned int hashVersion = decomposeHashLine(hash,MsgDigest_tmp,file_tmp);
+		int hashVersion = decomposeHashLine(hash,MsgDigest_tmp,file_tmp);
 		if (hashVersion == -1)
 		{
 			fprintf(stderr, "skein%d: %s is using newer version of skein%d algorithm\n",hashbitlen,file_tmp,hashbitlen);
@@ -419,7 +420,7 @@ void print_usage(void)
 	exit(1);
 }
 
-int is_goodfile(const char filename[], int verbose)
+int is_goodfile(const char filename[])
 {
 	if (!strcmp(filename, "-"))
 		return 1;
@@ -427,7 +428,7 @@ int is_goodfile(const char filename[], int verbose)
 	struct stat s;
 
 	if (stat(filename, &s) < 0) {
-		if (verbose) fprintf(stderr, "skein%dsum: %s: no such file or directory\n", hashbitlen, filename);
+		fprintf(stderr, "skein%dsum: %s: no such file or directory\n", hashbitlen, filename);
 		return 0;
 	}
 
@@ -435,7 +436,7 @@ int is_goodfile(const char filename[], int verbose)
 		return 1;
 
 	if (s.st_mode & S_IFDIR) {
-		if (verbose) fprintf(stderr, "skein%dsum: %s: is a directory\n", hashbitlen, filename);
+		fprintf(stderr, "skein%dsum: %s: is a directory\n", hashbitlen, filename);
 		return 0;
 	}
 
@@ -503,7 +504,7 @@ int main(int argc, char** argv)
 		for (file_index = first_file; file_index < argc; file_index++)
 		{
 			const char *filename = argv[file_index];
-			if (!is_goodfile(filename, 1)) {
+			if (!is_goodfile(filename)) {
 				errorFound++;
 				continue;
 			}
@@ -540,7 +541,7 @@ int main(int argc, char** argv)
 		for (file_index = first_file; file_index < argc; file_index++)
 		{
 			const char *filename = argv[file_index];
-			if (!is_goodfile(filename, 1)) {
+			if (!is_goodfile(filename)) {
 				errorFound++;
 				continue;
 			}