mirror of
git://git.code.sf.net/p/zsh/code
synced 2025-10-30 05:40:58 +01:00
manual/9083
This commit is contained in:
Tanaka Akira
parent
77d48c89e0
commit
02c0df2174
80 changed files with 470 additions and 394 deletions
|
|
@ -489,7 +489,7 @@ _cvs_extract_file_entries () {
|
|||
(( $+functions[_cvs_extract_modifiedfile_entries] )) ||
|
||||
_cvs_extract_modifiedfile_entries () {
|
||||
if zstyle -t ":completion${curcontext}:cvs" disable-stat ||
|
||||
! { zmodload -e stat || zmodload stat }; then
|
||||
! { zmodload -e zsh/stat || zmodload zsh/stat }; then
|
||||
_cvs_extract_file_entries
|
||||
return
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -172,7 +172,7 @@ Zsh/modlist.yo: $(MODDOCSRC)
|
|||
modules=`echo '' $(MODDOCSRC) '' | sed 's| Zsh/mod_| |g;s|\.yo | |g'`; \
|
||||
echo "startitem()"; \
|
||||
for mod in $$modules; do \
|
||||
echo "item(tt($$mod))("; \
|
||||
echo "item(tt(zsh/$$mod))("; \
|
||||
sed -n '1d;/^!MOD!)$$/q;p' < $(sdir)/Zsh/mod_$${mod}.yo; \
|
||||
echo ")"; \
|
||||
done; \
|
||||
|
|
@ -182,8 +182,8 @@ Zsh/modlist.yo: $(MODDOCSRC)
|
|||
echo "endmenu()"; \
|
||||
set '' $$modules; \
|
||||
while test ".$$2" != .; do \
|
||||
echo "texinode(The $$2 Module)($${3+The $$3 Module})($${1:+The $$1 Module})(Zsh Modules)"; \
|
||||
echo "sect(The $$2 Module)"; \
|
||||
echo "texinode(The zsh/$$2 Module)($${3+The $$3 Module})($${1:+The $$1 Module})(Zsh Modules)"; \
|
||||
echo "sect(The zsh/$$2 Module)"; \
|
||||
echo "includefile(Zsh/mod_$${2}.yo)"; \
|
||||
shift; \
|
||||
done \
|
||||
|
|
@ -193,7 +193,7 @@ Zsh/modmenu.yo: $(MODDOCSRC)
|
|||
( \
|
||||
modules=`echo '' $(MODDOCSRC) '' | sed 's| Zsh/mod_| |g;s|\.yo | |g'`; \
|
||||
for mod in $$modules; do \
|
||||
echo "menu(The $$mod Module)"; \
|
||||
echo "menu(The zsh/$$mod Module)"; \
|
||||
done \
|
||||
) > $(sdir)/Zsh/modmenu.yo
|
||||
|
||||
|
|
|
|||
|
|
@ -1303,16 +1303,15 @@ xitem(tt(zmodload) [ tt(-i) ] var(name) ... )
|
|||
item(tt(zmodload) tt(-u) [ tt(-i) ] var(name) ...)(
|
||||
In the simplest case, tt(zmodload) loads a binary module. The module must
|
||||
be in a file with a name consisting of the specified var(name) followed by
|
||||
a standard suffix, usually `tt(.so)'. If this can't be found, the
|
||||
var(name) is tried without the suffix. If the module to be loaded is
|
||||
a standard suffix, usually `tt(.so)'.
|
||||
If the module to be loaded is
|
||||
already loaded and the tt(-i) option is given, the duplicate module is
|
||||
ignored. Otherwise tt(zmodload) prints an error message.
|
||||
|
||||
The var(name)d module is searched for in the same way a command is, using
|
||||
tt($module_path) instead of tt($path). If var(name) contains a `tt(/)',
|
||||
it will be used as-is, and a path search will be performed otherwise.
|
||||
This behaviour can be modified by the tt(PATH_DIRS) option.
|
||||
cindex(PATH_DIRS, use of)
|
||||
tt($module_path) instead of tt($path). However, the path search is
|
||||
performed even when the module name contains a `tt(/)', which it usually does.
|
||||
There is no way to prevent the path search.
|
||||
|
||||
With tt(-u), tt(zmodload) unloads modules. The same var(name)
|
||||
must be given that was given when the module was loaded, but it is not
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
COMMENT(!MOD!
|
||||
Builtins for manipulating POSIX.1e (POSIX.6) capability (privilege) sets.
|
||||
!MOD!)
|
||||
The tt(cap) module is used for manipulating POSIX.1e (POSIX.6) capability
|
||||
The tt(zsh/cap) module is used for manipulating POSIX.1e (POSIX.6) capability
|
||||
sets. If the operating system does not support this interface, the
|
||||
builtins defined by this module will do nothing.
|
||||
The builtins in this module are:
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
COMMENT(!MOD!
|
||||
A builtin that can clone a running shell onto another terminal.
|
||||
!MOD!)
|
||||
The tt(clone) module makes available one builtin command:
|
||||
The tt(zsh/clone) module makes available one builtin command:
|
||||
|
||||
startitem()
|
||||
findex(clone)
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
COMMENT(!MOD!
|
||||
The tt(compctl) builtin for controlling completion.
|
||||
!MOD!)
|
||||
The tt(compctl) module makes available two builtin commands. tt(compctl),
|
||||
The tt(zsh/compctl) module makes available two builtin commands. tt(compctl),
|
||||
is the old, deprecated way to control completions for ZLE. See
|
||||
ifzman(zmanref(zshcompctl))\
|
||||
ifnzman(noderef(Programmable Completion Using compctl))\
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
COMMENT(!MOD!
|
||||
The basic completion code.
|
||||
!MOD!)
|
||||
The tt(complete) module makes available several builtin commands which
|
||||
The tt(zsh/complete) module makes available several builtin commands which
|
||||
can be used in user-defined completion widgets, see
|
||||
ifzman(zmanref(zshcompwid))\
|
||||
ifnzman(noderef(Completion Widgets))\
|
||||
|
|
|
|||
|
|
@ -3,15 +3,15 @@ Completion listing extensions.
|
|||
!MOD!)
|
||||
cindex(completion, listing)
|
||||
cindex(completion, coloured listings)
|
||||
The tt(complist) module offers two extensions to completion listings:
|
||||
The tt(zsh/complist) module offers two extensions to completion listings:
|
||||
the ability to highlight matches in such a list and a different
|
||||
style of menu-completion.
|
||||
|
||||
Whenever one of the parameters tt(ZLS_COLORS) or tt(ZLS_COLOURS) is set
|
||||
and the tt(complist) module is loaded or linked into the shell,
|
||||
and the tt(zsh/complist) module is loaded or linked into the shell,
|
||||
completion lists will be colored. Note, however, that tt(complist) will
|
||||
not automatically be loaded if it is not linked in: on systems with
|
||||
dynamic loading, `tt(zmodload complist)' is required.
|
||||
dynamic loading, `tt(zmodload zsh/complist)' is required.
|
||||
|
||||
subsect(Parameters)
|
||||
vindex(ZLS_COLORS)
|
||||
|
|
@ -130,7 +130,7 @@ subsect(Menu selection)
|
|||
cindex(completion, selecting by cursor)
|
||||
vindex(SELECTMIN)
|
||||
tindex(menu-select)
|
||||
The tt(complist) module also offers an alternative style of selecting
|
||||
The tt(zsh/complist) module also offers an alternative style of selecting
|
||||
matches from a list, called menu-selection, which can be used if the
|
||||
shell is set up to return to the last prompt after showing a
|
||||
completion list (see the tt(ALWAYS_LAST_PROMPT) option in
|
||||
|
|
@ -211,4 +211,4 @@ continue with normal menu-completion one can call
|
|||
|
||||
indent(tt(bindkey -M menuselect '^M' send-break))
|
||||
|
||||
after loading the tt(complist) module.
|
||||
after loading the tt(zsh/complist) module.
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ A module with utility builtins needed for the shell function based
|
|||
completion system.
|
||||
!MOD!)
|
||||
cindex(completion, utility)
|
||||
The tt(computil) module adds several builtin commands that are used by
|
||||
The tt(zsh/computil) module adds several builtin commands that are used by
|
||||
some of the completion functions in the shell function based
|
||||
completions system (see
|
||||
ifzman(zmanref(zshcompsys))\
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
COMMENT(!MOD!
|
||||
A ZLE function duplicating EMACS' tt(zap-to-char).
|
||||
!MOD!)
|
||||
The tt(deltochar) module makes available two ZLE functions:
|
||||
The tt(zsh/deltochar) module makes available two ZLE functions:
|
||||
|
||||
startitem()
|
||||
tindex(delete-to-char)
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
COMMENT(!MOD!
|
||||
An example of how to write a module.
|
||||
!MOD!)
|
||||
The tt(example) module makes available one builtin command:
|
||||
The tt(zsh/example) module makes available one builtin command:
|
||||
|
||||
startitem()
|
||||
findex(example)
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ COMMENT(!MOD!
|
|||
Some basic file manipulation commands as builtins.
|
||||
!MOD!)
|
||||
cindex(files, manipulating)
|
||||
The tt(files) module makes some standard commands available as builtins:
|
||||
The tt(zsh/files) module makes some standard commands available as builtins:
|
||||
|
||||
startitem()
|
||||
findex(chgrp)
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ COMMENT(!MOD!
|
|||
Access to external files via a special associative array.
|
||||
!MOD!)
|
||||
cindex(parameter, file access via)
|
||||
The tt(mapfile) module provides one special associative array parameter of
|
||||
The tt(zsh/mapfile) module provides one special associative array parameter of
|
||||
the same name.
|
||||
|
||||
startitem()
|
||||
|
|
|
|||
|
|
@ -3,7 +3,8 @@ Standard scientific functions for use in mathematical evaluations.
|
|||
!MOD!)
|
||||
cindex(functions, mathematical)
|
||||
cindex(mathematical functions)
|
||||
The tt(mathfunc) module provides standard mathematical functions for use when
|
||||
The tt(zsh/mathfunc) module provides standard
|
||||
mathematical functions for use when
|
||||
evaluating mathematical formulae. The syntax agrees with normal C and
|
||||
FORTRAN conventions, for example,
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ COMMENT(!MOD!
|
|||
Access to internal hash tables via special associative arrays.
|
||||
!MOD!)
|
||||
cindex(parameters, special)
|
||||
The tt(parameter) module gives access to some of the internal hash
|
||||
The tt(zsh/parameter) module gives access to some of the internal hash
|
||||
tables used by the shell by defining some special parameters.
|
||||
|
||||
startitem()
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
COMMENT(!MOD!
|
||||
A builtin that provides a timed execution facility within the shell.
|
||||
!MOD!)
|
||||
The tt(sched) module makes available one builtin command:
|
||||
The tt(zsh/sched) module makes available one builtin command:
|
||||
|
||||
startitem()
|
||||
findex(sched)
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
COMMENT(!MOD!
|
||||
A builtin command interface to the tt(stat) system call.
|
||||
!MOD!)
|
||||
The tt(stat) module makes available one builtin command:
|
||||
The tt(zsh/stat) module makes available one builtin command:
|
||||
|
||||
startitem()
|
||||
findex(stat)
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
COMMENT(!MOD!
|
||||
A builtin FTP client.
|
||||
!MOD!)
|
||||
The tt(zftp) module makes available one builtin command:
|
||||
The tt(zsh/zftp) module makes available one builtin command:
|
||||
|
||||
startitem()
|
||||
findex(zftp)
|
||||
cindex(FTP)
|
||||
cindex(files, transferring)
|
||||
item(tt(zftp) var(subcommand) [ var(args) ])(
|
||||
The tt(zftp) module is a client for FTP (file transfer protocol). It
|
||||
The tt(zsh/zftp) module is a client for FTP (file transfer protocol). It
|
||||
is implemented as a builtin to allow full use of shell command line
|
||||
editing, file I/O, and job control mechanisms. Often, users will
|
||||
access it via shell functions providing a more powerful interface; a set is
|
||||
|
|
@ -84,7 +84,7 @@ are deleted. In that case, calling tt(open) with no arguments will
|
|||
cause an error.
|
||||
|
||||
The list of parameters is not deleted after a tt(close), however it
|
||||
will be deleted if the tt(zftp) module is unloaded.
|
||||
will be deleted if the tt(zsh/zftp) module is unloaded.
|
||||
|
||||
For example,
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
COMMENT(!MOD!
|
||||
The Zsh Line Editor, including the tt(bindkey) and tt(vared) builtins.
|
||||
!MOD!)
|
||||
The tt(zle) module contains the Zsh Line Editor. See
|
||||
The tt(zsh/zle) module contains the Zsh Line Editor. See
|
||||
ifzman(zmanref(zshzle))\
|
||||
ifnzman(noderef(Zsh Line Editor))\
|
||||
. It also contains three related builtin commands:
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ COMMENT(!MOD!
|
|||
Access to internals of the Zsh Line Editor via parameters.
|
||||
!MOD!)
|
||||
cindex(parameters, special)
|
||||
The tt(zleparameter) module defines two special parameters that can be
|
||||
The tt(zsh/zleparameter) module defines two special parameters that can be
|
||||
used to access internal information of the Zsh Line Editor (see
|
||||
ifzman(zmanref(zshzle))\
|
||||
ifnzman(noderef(Zsh Line Editor))\
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ Some utility builtins, e.g. the one for supporting configuration via
|
|||
styles.
|
||||
!MOD!)
|
||||
cindex(builtins, utility)
|
||||
The tt(zutil) module only adds some builtins:
|
||||
The tt(zsh/zutil) module only adds some builtins:
|
||||
|
||||
startitem()
|
||||
xitem(tt(zstyle) [ tt(-L) ])
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ Some optional parts of zsh are in modules, separate from the core
|
|||
of the shell. Each of these modules may be linked in to the
|
||||
shell at build time,
|
||||
or can be dynamically linked while the shell is running
|
||||
if the installation supports this feature. The modules available are:
|
||||
if the installation supports this feature. The modules that
|
||||
are bundled with the zsh distribution are:
|
||||
|
||||
includefile(Zsh/modlist.yo)
|
||||
|
|
|
|||
|
|
@ -758,8 +758,7 @@ Thus if `tt(/usr/local/bin)' is in the user's path, and he types
|
|||
(assuming it exists).
|
||||
Commands explicitly beginning with `tt(/)', `tt(./)' or `tt(../)'
|
||||
are not subject to the path search.
|
||||
This also applies to the tt(.) builtin,
|
||||
and to searches for modules performed by the tt(zmodload) builtin.
|
||||
This also applies to the tt(.) builtin.
|
||||
)
|
||||
pindex(POSIX_BUILTINS)
|
||||
item(tt(POSIX_BUILTINS) <K> <S>)(
|
||||
|
|
|
|||
|
|
@ -29,8 +29,6 @@ itemiz(using the tt(ARGV0) parameter to override tt(argv[0]) for external
|
|||
commands)
|
||||
itemiz(turning off restricted mode with tt(set +r) or tt(unsetopt
|
||||
RESTRICTED))
|
||||
itemiz(specifying modules to be loaded with an explicitly given
|
||||
pathname containing slashes)
|
||||
enditemize()
|
||||
|
||||
These restrictions are enforced after processing the startup files. The
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ ifnzman(\
|
|||
noderef(The zftp Module)
|
||||
), must be available in the
|
||||
version of tt(zsh) installed at your site. If the shell is configured to
|
||||
load new commands at run time, it probably is: typing `tt(zmodload zftp)'
|
||||
load new commands at run time, it probably is: typing `tt(zmodload zsh/zftp)'
|
||||
will make sure (if that runs silently, it has worked). If this is not the
|
||||
case, it is possible tt(zftp) was linked into the shell anyway: to test
|
||||
this, type `tt(which zftp)' and if tt(zftp) is available you will get the
|
||||
|
|
|
|||
|
|
@ -147,16 +147,26 @@ C coding style
|
|||
groups of statements in the interests of clarity. There should never
|
||||
be two consecutive blank lines.
|
||||
|
||||
* Each .c file *must* #include the .mdh header for the module it is a
|
||||
part of and then its own .pro file (for local prototypes). It may
|
||||
also #include other system headers. It *must not* #include any other
|
||||
module's headers or any other .pro files.
|
||||
|
||||
Modules
|
||||
-------
|
||||
|
||||
Modules are described by a file named `foo.mdd' for a module
|
||||
`foo'. This file is actually a shell script that will sourced when zsh
|
||||
is build. To describe the module it can/should set the following shell
|
||||
variables:
|
||||
Modules have hierarchical names. Name segments are separated by `/', and
|
||||
each segment consists of alphanumerics plus `_'. Relative names are never
|
||||
used; the naming hierarchy is strictly for organisational convenience.
|
||||
|
||||
Each module is described by a file with a name ending in `.mdd' somewhere
|
||||
under the Src directory. This file is actually a shell script that will
|
||||
sourced when zsh is build. To describe the module it can/should set the
|
||||
following shell variables:
|
||||
|
||||
- name name of the module
|
||||
- moddeps modules on which this module depends (default none)
|
||||
- nozshdep non-empty indicates no dependence on the `zsh' pseudo-module
|
||||
- nozshdep non-empty indicates no dependence on the `zsh/main' pseudo-module
|
||||
- alwayslink if non-empty, always link the module into the executable
|
||||
- autobins builtins defined by the module, for autoloading
|
||||
- autoinfixconds infix condition codes defined by the module, for
|
||||
|
|
@ -170,25 +180,25 @@ variables:
|
|||
- hdrdeps extra headers on which the .mdh depends (default none)
|
||||
- otherincs extra headers that are included indirectly (default none)
|
||||
|
||||
Be sure to put the values in quotes. For further enlightenment have a
|
||||
look at the `mkmakemod.sh' script in the Src directory of the
|
||||
distribution.
|
||||
Be sure to put the values in quotes. For further enlightenment have a look
|
||||
at the `mkmakemod.sh' script in the Src directory of the distribution.
|
||||
|
||||
Modules have to define four functions which will be called automatically
|
||||
by the zsh core. The first one, named `setup_foo' for a module named
|
||||
`foo', should set up any data needed in the module, at least any data
|
||||
other modules may be interested in. The second one, named `boot_foo',
|
||||
should register all builtins, conditional codes, and function wrappers
|
||||
(i.e. anything that will be visible to the user) and will be called
|
||||
after the `setup'-function.
|
||||
The third one, named `cleanup_foo' for module `foo' is called when the
|
||||
user tries to unload a module and should de-register the builtins
|
||||
etc. The last function, `finish_foo' is called when the module is
|
||||
actually unloaded and should finalize all the data initialized in the
|
||||
`setup'-function.
|
||||
In short, the `cleanup'-function should undo what the `boot'-function
|
||||
did, and the `finish'-function should undo what the `setup'-function
|
||||
by the zsh core. The first one, named `setup_', should set up any data
|
||||
needed in the module, at least any data other modules may be interested
|
||||
in. The second one, named `boot_', should register all builtins,
|
||||
conditional codes, and function wrappers (i.e. anything that will be
|
||||
visible to the user) and will be called after the `setup_'-function.
|
||||
|
||||
The third one, named `cleanup_', is called when the user tries to unload
|
||||
a module and should de-register the builtins etc. The last function,
|
||||
`finish_' is called when the module is actually unloaded and should
|
||||
finalize all the data initialized in the `setup_'-function.
|
||||
|
||||
In short, the `cleanup_'-function should undo what the `boot_'-function
|
||||
did, and the `finish_'-function should undo what the `setup_'-function
|
||||
did.
|
||||
|
||||
All of these functions should return zero if they succeeded and
|
||||
non-zero otherwise.
|
||||
|
||||
|
|
@ -788,3 +798,20 @@ Documentation
|
|||
All the above should appear on their own, separated by newlines from the
|
||||
surrounding text. No extra newlines after the opening or before the
|
||||
closing parenthesis are required.
|
||||
|
||||
Module names
|
||||
------------
|
||||
|
||||
Modules have hierarchical names. Name segments are separated by `/', and
|
||||
each segment consists of alphanumerics plus `_'. Relative names are never
|
||||
used; the naming hierarchy is strictly for organisational convenience.
|
||||
|
||||
Top-level name segments should be organisational identifiers, assigned
|
||||
by the Zsh Development Group and recorded here:
|
||||
|
||||
top-level identifier organisation
|
||||
-------------------- ------------
|
||||
x_* reserved for private experimental use
|
||||
zsh The Zsh Development Group (contact: <coordinator@zsh.org>)
|
||||
|
||||
Below the top level, naming authority is delegated.
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# zls () {
|
||||
# simple internal ls using the stat module
|
||||
|
||||
zmodload -i stat || return 1
|
||||
zmodload -i zsh/stat || return 1
|
||||
|
||||
emulate -R zsh
|
||||
setopt localoptions
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
emulate -L zsh
|
||||
|
||||
[[ $1 = -n ]] || zmodload -e zftp || zmodload -ia zftp || return 1
|
||||
[[ $1 = -n ]] || zmodload -e zsh/zftp || zmodload -ia zsh/zftp || return 1
|
||||
|
||||
if zmodload -i zutil; then
|
||||
local arr
|
||||
|
|
|
|||
|
|
@ -625,21 +625,21 @@ static struct builtin bintab[] = {
|
|||
|
||||
/**/
|
||||
int
|
||||
setup_rlimits(Module m)
|
||||
setup_(Module m)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**/
|
||||
int
|
||||
boot_rlimits(Module m)
|
||||
boot_(Module m)
|
||||
{
|
||||
return !addbuiltins(m->nam, bintab, sizeof(bintab)/sizeof(*bintab));
|
||||
}
|
||||
|
||||
/**/
|
||||
int
|
||||
cleanup_rlimits(Module m)
|
||||
cleanup_(Module m)
|
||||
{
|
||||
deletebuiltins(m->nam, bintab, sizeof(bintab)/sizeof(*bintab));
|
||||
return 0;
|
||||
|
|
@ -647,7 +647,7 @@ cleanup_rlimits(Module m)
|
|||
|
||||
/**/
|
||||
int
|
||||
finish_rlimits(Module m)
|
||||
finish_(Module m)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
name=zsh/rlimits
|
||||
|
||||
autobins="limit ulimit unlimit"
|
||||
|
||||
objects="rlimits.o"
|
||||
|
|
|
|||
|
|
@ -185,14 +185,14 @@ static struct builtin bintab[] = {
|
|||
|
||||
/**/
|
||||
int
|
||||
setup_sched(Module m)
|
||||
setup_(Module m)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**/
|
||||
int
|
||||
boot_sched(Module m)
|
||||
boot_(Module m)
|
||||
{
|
||||
if(!addbuiltins(m->nam, bintab, sizeof(bintab)/sizeof(*bintab)))
|
||||
return 1;
|
||||
|
|
@ -202,7 +202,7 @@ boot_sched(Module m)
|
|||
|
||||
/**/
|
||||
int
|
||||
cleanup_sched(Module m)
|
||||
cleanup_(Module m)
|
||||
{
|
||||
struct schedcmd *sch, *schn;
|
||||
|
||||
|
|
@ -218,7 +218,7 @@ cleanup_sched(Module m)
|
|||
|
||||
/**/
|
||||
int
|
||||
finish_sched(Module m)
|
||||
finish_(Module m)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
name=zsh/sched
|
||||
|
||||
autobins="sched"
|
||||
|
||||
objects="sched.o"
|
||||
|
|
|
|||
|
|
@ -128,20 +128,7 @@ install.modules: install.modules-here
|
|||
uninstall.modules: uninstall.modules-here
|
||||
|
||||
install.bin-here uninstall.bin-here:
|
||||
|
||||
install.modules-here:
|
||||
modules='$(MODULES)'; \
|
||||
if test -n "$$modules"; then $(sdir_top)/mkinstalldirs $(DESTDIR)$(MODDIR); fi; \
|
||||
for mod in $$modules; do \
|
||||
$(INSTALL_PROGRAM) $$mod $(DESTDIR)$(MODDIR)/$$mod; \
|
||||
done
|
||||
|
||||
uninstall.modules-here:
|
||||
modules='$(MODULES)'; for mod in $$modules; do \
|
||||
if test -f $(DESTDIR)$(MODDIR)/$$mod; then \
|
||||
rm -f $(DESTDIR)$(MODDIR)/$$mod; \
|
||||
else :; fi; \
|
||||
done
|
||||
install.modules-here uninstall.modules-here:
|
||||
|
||||
# ========== DEPENDENCIES FOR CLEANUP ==========
|
||||
|
||||
|
|
|
|||
|
|
@ -124,21 +124,21 @@ static struct builtin bintab[] = {
|
|||
|
||||
/**/
|
||||
int
|
||||
setup_cap(Module m)
|
||||
setup_(Module m)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**/
|
||||
int
|
||||
boot_cap(Module m)
|
||||
boot_(Module m)
|
||||
{
|
||||
return !addbuiltins(m->nam, bintab, sizeof(bintab)/sizeof(*bintab));
|
||||
}
|
||||
|
||||
/**/
|
||||
int
|
||||
cleanup_cap(Module m)
|
||||
cleanup_(Module m)
|
||||
{
|
||||
deletebuiltins(m->nam, bintab, sizeof(bintab)/sizeof(*bintab));
|
||||
return 0;
|
||||
|
|
@ -146,7 +146,7 @@ cleanup_cap(Module m)
|
|||
|
||||
/**/
|
||||
int
|
||||
finish_cap(Module m)
|
||||
finish_(Module m)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
name=zsh/cap
|
||||
|
||||
autobins="cap getcap setcap"
|
||||
|
||||
objects="cap.o"
|
||||
|
|
|
|||
|
|
@ -98,21 +98,21 @@ static struct builtin bintab[] = {
|
|||
|
||||
/**/
|
||||
int
|
||||
setup_clone(Module m)
|
||||
setup_(Module m)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**/
|
||||
int
|
||||
boot_clone(Module m)
|
||||
boot_(Module m)
|
||||
{
|
||||
return !addbuiltins(m->nam, bintab, sizeof(bintab)/sizeof(*bintab));
|
||||
}
|
||||
|
||||
/**/
|
||||
int
|
||||
cleanup_clone(Module m)
|
||||
cleanup_(Module m)
|
||||
{
|
||||
deletebuiltins(m->nam, bintab, sizeof(bintab)/sizeof(*bintab));
|
||||
return 0;
|
||||
|
|
@ -120,7 +120,7 @@ cleanup_clone(Module m)
|
|||
|
||||
/**/
|
||||
int
|
||||
finish_clone(Module m)
|
||||
finish_(Module m)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
name=zsh/clone
|
||||
|
||||
autobins="clone"
|
||||
|
||||
objects="clone.o"
|
||||
|
|
|
|||
|
|
@ -159,7 +159,7 @@ ex_wrapper(List list, FuncWrap w, char *name)
|
|||
}
|
||||
|
||||
/*
|
||||
* boot_example is executed when the module is loaded.
|
||||
* boot_ is executed when the module is loaded.
|
||||
*/
|
||||
|
||||
static struct builtin bintab[] = {
|
||||
|
|
@ -188,7 +188,7 @@ static struct funcwrap wrapper[] = {
|
|||
|
||||
/**/
|
||||
int
|
||||
setup_example(Module m)
|
||||
setup_(Module m)
|
||||
{
|
||||
printf("The example module has now been set up.\n");
|
||||
fflush(stdout);
|
||||
|
|
@ -197,7 +197,7 @@ setup_example(Module m)
|
|||
|
||||
/**/
|
||||
int
|
||||
boot_example(Module m)
|
||||
boot_(Module m)
|
||||
{
|
||||
intparam = 42;
|
||||
strparam = ztrdup("example");
|
||||
|
|
@ -214,7 +214,7 @@ boot_example(Module m)
|
|||
|
||||
/**/
|
||||
int
|
||||
cleanup_example(Module m)
|
||||
cleanup_(Module m)
|
||||
{
|
||||
deletebuiltins(m->nam, bintab, sizeof(bintab)/sizeof(*bintab));
|
||||
deleteconddefs(m->nam, cotab, sizeof(cotab)/sizeof(*cotab));
|
||||
|
|
@ -226,7 +226,7 @@ cleanup_example(Module m)
|
|||
|
||||
/**/
|
||||
int
|
||||
finish_example(Module m)
|
||||
finish_(Module m)
|
||||
{
|
||||
printf("Thank you for using the example module. Have a nice day.\n");
|
||||
fflush(stdout);
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
name=zsh/example
|
||||
|
||||
autobins="example"
|
||||
|
||||
autoinfixconds="ex"
|
||||
|
|
|
|||
|
|
@ -714,21 +714,21 @@ static struct builtin bintab[] = {
|
|||
|
||||
/**/
|
||||
int
|
||||
setup_files(Module m)
|
||||
setup_(Module m)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**/
|
||||
int
|
||||
boot_files(Module m)
|
||||
boot_(Module m)
|
||||
{
|
||||
return !addbuiltins(m->nam, bintab, sizeof(bintab)/sizeof(*bintab));
|
||||
}
|
||||
|
||||
/**/
|
||||
int
|
||||
cleanup_files(Module m)
|
||||
cleanup_(Module m)
|
||||
{
|
||||
deletebuiltins(m->nam, bintab, sizeof(bintab)/sizeof(*bintab));
|
||||
return 0;
|
||||
|
|
@ -736,7 +736,7 @@ cleanup_files(Module m)
|
|||
|
||||
/**/
|
||||
int
|
||||
finish_files(Module m)
|
||||
finish_(Module m)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
name=zsh/files
|
||||
|
||||
autobins="chgrp chown ln mkdir mv rm rmdir sync"
|
||||
|
||||
objects="files.o"
|
||||
|
|
|
|||
|
|
@ -329,14 +329,14 @@ scanpmmapfile(HashTable ht, ScanFunc func, int flags)
|
|||
|
||||
/**/
|
||||
int
|
||||
setup_mapfile(Module m)
|
||||
setup_(Module m)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**/
|
||||
int
|
||||
boot_mapfile(Module m)
|
||||
boot_(Module m)
|
||||
{
|
||||
/* Create the special associative array. */
|
||||
|
||||
|
|
@ -348,7 +348,7 @@ boot_mapfile(Module m)
|
|||
|
||||
/**/
|
||||
int
|
||||
cleanup_mapfile(Module m)
|
||||
cleanup_(Module m)
|
||||
{
|
||||
Param pm;
|
||||
|
||||
|
|
@ -364,7 +364,7 @@ cleanup_mapfile(Module m)
|
|||
|
||||
/**/
|
||||
int
|
||||
finish_mapfile(Module m)
|
||||
finish_(Module m)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
name=zsh/mapfile
|
||||
|
||||
autoparams="mapfile"
|
||||
|
||||
objects="mapfile.o"
|
||||
|
|
|
|||
|
|
@ -450,21 +450,21 @@ math_func(char *name, int argc, mnumber *argv, int id)
|
|||
|
||||
/**/
|
||||
int
|
||||
setup_mathfunc(Module m)
|
||||
setup_(Module m)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**/
|
||||
int
|
||||
boot_mathfunc(Module m)
|
||||
boot_(Module m)
|
||||
{
|
||||
return !addmathfuncs(m->nam, mftab, sizeof(mftab)/sizeof(*mftab));
|
||||
}
|
||||
|
||||
/**/
|
||||
int
|
||||
cleanup_mathfunc(Module m)
|
||||
cleanup_(Module m)
|
||||
{
|
||||
deletemathfuncs(m->nam, mftab, sizeof(mftab)/sizeof(*mftab));
|
||||
return 0;
|
||||
|
|
@ -472,7 +472,7 @@ cleanup_mathfunc(Module m)
|
|||
|
||||
/**/
|
||||
int
|
||||
finish_mathfunc(Module m)
|
||||
finish_(Module m)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
name=zsh/mathfunc
|
||||
|
||||
autobins="mathfunc"
|
||||
|
||||
objects="mathfunc.o"
|
||||
|
|
|
|||
|
|
@ -1940,7 +1940,7 @@ static struct funcwrap wrapper[] = {
|
|||
|
||||
/**/
|
||||
int
|
||||
setup_parameter(Module m)
|
||||
setup_(Module m)
|
||||
{
|
||||
incleanup = 0;
|
||||
|
||||
|
|
@ -1949,7 +1949,7 @@ setup_parameter(Module m)
|
|||
|
||||
/**/
|
||||
int
|
||||
boot_parameter(Module m)
|
||||
boot_(Module m)
|
||||
{
|
||||
/* Create the special associative arrays.
|
||||
* As an example for autoloaded parameters, this is probably a bad
|
||||
|
|
@ -1988,7 +1988,7 @@ boot_parameter(Module m)
|
|||
|
||||
/**/
|
||||
int
|
||||
cleanup_parameter(Module m)
|
||||
cleanup_(Module m)
|
||||
{
|
||||
Param pm;
|
||||
struct pardef *def;
|
||||
|
|
@ -2010,7 +2010,7 @@ cleanup_parameter(Module m)
|
|||
|
||||
/**/
|
||||
int
|
||||
finish_parameter(Module m)
|
||||
finish_(Module m)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
name=zsh/parameter
|
||||
|
||||
autoparams="parameters commands functions dis_functions funcstack builtins dis_builtins reswords dis_reswords options modules dirstack history historywords jobtexts jobdirs jobstates nameddirs userdirs aliases dis_aliases galiases dis_galiases"
|
||||
|
||||
objects="parameter.o"
|
||||
|
|
|
|||
|
|
@ -590,21 +590,21 @@ static struct builtin bintab[] = {
|
|||
|
||||
/**/
|
||||
int
|
||||
setup_stat(Module m)
|
||||
setup_(Module m)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**/
|
||||
int
|
||||
boot_stat(Module m)
|
||||
boot_(Module m)
|
||||
{
|
||||
return !addbuiltins(m->nam, bintab, sizeof(bintab)/sizeof(*bintab));
|
||||
}
|
||||
|
||||
/**/
|
||||
int
|
||||
cleanup_stat(Module m)
|
||||
cleanup_(Module m)
|
||||
{
|
||||
deletebuiltins(m->nam, bintab, sizeof(bintab)/sizeof(*bintab));
|
||||
return 0;
|
||||
|
|
@ -612,7 +612,7 @@ cleanup_stat(Module m)
|
|||
|
||||
/**/
|
||||
int
|
||||
finish_stat(Module m)
|
||||
finish_(Module m)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
name=zsh/stat
|
||||
|
||||
autobins="stat"
|
||||
|
||||
objects="stat.o"
|
||||
|
|
|
|||
|
|
@ -3201,14 +3201,14 @@ bin_zftp(char *name, char **args, char *ops, int func)
|
|||
|
||||
/**/
|
||||
int
|
||||
setup_zftp(Module m)
|
||||
setup_(Module m)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**/
|
||||
int
|
||||
boot_zftp(Module m)
|
||||
boot_(Module m)
|
||||
{
|
||||
int ret;
|
||||
if ((ret = addbuiltins(m->nam, bintab,
|
||||
|
|
@ -3232,7 +3232,7 @@ boot_zftp(Module m)
|
|||
|
||||
/**/
|
||||
int
|
||||
cleanup_zftp(Module m)
|
||||
cleanup_(Module m)
|
||||
{
|
||||
/*
|
||||
* There are various parameters hanging around, but they're
|
||||
|
|
@ -3260,7 +3260,7 @@ cleanup_zftp(Module m)
|
|||
|
||||
/**/
|
||||
int
|
||||
finish_zftp(Module m)
|
||||
finish_(Module m)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
name=zsh/zftp
|
||||
|
||||
autobins="zftp"
|
||||
|
||||
objects="zftp.o"
|
||||
|
|
|
|||
|
|
@ -291,14 +291,14 @@ static struct funcwrap wrapper[] = {
|
|||
|
||||
/**/
|
||||
int
|
||||
setup_zprof(Module m)
|
||||
setup_(Module m)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**/
|
||||
int
|
||||
boot_zprof(Module m)
|
||||
boot_(Module m)
|
||||
{
|
||||
calls = NULL;
|
||||
ncalls = 0;
|
||||
|
|
@ -311,7 +311,7 @@ boot_zprof(Module m)
|
|||
|
||||
/**/
|
||||
int
|
||||
cleanup_zprof(Module m)
|
||||
cleanup_(Module m)
|
||||
{
|
||||
freepfuncs(calls);
|
||||
freeparcs(arcs);
|
||||
|
|
@ -322,7 +322,7 @@ cleanup_zprof(Module m)
|
|||
|
||||
/**/
|
||||
int
|
||||
finish_zprof(Module m)
|
||||
finish_(Module m)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
name=zsh/zprof
|
||||
|
||||
autobins="zprof"
|
||||
|
||||
objects="zprof.o"
|
||||
|
|
|
|||
|
|
@ -729,7 +729,7 @@ static struct builtin bintab[] = {
|
|||
|
||||
/**/
|
||||
int
|
||||
setup_zutil(Module m)
|
||||
setup_(Module m)
|
||||
{
|
||||
zstyles = NULL;
|
||||
|
||||
|
|
@ -738,14 +738,14 @@ setup_zutil(Module m)
|
|||
|
||||
/**/
|
||||
int
|
||||
boot_zutil(Module m)
|
||||
boot_(Module m)
|
||||
{
|
||||
return !addbuiltins(m->nam, bintab, sizeof(bintab)/sizeof(*bintab));
|
||||
}
|
||||
|
||||
/**/
|
||||
int
|
||||
cleanup_zutil(Module m)
|
||||
cleanup_(Module m)
|
||||
{
|
||||
deletebuiltins(m->nam, bintab, sizeof(bintab)/sizeof(*bintab));
|
||||
return 0;
|
||||
|
|
@ -753,7 +753,7 @@ cleanup_zutil(Module m)
|
|||
|
||||
/**/
|
||||
int
|
||||
finish_zutil(Module m)
|
||||
finish_(Module m)
|
||||
{
|
||||
freestypat(zstyles);
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
name=zsh/zutil
|
||||
|
||||
objects="zutil.o"
|
||||
|
||||
autobins="zformat zstyle"
|
||||
|
|
|
|||
|
|
@ -3732,7 +3732,7 @@ static struct builtin bintab[] = {
|
|||
|
||||
/**/
|
||||
int
|
||||
setup_compctl(Module m)
|
||||
setup_(Module m)
|
||||
{
|
||||
compctlreadptr = compctlread;
|
||||
createcompctltable();
|
||||
|
|
@ -3752,7 +3752,7 @@ setup_compctl(Module m)
|
|||
|
||||
/**/
|
||||
int
|
||||
boot_compctl(Module m)
|
||||
boot_(Module m)
|
||||
{
|
||||
addhookfunc("compctl_make", (Hookfn) ccmakehookfn);
|
||||
addhookfunc("compctl_before", (Hookfn) ccbeforehookfn);
|
||||
|
|
@ -3762,7 +3762,7 @@ boot_compctl(Module m)
|
|||
|
||||
/**/
|
||||
int
|
||||
cleanup_compctl(Module m)
|
||||
cleanup_(Module m)
|
||||
{
|
||||
deletehookfunc("compctl_make", (Hookfn) ccmakehookfn);
|
||||
deletehookfunc("compctl_before", (Hookfn) ccbeforehookfn);
|
||||
|
|
@ -3773,7 +3773,7 @@ cleanup_compctl(Module m)
|
|||
|
||||
/**/
|
||||
int
|
||||
finish_compctl(Module m)
|
||||
finish_(Module m)
|
||||
{
|
||||
deletehashtable(compctltab);
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,6 @@
|
|||
moddeps="complete zle"
|
||||
name=zsh/compctl
|
||||
|
||||
moddeps="zsh/complete zsh/zle"
|
||||
|
||||
autobins="compctl"
|
||||
|
||||
|
|
|
|||
|
|
@ -1350,7 +1350,7 @@ struct hookdef comphooks[] = {
|
|||
|
||||
/**/
|
||||
int
|
||||
setup_complete(Module m)
|
||||
setup_(Module m)
|
||||
{
|
||||
hasperm = 0;
|
||||
|
||||
|
|
@ -1371,7 +1371,7 @@ setup_complete(Module m)
|
|||
|
||||
/**/
|
||||
int
|
||||
boot_complete(Module m)
|
||||
boot_(Module m)
|
||||
{
|
||||
addhookfunc("complete", (Hookfn) do_completion);
|
||||
addhookfunc("before_complete", (Hookfn) before_complete);
|
||||
|
|
@ -1391,7 +1391,7 @@ boot_complete(Module m)
|
|||
|
||||
/**/
|
||||
int
|
||||
cleanup_complete(Module m)
|
||||
cleanup_(Module m)
|
||||
{
|
||||
deletehookfunc("complete", (Hookfn) do_completion);
|
||||
deletehookfunc("before_complete", (Hookfn) before_complete);
|
||||
|
|
@ -1410,7 +1410,7 @@ cleanup_complete(Module m)
|
|||
|
||||
/**/
|
||||
int
|
||||
finish_complete(Module m)
|
||||
finish_(Module m)
|
||||
{
|
||||
if (compwords)
|
||||
freearray(compwords);
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
moddeps="zle"
|
||||
name=zsh/complete
|
||||
|
||||
autobins="compgen compadd compset"
|
||||
moddeps="zsh/zle"
|
||||
|
||||
autobins="compadd compset"
|
||||
|
||||
autoprefixconds="prefix suffix between after"
|
||||
|
||||
|
|
|
|||
|
|
@ -1196,14 +1196,14 @@ menuselect(char **args)
|
|||
|
||||
/**/
|
||||
int
|
||||
setup_complist(Module m)
|
||||
setup_(Module m)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**/
|
||||
int
|
||||
boot_complist(Module m)
|
||||
boot_(Module m)
|
||||
{
|
||||
mtab = NULL;
|
||||
mgtab = NULL;
|
||||
|
|
@ -1237,7 +1237,7 @@ boot_complist(Module m)
|
|||
|
||||
/**/
|
||||
int
|
||||
cleanup_complist(Module m)
|
||||
cleanup_(Module m)
|
||||
{
|
||||
free(mtab);
|
||||
free(mgtab);
|
||||
|
|
@ -1251,7 +1251,7 @@ cleanup_complist(Module m)
|
|||
|
||||
/**/
|
||||
int
|
||||
finish_complist(Module m)
|
||||
finish_(Module m)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
moddeps="complete zle"
|
||||
name=zsh/complist
|
||||
|
||||
moddeps="zsh/complete zsh/zle"
|
||||
|
||||
objects="complist.o"
|
||||
|
|
|
|||
|
|
@ -2408,7 +2408,7 @@ static struct builtin bintab[] = {
|
|||
|
||||
/**/
|
||||
int
|
||||
setup_computil(Module m)
|
||||
setup_(Module m)
|
||||
{
|
||||
memset(cadef_cache, 0, sizeof(cadef_cache));
|
||||
memset(cvdef_cache, 0, sizeof(cvdef_cache));
|
||||
|
|
@ -2422,14 +2422,14 @@ setup_computil(Module m)
|
|||
|
||||
/**/
|
||||
int
|
||||
boot_computil(Module m)
|
||||
boot_(Module m)
|
||||
{
|
||||
return !addbuiltins(m->nam, bintab, sizeof(bintab)/sizeof(*bintab));
|
||||
}
|
||||
|
||||
/**/
|
||||
int
|
||||
cleanup_computil(Module m)
|
||||
cleanup_(Module m)
|
||||
{
|
||||
deletebuiltins(m->nam, bintab, sizeof(bintab)/sizeof(*bintab));
|
||||
return 0;
|
||||
|
|
@ -2437,7 +2437,7 @@ cleanup_computil(Module m)
|
|||
|
||||
/**/
|
||||
int
|
||||
finish_computil(Module m)
|
||||
finish_(Module m)
|
||||
{
|
||||
int i;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,6 @@
|
|||
moddeps="complete zle"
|
||||
name=zsh/computil
|
||||
|
||||
moddeps="zsh/complete zsh/zle"
|
||||
|
||||
objects="computil.o"
|
||||
|
||||
|
|
|
|||
|
|
@ -75,14 +75,14 @@ deltochar(char **args)
|
|||
|
||||
/**/
|
||||
int
|
||||
setup_deltochar(Module m)
|
||||
setup_(Module m)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**/
|
||||
int
|
||||
boot_deltochar(Module m)
|
||||
boot_(Module m)
|
||||
{
|
||||
w_deletetochar = addzlefunction("delete-to-char", deltochar,
|
||||
ZLE_KILL | ZLE_KEEPSUFFIX);
|
||||
|
|
@ -100,7 +100,7 @@ boot_deltochar(Module m)
|
|||
|
||||
/**/
|
||||
int
|
||||
cleanup_deltochar(Module m)
|
||||
cleanup_(Module m)
|
||||
{
|
||||
deletezlefunction(w_deletetochar);
|
||||
deletezlefunction(w_zaptochar);
|
||||
|
|
@ -109,7 +109,7 @@ cleanup_deltochar(Module m)
|
|||
|
||||
/**/
|
||||
int
|
||||
finish_deltochar(Module m)
|
||||
finish_(Module m)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
moddeps="zle"
|
||||
name=zsh/deltochar
|
||||
|
||||
moddeps="zsh/zle"
|
||||
|
||||
objects="deltochar.o"
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
name=zsh/zle
|
||||
|
||||
autobins="bindkey vared zle"
|
||||
|
||||
objects="zle_bindings.o zle_hist.o zle_keymap.o zle_main.o \
|
||||
|
|
|
|||
|
|
@ -1003,7 +1003,7 @@ mod_export struct hookdef zlehooks[] = {
|
|||
|
||||
/**/
|
||||
int
|
||||
setup_zle(Module m)
|
||||
setup_(Module m)
|
||||
{
|
||||
/* Set up editor entry points */
|
||||
trashzleptr = trashzle;
|
||||
|
|
@ -1036,7 +1036,7 @@ setup_zle(Module m)
|
|||
|
||||
/**/
|
||||
int
|
||||
boot_zle(Module m)
|
||||
boot_(Module m)
|
||||
{
|
||||
addbuiltins(m->nam, bintab, sizeof(bintab)/sizeof(*bintab));
|
||||
addhookdefs(m->nam, zlehooks, sizeof(zlehooks)/sizeof(*zlehooks));
|
||||
|
|
@ -1045,7 +1045,7 @@ boot_zle(Module m)
|
|||
|
||||
/**/
|
||||
int
|
||||
cleanup_zle(Module m)
|
||||
cleanup_(Module m)
|
||||
{
|
||||
if(zleactive) {
|
||||
zerrnam(m->nam, "can't unload the zle module while zle is active",
|
||||
|
|
@ -1059,7 +1059,7 @@ cleanup_zle(Module m)
|
|||
|
||||
/**/
|
||||
int
|
||||
finish_zle(Module m)
|
||||
finish_(Module m)
|
||||
{
|
||||
int i;
|
||||
|
||||
|
|
|
|||
|
|
@ -546,7 +546,7 @@ bin_zle_complete(char *name, char **args, char *ops, char func)
|
|||
Thingy t;
|
||||
Widget w, cw;
|
||||
|
||||
if (!require_module(name, "complete", 0, 0)) {
|
||||
if (!require_module(name, "zsh/complete", 0, 0)) {
|
||||
zerrnam(name, "can't load complete module", NULL, 0);
|
||||
return 1;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -198,14 +198,14 @@ static struct pardef partab[] = {
|
|||
|
||||
/**/
|
||||
int
|
||||
setup_zleparameter(Module m)
|
||||
setup_(Module m)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**/
|
||||
int
|
||||
boot_zleparameter(Module m)
|
||||
boot_(Module m)
|
||||
{
|
||||
struct pardef *def;
|
||||
|
||||
|
|
@ -232,7 +232,7 @@ boot_zleparameter(Module m)
|
|||
|
||||
/**/
|
||||
int
|
||||
cleanup_zleparameter(Module m)
|
||||
cleanup_(Module m)
|
||||
{
|
||||
Param pm;
|
||||
struct pardef *def;
|
||||
|
|
@ -249,7 +249,7 @@ cleanup_zleparameter(Module m)
|
|||
|
||||
/**/
|
||||
int
|
||||
finish_zleparameter(Module m)
|
||||
finish_(Module m)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,6 @@
|
|||
moddeps="zle"
|
||||
name=zsh/zleparameter
|
||||
|
||||
moddeps="zsh/zle"
|
||||
|
||||
autoparams="widgets keymaps"
|
||||
|
||||
|
|
|
|||
16
Src/init.c
16
Src/init.c
|
|
@ -943,7 +943,7 @@ init_bltinmods(void)
|
|||
|
||||
#include "bltinmods.list"
|
||||
|
||||
load_module("zsh");
|
||||
load_module("zsh/main");
|
||||
}
|
||||
|
||||
/**/
|
||||
|
|
@ -965,7 +965,7 @@ noop_function_int(int nothing)
|
|||
* avoid wasting space with the fallback functions. No other source *
|
||||
* file needs to know which modules are linked in. */
|
||||
|
||||
#ifdef LINKED_XMOD_zle
|
||||
#ifdef LINKED_XMOD_zshQszle
|
||||
|
||||
/**/
|
||||
mod_export ZleVoidFn trashzleptr = noop_function;
|
||||
|
|
@ -978,26 +978,26 @@ mod_export ZleVoidIntFn spaceinlineptr = noop_function_int;
|
|||
/**/
|
||||
mod_export ZleReadFn zlereadptr = autoload_zleread;
|
||||
|
||||
#else /* !LINKED_XMOD_zle */
|
||||
#else /* !LINKED_XMOD_zshQszle */
|
||||
|
||||
mod_export ZleVoidFn trashzleptr = noop_function;
|
||||
mod_export ZleVoidFn gotwordptr = noop_function;
|
||||
mod_export ZleVoidFn refreshptr = noop_function;
|
||||
mod_export ZleVoidIntFn spaceinlineptr = noop_function_int;
|
||||
# ifdef UNLINKED_XMOD_zle
|
||||
# ifdef UNLINKED_XMOD_zshQszle
|
||||
mod_export ZleReadFn zlereadptr = autoload_zleread;
|
||||
# else /* !UNLINKED_XMOD_zle */
|
||||
# else /* !UNLINKED_XMOD_zshQszle */
|
||||
mod_export ZleReadFn zlereadptr = fallback_zleread;
|
||||
# endif /* !UNLINKED_XMOD_zle */
|
||||
# endif /* !UNLINKED_XMOD_zshQszle */
|
||||
|
||||
#endif /* !LINKED_XMOD_zle */
|
||||
#endif /* !LINKED_XMOD_zshQszle */
|
||||
|
||||
/**/
|
||||
unsigned char *
|
||||
autoload_zleread(char *lp, char *rp, int ha)
|
||||
{
|
||||
zlereadptr = fallback_zleread;
|
||||
load_module("zle");
|
||||
load_module("zsh/zle");
|
||||
return zleread(lp, rp, ha);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -109,15 +109,6 @@ BEGIN {
|
|||
gsub(/@>/, ")", dcltor)
|
||||
gsub(/@!/, ",", dcltor)
|
||||
|
||||
# If this is a module boot/cleanup function, conditionally rename it.
|
||||
if(" " dtype " " ~ / int / && dcltor ~ / *@\+(boot|cleanup|setup|finish)_[_0-9A-Za-z]+@- *_\(\( *Module +[_0-9A-Za-z]+ *\)\) */) {
|
||||
modtype = dnam
|
||||
sub(/_.*$/, "", modtype)
|
||||
printf "%s# if defined(DYNAMIC_NAME_CLASH_OK) && defined(MODULE)\n", locality
|
||||
printf "%s# define " dnam " " modtype "_\n", locality
|
||||
printf "%s# endif\n", locality
|
||||
}
|
||||
|
||||
# If this is exported, add it to the exported symbol list.
|
||||
if(exported)
|
||||
printf "X%s\n", dnam
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ test "x$srcdir" = "x" && srcdir=.
|
|||
MODBINS=${MODBINS-modules-bltin}
|
||||
XMODCF=${XMODCF-$srcdir/xmods.conf}
|
||||
|
||||
bin_mods=" zsh "`sed 's/^/ /;s/$/ /' $MODBINS`
|
||||
bin_mods=" zsh/main "`sed 's/^/ /;s/$/ /' $MODBINS`
|
||||
x_mods=`cat $XMODCF`
|
||||
. ./modules.index
|
||||
|
||||
|
|
@ -20,6 +20,7 @@ trap "rm -f $1; exit 1" 1 2 15
|
|||
exec > $1
|
||||
|
||||
for x_mod in $x_mods; do
|
||||
q_x_mod=`echo $x_mod | sed 's,Q,Qq,g;s,_,Qu,g;s,/,Qs,g'`
|
||||
case "$bin_mods" in
|
||||
*" $x_mod "*)
|
||||
echo "/* linked-in known module \`$x_mod' */"
|
||||
|
|
@ -30,10 +31,10 @@ for x_mod in $x_mods; do
|
|||
echo "/* non-linked-in known module \`$x_mod' */"
|
||||
linked=no
|
||||
esac
|
||||
eval "loc=\$loc_$x_mod"
|
||||
eval "modfile=\$modfile_$q_x_mod"
|
||||
unset moddeps autobins autoinfixconds autoprefixconds autoparams
|
||||
unset automathfuncs
|
||||
. $srcdir/../$loc/${x_mod}.mdd
|
||||
. $srcdir/../$modfile
|
||||
for bin in $autobins; do
|
||||
echo " add_autobin(\"$bin\", \"$x_mod\");"
|
||||
done
|
||||
|
|
@ -58,10 +59,11 @@ done
|
|||
echo
|
||||
done_mods=" "
|
||||
for bin_mod in $bin_mods; do
|
||||
q_bin_mod=`echo $bin_mod | sed 's,Q,Qq,g;s,_,Qu,g;s,/,Qs,g'`
|
||||
echo "/* linked-in module \`$bin_mod' */"
|
||||
eval "loc=\$loc_$bin_mod"
|
||||
eval "modfile=\$modfile_$q_bin_mod"
|
||||
unset moddeps
|
||||
. $srcdir/../$loc/${bin_mod}.mdd
|
||||
. $srcdir/../$modfile
|
||||
for dep in $moddeps; do
|
||||
case $done_mods in
|
||||
*" $dep "*)
|
||||
|
|
@ -72,14 +74,14 @@ for bin_mod in $bin_mods; do
|
|||
esac
|
||||
done
|
||||
echo " {"
|
||||
echo " extern int setup_${bin_mod} _((Module));"
|
||||
echo " extern int boot_${bin_mod} _((Module));"
|
||||
echo " extern int cleanup_${bin_mod} _((Module));"
|
||||
echo " extern int finish_${bin_mod} _((Module));"
|
||||
echo " extern int setup_${q_bin_mod} _((Module));"
|
||||
echo " extern int boot_${q_bin_mod} _((Module));"
|
||||
echo " extern int cleanup_${q_bin_mod} _((Module));"
|
||||
echo " extern int finish_${q_bin_mod} _((Module));"
|
||||
echo
|
||||
echo " register_module(\"$bin_mod\","
|
||||
echo " setup_${bin_mod}, boot_${bin_mod},"
|
||||
echo " cleanup_${bin_mod}, finish_${bin_mod});"
|
||||
echo " setup_${q_bin_mod}, boot_${q_bin_mod},"
|
||||
echo " cleanup_${q_bin_mod}, finish_${q_bin_mod});"
|
||||
echo " }"
|
||||
done_mods="$done_mods$bin_mod "
|
||||
done
|
||||
|
|
|
|||
204
Src/mkmakemod.sh
204
Src/mkmakemod.sh
|
|
@ -17,8 +17,9 @@
|
|||
# defines one module. The .mdd file is actually a shell script, which will
|
||||
# be sourced. It may define the following shell variables:
|
||||
#
|
||||
# name name of this module
|
||||
# moddeps modules on which this module depends (default none)
|
||||
# nozshdep non-empty indicates no dependence on the `zsh' pseudo-module
|
||||
# nozshdep non-empty indicates no dependence on the `zsh/main' pseudo-module
|
||||
# alwayslink if non-empty, always link the module into the executable
|
||||
# autobins builtins defined by the module, for autoloading
|
||||
# autoinfixconds infix condition codes defined by the module, for
|
||||
|
|
@ -103,14 +104,14 @@ if $first_stage; then
|
|||
echo
|
||||
|
||||
. Src/modules.index
|
||||
bin_mods=" zsh "`sed 's/^/ /;s/$/ /' Src/modules-bltin`
|
||||
bin_mods=" zsh/main "`sed 's/^/ /;s/$/ /' Src/modules-bltin`
|
||||
if grep '%@D@%D%' config.status >/dev/null; then
|
||||
is_dynamic=true
|
||||
else
|
||||
is_dynamic=false
|
||||
fi
|
||||
|
||||
here_modules=
|
||||
here_mddnames=
|
||||
all_subdirs=
|
||||
all_modobjs=
|
||||
all_modules=
|
||||
|
|
@ -119,30 +120,31 @@ if $first_stage; then
|
|||
all_proto=
|
||||
lastsub=//
|
||||
for module in $module_list; do
|
||||
eval "loc=\$loc_$module"
|
||||
case $loc in
|
||||
$the_subdir)
|
||||
here_modules="$here_modules $module"
|
||||
q_module=`echo $module | sed 's,Q,Qq,g;s,_,Qu,g;s,/,Qs,g'`
|
||||
eval "modfile=\$modfile_$q_module"
|
||||
case $modfile in
|
||||
$the_subdir/$lastsub/*) ;;
|
||||
$the_subdir/*/*)
|
||||
lastsub=`echo $modfile | sed 's,^'$the_subdir'/,,;s,/[^/]*$,,'`
|
||||
all_subdirs="$all_subdirs $lastsub"
|
||||
;;
|
||||
$the_subdir/*)
|
||||
mddname=`echo $modfile | sed 's,^.*/,,;s,\.mdd$,,'`
|
||||
here_mddnames="$here_mddnames $mddname"
|
||||
build=$is_dynamic
|
||||
case $is_dynamic@$bin_mods in
|
||||
*" $module "*)
|
||||
build=true
|
||||
all_modobjs="$all_modobjs modobjs.${module}" ;;
|
||||
all_modobjs="$all_modobjs modobjs.${mddname}" ;;
|
||||
true@*)
|
||||
all_modules="$all_modules ${module}.\$(DL_EXT)" ;;
|
||||
all_modules="$all_modules ${mddname}.\$(DL_EXT)" ;;
|
||||
esac
|
||||
all_mdds="$all_mdds ${module}.mdd"
|
||||
$build && all_mdhs="$all_mdhs ${module}.mdh"
|
||||
$build && all_proto="$all_proto proto.${module}"
|
||||
;;
|
||||
$lastsub | $lastsub/*) ;;
|
||||
$the_subdir/*)
|
||||
all_subdirs="$all_subdirs $loc"
|
||||
lastsub=$loc
|
||||
all_mdds="$all_mdds ${mddname}.mdd"
|
||||
$build && all_mdhs="$all_mdhs ${mddname}.mdh"
|
||||
$build && all_proto="$all_proto proto.${mddname}"
|
||||
;;
|
||||
esac
|
||||
done
|
||||
all_subdirs=`echo "$all_subdirs" | sed "s' $the_subdir/' 'g"`
|
||||
echo "MODOBJS =$all_modobjs"
|
||||
echo "MODULES =$all_modules"
|
||||
echo "MDDS =$all_mdds"
|
||||
|
|
@ -169,106 +171,148 @@ if $first_stage; then
|
|||
|
||||
other_mdhs=
|
||||
remote_mdhs=
|
||||
for module in $here_modules; do
|
||||
other_exports=
|
||||
remote_exports=
|
||||
for mddname in $here_mddnames; do
|
||||
|
||||
unset moddeps nozshdep alwayslink hasexport
|
||||
unset name moddeps nozshdep alwayslink hasexport
|
||||
unset autobins autoinfixconds autoprefixconds autoparams automathfuncs
|
||||
unset objects proto headers hdrdeps otherincs
|
||||
. $top_srcdir/$the_subdir/${module}.mdd
|
||||
. $top_srcdir/$the_subdir/${mddname}.mdd
|
||||
q_name=`echo $name | sed 's,Q,Qq,g;s,_,Qu,g;s,/,Qs,g'`
|
||||
test -n "${moddeps+set}" || moddeps=
|
||||
test -n "$nozshdep" || moddeps="$moddeps zsh"
|
||||
test -n "$nozshdep" || moddeps="$moddeps zsh/main"
|
||||
test -n "${proto+set}" ||
|
||||
proto=`echo $objects '' | sed 's,\.o ,.syms ,g'`
|
||||
|
||||
dobjects=`echo $objects '' | sed 's,\.o ,..o ,g'`
|
||||
modhdeps=
|
||||
imports=
|
||||
depimports=
|
||||
exportdeps=
|
||||
q_moddeps=
|
||||
for dep in $moddeps; do
|
||||
eval "loc=\$loc_$dep"
|
||||
imports="$imports \$(IMPOPT)\$(dir_top)/$loc/$dep.export"
|
||||
test "$loc" = "$the_subdir" &&
|
||||
depimports="$depimports $dep.export"
|
||||
q_dep=`echo $dep | sed 's,Q,Qq,g;s,_,Qu,g;s,/,Qs,g'`
|
||||
q_moddeps="$q_moddeps $q_dep"
|
||||
eval "depfile=\$modfile_$q_dep"
|
||||
eval `echo $depfile | sed 's,/\([^/]*\)\.mdd$,;depbase=\1,;s,^,loc=,'`
|
||||
case $the_subdir in
|
||||
$loc)
|
||||
mdh="${dep}.mdh"
|
||||
mdh="${depbase}.mdh"
|
||||
export="${depbase}.export"
|
||||
;;
|
||||
$loc/*)
|
||||
mdh="\$(dir_top)/$loc/${dep}.mdh"
|
||||
mdh="\$(dir_top)/$loc/${depbase}.mdh"
|
||||
case "$other_mdhs " in
|
||||
*" $mdh "*) ;;
|
||||
*) other_mdhs="$other_mdhs $mdh" ;;
|
||||
esac
|
||||
export="\$(dir_top)/$loc/${depbase}.export"
|
||||
case "$other_exports " in
|
||||
*" $export "*) ;;
|
||||
*) other_exports="$other_exports $export" ;;
|
||||
esac
|
||||
;;
|
||||
*)
|
||||
mdh="\$(dir_top)/$loc/${dep}.mdh"
|
||||
mdh="\$(dir_top)/$loc/${depbase}.mdh"
|
||||
case "$remote_mdhs " in
|
||||
*" $mdh "*) ;;
|
||||
*) remote_mdhs="$remote_mdhs $mdh" ;;
|
||||
esac
|
||||
export="\$(dir_top)/$loc/${depbase}.export"
|
||||
case "$remote_exports " in
|
||||
*" $export "*) ;;
|
||||
*) remote_exports="$remote_exports $export" ;;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
modhdeps="$modhdeps $mdh"
|
||||
exportdeps="$exportdeps $export"
|
||||
done
|
||||
|
||||
echo "##### ===== DEPENDENCIES GENERATED FROM ${module}.mdd ===== #####"
|
||||
echo "##### ===== DEPENDENCIES GENERATED FROM ${mddname}.mdd ===== #####"
|
||||
echo
|
||||
echo "MODOBJS_${module} = $objects"
|
||||
echo "MODDOBJS_${module} = $dobjects \$(@E@NTRYOBJ)"
|
||||
echo "SYMS_${module} = $proto"
|
||||
echo "EPRO_${module} = "`echo $proto '' | sed 's,\.syms ,.epro ,g'`
|
||||
echo "INCS_${module} = \$(EPRO_${module}) $otherincs"
|
||||
echo "EXPIMP_${module} = $imports \$(EXPOPT)$module.export"
|
||||
echo "NXPIMP_${module} ="
|
||||
echo "MODOBJS_${mddname} = $objects"
|
||||
echo "MODDOBJS_${mddname} = $dobjects \$(@E@NTRYOBJ)"
|
||||
echo "SYMS_${mddname} = $proto"
|
||||
echo "EPRO_${mddname} = "`echo $proto '' | sed 's,\.syms ,.epro ,g'`
|
||||
echo "INCS_${mddname} = \$(EPRO_${mddname}) $otherincs"
|
||||
echo "EXPIMP_${mddname} = $exportdeps \$(EXPOPT)$mddname.export"
|
||||
echo "NXPIMP_${mddname} ="
|
||||
echo
|
||||
echo "proto.${module}: \$(EPRO_${module})"
|
||||
echo "\$(SYMS_${module}): \$(PROTODEPS)"
|
||||
echo "proto.${mddname}: \$(EPRO_${mddname})"
|
||||
echo "\$(SYMS_${mddname}): \$(PROTODEPS)"
|
||||
echo
|
||||
echo "${module}.export: \$(SYMS_${module})"
|
||||
echo " ( echo '#!'; cat \$(SYMS_${module}) | sed -n '/^X/{s/^X//;p;}' | sort -u ) > \$@"
|
||||
echo "${mddname}.export: \$(SYMS_${mddname})"
|
||||
echo " ( echo '#!'; cat \$(SYMS_${mddname}) | sed -n '/^X/{s/^X//;p;}' | sort -u ) > \$@"
|
||||
echo
|
||||
echo "modobjs.${module}: \$(MODOBJS_${module})"
|
||||
echo " echo '' \$(MODOBJS_${module}) $modobjs_sed>> \$(dir_src)/stamp-modobjs.tmp"
|
||||
echo "modobjs.${mddname}: \$(MODOBJS_${mddname})"
|
||||
echo " echo '' \$(MODOBJS_${mddname}) $modobjs_sed>> \$(dir_src)/stamp-modobjs.tmp"
|
||||
echo
|
||||
if test -z "$alwayslink"; then
|
||||
echo "${module}.\$(DL_EXT): \$(MODDOBJS_${module}) ${module}.export $depimports"
|
||||
case " $all_modules" in *" ${mddname}."*)
|
||||
echo "install.modules-here: install.modules.${mddname}"
|
||||
echo "uninstall.modules-here: uninstall.modules.${mddname}"
|
||||
echo
|
||||
;; esac
|
||||
instsubdir=`echo $name | sed 's,^,/,;s,/[^/]*$,,'`
|
||||
echo "install.modules.${mddname}: ${mddname}.\$(DL_EXT)"
|
||||
echo " \$(sdir_top)/mkinstalldirs \$(DESTDIR)\$(MODDIR)${instsubdir}"
|
||||
echo " \$(INSTALL_PROGRAM) ${mddname}.\$(DL_EXT) \$(DESTDIR)\$(MODDIR)/${name}.\$(DL_EXT)"
|
||||
echo
|
||||
echo "uninstall.modules.${mddname}:"
|
||||
echo " rm -f \$(DESTDIR)\$(MODDIR)/${name}.\$(DL_EXT)"
|
||||
echo
|
||||
echo "${mddname}.\$(DL_EXT): \$(MODDOBJS_${mddname}) ${mddname}.export $exportdeps"
|
||||
echo ' rm -f $@'
|
||||
echo " \$(DLLINK) \$(@E@XPIMP_$module) \$(@E@NTRYOPT) \$(MODDOBJS_${module}) \$(LIBS)"
|
||||
echo " \$(DLLINK) \$(@E@XPIMP_$mddname) \$(@E@NTRYOPT) \$(MODDOBJS_${mddname}) \$(LIBS)"
|
||||
echo
|
||||
fi
|
||||
echo "${module}.mdhi: ${module}.mdhs \$(INCS_${module})"
|
||||
echo "${mddname}.mdhi: ${mddname}.mdhs \$(INCS_${mddname})"
|
||||
echo " @test -f \$@ || echo 'do not delete this file' > \$@"
|
||||
echo
|
||||
echo "${module}.mdhs: ${module}.mdd"
|
||||
echo " @\$(MAKE) -f \$(makefile) \$(MAKEDEFS) ${module}.mdh.tmp"
|
||||
echo " @if cmp -s ${module}.mdh ${module}.mdh.tmp; then \\"
|
||||
echo " rm -f ${module}.mdh.tmp; \\"
|
||||
echo " echo \"\\\`${module}.mdh' is up to date.\"; \\"
|
||||
echo "${mddname}.mdhs: ${mddname}.mdd"
|
||||
echo " @\$(MAKE) -f \$(makefile) \$(MAKEDEFS) ${mddname}.mdh.tmp"
|
||||
echo " @if cmp -s ${mddname}.mdh ${mddname}.mdh.tmp; then \\"
|
||||
echo " rm -f ${mddname}.mdh.tmp; \\"
|
||||
echo " echo \"\\\`${mddname}.mdh' is up to date.\"; \\"
|
||||
echo " else \\"
|
||||
echo " mv -f ${module}.mdh.tmp ${module}.mdh; \\"
|
||||
echo " echo \"Updated \\\`${module}.mdh'.\"; \\"
|
||||
echo " mv -f ${mddname}.mdh.tmp ${mddname}.mdh; \\"
|
||||
echo " echo \"Updated \\\`${mddname}.mdh'.\"; \\"
|
||||
echo " fi"
|
||||
echo " echo 'timestamp for ${module}.mdh against ${module}.mdd' > \$@"
|
||||
echo " echo 'timestamp for ${mddname}.mdh against ${mddname}.mdd' > \$@"
|
||||
echo
|
||||
echo "${module}.mdh: ${modhdeps} ${headers} ${hdrdeps} ${module}.mdhi"
|
||||
echo " @\$(MAKE) -f \$(makefile) \$(MAKEDEFS) ${module}.mdh.tmp"
|
||||
echo " @mv -f ${module}.mdh.tmp ${module}.mdh"
|
||||
echo " @echo \"Updated \\\`${module}.mdh'.\""
|
||||
echo "${mddname}.mdh: ${modhdeps} ${headers} ${hdrdeps} ${mddname}.mdhi"
|
||||
echo " @\$(MAKE) -f \$(makefile) \$(MAKEDEFS) ${mddname}.mdh.tmp"
|
||||
echo " @mv -f ${mddname}.mdh.tmp ${mddname}.mdh"
|
||||
echo " @echo \"Updated \\\`${mddname}.mdh'.\""
|
||||
echo
|
||||
echo "${module}.mdh.tmp:"
|
||||
echo "${mddname}.mdh.tmp:"
|
||||
echo " @( \\"
|
||||
echo " echo '#ifndef have_${module}_module'; \\"
|
||||
echo " echo '#define have_${module}_module'; \\"
|
||||
echo " echo '#ifndef have_${q_name}_module'; \\"
|
||||
echo " echo '#define have_${q_name}_module'; \\"
|
||||
echo " echo; \\"
|
||||
if test -n "$moddeps"; then
|
||||
echo " echo '# ifndef IMPORTING_MODULE_${q_name}'; \\"
|
||||
echo " if test @SHORTBOOTNAMES@ = yes; then \\"
|
||||
echo " echo '# ifndef MODULE'; \\"
|
||||
echo " fi; \\"
|
||||
echo " echo '# define boot_ boot_${q_name}'; \\"
|
||||
echo " echo '# define cleanup_ cleanup_${q_name}'; \\"
|
||||
echo " echo '# define setup_ setup_${q_name}'; \\"
|
||||
echo " echo '# define finish_ finish_${q_name}'; \\"
|
||||
echo " if test @SHORTBOOTNAMES@ = yes; then \\"
|
||||
echo " echo '# endif /* !MODULE */'; \\"
|
||||
echo " fi; \\"
|
||||
echo " echo '# endif /* !IMPORTING_MODULE_${q_name} */'; \\"
|
||||
echo " echo; \\"
|
||||
if test -n "$moddeps"; then (
|
||||
set x $q_moddeps
|
||||
echo " echo '/* Module dependencies */'; \\"
|
||||
echo " for mod in $modhdeps; do \\"
|
||||
echo " echo '# define USING_MODULE'; \\"
|
||||
echo " echo '# include \"'\$\$mod'\"'; \\"
|
||||
echo " done; \\"
|
||||
echo " echo '# undef USING_MODULE'; \\"
|
||||
for hdep in $modhdeps; do
|
||||
shift
|
||||
echo " echo '# define IMPORTING_MODULE_${1} 1'; \\"
|
||||
echo " echo '# include \"${hdep}\"'; \\"
|
||||
done
|
||||
echo " echo; \\"
|
||||
fi
|
||||
) fi
|
||||
if test -n "$headers"; then
|
||||
echo " echo '/* Extra headers for this module */'; \\"
|
||||
echo " for hdr in $headers; do \\"
|
||||
|
|
@ -281,23 +325,23 @@ if $first_stage; then
|
|||
echo " echo; \\"
|
||||
fi
|
||||
if test -n "$proto"; then
|
||||
echo " for epro in \$(EPRO_${module}); do \\"
|
||||
echo " for epro in \$(EPRO_${mddname}); do \\"
|
||||
echo " echo '# include \"'\$\$epro'\"'; \\"
|
||||
echo " done; \\"
|
||||
echo " echo; \\"
|
||||
fi
|
||||
echo " echo '#endif /* !have_${module}_module */'; \\"
|
||||
echo " echo '#endif /* !have_${q_name}_module */'; \\"
|
||||
echo " ) > \$@"
|
||||
echo
|
||||
echo "\$(MODOBJS_${module}) \$(MODDOBJS_${module}): ${module}.mdh"
|
||||
echo "\$(MODOBJS_${mddname}) \$(MODDOBJS_${mddname}): ${mddname}.mdh"
|
||||
sed -e '/^ *: *<< *\\Make *$/,/^Make$/!d' \
|
||||
-e 's/^ *: *<< *\\Make *$//; /^Make$/d' \
|
||||
< $top_srcdir/$the_subdir/${module}.mdd
|
||||
< $top_srcdir/$the_subdir/${mddname}.mdd
|
||||
echo
|
||||
|
||||
done
|
||||
|
||||
if test -n "$remote_mdhs$other_mdhs"; then
|
||||
if test -n "$remote_mdhs$other_mdhs$remote_exports$other_exports"; then
|
||||
echo "##### ===== DEPENDENCIES FOR REMOTE MODULES ===== #####"
|
||||
echo
|
||||
for mdh in $remote_mdhs; do
|
||||
|
|
@ -310,6 +354,16 @@ if $first_stage; then
|
|||
echo " false # should only happen with make -n"
|
||||
echo
|
||||
fi
|
||||
for export in $remote_exports; do
|
||||
echo "$export: FORCE"
|
||||
echo " @cd @%@ && \$(MAKE) \$(MAKEDEFS) @%@$export"
|
||||
echo
|
||||
done | sed 's,^\(.*\)@%@\(.*\)@%@\(.*\)/\([^/]*\)$,\1\3\2\4,'
|
||||
if test -n "$other_exports"; then
|
||||
echo "${other_exports}:"
|
||||
echo " false # should only happen with make -n"
|
||||
echo
|
||||
fi
|
||||
fi
|
||||
|
||||
echo "##### End of ${the_makefile}.in"
|
||||
|
|
|
|||
|
|
@ -13,28 +13,25 @@ while test $# -ne 0; do
|
|||
dir=$1
|
||||
shift
|
||||
( set $dir/*.mdd; test -f $1 ) || continue
|
||||
dosubs=false
|
||||
for mod in `echo '' $dir/*.mdd '' | sed 's, [^ ]*/, ,g;s,\.mdd , ,g'`; do
|
||||
case `echo "$mod@ $module_list " | sed 's,^.*[^_0-9A-Za-z].*@,@@,'` in
|
||||
@@*)
|
||||
echo >&2 "WARNING: illegally named module \`$mod' in $dir"
|
||||
for modfile in $dir/*.mdd; do
|
||||
name=`( . $modfile; echo $name )`
|
||||
case "$name" in *[!/_0-9A-Za-z]* | /* | */ | *//*)
|
||||
echo >&2 "WARNING: illegally named module \`$name' in $modfile"
|
||||
echo >&2 " (ignoring it)"
|
||||
;;
|
||||
*@*" $mod "*)
|
||||
eval "loc=\$loc_$mod"
|
||||
echo >&2 "WARNING: module \`$mod' (in $loc) duplicated in $dir"
|
||||
continue
|
||||
;; esac
|
||||
q_name=`echo $name | sed 's,Q,Qq,g;s,_,Qu,g;s,/,Qs,g'`
|
||||
case " $module_list " in *" $name "*)
|
||||
eval "omodfile=\$modfile_$q_name"
|
||||
echo >&2 "WARNING: module \`$name' (in $omodfile) duplicated in $modfile"
|
||||
echo >&2 " (ignoring duplicate)"
|
||||
dosubs=true
|
||||
;;
|
||||
*)
|
||||
module_list="$module_list$mod "
|
||||
echo "loc_$mod=$dir"
|
||||
eval "loc_$mod=\$dir"
|
||||
dosubs=true
|
||||
;;
|
||||
esac
|
||||
continue
|
||||
;; esac
|
||||
module_list="$module_list$name "
|
||||
echo "modfile_$q_name=$modfile"
|
||||
eval "modfile_$q_name=\$modfile"
|
||||
done
|
||||
$dosubs && set `echo $dir/*/. '' | sed 's,/\. , ,g'` "$@"
|
||||
set `echo $dir/*/. '' | sed 's,/\. , ,g'` "$@"
|
||||
done
|
||||
|
||||
echo
|
||||
|
|
|
|||
140
Src/module.c
140
Src/module.c
|
|
@ -36,34 +36,34 @@
|
|||
LinkList linkedmodules;
|
||||
|
||||
|
||||
/* The `zsh' module contains all the base code that can't actually be built *
|
||||
* as a separate module. It is initialised by main(), so there's nothing *
|
||||
* for the boot function to do. */
|
||||
/* The `zsh/main' module contains all the base code that can't actually be *
|
||||
* built as a separate module. It is initialised by main(), so there's *
|
||||
* nothing for the boot function to do. */
|
||||
|
||||
/**/
|
||||
int
|
||||
setup_zsh(Module m)
|
||||
setup_(Module m)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**/
|
||||
int
|
||||
boot_zsh(Module m)
|
||||
boot_(Module m)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**/
|
||||
int
|
||||
cleanup_zsh(Module m)
|
||||
cleanup_(Module m)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**/
|
||||
int
|
||||
finish_zsh(Module m)
|
||||
finish_(Module m)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -358,22 +358,14 @@ hpux_dlsym(void *handle, char *name)
|
|||
|
||||
#ifdef DLSYM_NEEDS_UNDERSCORE
|
||||
# define STR_SETUP "_setup_"
|
||||
# define STR_SETUP_S "_setup_%s"
|
||||
# define STR_BOOT "_boot_"
|
||||
# define STR_BOOT_S "_boot_%s"
|
||||
# define STR_CLEANUP "_cleanup_"
|
||||
# define STR_CLEANUP_S "_cleanup_%s"
|
||||
# define STR_FINISH "_finish_"
|
||||
# define STR_FINISH_S "_finish_%s"
|
||||
#else /* !DLSYM_NEEDS_UNDERSCORE */
|
||||
# define STR_SETUP "setup_"
|
||||
# define STR_SETUP_S "setup_%s"
|
||||
# define STR_BOOT "boot_"
|
||||
# define STR_BOOT_S "boot_%s"
|
||||
# define STR_CLEANUP "cleanup_"
|
||||
# define STR_CLEANUP_S "cleanup_%s"
|
||||
# define STR_FINISH "finish_"
|
||||
# define STR_FINISH_S "finish_%s"
|
||||
#endif /* !DLSYM_NEEDS_UNDERSCORE */
|
||||
|
||||
/**/
|
||||
|
|
@ -395,21 +387,11 @@ try_load_module(char const *name)
|
|||
void *ret = NULL;
|
||||
int l;
|
||||
|
||||
if (strchr(name, '/')) {
|
||||
ret = dlopen(unmeta(name), RTLD_LAZY | RTLD_GLOBAL);
|
||||
if (ret ||
|
||||
unset(PATHDIRS) ||
|
||||
(*name == '/') ||
|
||||
(*name == '.' && name[1] == '/') ||
|
||||
(*name == '.' && name[1] == '.' && name[2] == '/'))
|
||||
return ret;
|
||||
}
|
||||
|
||||
l = strlen(name) + 1;
|
||||
l = 1 + strlen(name) + 1 + strlen(DL_EXT);
|
||||
for (pp = module_path; !ret && *pp; pp++) {
|
||||
if (l + (**pp ? strlen(*pp) : 1) > PATH_MAX)
|
||||
continue;
|
||||
sprintf(buf, "%s/%s", **pp ? *pp : ".", name);
|
||||
sprintf(buf, "%s/%s.%s", **pp ? *pp : ".", name, DL_EXT);
|
||||
ret = dlopen(unmeta(buf), RTLD_LAZY | RTLD_GLOBAL);
|
||||
}
|
||||
|
||||
|
|
@ -420,14 +402,8 @@ try_load_module(char const *name)
|
|||
static void *
|
||||
do_load_module(char const *name)
|
||||
{
|
||||
void *ret = NULL;
|
||||
char buf[PATH_MAX + 1];
|
||||
void *ret;
|
||||
|
||||
if (strlen(name) + strlen(DL_EXT) < PATH_MAX) {
|
||||
sprintf(buf, "%s.%s", name, DL_EXT);
|
||||
ret = try_load_module(buf);
|
||||
}
|
||||
if (!ret)
|
||||
ret = try_load_module(name);
|
||||
if (!ret) {
|
||||
int waserr = errflag;
|
||||
|
|
@ -505,37 +481,39 @@ dyn_finish_module(Module m)
|
|||
#else
|
||||
|
||||
static Module_func
|
||||
module_func(Module m, char *name, char *name_s)
|
||||
module_func(Module m, char *name)
|
||||
{
|
||||
char *s, *t;
|
||||
#ifndef DYNAMIC_NAME_CLASH_OK
|
||||
char buf[PATH_MAX + 1];
|
||||
#endif
|
||||
Module_func fn;
|
||||
|
||||
s = strrchr(m->nam, '/');
|
||||
if (s)
|
||||
s = dupstring(++s);
|
||||
else
|
||||
s = m->nam;
|
||||
if ((t = strrchr(s, '.')))
|
||||
*t = '\0';
|
||||
#ifdef DYNAMIC_NAME_CLASH_OK
|
||||
fn = (Module_func) dlsym(m->u.handle, name);
|
||||
return (Module_func) dlsym(m->u.handle, name);
|
||||
#else /* !DYNAMIC_NAME_CLASH_OK */
|
||||
if (strlen(s) + 6 > PATH_MAX)
|
||||
return NULL;
|
||||
sprintf(buf, name_s, s);
|
||||
fn = (Module_func) dlsym(m->u.handle, buf);
|
||||
VARARR(char, buf, strlen(name) + strlen(m->nam)*2 + 1);
|
||||
char const *p;
|
||||
char *q;
|
||||
strcpy(buf, name);
|
||||
q = strchr(buf, 0);
|
||||
for(p = m->nam; *p; p++) {
|
||||
if(*p == '/') {
|
||||
*q++ = 'Q';
|
||||
*q++ = 's';
|
||||
} else if(*p == '_') {
|
||||
*q++ = 'Q';
|
||||
*q++ = 'u';
|
||||
} else if(*p == 'Q') {
|
||||
*q++ = 'Q';
|
||||
*q++ = 'q';
|
||||
} else
|
||||
*q++ = *p;
|
||||
}
|
||||
*q = 0;
|
||||
return (Module_func) dlsym(m->u.handle, buf);
|
||||
#endif /* !DYNAMIC_NAME_CLASH_OK */
|
||||
return fn;
|
||||
}
|
||||
|
||||
/**/
|
||||
static int
|
||||
dyn_setup_module(Module m)
|
||||
{
|
||||
Module_func fn = module_func(m, STR_SETUP, STR_SETUP_S);
|
||||
Module_func fn = module_func(m, STR_SETUP);
|
||||
|
||||
if (fn)
|
||||
return fn(m);
|
||||
|
|
@ -547,7 +525,7 @@ dyn_setup_module(Module m)
|
|||
static int
|
||||
dyn_boot_module(Module m)
|
||||
{
|
||||
Module_func fn = module_func(m, STR_BOOT, STR_BOOT_S);
|
||||
Module_func fn = module_func(m, STR_BOOT);
|
||||
|
||||
if(fn)
|
||||
return fn(m);
|
||||
|
|
@ -559,7 +537,7 @@ dyn_boot_module(Module m)
|
|||
static int
|
||||
dyn_cleanup_module(Module m)
|
||||
{
|
||||
Module_func fn = module_func(m, STR_CLEANUP, STR_CLEANUP_S);
|
||||
Module_func fn = module_func(m, STR_CLEANUP);
|
||||
|
||||
if(fn)
|
||||
return fn(m);
|
||||
|
|
@ -574,7 +552,7 @@ dyn_cleanup_module(Module m)
|
|||
static int
|
||||
dyn_finish_module(Module m)
|
||||
{
|
||||
Module_func fn = module_func(m, STR_FINISH, STR_FINISH_S);
|
||||
Module_func fn = module_func(m, STR_FINISH);
|
||||
int r;
|
||||
|
||||
if (fn)
|
||||
|
|
@ -656,6 +634,22 @@ finish_module(Module m)
|
|||
/**/
|
||||
#endif /* !DYNAMIC */
|
||||
|
||||
/**/
|
||||
static int
|
||||
modname_ok(char const *p)
|
||||
{
|
||||
do {
|
||||
if(*p != '_' && !ialnum(*p))
|
||||
return 0;
|
||||
do {
|
||||
p++;
|
||||
} while(*p == '_' || ialnum(*p));
|
||||
if(!*p)
|
||||
return 1;
|
||||
} while(*p++ == '/');
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**/
|
||||
int
|
||||
load_module(char const *name)
|
||||
|
|
@ -666,6 +660,10 @@ load_module(char const *name)
|
|||
LinkNode node, n;
|
||||
int set;
|
||||
|
||||
if (!modname_ok(name)) {
|
||||
zerr("invalid module name `%s'", name, 0);
|
||||
return 0;
|
||||
}
|
||||
if (!(node = find_module(name))) {
|
||||
if (!(linked = module_linked(name)) &&
|
||||
!(handle = do_load_module(name)))
|
||||
|
|
@ -778,9 +776,6 @@ require_module(char *nam, char *module, int res, int test)
|
|||
zwarnnam(nam, "module %s already loaded.", module, 0);
|
||||
return 0;
|
||||
}
|
||||
} else if (res && isset(RESTRICTED) && strchr(module, '/')) {
|
||||
zwarnnam(nam, "%s: restricted", module, 0);
|
||||
return 0;
|
||||
} else
|
||||
return load_module(module);
|
||||
|
||||
|
|
@ -984,13 +979,8 @@ bin_zmodload_dep(char *nam, char **args, char *ops)
|
|||
int ret = 0;
|
||||
char *tnam = *args++;
|
||||
|
||||
for(; *args; args++) {
|
||||
if(isset(RESTRICTED) && strchr(*args, '/')) {
|
||||
zwarnnam(nam, "%s: restricted", *args, 0);
|
||||
ret = 1;
|
||||
} else
|
||||
for(; *args; args++)
|
||||
add_dep(tnam, *args);
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
|
|
@ -1025,10 +1015,6 @@ bin_zmodload_auto(char *nam, char **args, char *ops)
|
|||
/* add autoloaded builtins */
|
||||
char *modnam;
|
||||
modnam = *args++;
|
||||
if(isset(RESTRICTED) && strchr(modnam, '/')) {
|
||||
zwarnnam(nam, "%s: restricted", modnam, 0);
|
||||
return 1;
|
||||
}
|
||||
do {
|
||||
char *bnam = *args ? *args++ : modnam;
|
||||
if (strchr(bnam, '/')) {
|
||||
|
|
@ -1092,10 +1078,6 @@ bin_zmodload_cond(char *nam, char **args, char *ops)
|
|||
char *modnam;
|
||||
|
||||
modnam = *args++;
|
||||
if(isset(RESTRICTED) && strchr(modnam, '/')) {
|
||||
zwarnnam(nam, "%s: restricted", modnam, 0);
|
||||
return 1;
|
||||
}
|
||||
do {
|
||||
char *cnam = *args ? *args++ : modnam;
|
||||
if (strchr(cnam, '/')) {
|
||||
|
|
@ -1152,10 +1134,6 @@ bin_zmodload_math(char *nam, char **args, char *ops)
|
|||
char *modnam;
|
||||
|
||||
modnam = *args++;
|
||||
if(isset(RESTRICTED) && strchr(modnam, '/')) {
|
||||
zwarnnam(nam, "%s: restricted", modnam, 0);
|
||||
return 1;
|
||||
}
|
||||
do {
|
||||
char *fnam = *args ? *args++ : modnam;
|
||||
if (strchr(fnam, '/')) {
|
||||
|
|
@ -1215,10 +1193,6 @@ bin_zmodload_param(char *nam, char **args, char *ops)
|
|||
char *modnam;
|
||||
|
||||
modnam = *args++;
|
||||
if(isset(RESTRICTED) && strchr(modnam, '/')) {
|
||||
zwarnnam(nam, "%s: restricted", modnam, 0);
|
||||
return 1;
|
||||
}
|
||||
do {
|
||||
char *pnam = *args ? *args++ : modnam;
|
||||
if (strchr(pnam, '/')) {
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
rlimits
|
||||
zle
|
||||
complete
|
||||
compctl
|
||||
sched
|
||||
complist
|
||||
zutil
|
||||
computil
|
||||
parameter
|
||||
zleparameter
|
||||
zsh/rlimits
|
||||
zsh/zle
|
||||
zsh/complete
|
||||
zsh/compctl
|
||||
zsh/sched
|
||||
zsh/complist
|
||||
zsh/zutil
|
||||
zsh/computil
|
||||
zsh/parameter
|
||||
zsh/zleparameter
|
||||
|
|
|
|||
13
Src/zsh.mdd
13
Src/zsh.mdd
|
|
@ -1,3 +1,5 @@
|
|||
name=zsh/main
|
||||
|
||||
nozshdep=1
|
||||
alwayslink=1
|
||||
|
||||
|
|
@ -61,18 +63,15 @@ zshxmods.h: modules-bltin xmods.conf
|
|||
@( \
|
||||
binmods=`sed 's/^/ /;s/$$/ /' modules-bltin`; \
|
||||
for mod in `cat $(sdir_src)/xmods.conf`; do \
|
||||
q_mod=`echo $$mod | sed 's,Q,Qq,g;s,_,Qu,g;s,/,Qs,g'`; \
|
||||
case $$binmods in \
|
||||
*" $$mod "*) \
|
||||
echo "#define LINKED_XMOD_$$mod 1" ;; \
|
||||
echo "#define LINKED_XMOD_$$q_mod 1" ;; \
|
||||
*) echo "#ifdef DYNAMIC"; \
|
||||
echo "# define UNLINKED_XMOD_$$mod 1"; \
|
||||
echo "# define UNLINKED_XMOD_$$q_mod 1"; \
|
||||
echo "#endif" ;; \
|
||||
esac; \
|
||||
done; \
|
||||
echo; \
|
||||
for mod in $$binmods; do \
|
||||
echo "int boot_$$mod _((Module));"; \
|
||||
done; \
|
||||
done \
|
||||
) > $@
|
||||
|
||||
clean-here: clean.zsh
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ emulate -R zsh
|
|||
|
||||
# We need to be able to save and restore the options used in the test.
|
||||
# We use the $options variable of the parameter module for this.
|
||||
zmodload -i parameter
|
||||
zmodload -i zsh/parameter
|
||||
|
||||
# Note that both the following are regular arrays, since we only use them
|
||||
# in whole array assignments to/from $options.
|
||||
|
|
|
|||
|
|
@ -1525,6 +1525,13 @@ else
|
|||
E=N
|
||||
fi
|
||||
|
||||
if test "x$zsh_cv_sys_dynamic_clash_ok" = xyes; then
|
||||
SHORTBOOTNAMES=yes
|
||||
else
|
||||
SHORTBOOTNAMES=no
|
||||
fi
|
||||
AC_SUBST(SHORTBOOTNAMES)
|
||||
|
||||
AC_DEFINE_UNQUOTED(DL_EXT, "$DL_EXT")dnl
|
||||
AC_SUBST(D)dnl
|
||||
AC_SUBST(DL_EXT)dnl
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue