WebSVN – planix.SVN – Diff – /os/branches/feature_posix/sys/src/ape/cmd/cut/cut.c

 /*
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
+ * Copyright (c) 2019
+ * 	The PLANIX Project. All rights reserved
+ *
  * This code is derived from software contributed to Berkeley by
  * Adam S. Moskowitz of Menlo Consulting and Marciano Pitargue.
+ *
  * Redistribution and use in source and binary forms, with or without
  * 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.
  */
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1989, 1993\n\
-	The Regents of the University of California.  All rights reserved.\n";
-static const char sccsid[] = "@(#)cut.c	8.3 (Berkeley) 5/4/95";
-#endif /* not lint */
 #include <ctype.h>
 #include <errno.h>
 #include <limits.h>
 #include <locale.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <wchar.h>
+#include <err.h>
 static int	bflag;
 static int	cflag;
 static wchar_t	dchar;
 static char	dcharmb[MB_LEN_MAX + 1];
 static int	sflag;
 static int	wflag;
 static size_t	autostart, autostop, maxval;
 static char *	positions;
 static int	b_cut(FILE *, const char *);
 static int	b_n_cut(FILE *, const char *);
 static int	c_cut(FILE *, const char *);
 static int	f_cut(FILE *, const char *);
 static void	get_list(char *);
 		case 'c':
 			get_list(optarg);
 			cflag = 1;
 			break;
 		case 'd':
-			n = mbrtowc(&dchar, optarg, MB_LEN_MAX, NULL);
+//			n = mbrtowc(&dchar, optarg, MB_LEN_MAX, NULL);
+			n = mbtowc(&dchar, optarg, MB_LEN_MAX);
 			if (dchar == '\0' || n != strlen(optarg))
 				errx(1, "bad delimiter");
 			strcpy(dcharmb, optarg);
 			dflag = 1;
 			break;
+			}
+		}
 	else
 		rval = fcn(stdin, "stdin");
 	exit(rval);
+	return rval;
+}
 static void
 get_list(char *list)
+{
 		memset((char *)positions + oldnpos, 0, npos - oldnpos);
+	}
+}
 static int
-b_cut(FILE *fp, const char *fname __unused)
+b_cut(FILE *fp, const char *fname )
+{
 	int ch, col;
 	char *pos;
 	ch = 0;
 	int canwrite, clen, warned;
 	mbstate_t mbs;
 	memset(&mbs, 0, sizeof(mbs));
 	warned = 0;
+	lbuf = NULL;
-	while ((lbuf = fgetln(fp, &lbuflen)) != NULL) {
+//	while ((lbuf = fgetln(fp, &lbuflen)) != NULL) {
+	while ((lbuflen = getline(&lbuf,0, fp)) != -1) {
 		for (col = 0; lbuflen > 0; col += clen) {
 			if ((clen = mbrlen(lbuf, lbuflen, &mbs)) < 0) {
 				if (!warned) {
 					warn("%s", fname);
 					warned = 1;
+				}
 				memset(&mbs, 0, sizeof(mbs));
 				clen = 1;
+			}
 			if (clen == 0 || *lbuf == '\n')
 				break;
 			if (col < maxval && !positions[1 + col]) {
 				/*
 				 * Print the character if (1) after an initial
 				 * segment of un-selected bytes, the rest of
 				 * it is selected, and (2) the last byte is
 			lbuflen -= clen;
+		}
 		if (lbuflen > 0)
 			putchar('\n');
+	}
+	free(lbuf);
 	return (warned);
+}
 static int
 c_cut(FILE *fp, const char *fname)
 				while ((ch = getwc(fp)) != WEOF && ch != '\n');
+		}
 		(void)putwchar('\n');
+	}
 out:
 	if (ferror(fp)) {
 		warn("%s", fname);
 		return (1);
 	}
 	return (0);
 }
 static int
 is_delim(wchar_t ch)
+{
 	if (wflag) {
 		if (ch == ' ' || ch == '\t')
 			return 1;
 		if (ch == dchar)
 			return 1;
+	}
 	return 0;
+}
 static int
 f_cut(FILE *fp, const char *fname)
+{
 	wchar_t ch;
 	int field, i, isdelim;
 	int output;
 	char *lbuf, *mlbuf;
 	size_t clen, lbuflen, reallen;
 	mlbuf = NULL;
+	lbuf = NULL;
-	while ((lbuf = fgetln(fp, &lbuflen)) != NULL) {
+	//while ((lbuf = fgetln(fp, &lbuflen)) != NULL)
+	while ((lbuflen = getline(&lbuf,0, fp)) != -1)
+	{
 		reallen = lbuflen;
 		/* Assert EOL has a newline. */
 		if (*(lbuf + lbuflen - 1) != '\n') {
 			/* Can't have > 1 line with no trailing newline. */
 			mlbuf = malloc(lbuflen + 1);
 			lbuf = mlbuf;
 			reallen++;
+		}
 		output = 0;
 		for (isdelim = 0, p = lbuf;; p += clen) {
-			clen = mbrtowc(&ch, p, lbuf + reallen - p, NULL);
+//			clen = mbrtowc(&ch, p, lbuf + reallen - p, NULL);
+			clen = mbtowc(&ch, p, lbuf + reallen - p);
 			if (clen == (size_t)-1 || clen == (size_t)-2) {
-				warnc(EILSEQ, "%s", fname);
+//				warnc(EILSEQ, "%s", fname);
+				free(lbuf);
 				free(mlbuf);
 				return (1);
+			}
 			if (clen == 0)
 				clen = 1;
 		for (field = maxval, p = lbuf; field; --field, ++pos) {
 			if (*pos && output++)
 				for (i = 0; dcharmb[i] != '\0'; i++)
 					putchar(dcharmb[i]);
 			for (;;) {
-				clen = mbrtowc(&ch, p, lbuf + reallen - p,
+//				clen = mbrtowc(&ch, p, lbuf + reallen - p,
-				    NULL);
+//				    NULL);
+				clen = mbtowc(&ch, p, lbuf + reallen - p);
 				if (clen == (size_t)-1 || clen == (size_t)-2) {
-					warnc(EILSEQ, "%s", fname);
+//					warnc(EILSEQ, "%s", fname);
+					free(lbuf);
 					free(mlbuf);
 					return (1);
+				}
 				if (clen == 0)
 					clen = 1;
 				for (; (ch = *p) != '\n'; ++p);
+		}
 		(void)putchar('\n');
+	}
 	free(mlbuf);
+	free(lbuf);
 	return (0);
+}
 static void
 usage(void)

Subversion Repositories planix.SVN

(root)/os/branches/feature_posix/sys/src/ape/cmd/cut/cut.c – Rev 49 → 59