diff options
| author | phk <phk@FreeBSD.org> | 1996-02-05 16:06:55 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 1996-02-05 16:06:55 +0000 |
| commit | 20dc7e151c09bca6d413128cb1d0026164283639 (patch) | |
| tree | ea4349e8a5900a751337834c697140f006faae27 /usr.sbin/ctm/ctm/ctm_pass2.c | |
| parent | 3a86983b1ac388d1ba017c384d01e94228c5040d (diff) | |
| download | FreeBSD-src-20dc7e151c09bca6d413128cb1d0026164283639.zip FreeBSD-src-20dc7e151c09bca6d413128cb1d0026164283639.tar.gz | |
Add support for local modifications to the tree, by using FOO.ctm instead
of FOO if present. Various other tweaks.
Submitted by: Christian Haury <Christian.Haury@sagem.fr>
Diffstat (limited to 'usr.sbin/ctm/ctm/ctm_pass2.c')
| -rw-r--r-- | usr.sbin/ctm/ctm/ctm_pass2.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/usr.sbin/ctm/ctm/ctm_pass2.c b/usr.sbin/ctm/ctm/ctm_pass2.c index 4e25719..0afa539 100644 --- a/usr.sbin/ctm/ctm/ctm_pass2.c +++ b/usr.sbin/ctm/ctm/ctm_pass2.c @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id: ctm_pass2.c,v 1.9 1995/07/12 09:16:10 phk Exp $ + * $Id: ctm_pass2.c,v 1.10 1995/11/10 12:17:23 phk Exp $ * */ @@ -44,9 +44,9 @@ Pass2(FILE *fd) /* XXX drop or use ? */ for(;;) { - if(trash) {Free(trash), trash = 0;} - if(name) {Free(name), name = 0;} - if(md5) {Free(md5), md5 = 0;} + Delete(trash); + Delete(name); + Delete(md5); cnt = -1; GETFIELD(p,' '); @@ -69,7 +69,7 @@ Pass2(FILE *fd) switch (j & CTM_F_MASK) { case CTM_F_Name: - GETFIELDCOPY(name,sep); + GETNAMECOPY(name,sep,j,0); /* XXX Check DR DM rec's for parent-dir */ if(j & CTM_Q_Name_New) { /* XXX Check DR FR rec's for item */ @@ -163,7 +163,7 @@ Pass2(FILE *fd) return ret; } unlink(p); - free(p); + Free(p); } break; @@ -171,6 +171,11 @@ Pass2(FILE *fd) } } } + + Delete(trash); + Delete(name); + Delete(md5); + q = MD5End (&ctx,md5_1); GETFIELD(p,'\n'); /* <MD5> */ if(strcmp(q,p)) WRONG |
