 @@ -1,14 +1,14 @@
-.\"	$NetBSD: fold.1,v 1.10 2003/08/07 11:13:47 agc Exp $
+.\"	$NetBSD: fold.1,v 1.11 2009/07/21 01:35:02 ahoka Exp $
 .\"
 .\" Copyright (c) 1980, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\" 3. Neither the name of the University nor the names of its contributors
 @@ -19,27 +19,27 @@
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 .\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
 .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)fold.1	8.1 (Berkeley) 6/6/93
 .\"
-.Dd June 6, 1993
+.Dd July 21, 2009
 .Dt FOLD 1
 .Os
 .Sh NAME
 .Nm fold
 .Nd "fold long lines for finite width output device"
 .Sh SYNOPSIS
 .Nm
 .Op Fl bs
 .Op Fl w Ar width
 .Ar
 .Sh DESCRIPTION
 .Nm
 is a filter which folds the contents of the specified files,
 @@ -49,33 +49,38 @@ breaking the lines to have maximum of 80
 The options are as follows:
 .Bl -tag -width indent
 .It Fl b
 Count
 .Ar width
 in bytes rather than column positions.
 .It Fl s
 Fold line after the last blank character within the first
 .Ar width
 column positions (or bytes).
 .It Fl w
 Specifies a line width to use instead of the default 80 characters.
 .El
 .Sh EXIT STATUS
 .Pp
 The
 .Nm
 utility exits 0 on success, and \*[Gt]0 if an error occurs.
 .Sh ENVIRONMENT
 .Bl -tag -width indent
 .It Ev LC_CTYPE
 .El
 .Sh SEE ALSO
 .Xr expand 1
 .Sh STANDARDS
 The
 .Nm
 utility conforms to
-.St -p1003.2-92 .
+.St -p1003.1-2008 .
 .Sh BUGS
 If underlining is present it may be messed up by folding.
 .Pp
 .Ar Width
 should be a multiple of 8 if tabs are present, or the tabs should
 be expanded using
 .Xr expand 1
 before using
 .Nm .

 @@ -1,14 +1,14 @@
-/*	$NetBSD: fold.c,v 1.15 2008/10/29 01:31:09 ahoka Exp $	*/
+/*	$NetBSD: fold.c,v 1.16 2009/07/21 01:35:02 ahoka Exp $	*/
 /*-
  * Copyright (c) 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Kevin Ruddy.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -32,52 +32,57 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1990, 1993\
  The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)fold.c	8.1 (Berkeley) 6/6/93";
 #endif
-__RCSID("$NetBSD: fold.c,v 1.15 2008/10/29 01:31:09 ahoka Exp $");
+__RCSID("$NetBSD: fold.c,v 1.16 2009/07/21 01:35:02 ahoka Exp $");
 #endif /* not lint */
 #include <limits.h>
 #include <locale.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <wchar.h>
 #include <err.h>
 #define	DEFLINEWIDTH	80
 	int	main(int, char **);
 static	void	fold(int);
-static	int	new_column_position(int, int);
+static	int	new_column_position(int, wint_t);
 static	void	usage(void);
 int count_bytes = 0;
 int split_words = 0;
 int
 main(int argc, char **argv)
