mirror of
git://git.code.sf.net/p/cdesktopenv/code
synced 2025-03-09 15:50:02 +00:00
This takes another step towards cleaning up the build system. We now do not even pretend to be theoretically compatible with pre-1989 K&R C compilers or with C++ compilers. In practice, this had already been broken for many years due to bit rot. Commit46593a89already removed the license handling enormity that depended on proto, so now we can cleanly remove it altogether. But we do need to leave some backwards compatibility stubs to keep the build system compatible with older AST code; it should remain possible to build older ksh versions with the current build system (the bin/ and src/cmd/INIT/ directories) for testing purposes. So as of now there is no more __MANGLE__d rubbish in your generated header files. This is only about a quarter of a century overdue... This commit also includes a huge amount of code cleanup to remove thousands of unused K&R C fallbacks and other cruft, particularly in libast. This code base should now be a little easier to understand for people who are familiar with a modern(ish) C standard. ratz is now also removed; this was a standalone and simplified 2005 version of gunzip. As of6137b99a, none of our code uses it, even theoretically. And the real g(un)zip is now everywhere. src/cmd/INIT/proto.c, src/cmd/INIT/ratz.c: - Removed. COPYRIGHT: - Remove zlib license; this only applied to ratz. bin/package, src/cmd/INIT/package.sh: - Related cleanups. - Unset LC_ALL before invoking a new shell, respecting the user's locale again and avoiding multibyte character corruption on the command line. src/cmd/INIT/proto.sh: - Add stub for backwards compatibility with Mamfiles that depend on proto. It does nothing but pass input without modification and is now installed as the new arch/*/bin/proto by src/cmd/INIT/Mamfile. src/cmd/INIT/iffe.sh: - Ignore the proto-related -e (--package) and -p (--prototyped) options; keep parsing them for backwards compatibility. - Trim the macros passed to every test to their standard C versions, removing K&R C and C++ versions. These are now considered to be for backwards compatibility only. src/cmd/INIT/iffe.tst: - Remove proto(1) mangling code. By the way, iffe can be regression-tested as follows: $ bin/package use # set up environment in a child shell $ regress src/cmd/INIT/iffe.tst $ exit # leave package environment src/cmd/INIT/make.probe, src/cmd/INIT/probe.win32: - Remove code to handle C++. src/lib/libast/features/common: - As in iffe.sh above, trim macros designed for compatibility with C++ and ancient C compilers to their standard C versions and comment that they are for backwards compatibility with AST code. This is needed to keep all the old ast and ksh code compiling. src/cmd/ksh93/sh/init.c, src/cmd/ksh93/sh/name.c: - Clarify libshell ABI compatibility function versions of macros. A "proto workaround" comment in the original code mislead me into thinking this had something to do with the removed proto(1), but it's unrelated. Call the workaround macro BYPASS_MACRO instead. src/cmd/ksh93/include/defs.h: - sh_sigcheck() macro: allow &sh as an argument: parenthesise shp. src/cmd/ksh93/sh/nvtype.c: - Remove unused nv_mkstruct() function. (re:d0a5cab1) **/features/*: - Remove obsolete iffe 'set prototyped' option. **/Mamfile: - Remove all references to the ast/prototyped.h header. - Remove all use of the proto command. Simply copy instead. *** 850-ish source files: *** - Remove all '#pragma prototyped' directives. - Remove all C++ compat code conditional upon defined(__cplusplus). - Remove all use of the _ARG_ macro, which on standard C expands to its argument: #define _ARG_(x) x (on K&R C, it expanded to nothing) - Remove all use of _BEGIN_EXTERNS_ and _END_EXTERNS_ macros (empty on standard C; this was for C++ compatibility) - Reduce all #if __STD_C (standard code) #else (K&R code) #endif blocks to the standard code only, without use of the macro. - Same for _STD_ macro which seems to have had the same function. - Change all instances of 'Void_t' to standard 'void'.
243 lines
6.7 KiB
C
243 lines
6.7 KiB
C
/***********************************************************************
|
|
* *
|
|
* This software is part of the ast package *
|
|
* Copyright (c) 1992-2012 AT&T Intellectual Property *
|
|
* Copyright (c) 2020-2021 Contributors to ksh 93u+m *
|
|
* and is licensed under the *
|
|
* Eclipse Public License, Version 1.0 *
|
|
* by AT&T Intellectual Property *
|
|
* *
|
|
* A copy of the License is available at *
|
|
* http://www.eclipse.org/org/documents/epl-v10.html *
|
|
* (with md5 checksum b35adb5213ca9657e911e9befb180842) *
|
|
* *
|
|
* Information and Software Systems Research *
|
|
* AT&T Research *
|
|
* Florham Park NJ *
|
|
* *
|
|
* Glenn Fowler <gsf@research.att.com> *
|
|
* David Korn <dgk@research.att.com> *
|
|
* *
|
|
***********************************************************************/
|
|
/*
|
|
* David Korn
|
|
* AT&T Bell Laboratories
|
|
*
|
|
* fold
|
|
*/
|
|
|
|
static const char usage[] =
|
|
"[-?\n@(#)$Id: fold (AT&T Research) 2004-11-18 $\n]"
|
|
"[--catalog?" ERROR_CATALOG "]"
|
|
"[+NAME?fold - fold lines]"
|
|
"[+DESCRIPTION?\bfold\b is a filter that folds lines from its input, "
|
|
"breaking the lines to have a maximum of \awidth\a column "
|
|
"positions (or bytes if the \b-b\b option is specified). Lines "
|
|
"are broken by the insertion of a newline character such that "
|
|
"each output line is the maximum width possible that does not "
|
|
"exceed the specified number of column positions, (or bytes). A line "
|
|
"will not be broken in the middle of a character.] "
|
|
"[+?Unless the \b-b\b option is specified, the following will be treated "
|
|
"specially:]{"
|
|
"[+carriage-return?The current count of line width will be set "
|
|
"to zero. \bfold\b will not insert a newline immediately "
|
|
"before or after a carriage-return.]"
|
|
"[+backspace?If positive, the current count of line width will be "
|
|
"decremented by one. \bfold\b will not insert a newline "
|
|
"immediately before or after a backspace.]"
|
|
"[+tab?Each tab character encountered will advance the column "
|
|
"position to the next tab stop. Tab stops are at each "
|
|
"column position \an\a, where \an\a modulo 8 equals 1.]"
|
|
"}"
|
|
"[+?If no \afile\a is given, or if the \afile\a is \b-\b, \bfold\b "
|
|
"reads from standard input. The start of the file is defined "
|
|
"as the current offset.]"
|
|
|
|
"[b:bytes?Count bytes rather than columns so that each carriage-return, "
|
|
"backspace, and tab counts as 1.]"
|
|
"[c:continue?Emit \atext\a at line splits.]:[text:='\\n']"
|
|
"[d:delimiter?Break at \adelim\a boundaries.]:[delim]"
|
|
"[s:spaces?Break at word boundaries. If the line contains any blanks, "
|
|
"(spaces or tabs), within the first \awidth\a column positions or "
|
|
"bytes, the line is broken after the last blank meeting the "
|
|
"\awidth\a constraint.]"
|
|
"[w:width]#[width:=80?Use a maximum line length of \awidth\a columns "
|
|
"instead of the default.]"
|
|
"\n"
|
|
"\n[file ...]\n"
|
|
"\n"
|
|
"[+EXIT STATUS?]{"
|
|
"[+0?All files processed successfully.]"
|
|
"[+>0?An error occurred.]"
|
|
"}"
|
|
"[+SEE ALSO?\bpaste\b(1)]"
|
|
;
|
|
|
|
|
|
#include <cmd.h>
|
|
|
|
#define WIDTH 80
|
|
#define TABSIZE 8
|
|
|
|
#define T_EOF 1
|
|
#define T_NL 2
|
|
#define T_BS 3
|
|
#define T_TAB 4
|
|
#define T_SP 5
|
|
#define T_RET 6
|
|
|
|
static void fold(Sfio_t *in, Sfio_t *out, register int width, const char *cont, size_t contsize, char *cols)
|
|
{
|
|
register char *cp, *first;
|
|
register int n, col=0, x=0;
|
|
register char *last_space=0;
|
|
cols[0] = 0;
|
|
for (;;)
|
|
{
|
|
if (!(cp = sfgetr(in,'\n',0)))
|
|
{
|
|
if (!(cp = sfgetr(in,'\n',-1)) || (n = sfvalue(in)) <= 0)
|
|
break;
|
|
x = cp[--n];
|
|
cp[n] = '\n';
|
|
}
|
|
/* special case -b since no column adjustment is needed */
|
|
if(cols['\b']==0 && (n=sfvalue(in))<=width)
|
|
{
|
|
sfwrite(out,cp,n);
|
|
continue;
|
|
}
|
|
first = cp;
|
|
col = 0;
|
|
last_space = 0;
|
|
for(;;)
|
|
{
|
|
while((n=cols[*(unsigned char*)cp++])==0);
|
|
while((cp-first) > (width-col))
|
|
{
|
|
if(last_space)
|
|
col = last_space - first;
|
|
else
|
|
col = width-col;
|
|
sfwrite(out,first,col);
|
|
first += col;
|
|
col = 0;
|
|
last_space = 0;
|
|
if(cp>first+1 || (n!=T_NL && n!=T_BS))
|
|
sfwrite(out, cont, contsize);
|
|
}
|
|
switch(n)
|
|
{
|
|
case T_NL:
|
|
if(x)
|
|
*(cp-1) = x;
|
|
break;
|
|
case T_RET:
|
|
col = 0;
|
|
continue;
|
|
case T_BS:
|
|
if((cp+(--col)-first)>0)
|
|
col--;
|
|
continue;
|
|
case T_TAB:
|
|
n = (TABSIZE-1) - (cp+col-1-first)&(TABSIZE-1);
|
|
col +=n;
|
|
if((cp-first) > (width-col))
|
|
{
|
|
sfwrite(out,first,(--cp)-first);
|
|
sfwrite(out, cont, contsize);
|
|
first = cp;
|
|
col = TABSIZE-1;
|
|
last_space = 0;
|
|
continue;
|
|
}
|
|
if(cols[' '])
|
|
last_space = cp;
|
|
continue;
|
|
case T_SP:
|
|
last_space = cp;
|
|
continue;
|
|
default:
|
|
continue;
|
|
}
|
|
break;
|
|
}
|
|
sfwrite(out,first,cp-first);
|
|
}
|
|
}
|
|
|
|
int
|
|
b_fold(int argc, char** argv, Shbltin_t* context)
|
|
{
|
|
register int n, width=WIDTH;
|
|
register Sfio_t *fp;
|
|
register char *cp;
|
|
char *cont="\n";
|
|
size_t contsize = 1;
|
|
char cols[1<<CHAR_BIT];
|
|
|
|
cmdinit(argc, argv, context, ERROR_CATALOG, 0);
|
|
memset(cols, 0, sizeof(cols));
|
|
cols['\t'] = T_TAB;
|
|
cols['\b'] = T_BS;
|
|
cols['\n'] = T_NL;
|
|
cols['\r'] = T_RET;
|
|
for (;;)
|
|
{
|
|
switch (optget(argv, usage))
|
|
{
|
|
case 'b':
|
|
cols['\r'] = cols['\b'] = 0;
|
|
cols['\t'] = cols[' '];
|
|
continue;
|
|
case 'c':
|
|
contsize = stresc(cont = strdup(opt_info.arg));
|
|
continue;
|
|
case 'd':
|
|
if (n = *opt_info.arg)
|
|
cols[n] = T_SP;
|
|
continue;
|
|
case 's':
|
|
cols[' '] = T_SP;
|
|
if(cols['\t']==0)
|
|
cols['\t'] = T_SP;
|
|
continue;
|
|
case 'w':
|
|
if ((width = opt_info.num) <= 0)
|
|
error(2, "%d: width must be positive", opt_info.num);
|
|
continue;
|
|
case ':':
|
|
error(2, "%s", opt_info.arg);
|
|
continue;
|
|
case '?':
|
|
error(ERROR_usage(2), "%s", opt_info.arg);
|
|
UNREACHABLE();
|
|
}
|
|
break;
|
|
}
|
|
argv += opt_info.index;
|
|
argc -= opt_info.index;
|
|
if(error_info.errors)
|
|
{
|
|
error(ERROR_usage(2),"%s", optusage(NiL));
|
|
UNREACHABLE();
|
|
}
|
|
if(cp = *argv)
|
|
argv++;
|
|
do
|
|
{
|
|
if(!cp || streq(cp,"-"))
|
|
fp = sfstdin;
|
|
else if(!(fp = sfopen(NiL,cp,"r")))
|
|
{
|
|
error(ERROR_system(0),"%s: cannot open",cp);
|
|
error_info.errors = 1;
|
|
continue;
|
|
}
|
|
fold(fp,sfstdout,width,cont,contsize,cols);
|
|
if(fp!=sfstdin)
|
|
sfclose(fp);
|
|
}
|
|
while(cp= *argv++);
|
|
return(error_info.errors);
|
|
}
|