| pr.c (93481) | pr.c (98408) |
|---|---|
| 1/*- 2 * Copyright (c) 1991 Keith Muller. 3 * Copyright (c) 1993 4 * The Regents of the University of California. All rights reserved. 5 * 6 * This code is derived from software contributed to Berkeley by 7 * Keith Muller of the University of California, San Diego. 8 * --- 20 unchanged lines hidden (view full) --- 29 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 30 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 31 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 32 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 33 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 34 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 35 * SUCH DAMAGE. 36 * | 1/*- 2 * Copyright (c) 1991 Keith Muller. 3 * Copyright (c) 1993 4 * The Regents of the University of California. All rights reserved. 5 * 6 * This code is derived from software contributed to Berkeley by 7 * Keith Muller of the University of California, San Diego. 8 * --- 20 unchanged lines hidden (view full) --- 29 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 30 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 31 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 32 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 33 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 34 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 35 * SUCH DAMAGE. 36 * |
| 37 * $FreeBSD: head/usr.bin/pr/pr.c 93481 2002-03-31 18:44:36Z jmallett $ | 37 * $FreeBSD: head/usr.bin/pr/pr.c 98408 2002-06-19 01:45:03Z tjr $ |
| 38 */ 39 40#ifndef lint 41static char copyright[] = 42"@(#) Copyright (c) 1993\n\ 43 The Regents of the University of California. All rights reserved.\n"; 44#endif /* not lint */ 45 --- 1100 unchanged lines hidden (view full) --- 1146 ips += gap - (ips % gap); 1147 ++buf; 1148 continue; 1149 } 1150 1151 /* 1152 * got a non space char; contract out spaces 1153 */ | 38 */ 39 40#ifndef lint 41static char copyright[] = 42"@(#) Copyright (c) 1993\n\ 43 The Regents of the University of California. All rights reserved.\n"; 44#endif /* not lint */ 45 --- 1100 unchanged lines hidden (view full) --- 1146 ips += gap - (ips % gap); 1147 ++buf; 1148 continue; 1149 } 1150 1151 /* 1152 * got a non space char; contract out spaces 1153 */ |
| 1154 while (ops < ips) { | 1154 while (ips - ops > 1) { |
| 1155 /* 1156 * use as many ochar as will fit 1157 */ 1158 if ((tbps = ops + gap - (ops % gap)) > ips) 1159 break; 1160 if (putchar(ochar) == EOF) { 1161 pfail(); 1162 return(1); --- 28 unchanged lines hidden (view full) --- 1191 * if incomplete line, save position counts 1192 */ 1193 *svops = ops; 1194 *svips = ips; 1195 return(0); 1196 } 1197 1198 if (mor < 0) { | 1155 /* 1156 * use as many ochar as will fit 1157 */ 1158 if ((tbps = ops + gap - (ops % gap)) > ips) 1159 break; 1160 if (putchar(ochar) == EOF) { 1161 pfail(); 1162 return(1); --- 28 unchanged lines hidden (view full) --- 1191 * if incomplete line, save position counts 1192 */ 1193 *svops = ops; 1194 *svips = ips; 1195 return(0); 1196 } 1197 1198 if (mor < 0) { |
| 1199 while (ops < ips) { | 1199 while (ips - ops > 1) { |
| 1200 /* 1201 * use as many ochar as will fit 1202 */ 1203 if ((tbps = ops + gap - (ops % gap)) > ips) 1204 break; 1205 if (putchar(ochar) == EOF) { 1206 pfail(); 1207 return(1); --- 662 unchanged lines hidden --- | 1200 /* 1201 * use as many ochar as will fit 1202 */ 1203 if ((tbps = ops + gap - (ops % gap)) > ips) 1204 break; 1205 if (putchar(ochar) == EOF) { 1206 pfail(); 1207 return(1); --- 662 unchanged lines hidden --- |