From b9b03ba0bc38e14228189bc0232e730c2a06f208 Mon Sep 17 00:00:00 2001 From: Juli Mallett Date: Fri, 3 May 2002 17:13:29 +0000 Subject: [PATCH] Get rid of bogus holder for realloc(3). --- usr.bin/xargs/xargs.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/usr.bin/xargs/xargs.c b/usr.bin/xargs/xargs.c index f0b5854fafd..ea1e3f1c3d2 100644 --- a/usr.bin/xargs/xargs.c +++ b/usr.bin/xargs/xargs.c @@ -255,10 +255,9 @@ arg2: *p++ = '\0'; *xp++ = argp; if (Iflag) { - char *realloc_holder; size_t curlen; - realloc_holder = inpline; - if (realloc_holder == NULL) + + if (inpline == NULL) curlen = 0; else { /* @@ -267,7 +266,7 @@ arg2: * seperation before the next * argument. */ - if (*inpline != '\0') + if ((curlen = strlen(inpline))) strcat(inpline, " "); } curlen++; @@ -277,8 +276,8 @@ arg2: * a space next time through, if we have * to. */ - inpline = realloc(realloc_holder, strlen(argp) + - curlen + 2); + inpline = realloc(inpline, curlen + 2 + + strlen(argp)); if (inpline == NULL) err(1, "realloc"); if (curlen == 1)