external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00
Code Issues Releases Wiki Activity

INIT: remove proto, ratz (re: 46593a89, 6137b99a); major cleanup

Browse source 
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.

Commit 46593a89 already 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 of 6137b99a, 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'.
This commit is contained in:
Martijn Dekker 2021-12-23 03:14:20 +00:00
parent 3785a0685c
commit a1f5c99204
869 changed files with 1853 additions and 14292 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/cmd/ksh93/include/argnod.h
View file

@ -18,7 +18,6 @@
* David Korn <dgk@research.att.com> *
* *
***********************************************************************/
#pragma prototyped
#ifndef ARG_RAW
/*
* struct to hold a word argument

1
src/cmd/ksh93/include/builtins.h
View file

@ -18,7 +18,6 @@
* David Korn <dgk@research.att.com> *
* *
***********************************************************************/
#pragma prototyped
#ifndef __builtins_h_defined
#define __builtins_h_defined

3
src/cmd/ksh93/include/defs.h
View file

@ -18,7 +18,6 @@
* David Korn <dgk@research.att.com> *
* *
***********************************************************************/
#pragma prototyped
/*
* David Korn
* AT&T Labs
@ -417,7 +416,7 @@ extern char *sh_getcwd(void);
#define sh_getstate() (sh.st.states)
#define sh_setstate(x) (sh.st.states = (x))
#define sh_sigcheck(shp) do{if(shp->trapnote&SH_SIGSET)sh_exit(SH_EXITSIG);} while(0)
#define sh_sigcheck(shp) do{if((shp)->trapnote&SH_SIGSET)sh_exit(SH_EXITSIG);} while(0)
extern int32_t sh_mailchk;
extern const char e_dict[];

5
src/cmd/ksh93/include/edit.h
View file

@ -18,7 +18,6 @@
* David Korn <dgk@research.att.com> *
* *
***********************************************************************/
#pragma prototyped
#ifndef SEARCHSIZE
/*
* edit.h - common data structure for vi and emacs edit options
@ -238,11 +237,11 @@ extern int hist_expand(const char *, char **);
#endif /* SHOPT_HISTEXPAND */
#if SHOPT_ESH
extern void emacs_redraw(Void_t*);
extern void emacs_redraw(void*);
#endif /* SHOPT_ESH */
#if SHOPT_VSH
extern void vi_redraw(Void_t*);
extern void vi_redraw(void*);
#endif /* SHOPT_VSH */
#endif /* !SEARCHSIZE */

1
src/cmd/ksh93/include/fault.h
View file

@ -18,7 +18,6 @@
* David Korn <dgk@research.att.com> *
* *
***********************************************************************/
#pragma prototyped
#ifndef SH_SIGBITS
/*
* UNIX shell

1
src/cmd/ksh93/include/fcin.h
View file

@ -18,7 +18,6 @@
* David Korn <dgk@research.att.com> *
* *
***********************************************************************/
#pragma prototyped
#ifndef fcgetc
/*
* David Korn

1
src/cmd/ksh93/include/history.h
View file

@ -18,7 +18,6 @@
* David Korn <dgk@research.att.com> *
* *
***********************************************************************/
#pragma prototyped
#ifndef HIST_VERSION
/*
* Interface for history mechanism

1
src/cmd/ksh93/include/io.h
View file

@ -18,7 +18,6 @@
* David Korn <dgk@research.att.com> *
* *
***********************************************************************/
#pragma prototyped
/*
* UNIX shell
* David Korn

1
src/cmd/ksh93/include/jobs.h
View file

@ -18,7 +18,6 @@
* David Korn <dgk@research.att.com> *
* *
***********************************************************************/
#pragma prototyped
#ifndef JOB_NFLAG
/*
* Interface to job control for shell

1
src/cmd/ksh93/include/lexstates.h
View file

@ -18,7 +18,6 @@
* David Korn <dgk@research.att.com> *
* *
***********************************************************************/
#pragma prototyped
#ifndef S_BREAK
#define S_BREAK 1 /* end of token */
#define S_EOF 2 /* end of buffer */

5
src/cmd/ksh93/include/name.h
View file

