diff options
| author | phk <phk@FreeBSD.org> | 2003-11-05 20:07:40 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2003-11-05 20:07:40 +0000 |
| commit | c1f70887cd98e91b587bcd5c639ecb6d38c0c902 (patch) | |
| tree | 012791d93bb5e7802665c0e4177bdb06d01ded9c /usr.sbin/mtree/spec.c | |
| parent | a88a9d9e80a3590a9fbb80c7d4e9a6ad34e6bbe5 (diff) | |
| download | FreeBSD-src-c1f70887cd98e91b587bcd5c639ecb6d38c0c902.zip FreeBSD-src-c1f70887cd98e91b587bcd5c639ecb6d38c0c902.tar.gz | |
Rename spec() and verify() functions to have mtree_ prefix and take
explicit file descriptor instead of assuming stdin.
Diffstat (limited to 'usr.sbin/mtree/spec.c')
| -rw-r--r-- | usr.sbin/mtree/spec.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/usr.sbin/mtree/spec.c b/usr.sbin/mtree/spec.c index 71038da..1e26559 100644 --- a/usr.sbin/mtree/spec.c +++ b/usr.sbin/mtree/spec.c @@ -55,7 +55,7 @@ static void set(char *, NODE *); static void unset(char *, NODE *); NODE * -spec(void) +mtree_readspec(FILE *fi) { NODE *centry, *last; char *p; @@ -66,7 +66,7 @@ spec(void) centry = last = root = NULL; bzero(&ginfo, sizeof(ginfo)); c_cur = c_next = 0; - for (lineno = 1; fgets(buf, sizeof(buf), stdin); + for (lineno = 1; fgets(buf, sizeof(buf), fi); ++lineno, c_cur = c_next, c_next = 0) { /* Skip empty lines. */ if (buf[0] == '\n') @@ -186,21 +186,18 @@ set(char *t, NODE *ip) break; case F_MD5: ip->md5digest = strdup(val); - if(!ip->md5digest) { + if(!ip->md5digest) errx(1, "strdup"); - } break; case F_SHA1: ip->sha1digest = strdup(val); - if(!ip->sha1digest) { + if(!ip->sha1digest) errx(1, "strdup"); - } break; case F_RMD160: ip->rmd160digest = strdup(val); - if(!ip->rmd160digest) { + if(!ip->rmd160digest) errx(1, "strdup"); - } break; case F_FLAGS: if (strcmp("none", val) == 0) |
