From owner-p4-projects@FreeBSD.ORG Sat Jun 14 17:33:10 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CE201106567A; Sat, 14 Jun 2008 17:33:10 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 904691065675 for ; Sat, 14 Jun 2008 17:33:10 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8087A8FC15 for ; Sat, 14 Jun 2008 17:33:10 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5EHXA17042205 for ; Sat, 14 Jun 2008 17:33:10 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5EHXACl042203 for perforce@freebsd.org; Sat, 14 Jun 2008 17:33:10 GMT (envelope-from gabor@freebsd.org) Date: Sat, 14 Jun 2008 17:33:10 GMT Message-Id: <200806141733.m5EHXACl042203@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 143448 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Jun 2008 17:33:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=143448 Change 143448 by gabor@gabor_server on 2008/06/14 17:32:44 - Slight changes to the --color code, -o --color works now, --color in itself is still broken. - Use strlcpy instead of strncpy and use asprintf instead of sprintf. [1] Pointed out by: fjoe (soc-mentor) Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/util.c#15 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/util.c#15 (text+ko) ==== @@ -224,36 +224,37 @@ if (pmatch.rm_so != 0 || pmatch.rm_eo != l->len) r = REG_NOMATCH; } - if ((r == 0) && (color != NULL)) { + if ((r == 0) && (color != NULL) && !oflag) { /* XXX: this color stuff does not work yet :( */ - if (oflag) { - char *matched, *tmp; - matched = malloc((pmatch.rm_eo - pmatch.rm_so + 2) * sizeof(char)); - strncpy(matched, &(l->dat[pmatch.rm_so]), pmatch.rm_eo - pmatch.rm_so + 1); - tmp = malloc((strlen(matched) + 50) * sizeof(char)); - sprintf(tmp, "\33[%sm%s\33[00m", color, matched); - } else { - char *tmp, *begin, *matched, *end; - begin = malloc(strlen(l->dat) - pmatch.rm_so + 1); - matched = malloc((pmatch.rm_eo - pmatch.rm_so + 2) * sizeof(char)); - end = malloc(strlen(l->dat) - pmatch.rm_eo); - strncpy(begin, l->dat, pmatch.rm_so); - strncpy(matched, &(l->dat[pmatch.rm_so]), pmatch.rm_eo - pmatch.rm_so + 1); - strncpy(end, &(l->dat[pmatch.rm_eo]), strlen(l->dat) - strlen(begin) - strlen(matched)); - tmp = malloc((strlen(l->dat) + 50) * sizeof(char)); - sprintf(tmp, "%s\33[%sm%s\33[00m%s", begin, color, matched, end); - free(begin); - free(matched); - free(end); - l->dat = tmp; - } + char *tmp, *begin, *matched, *end; + + begin = malloc(strlen(l->dat) - pmatch.rm_so + 2); + matched = malloc((pmatch.rm_eo - pmatch.rm_so + 1) * sizeof(char)); + end = malloc(strlen(l->dat) - pmatch.rm_eo + 1); + + strlcpy(begin, l->dat, pmatch.rm_so + 1); + strlcpy(matched, &(l->dat[pmatch.rm_so]), pmatch.rm_eo - pmatch.rm_so + 1); + strlcpy(end, &(l->dat[pmatch.rm_eo]), strlen(l->dat) - strlen(begin) - strlen(matched) + 1); + asprintf(&tmp, "%s\33[%sm%s\33[00m%s", begin, color, matched, end); + + free(begin); + free(matched); + free(end); + + l->dat = tmp; } - if (r == 0 && oflag && (color == NULL)) { - char *tmp; - if ((tmp = malloc((pmatch.rm_eo - pmatch.rm_so + 2) * sizeof(char))) == NULL) + if (r == 0 && oflag) { + char *tmp, *matched; + + if ((matched = malloc((pmatch.rm_eo - pmatch.rm_so + 2) * sizeof(char))) == NULL) errx(2, NULL); - strncpy(tmp, &(l->dat[pmatch.rm_so]), pmatch.rm_eo - pmatch.rm_so + 1); - tmp[pmatch.rm_eo - pmatch.rm_so] = '\0'; + strlcpy(matched, &(l->dat[pmatch.rm_so]), pmatch.rm_eo - pmatch.rm_so + 1); + + if (color != NULL) + asprintf(&tmp, "\33[%sm%s\33[00m", color, matched); + else + tmp = matched; + l->dat = tmp; l->len = strlen(l->dat); }