system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-09-20 00:33:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add support for multibyte characters and for characters that take up

Browse source 
more than one column position.
This commit is contained in:
Tim J. Robbins 2004-06-24 13:42:26 +00:00
parent b46f884b80
commit e545e3c55c
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=131051
1 changed files with 23 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
usr.bin/expand/expand.c
View file

@ -51,6 +51,8 @@ __FBSDID("$FreeBSD$");
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <wchar.h>
#include <wctype.h>
/*
* expand - expand tabs to equivalent spaces
@ -64,9 +66,12 @@ static void usage(void);
int
main(int argc, char *argv[])
{
const char *curfile;
wint_t wc;
int c, column;
int n;
int rval;
int width;
setlocale(LC_CTYPE, "");
@ -100,22 +105,24 @@ main(int argc, char *argv[])
argc--, argv++;
continue;
}
curfile = argv[0];
argc--, argv++;
}
} else
curfile = "stdin";
column = 0;
while ((c = getchar()) != EOF) {
switch (c) {
while ((wc = getwchar()) != WEOF) {
switch (wc) {
case '\t':
if (nstops == 0) {
do {
putchar(' ');
putwchar(' ');
column++;
} while (column & 07);
continue;
}
if (nstops == 1) {
do {
putchar(' ');
putwchar(' ');
column++;
} while (((column - 1) % tabstops[0]) != (tabstops[0] - 1));
continue;
@ -124,12 +131,12 @@ main(int argc, char *argv[])
if (tabstops[n] > column)
break;
if (n == nstops) {
putchar(' ');
putwchar(' ');
column++;
continue;
}
while (column < tabstops[n]) {
putchar(' ');
putwchar(' ');
column++;
}
continue;
@ -137,21 +144,25 @@ main(int argc, char *argv[])
case '\b':
if (column)
column--;
putchar('\b');
putwchar('\b');
continue;
default:
putchar(c);
if (isprint(c))
column++;
putwchar(wc);
if ((width = wcwidth(wc)) > 0)
column += width;
continue;
case '\n':
putchar(c);
putwchar(wc);
column = 0;
continue;
}
}
if (ferror(stdin)) {
warn("%s", curfile);
rval = 1;
}
} while (argc > 0);
exit(rval);
}