From 7853af48f533b7581ad3968e66255f2a262f0833 Mon Sep 17 00:00:00 2001 From: tjr Date: Sat, 15 Jun 2002 10:16:39 +0000 Subject: Allow s to be used to separate tab stop positions with the -t argument, not just ASCII space characters and commas. Don't count non-printing characters when determining column position. --- usr.bin/expand/expand.1 | 12 ++++++++++++ usr.bin/expand/expand.c | 11 ++++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) (limited to 'usr.bin/expand') diff --git a/usr.bin/expand/expand.1 b/usr.bin/expand/expand.1 index 99d89a0..812691f 100644 --- a/usr.bin/expand/expand.1 +++ b/usr.bin/expand/expand.1 @@ -95,6 +95,18 @@ are reconverted to maximal strings of tabs. If the option is given, then tabs are inserted whenever they would compress the resultant file by replacing two or more characters. .El +.Sh ENVIRONMENT +The +.Ev LANG , +.Ev LC_ALL +and +.Ev LC_CTYPE +environment variables affect the execution of +.Nm expand +and +.Nm unexpand +as described in +.Xr environ 7 . .Sh STANDARDS The .Nm expand diff --git a/usr.bin/expand/expand.c b/usr.bin/expand/expand.c index f83419d..e5a63c5 100644 --- a/usr.bin/expand/expand.c +++ b/usr.bin/expand/expand.c @@ -47,6 +47,7 @@ static const char rcsid[] = #include #include +#include #include #include #include @@ -69,8 +70,11 @@ main(argc, argv) register int n; int rval; + setlocale(LC_CTYPE, ""); + /* handle obsolete syntax */ - while (argc > 1 && argv[1][0] == '-' && isdigit(argv[1][1])) { + while (argc > 1 && argv[1][0] == '-' && + isdigit((unsigned char)argv[1][1])) { getstops(&argv[1][1]); argc--; argv++; } @@ -140,7 +144,8 @@ main(argc, argv) default: putchar(c); - column++; + if (isprint(c)) + column++; continue; case '\n': @@ -173,7 +178,7 @@ getstops(cp) tabstops[nstops++] = i; if (*cp == 0) break; - if (*cp != ',' && *cp != ' ') + if (*cp != ',' && !isblank((unsigned char)*cp)) errx(1, "bad tab stop spec"); cp++; } -- cgit v1.1