Home | History | Annotate | Line # | Download | only in fmt
fmt.c revision 1.13
      1  1.13       abs /*	$NetBSD: fmt.c,v 1.13 2000/09/18 13:42:53 abs Exp $	*/
      2   1.4       jtc 
      3   1.1       cgd /*
      4   1.4       jtc  * Copyright (c) 1980, 1993
      5   1.4       jtc  *	The Regents of the University of California.  All rights reserved.
      6   1.1       cgd  *
      7   1.1       cgd  * Redistribution and use in source and binary forms, with or without
      8   1.1       cgd  * modification, are permitted provided that the following conditions
      9   1.1       cgd  * are met:
     10   1.1       cgd  * 1. Redistributions of source code must retain the above copyright
     11   1.1       cgd  *    notice, this list of conditions and the following disclaimer.
     12   1.1       cgd  * 2. Redistributions in binary form must reproduce the above copyright
     13   1.1       cgd  *    notice, this list of conditions and the following disclaimer in the
     14   1.1       cgd  *    documentation and/or other materials provided with the distribution.
     15   1.1       cgd  * 3. All advertising materials mentioning features or use of this software
     16   1.1       cgd  *    must display the following acknowledgement:
     17   1.1       cgd  *	This product includes software developed by the University of
     18   1.1       cgd  *	California, Berkeley and its contributors.
     19   1.1       cgd  * 4. Neither the name of the University nor the names of its contributors
     20   1.1       cgd  *    may be used to endorse or promote products derived from this software
     21   1.1       cgd  *    without specific prior written permission.
     22   1.1       cgd  *
     23   1.1       cgd  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
     24   1.1       cgd  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
     25   1.1       cgd  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
     26   1.1       cgd  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
     27   1.1       cgd  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
     28   1.1       cgd  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
     29   1.1       cgd  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
     30   1.1       cgd  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
     31   1.1       cgd  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
     32   1.1       cgd  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
     33   1.1       cgd  * SUCH DAMAGE.
     34   1.1       cgd  */
     35   1.1       cgd 
     36   1.6     lukem #include <sys/cdefs.h>
     37   1.1       cgd #ifndef lint
     38   1.6     lukem __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
     39   1.6     lukem 	The Regents of the University of California.  All rights reserved.\n");
     40   1.1       cgd #endif /* not lint */
     41   1.1       cgd 
     42   1.1       cgd #ifndef lint
     43   1.4       jtc #if 0
     44   1.4       jtc static char sccsid[] = "@(#)fmt.c	8.1 (Berkeley) 7/20/93";
     45   1.4       jtc #endif
     46  1.13       abs __RCSID("$NetBSD: fmt.c,v 1.13 2000/09/18 13:42:53 abs Exp $");
     47   1.1       cgd #endif /* not lint */
     48   1.1       cgd 
     49   1.1       cgd #include <stdio.h>
     50   1.3       cgd #include <stdlib.h>
     51   1.3       cgd #include <string.h>
     52   1.1       cgd #include <ctype.h>
     53   1.5    kleink #include <locale.h>
     54   1.1       cgd 
     55   1.1       cgd /*
     56   1.1       cgd  * fmt -- format the concatenation of input files or standard input
     57   1.1       cgd  * onto standard output.  Designed for use with Mail ~|
     58   1.1       cgd  *
     59   1.1       cgd  * Syntax : fmt [ goal [ max ] ] [ name ... ]
     60   1.1       cgd  * Authors: Kurt Shoens (UCB) 12/7/78;
     61   1.1       cgd  *          Liz Allen (UMCP) 2/24/83 [Addition of goal length concept].
     62   1.1       cgd  */
     63   1.1       cgd 
     64   1.1       cgd /* LIZ@UOM 6/18/85 -- Don't need LENGTH any more.
     65   1.1       cgd  * #define	LENGTH	72		Max line length in output
     66   1.1       cgd  */
     67   1.1       cgd #define	NOSTR	((char *) 0)	/* Null string pointer for lint */
     68   1.1       cgd 
     69   1.1       cgd /* LIZ@UOM 6/18/85 --New variables goal_length and max_length */
     70   1.1       cgd #define GOAL_LENGTH 65
     71   1.1       cgd #define MAX_LENGTH 75
     72   1.1       cgd int	goal_length;		/* Target or goal line length in output */
     73   1.1       cgd int	max_length;		/* Max line length in output */
     74   1.1       cgd int	pfx;			/* Current leading blank count */
     75   1.1       cgd int	lineno;			/* Current input line */
     76   1.1       cgd int	mark;			/* Last place we saw a head line */
     77  1.12       abs int	center;
     78   1.1       cgd 
     79   1.1       cgd char	*headnames[] = {"To", "Subject", "Cc", 0};
     80   1.1       cgd 
     81  1.10  jdolecek static void	fmt __P((FILE *));
     82  1.10  jdolecek static int	ispref __P((const char *, const char *));
     83  1.10  jdolecek static void	leadin __P((void));
     84  1.10  jdolecek static void	oflush __P((void));
     85  1.10  jdolecek static void	pack __P((const char *, int));
     86  1.10  jdolecek static void	prefix __P((const char *, int));
     87  1.10  jdolecek static void	setout __P((void));
     88  1.10  jdolecek static void	split __P((const char *, int));
     89  1.10  jdolecek static void	tabulate __P((char *));
     90  1.10  jdolecek 
     91  1.10  jdolecek int	ishead __P((const char *));
     92   1.6     lukem int	main __P((int, char **));
     93   1.6     lukem 
     94   1.1       cgd /*
     95   1.1       cgd  * Drive the whole formatter by managing input files.  Also,
     96   1.1       cgd  * cause initialization of the output stuff and flush it out
     97   1.1       cgd  * at the end.
     98   1.1       cgd  */
     99   1.1       cgd 
    100   1.6     lukem int
    101   1.1       cgd main(argc, argv)
    102   1.1       cgd 	int argc;
    103   1.1       cgd 	char **argv;
    104   1.1       cgd {
    105   1.6     lukem 	FILE *fi;
    106   1.6     lukem 	int errs = 0;
    107   1.1       cgd 	int number;		/* LIZ@UOM 6/18/85 */
    108   1.1       cgd 
    109   1.1       cgd 	goal_length = GOAL_LENGTH;
    110   1.1       cgd 	max_length = MAX_LENGTH;
    111   1.1       cgd 	setout();
    112   1.1       cgd 	lineno = 1;
    113   1.1       cgd 	mark = -10;
    114   1.5    kleink 
    115   1.5    kleink 	setlocale(LC_ALL, "");
    116   1.5    kleink 
    117   1.1       cgd 	/*
    118   1.1       cgd 	 * LIZ@UOM 6/18/85 -- Check for goal and max length arguments
    119   1.1       cgd 	 */
    120  1.13       abs 	if (argc > 1 && !strcmp(argv[1], "-C")) {
    121  1.12       abs 		center++;
    122  1.12       abs 		argc--;
    123  1.12       abs 		argv++;
    124  1.12       abs 	}
    125   1.1       cgd 	if (argc > 1 && (1 == (sscanf(argv[1], "%d", &number)))) {
    126   1.1       cgd 		argv++;
    127   1.1       cgd 		argc--;
    128   1.8      ross 		goal_length = abs(number);
    129   1.1       cgd 		if (argc > 1 && (1 == (sscanf(argv[1], "%d", &number)))) {
    130   1.1       cgd 			argv++;
    131   1.1       cgd 			argc--;
    132   1.8      ross 			max_length = abs(number);
    133   1.1       cgd 		}
    134   1.1       cgd 	}
    135   1.1       cgd 	if (max_length <= goal_length) {
    136   1.1       cgd 		fprintf(stderr, "Max length must be greater than %s\n",
    137   1.1       cgd 			"goal length");
    138   1.1       cgd 		exit(1);
    139   1.1       cgd 	}
    140   1.1       cgd 	if (argc < 2) {
    141   1.1       cgd 		fmt(stdin);
    142   1.1       cgd 		oflush();
    143   1.1       cgd 		exit(0);
    144   1.1       cgd 	}
    145   1.1       cgd 	while (--argc) {
    146   1.1       cgd 		if ((fi = fopen(*++argv, "r")) == NULL) {
    147   1.1       cgd 			perror(*argv);
    148   1.1       cgd 			errs++;
    149   1.1       cgd 			continue;
    150   1.1       cgd 		}
    151   1.1       cgd 		fmt(fi);
    152   1.1       cgd 		fclose(fi);
    153   1.1       cgd 	}
    154   1.1       cgd 	oflush();
    155   1.1       cgd 	exit(errs);
    156   1.1       cgd }
    157   1.1       cgd 
    158   1.1       cgd /*
    159   1.1       cgd  * Read up characters from the passed input file, forming lines,
    160   1.1       cgd  * doing ^H processing, expanding tabs, stripping trailing blanks,
    161   1.1       cgd  * and sending each line down for analysis.
    162   1.1       cgd  */
    163  1.10  jdolecek static void
    164   1.1       cgd fmt(fi)
    165   1.1       cgd 	FILE *fi;
    166   1.1       cgd {
    167   1.1       cgd 	char linebuf[BUFSIZ], canonb[BUFSIZ];
    168   1.6     lukem 	char *cp, *cp2;
    169  1.10  jdolecek 	int c, col, add_space;
    170   1.1       cgd 
    171  1.12       abs 	if (center) {
    172  1.12       abs 		while (1) {
    173  1.12       abs 			cp = fgets(linebuf, BUFSIZ, fi);
    174  1.12       abs 			if (!cp)
    175  1.12       abs 				return;
    176  1.12       abs 			while (*cp && isspace(*cp))
    177  1.12       abs 				cp++;
    178  1.12       abs 			cp2 = cp + strlen(cp) - 1;
    179  1.12       abs 			while (cp2 > cp && isspace(*cp2))
    180  1.12       abs 				cp2--;
    181  1.12       abs 			if (cp == cp2)
    182  1.12       abs 				putchar('\n');
    183  1.12       abs 			col = cp2 - cp;
    184  1.12       abs 			for (c = 0; c < (goal_length-col)/2; c++)
    185  1.12       abs 				putchar(' ');
    186  1.12       abs 			while (cp <= cp2)
    187  1.12       abs 				putchar(*cp++);
    188  1.12       abs 			putchar('\n');
    189  1.12       abs 		}
    190  1.12       abs 	}
    191   1.1       cgd 	c = getc(fi);
    192   1.1       cgd 	while (c != EOF) {
    193   1.1       cgd 		/*
    194   1.1       cgd 		 * Collect a line, doing ^H processing.
    195   1.1       cgd 		 * Leave tabs for now.
    196   1.1       cgd 		 */
    197   1.1       cgd 		cp = linebuf;
    198   1.1       cgd 		while (c != '\n' && c != EOF && cp-linebuf < BUFSIZ-1) {
    199   1.1       cgd 			if (c == '\b') {
    200   1.1       cgd 				if (cp > linebuf)
    201   1.1       cgd 					cp--;
    202   1.1       cgd 				c = getc(fi);
    203   1.1       cgd 				continue;
    204   1.1       cgd 			}
    205   1.5    kleink 			if(!(isprint(c) || c == '\t')) {
    206   1.1       cgd 				c = getc(fi);
    207   1.1       cgd 				continue;
    208   1.1       cgd 			}
    209   1.1       cgd 			*cp++ = c;
    210   1.1       cgd 			c = getc(fi);
    211   1.1       cgd 		}
    212   1.1       cgd 		*cp = '\0';
    213   1.1       cgd 
    214   1.1       cgd 		/*
    215  1.10  jdolecek 		 * By default, add space after the end of current input
    216  1.10  jdolecek 		 * (normally end of line)
    217  1.10  jdolecek 		 */
    218  1.10  jdolecek 		add_space = 1;
    219  1.10  jdolecek 
    220  1.10  jdolecek 		/*
    221  1.10  jdolecek 		 * If the input line is longer than linebuf buffer can hold,
    222  1.10  jdolecek 		 * process the data read so far as if it was a separate line -
    223  1.10  jdolecek 		 * if there is any whitespace character in the read data,
    224  1.10  jdolecek 		 * process all the data up to it, otherwise process all.
    225   1.1       cgd 		 */
    226  1.10  jdolecek 		if (c != '\n' && c != EOF && !isspace(c)) {
    227  1.10  jdolecek 			/*
    228  1.10  jdolecek 			 * Find out if any whitespace character has been read.
    229  1.10  jdolecek 			 */
    230  1.10  jdolecek 			for(cp2 = cp; cp2 >= linebuf
    231  1.10  jdolecek 				&& !isspace((unsigned char)*cp2); cp2--);
    232  1.10  jdolecek 
    233  1.10  jdolecek 			if (cp2 < linebuf) {
    234  1.10  jdolecek 				/*
    235  1.10  jdolecek 				 * ungetc() last read character so that it
    236  1.10  jdolecek 				 * won't get lost.
    237  1.10  jdolecek 				 */
    238  1.10  jdolecek 				ungetc(c, fi);
    239  1.10  jdolecek 				/*
    240  1.10  jdolecek 				 * Don't append space on the end in split().
    241  1.10  jdolecek 				 */
    242  1.10  jdolecek 				add_space = 0;
    243  1.10  jdolecek 			} else {
    244  1.10  jdolecek 				/*
    245  1.10  jdolecek 				 * To avoid splitting a word in a middle,
    246  1.10  jdolecek 				 * ungetc() all characters after last
    247  1.10  jdolecek 				 * whitespace char.
    248  1.10  jdolecek 				 */
    249  1.10  jdolecek 				while (!isspace(c) && (cp >= linebuf)) {
    250  1.10  jdolecek 					ungetc(c, fi);
    251  1.10  jdolecek 					c = *--cp;
    252  1.10  jdolecek 				}
    253  1.10  jdolecek 				*cp = '\0';
    254  1.10  jdolecek 			}
    255  1.10  jdolecek 		}
    256   1.1       cgd 
    257   1.1       cgd 		/*
    258   1.1       cgd 		 * Expand tabs on the way to canonb.
    259   1.1       cgd 		 */
    260   1.1       cgd 		col = 0;
    261   1.1       cgd 		cp = linebuf;
    262   1.1       cgd 		cp2 = canonb;
    263   1.6     lukem 		while ((c = *cp++) != 0) {
    264   1.1       cgd 			if (c != '\t') {
    265   1.1       cgd 				col++;
    266   1.1       cgd 				if (cp2-canonb < BUFSIZ-1)
    267   1.1       cgd 					*cp2++ = c;
    268   1.1       cgd 				continue;
    269   1.1       cgd 			}
    270   1.1       cgd 			do {
    271   1.1       cgd 				if (cp2-canonb < BUFSIZ-1)
    272   1.1       cgd 					*cp2++ = ' ';
    273   1.1       cgd 				col++;
    274   1.1       cgd 			} while ((col & 07) != 0);
    275   1.1       cgd 		}
    276   1.1       cgd 
    277   1.1       cgd 		/*
    278   1.1       cgd 		 * Swipe trailing blanks from the line.
    279   1.1       cgd 		 */
    280   1.1       cgd 		for (cp2--; cp2 >= canonb && *cp2 == ' '; cp2--)
    281   1.1       cgd 			;
    282   1.1       cgd 		*++cp2 = '\0';
    283  1.10  jdolecek 		prefix(canonb, add_space);
    284   1.1       cgd 		if (c != EOF)
    285   1.1       cgd 			c = getc(fi);
    286   1.1       cgd 	}
    287   1.1       cgd }
    288   1.1       cgd 
    289   1.1       cgd /*
    290   1.1       cgd  * Take a line devoid of tabs and other garbage and determine its
    291   1.1       cgd  * blank prefix.  If the indent changes, call for a linebreak.
    292   1.1       cgd  * If the input line is blank, echo the blank line on the output.
    293   1.1       cgd  * Finally, if the line minus the prefix is a mail header, try to keep
    294   1.1       cgd  * it on a line by itself.
    295   1.1       cgd  */
    296  1.10  jdolecek static void
    297  1.10  jdolecek prefix(line, add_space)
    298  1.10  jdolecek 	const char line[];
    299  1.10  jdolecek 	int add_space;
    300   1.1       cgd {
    301  1.10  jdolecek 	const char *cp;
    302  1.10  jdolecek 	char **hp;
    303   1.6     lukem 	int np, h;
    304   1.1       cgd 
    305   1.1       cgd 	if (strlen(line) == 0) {
    306   1.1       cgd 		oflush();
    307   1.1       cgd 		putchar('\n');
    308   1.1       cgd 		return;
    309   1.1       cgd 	}
    310   1.1       cgd 	for (cp = line; *cp == ' '; cp++)
    311   1.1       cgd 		;
    312   1.1       cgd 	np = cp - line;
    313   1.1       cgd 
    314   1.1       cgd 	/*
    315   1.1       cgd 	 * The following horrible expression attempts to avoid linebreaks
    316   1.1       cgd 	 * when the indent changes due to a paragraph.
    317   1.1       cgd 	 */
    318   1.1       cgd 	if (np != pfx && (np > pfx || abs(pfx-np) > 8))
    319   1.1       cgd 		oflush();
    320   1.6     lukem 	if ((h = ishead(cp)) != 0)
    321   1.1       cgd 		oflush(), mark = lineno;
    322   1.1       cgd 	if (lineno - mark < 3 && lineno - mark > 0)
    323   1.1       cgd 		for (hp = &headnames[0]; *hp != (char *) 0; hp++)
    324   1.1       cgd 			if (ispref(*hp, cp)) {
    325   1.1       cgd 				h = 1;
    326   1.1       cgd 				oflush();
    327   1.1       cgd 				break;
    328   1.1       cgd 			}
    329   1.1       cgd 	if (!h && (h = (*cp == '.')))
    330   1.1       cgd 		oflush();
    331   1.1       cgd 	pfx = np;
    332  1.10  jdolecek 	if (h) {
    333   1.4       jtc 		pack(cp, strlen(cp));
    334   1.1       cgd 		oflush();
    335  1.10  jdolecek 	} else
    336  1.10  jdolecek 		split(cp, add_space);
    337   1.1       cgd 	lineno++;
    338   1.1       cgd }
    339   1.1       cgd 
    340   1.1       cgd /*
    341   1.1       cgd  * Split up the passed line into output "words" which are
    342   1.1       cgd  * maximal strings of non-blanks with the blank separation
    343   1.1       cgd  * attached at the end.  Pass these words along to the output
    344   1.1       cgd  * line packer.
    345   1.1       cgd  */
    346  1.10  jdolecek static void
    347  1.10  jdolecek split(line, add_space)
    348  1.10  jdolecek 	const char line[];
    349  1.10  jdolecek 	int add_space;
    350   1.1       cgd {
    351  1.10  jdolecek 	const char *cp;
    352  1.10  jdolecek 	char *cp2;
    353   1.1       cgd 	char word[BUFSIZ];
    354   1.1       cgd 	int wordl;		/* LIZ@UOM 6/18/85 */
    355   1.1       cgd 
    356   1.1       cgd 	cp = line;
    357   1.1       cgd 	while (*cp) {
    358   1.1       cgd 		cp2 = word;
    359   1.1       cgd 		wordl = 0;	/* LIZ@UOM 6/18/85 */
    360   1.1       cgd 
    361   1.1       cgd 		/*
    362   1.1       cgd 		 * Collect a 'word,' allowing it to contain escaped white
    363   1.1       cgd 		 * space.
    364   1.1       cgd 		 */
    365   1.1       cgd 		while (*cp && *cp != ' ') {
    366   1.9  christos 			if (*cp == '\\' && isspace((unsigned char)cp[1]))
    367   1.1       cgd 				*cp2++ = *cp++;
    368   1.1       cgd 			*cp2++ = *cp++;
    369   1.1       cgd 			wordl++;/* LIZ@UOM 6/18/85 */
    370   1.1       cgd 		}
    371   1.1       cgd 
    372   1.1       cgd 		/*
    373   1.1       cgd 		 * Guarantee a space at end of line. Two spaces after end of
    374   1.1       cgd 		 * sentence punctuation.
    375   1.1       cgd 		 */
    376  1.10  jdolecek 		if (*cp == '\0' && add_space) {
    377   1.1       cgd 			*cp2++ = ' ';
    378   1.7     lukem 			if (strchr(".:!", cp[-1]))
    379   1.1       cgd 				*cp2++ = ' ';
    380   1.1       cgd 		}
    381   1.1       cgd 		while (*cp == ' ')
    382   1.1       cgd 			*cp2++ = *cp++;
    383   1.1       cgd 		*cp2 = '\0';
    384   1.1       cgd 		/*
    385   1.1       cgd 		 * LIZ@UOM 6/18/85 pack(word);
    386   1.1       cgd 		 */
    387   1.1       cgd 		pack(word, wordl);
    388   1.1       cgd 	}
    389   1.1       cgd }
    390   1.1       cgd 
    391   1.1       cgd /*
    392   1.1       cgd  * Output section.
    393   1.1       cgd  * Build up line images from the words passed in.  Prefix
    394   1.1       cgd  * each line with correct number of blanks.  The buffer "outbuf"
    395   1.1       cgd  * contains the current partial line image, including prefixed blanks.
    396   1.1       cgd  * "outp" points to the next available space therein.  When outp is NOSTR,
    397   1.1       cgd  * there ain't nothing in there yet.  At the bottom of this whole mess,
    398   1.1       cgd  * leading tabs are reinserted.
    399   1.1       cgd  */
    400   1.1       cgd char	outbuf[BUFSIZ];			/* Sandbagged output line image */
    401   1.1       cgd char	*outp;				/* Pointer in above */
    402   1.1       cgd 
    403   1.1       cgd /*
    404   1.1       cgd  * Initialize the output section.
    405   1.1       cgd  */
    406  1.10  jdolecek static void
    407   1.1       cgd setout()
    408   1.1       cgd {
    409   1.1       cgd 	outp = NOSTR;
    410   1.1       cgd }
    411   1.1       cgd 
    412   1.1       cgd /*
    413   1.1       cgd  * Pack a word onto the output line.  If this is the beginning of
    414   1.1       cgd  * the line, push on the appropriately-sized string of blanks first.
    415   1.1       cgd  * If the word won't fit on the current line, flush and begin a new
    416   1.1       cgd  * line.  If the word is too long to fit all by itself on a line,
    417   1.1       cgd  * just give it its own and hope for the best.
    418   1.1       cgd  *
    419   1.1       cgd  * LIZ@UOM 6/18/85 -- If the new word will fit in at less than the
    420   1.1       cgd  *	goal length, take it.  If not, then check to see if the line
    421   1.1       cgd  *	will be over the max length; if so put the word on the next
    422   1.1       cgd  *	line.  If not, check to see if the line will be closer to the
    423   1.1       cgd  *	goal length with or without the word and take it or put it on
    424   1.1       cgd  *	the next line accordingly.
    425   1.1       cgd  */
    426   1.1       cgd 
    427   1.1       cgd /*
    428   1.1       cgd  * LIZ@UOM 6/18/85 -- pass in the length of the word as well
    429   1.1       cgd  * pack(word)
    430   1.1       cgd  *	char word[];
    431   1.1       cgd  */
    432  1.10  jdolecek static void
    433   1.1       cgd pack(word,wl)
    434  1.10  jdolecek 	const char word[];
    435   1.1       cgd 	int wl;
    436   1.1       cgd {
    437  1.10  jdolecek 	const char *cp;
    438   1.6     lukem 	int s, t;
    439   1.1       cgd 
    440   1.1       cgd 	if (outp == NOSTR)
    441   1.1       cgd 		leadin();
    442   1.1       cgd 	/*
    443   1.1       cgd 	 * LIZ@UOM 6/18/85 -- change condition to check goal_length; s is the
    444   1.1       cgd 	 * length of the line before the word is added; t is now the length
    445   1.1       cgd 	 * of the line after the word is added
    446   1.1       cgd 	 *	t = strlen(word);
    447   1.1       cgd 	 *	if (t+s <= LENGTH)
    448   1.1       cgd 	 */
    449   1.1       cgd 	s = outp - outbuf;
    450   1.1       cgd 	t = wl + s;
    451   1.1       cgd 	if ((t <= goal_length) ||
    452   1.1       cgd 	    ((t <= max_length) && (t - goal_length <= goal_length - s))) {
    453   1.1       cgd 		/*
    454   1.1       cgd 		 * In like flint!
    455   1.1       cgd 		 */
    456   1.1       cgd 		for (cp = word; *cp; *outp++ = *cp++);
    457   1.1       cgd 		return;
    458   1.1       cgd 	}
    459   1.1       cgd 	if (s > pfx) {
    460   1.1       cgd 		oflush();
    461   1.1       cgd 		leadin();
    462   1.1       cgd 	}
    463   1.1       cgd 	for (cp = word; *cp; *outp++ = *cp++);
    464   1.1       cgd }
    465   1.1       cgd 
    466   1.1       cgd /*
    467   1.1       cgd  * If there is anything on the current output line, send it on
    468   1.1       cgd  * its way.  Set outp to NOSTR to indicate the absence of the current
    469   1.1       cgd  * line prefix.
    470   1.1       cgd  */
    471  1.10  jdolecek static void
    472   1.1       cgd oflush()
    473   1.1       cgd {
    474   1.1       cgd 	if (outp == NOSTR)
    475   1.1       cgd 		return;
    476   1.1       cgd 	*outp = '\0';
    477   1.1       cgd 	tabulate(outbuf);
    478   1.1       cgd 	outp = NOSTR;
    479   1.1       cgd }
    480   1.1       cgd 
    481   1.1       cgd /*
    482   1.1       cgd  * Take the passed line buffer, insert leading tabs where possible, and
    483   1.1       cgd  * output on standard output (finally).
    484   1.1       cgd  */
    485  1.10  jdolecek static void
    486   1.1       cgd tabulate(line)
    487   1.1       cgd 	char line[];
    488   1.1       cgd {
    489   1.6     lukem 	char *cp;
    490   1.6     lukem 	int b, t;
    491   1.1       cgd 
    492   1.1       cgd 	/*
    493   1.1       cgd 	 * Toss trailing blanks in the output line.
    494   1.1       cgd 	 */
    495   1.1       cgd 	cp = line + strlen(line) - 1;
    496   1.1       cgd 	while (cp >= line && *cp == ' ')
    497   1.1       cgd 		cp--;
    498   1.1       cgd 	*++cp = '\0';
    499   1.1       cgd 
    500   1.1       cgd 	/*
    501   1.1       cgd 	 * Count the leading blank space and tabulate.
    502   1.1       cgd 	 */
    503   1.1       cgd 	for (cp = line; *cp == ' '; cp++)
    504   1.1       cgd 		;
    505   1.1       cgd 	b = cp-line;
    506   1.1       cgd 	t = b >> 3;
    507   1.1       cgd 	b &= 07;
    508   1.1       cgd 	if (t > 0)
    509   1.1       cgd 		do
    510   1.1       cgd 			putc('\t', stdout);
    511   1.1       cgd 		while (--t);
    512   1.1       cgd 	if (b > 0)
    513   1.1       cgd 		do
    514   1.1       cgd 			putc(' ', stdout);
    515   1.1       cgd 		while (--b);
    516   1.1       cgd 	while (*cp)
    517   1.1       cgd 		putc(*cp++, stdout);
    518   1.1       cgd 	putc('\n', stdout);
    519   1.1       cgd }
    520   1.1       cgd 
    521   1.1       cgd /*
    522   1.1       cgd  * Initialize the output line with the appropriate number of
    523   1.1       cgd  * leading blanks.
    524   1.1       cgd  */
    525  1.10  jdolecek static void
    526   1.1       cgd leadin()
    527   1.1       cgd {
    528   1.6     lukem 	int b;
    529   1.6     lukem 	char *cp;
    530   1.1       cgd 
    531   1.1       cgd 	for (b = 0, cp = outbuf; b < pfx; b++)
    532   1.1       cgd 		*cp++ = ' ';
    533   1.1       cgd 	outp = cp;
    534   1.1       cgd }
    535   1.1       cgd 
    536   1.1       cgd /*
    537   1.1       cgd  * Is s1 a prefix of s2??
    538   1.1       cgd  */
    539  1.10  jdolecek static int
    540   1.1       cgd ispref(s1, s2)
    541  1.10  jdolecek 	const char *s1, *s2;
    542   1.1       cgd {
    543   1.1       cgd 
    544   1.1       cgd 	while (*s1++ == *s2)
    545   1.1       cgd 		;
    546   1.1       cgd 	return (*s1 == '\0');
    547   1.1       cgd }
    548