Date: Wed, 12 May 2010 11:01:26 +0300 From: Eitan Adler <lists@eitanadler.com> To: hackers@freebsd.org Subject: adding "check option to md5(1) [was: md5(1) and cal(1) on -questions] Message-ID: <AANLkTilye8lHWXnVh8T5SaifpkDTPBFhIKvOtOx7F09g@mail.gmail.com>
next in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
> D> 2. Why doesn't md5(1) have a "check" option? Seems to me requiring a
> D> manual inspection is error-prone at best, and makes scripting
> D> unecessarily complicated.
Would something like the attached patch be good?
It adds a -c option for a string to check against. It prints
"[failed]" if the string does not match the files md5 unless in -q
mode.
It also returns 2 to indicate md5 match failure for use in scripts.
[-- Attachment #2 --]
Index: md5.1
===================================================================
--- md5.1 (revision 207433)
+++ md5.1 (working copy)
@@ -73,6 +73,8 @@
The hexadecimal checksum of each file listed on the command line is printed
after the options are processed.
.Bl -tag -width indent
+.It Fl c Ar string
+Compare files to this md5 string
.It Fl s Ar string
Print a checksum of the given
.Ar string .
@@ -101,7 +103,8 @@
and
.Nm rmd160
utilities exit 0 on success,
-and 1 if at least one of the input files could not be read.
+1 if at least one of the input files could not be read,
+and 2 if at least one file does not have the same hash as the -c option.
.Sh SEE ALSO
.Xr cksum 1 ,
.Xr md5 3 ,
Index: md5.c
===================================================================
--- md5.c (revision 207433)
+++ md5.c (working copy)
@@ -44,6 +44,8 @@
int qflag;
int rflag;
int sflag;
+unsigned char* checkAgainst;
+int checksFailed;
typedef void (DIGEST_Init)(void *);
typedef void (DIGEST_Update)(void *, const unsigned char *, size_t);
@@ -138,8 +140,13 @@
digest = 0;
failed = 0;
- while ((ch = getopt(argc, argv, "pqrs:tx")) != -1)
+ checkAgainst = NULL;
+ checksFailed = 0;
+ while ((ch = getopt(argc, argv, "c:pqrs:tx")) != -1)
switch (ch) {
+ case 'c':
+ checkAgainst = optarg;
+ break;
case 'p':
MDFilter(&Algorithm[digest], 1);
break;
@@ -173,12 +180,19 @@
failed++;
} else {
if (qflag)
- printf("%s\n", p);
+ printf("%s", p);
else if (rflag)
- printf("%s %s\n", p, *argv);
+ printf("%s %s", p, *argv);
else
- printf("%s (%s) = %s\n",
+ printf("%s (%s) = %s",
Algorithm[digest].name, *argv, p);
+ if (checkAgainst && strcmp(checkAgainst,p))
+ {
+ checksFailed++;
+ if (!qflag)
+ printf("%s","[ Failed ]");
+ }
+ printf("\n");
}
} while (*++argv);
} else if (!sflag && (optind == 1 || qflag || rflag))
@@ -186,6 +200,8 @@
if (failed != 0)
return (1);
+ if (checksFailed != 0)
+ return (2);
return (0);
}
@@ -198,12 +214,20 @@
size_t len = strlen(string);
char buf[HEX_DIGEST_LENGTH];
+ alg->Data(string,len,buf);
if (qflag)
- printf("%s\n", alg->Data(string, len, buf));
+ printf("%s", buf);
else if (rflag)
- printf("%s \"%s\"\n", alg->Data(string, len, buf), string);
+ printf("%s \"%s\"", buf, string);
else
- printf("%s (\"%s\") = %s\n", alg->name, string, alg->Data(string, len, buf));
+ printf("%s (\"%s\") = %s", alg->name, string, buf);
+ if (checkAgainst && strcmp(buf,checkAgainst))
+ {
+ checksFailed++;
+ if (!qflag)
+ printf("%s"," [ failed ]");
+ }
+ printf("\n");
}
/*
* Measures the time to digest TEST_BLOCK_COUNT TEST_BLOCK_LEN-byte blocks.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?AANLkTilye8lHWXnVh8T5SaifpkDTPBFhIKvOtOx7F09g>