src/usr.bin/lam/lam.c - diff

Return to lam.c CVS log

Up to [local] / src / usr.bin / lam

Diff for /src/usr.bin/lam/lam.c between version 1.6 and 1.7

version 1.6, 2003/04/06 02:40:21

version 1.7, 2003/04/21 00:42:49

Line 178

pad(ip)

struct openfile *ip;

{

char *p = ip->sepstring;

size_t n;

char *lp = linep;

while (*p)

n = strlcpy(lp, ip->sepstring, line + sizeof(line) - lp);

*lp++ = *p++;

lp += (n < line + sizeof(line) - lp) ? n : strlen(lp);

if (ip->pad) {

sprintf(lp, ip->format, "");

n = snprintf(lp, line + sizeof(line) - lp, ip->format, "");

lp += strlen(lp);

lp += (n < line + sizeof(line) - lp) ? n : strlen(lp);

}

return (lp);

}

Line 194

gatherline(ip)

struct openfile *ip;

{

size_t n;

char s[BUFSIZ];

int c;

char *p;

char *lp = linep;

char *end = s + BUFSIZ;

int c;

if (ip->eof)

return (pad(ip));

Line 213

Line 214

morefiles--;

return (pad(ip));

}

p = ip->sepstring;

n = strlcpy(lp, ip->sepstring, line + sizeof(line) - lp);

while (*p)

lp += (n < line + sizeof(line) - lp) ? n : strlen(lp);

*lp++ = *p++;

n = snprintf(lp, line + sizeof line - lp, ip->format, s);

sprintf(lp, ip->format, s);

lp += (n < line + sizeof(line) - lp) ? n : strlen(lp);

lp += strlen(lp);

return (lp);

}