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

Return to pr.c CVS log

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

Diff for /src/usr.bin/pr/pr.c between version 1.34 and 1.35

version 1.34, 2014/04/15 17:27:37

version 1.35, 2015/02/08 23:40:34

Line 1789

ferrout("pr: +page number is %s: %s\n", errstr, eoptarg);

return(1);

}

++skipping;

skipping = 1;

break;

case '-':

clcnt = strtonum(eoptarg, 1, INT_MAX, &errstr);

Line 1798

return(1);

}

if (clcnt > 1)

++cflag;

cflag = 1;

break;

case 'a':

++across;

across = 1;

break;

case 'd':

++dspace;

dspace = 1;

break;

case 'e':

++eflag;

eflag = 1;

if ((eoptarg != NULL) && !isdigit((unsigned char)*eoptarg))

inchar = *eoptarg++;

else

Line 1828

break;

case 'f':

case 'F':

++formfeed;

formfeed = 1;

break;

case 'h':

header = eoptarg;

break;

case 'i':

++iflag;

iflag = 1;

if ((eoptarg != NULL) && !isdigit((unsigned char)*eoptarg))

ochar = *eoptarg++;

else

Line 1861

}

break;

case 'm':

++merge;

merge = 1;

break;

case 'n':

if ((eoptarg != NULL) && !isdigit((unsigned char)*eoptarg))

Line 1888

}

break;

case 'r':

++nodiag;

nodiag = 1;

break;

case 's':

++sflag;

sflag = 1;

if (eoptarg == NULL)

schar = SCHAR;

else {

Line 1903

}

break;

case 't':

++nohead;

nohead = 1;

break;

case 'w':

++wflag;

wflag = 1;

pgwd = strtonum(eoptarg, 1, INT_MAX, &errstr);

if (errstr) {

ferrout("pr: -w width is %s: %s\n", errstr, eoptarg);

Line 1984

* make sure long enough for headers. if not disable

if (lines <= HEADLEN + TAILLEN)

++nohead;

nohead = 1;

else if (!nohead)

lines -= HEADLEN + TAILLEN;