+{
 	int ch;
 	int width;
 	char *p;
 	setlocale(LC_CTYPE, "");
 	setprogname(argv[0]);
 	width = -1;
 	while ((ch = getopt(argc, argv, "0123456789bsw:")) != -1)
 		switch (ch) {
 		case 'b':
 			count_bytes = 1;
 			break;
 		case 's':
 			split_words = 1;
 			break;
 		case 'w':
 			if ((width = atoi(optarg)) <= 0)
 				errx(1, "illegal width value");
 			break;
 @@ -115,117 +120,130 @@ main(int argc, char **argv)
  * Fold the contents of standard input to fit within WIDTH columns
  * (or bytes) and write to standard output.
+ *
  * If split_words is set, split the line at the last space character
  * on the line.  This flag necessitates storing the line in a buffer
  * until the current column > width, or a newline or EOF is read.
+ *
  * The buffer can grow larger than WIDTH due to backspaces and carriage
  * returns embedded in the input stream.
  */
 static void
 fold(int width)
+{
-	static char *buf = NULL;
+	static wchar_t *buf = NULL;
-	char *nbuf;
+	wchar_t *nbuf;
 	static int   buf_max = 0;
-	int ch, col;
+	wint_t ch;
-	int indx;
+	int col, indx, i;
 	col = indx = 0;
-	while ((ch = getchar()) != EOF) {
+	while ((ch = getwchar()) != WEOF) {
-		if (ch == '\n') {
+		if (ch == L'\n') {
-			if (indx != 0)
+			if (indx != 0) {
-				fwrite (buf, 1, indx, stdout);
+				for (i = 0; i < indx; i++)
-			putchar('\n');
+					putwchar(buf[i]);
+			}
 			putwchar(L'\n');
 			col = indx = 0;
 			continue;
+		}
 		col = new_column_position (col, ch);
 		if (col > width) {
-			int i, last_space;
+			int last_space;
 #ifdef __GNUC__
 			last_space = 0;	/* XXX gcc */
 #endif
 			if (split_words) {
 				for (i = 0, last_space = -1; i < indx; i++)
-					if (buf[i] == ' ')
+					if (buf[i] == L' ')
 						last_space = i;
+			}
 			if (split_words && last_space != -1) {
-				fwrite (buf, 1, last_space, stdout);
+				for (i = 0; i < last_space; i++)
 					putwchar(buf[i]);
 				/* increase last_space here, so we skip trailing whitespace */
 				last_space++;
-				memmove (buf, buf+last_space, indx-last_space);
+				wmemmove (buf, buf+last_space, indx-last_space);
 				indx -= last_space;
 				col = 0;
 				for (i = 0; i < indx; i++) {
 					col = new_column_position (col, buf[i]);
+				}
 			} else {
-				fwrite (buf, 1, indx, stdout);
+				for (i = 0; i < indx; i++)
 					putwchar(buf[i]);
 				col = indx = 0;
+			}
-			putchar('\n');
+			putwchar('\n');
 			/* calculate the column position for the next line. */
 			col = new_column_position (col, ch);
+		}
 		if (indx + 1 > buf_max) {
 			/* Allocate buffer in LINE_MAX increments */
 			if ((nbuf = realloc (buf, buf_max + 2048)) == NULL) {
 				err (1, "realloc");
 				/* NOTREACHED */
+			}
 			buf = nbuf;
 			buf_max += 2048;
+		}
 		buf[indx++] = ch;
+	}
-	if (indx != 0)
+	if (indx != 0) {
-		fwrite (buf, 1, indx, stdout);
+		for (i = 0; i < indx; i++)
 			putwchar(buf[i]);
+	}
+}
 /*
  * calculate the column position
  */
 static int
-new_column_position (int col, int ch)
+new_column_position (int col, wint_t ch)
+{
 	int w;
 	if (!count_bytes) {
 		switch (ch) {
-		case '\b':
+		case L'\b':
 			if (col > 0)
 				--col;
 			break;
-		case '\r':
+		case L'\r':
 			col = 0;
 			break;
-		case '\t':
+		case L'\t':
 			col = (col + 8) & ~7;
 			break;
 		default:
-			++col;
+			w = wcwidth(ch);
 			if (w > 0)
 				col += w;
 			break;
+		}
 	} else {
-		++col;
+		char dummy[MB_LEN_MAX];
 		/* XXX: we assume stateless encoding */
 		col += wcrtomb(dummy, ch, NULL);
+	}
 	return col;
+}
 static void
 usage(void)
+{
 	(void)fprintf(stderr,
-		    "usage: fold [-bs] [-w width] [file ...]\n");
+	    "usage: %s [-bs] [-w width] [file ...]\n", getprogname());
 	exit(1);
+}