diff options
| author | michaels <michaels@cvs.openbsd.org> | 1997-02-27 23:33:00 +0000 |
|---|---|---|
| committer | michaels <michaels@cvs.openbsd.org> | 1997-02-27 23:33:00 +0000 |
| commit | 786b8f777bbbbfb8398d28d7ecc3f5b9af405c4c (patch) | |
| tree | 66f359abab9c66ad77c2387b8c8c29d3eec27e05 /bin/pax/pat_rep.c | |
| parent | f6037fc60349ecd5591d406f0af34da7ee2593b5 (diff) | |
fix pr system/124, reported by Janjaap van Velthooven (janjaap@stack.nl).
Diffstat (limited to 'bin/pax/pat_rep.c')
| -rw-r--r-- | bin/pax/pat_rep.c | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/bin/pax/pat_rep.c b/bin/pax/pat_rep.c index d4755558738..afe44a41030 100644 --- a/bin/pax/pat_rep.c +++ b/bin/pax/pat_rep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pat_rep.c,v 1.5 1996/10/27 06:45:12 downsj Exp $ */ +/* $OpenBSD: pat_rep.c,v 1.6 1997/02/27 23:32:59 michaels Exp $ */ /* $NetBSD: pat_rep.c,v 1.4 1995/03/21 09:07:33 cgd Exp $ */ /*- @@ -42,7 +42,7 @@ #if 0 static char sccsid[] = "@(#)pat_rep.c 8.2 (Berkeley) 4/18/94"; #else -static char rcsid[] = "$OpenBSD: pat_rep.c,v 1.5 1996/10/27 06:45:12 downsj Exp $"; +static char rcsid[] = "$OpenBSD: pat_rep.c,v 1.6 1997/02/27 23:32:59 michaels Exp $"; #endif #endif /* not lint */ @@ -234,12 +234,12 @@ rep_add(str) #if __STDC__ int -pat_add(char *str, char *chdnam) +pat_add(char *str, char *chdname) #else int -pat_add(str, chdnam) +pat_add(str, chdname) char *str; - char *chdnam; + char *chdname; #endif { register PATTERN *pt; @@ -267,15 +267,8 @@ pat_add(str, chdnam) pt->plen = strlen(str); pt->fow = NULL; pt->flgs = 0; - if (chdnam != (char *)NULL) { - pt->chdnam = strdup(chdnam); - if (pt->chdnam == (char *)NULL) { - paxwarn(1, - "Unable to allocate memory for pattern string"); - return(-1); - } - } else - pt->chdnam = (char *)NULL; + pt->chdname = chdname; + if (pathead == NULL) { pattail = pathead = pt; return(0); @@ -441,8 +434,6 @@ pat_sel(arcn) return(-1); } *ppt = pt->fow; - if (pt->chdnam != (char *)NULL) - (void)free(pt->chdnam); (void)free((char *)pt); arcn->pat = NULL; return(0); |