Page MenuHomeFreeBSD
Files F142339719

D43990.id134737.diff
No OneTemporary
Actions

D43990.id134737.diff
View Options

diff --git a/sbin/md5/md5.c b/sbin/md5/md5.c
--- a/sbin/md5/md5.c
+++ b/sbin/md5/md5.c
@@ -287,9 +287,10 @@
}
struct chksumrec {
- char *filename;
- char *chksum;
- struct chksumrec *next;
+ char *filename;
+ enum input_mode input_mode;
+ char *chksum;
+ struct chksumrec *next;
};
static struct chksumrec *head = NULL;
@@ -362,16 +363,18 @@
if (rec == NULL)
errx(1, "malloc failed");
- if (*filename == '*' ||
- *filename == ' ' ||
- *filename == 'U' ||
- *filename == '^') {
- if (lstat(filename, &st) != 0)
- filename++;
+ if ((*filename == '*' || *filename == ' ' ||
+ *filename == 'U' || *filename == '^') &&
+ lstat(filename, &st) != 0 &&
+ lstat(filename + 1, &st) == 0) {
+ rec->filename = strdup(filename + 1);
+ rec->input_mode = (enum input_mode)*filename;
+ } else {
+ rec->filename = strdup(filename);
+ rec->input_mode = input_binary;
}
rec->chksum = strdup(hashstr);
- rec->filename = strdup(filename);
if (rec->chksum == NULL || rec->filename == NULL)
errx(1, "malloc failed");
rec->next = NULL;
@@ -612,6 +615,13 @@
const char *filename = *argv;
const char *filemode = "rb";
+ if (cflag && mode != mode_bsd) {
+ input_mode = rec->input_mode;
+ checkAgainst = rec->chksum;
+ rec = rec->next;
+ }
+ if (input_mode == input_text)
+ filemode = "r";
if (strcmp(filename, "-") == 0) {
f = stdin;
} else {
@@ -626,14 +636,8 @@
warn("%s", filename);
failed = true;
}
- if (cflag && mode != mode_bsd)
- rec = rec->next;
continue;
}
- if (cflag && mode != mode_bsd) {
- checkAgainst = rec->chksum;
- rec = rec->next;
- }
p = MDInput(&Algorithm[digest], f, buf, false);
if (f != stdin)
(void)fclose(f);

File Metadata

Mime Type
text/plain
Expires
Mon, Jan 19, 7:18 PM (13 h, 35 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27751434
Default Alt Text
D43990.id134737.diff (1 KB)

Event Timeline