@ -18,7 +18,6 @@
* David Korn <dgk@research.att.com> *
* *
***********************************************************************/
#pragma prototyped
#ifndef _NV_PRIVATE
/*
* This is the implementation header file for name-value pairs
@ -76,7 +75,7 @@ union Value
#if SHOPT_FIXEDARRAY
# define ARRAY_FIXED ARRAY_NOCLONE /* For index values */
#endif /* SHOPT_FIXEDARRAY */
#define NV_FARRAY 0x10000000 /* fixed sized arrays */
#define NV_FARRAY 0x10000000 /* fixed-size arrays */
#define NV_ASETSUB 8 /* set subscript */
/* These flags are used as options to array_get() */
@ -213,7 +212,7 @@ extern Namval_t *nv_parent(Namval_t*);
extern char *nv_getbuf(size_t);
extern Namval_t *nv_mount(Namval_t*, const char *name, Dt_t*);
extern Namval_t *nv_arraychild(Namval_t*, Namval_t*, int);
extern int nv_compare(Dt_t*, Void_t*, Void_t*, Dtdisc_t*);
extern int nv_compare(Dt_t*, void*, void*, Dtdisc_t*);
extern void nv_outnode(Namval_t*,Sfio_t*, int, int);
extern int nv_subsaved(Namval_t*, int);
extern void nv_typename(Namval_t*, Sfio_t*);

1
src/cmd/ksh93/include/national.h
View file

@ -18,7 +18,6 @@
* David Korn <dgk@research.att.com> *
* *
***********************************************************************/
#pragma prototyped
/*
* national.h - definitions for multibyte character sets
*

3
src/cmd/ksh93/include/nval.h
View file

@ -18,7 +18,6 @@
* David Korn <dgk@research.att.com> *
* *
***********************************************************************/
#pragma prototyped
#ifndef NV_DEFAULT
/*
* David Korn
@ -87,7 +86,7 @@ struct Namarray
Namfun_t hdr;
long nelem; /* number of elements */
void *(*fun)(Namval_t*,const char*,int); /* associative arrays */
void *fixed; /* for fixed sized arrays */
void *fixed; /* for fixed-size arrays */
Dt_t *table; /* for subscripts */
void *scope; /* non-zero when scoped */
};

1
src/cmd/ksh93/include/path.h
View file

@ -18,7 +18,6 @@
* David Korn <dgk@research.att.com> *
* *
***********************************************************************/
#pragma prototyped
#ifndef PATH_OFFSET
/*

1
src/cmd/ksh93/include/regress.h
View file

@ -18,7 +18,6 @@
* David Korn <dgk@research.att.com> *
* *
***********************************************************************/
#pragma prototyped
/*
* David Korn
* AT&T Labs

1
src/cmd/ksh93/include/shell.h
View file

@ -18,7 +18,6 @@
* David Korn <dgk@research.att.com> *
* *
***********************************************************************/
#pragma prototyped
#ifndef SH_INTERACTIVE
/*
* David Korn

1
src/cmd/ksh93/include/shlex.h
View file

@ -18,7 +18,6 @@
* David Korn <dgk@research.att.com> *
* *
***********************************************************************/
#pragma prototyped
#ifndef NOTSYM
/*
* UNIX shell

1
src/cmd/ksh93/include/shnodes.h
View file

@ -18,7 +18,6 @@
* David Korn <dgk@research.att.com> *
* *
***********************************************************************/
#pragma prototyped
#ifndef _SHNODES_H
#define _SHNODES_H 1
/*

1
src/cmd/ksh93/include/shtable.h
View file

@ -18,7 +18,6 @@
* David Korn <dgk@research.att.com> *
* *
***********************************************************************/
#pragma prototyped
#ifndef _SHTABLE_H
/*

1
src/cmd/ksh93/include/streval.h
View file

@ -18,7 +18,6 @@
* David Korn <dgk@research.att.com> *
* *
***********************************************************************/
#pragma prototyped
#ifndef SEQPOINT
/*
* D. G. Korn

1
src/cmd/ksh93/include/terminal.h
View file

@ -18,7 +18,6 @@
* David Korn <dgk@research.att.com> *
* *
***********************************************************************/
#pragma prototyped
#ifndef _terminal_
#define _terminal_ 1

1
src/cmd/ksh93/include/test.h
View file

@ -18,7 +18,6 @@
* David Korn <dgk@research.att.com> *
* *
***********************************************************************/
#pragma prototyped
#ifndef TEST_ARITH
/*
* UNIX shell

1
src/cmd/ksh93/include/ulimit.h
View file

@ -18,7 +18,6 @@
* David Korn <dgk@research.att.com> *
* *
***********************************************************************/
#pragma prototyped
#ifndef _ULIMIT_H
#define _ULIMIT_H 1
/*

1
src/cmd/ksh93/include/variables.h
View file

@ -18,7 +18,6 @@
* David Korn <dgk@research.att.com> *
* *
***********************************************************************/
#pragma prototyped
#ifndef SH_VALNOD