summary refs log tree commit diff
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2010-11-28 20:47:07 +0800
committerHerbert Xu <herbert@gondor.apana.org.au>2010-11-28 20:47:07 +0800
commit8393af1b1412201a2815e0a21cfec1e7d2f83b68 (patch)
treebbd96de78fb7e68a2bbf55b0ff53627a78905c66
parent[BUILTIN] Use EXEXIT in place of EXEXEC (diff)
downloaddash-8393af1b1412201a2815e0a21cfec1e7d2f83b68.tar.gz
dash-8393af1b1412201a2815e0a21cfec1e7d2f83b68.zip
[BUILTIN] Stop documenting EXSHELLPROC
At some point between ash 0.3.5-11.0.1 and ash 0.3.8-37, Debian
ash stopped using the EXSHELLPROC exception to handle shell
scripts without a magic number.

Remove all remaining references to it to avoid confusion.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to '')
-rw-r--r--ChangeLog1
-rw-r--r--src/TOUR11
-rw-r--r--src/error.h1
3 files changed, 2 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index ac722c4..c4dfa33 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2010-11-28  Jonathan Nieder <jrnieder@gmail.com>
 
 	* Use EXEXIT in place of EXEXEC.
+	* Stop documenting EXSHELLPROC.
 
 2010-11-28  Gerrit Pape <pape@smarden.org>
 
diff --git a/src/TOUR b/src/TOUR
index 4baac62..056e79b 100644
--- a/src/TOUR
+++ b/src/TOUR
@@ -43,10 +43,6 @@ C source files for entries looking like:
                            back to the main command loop */
         }
 
-        SHELLPROC {
-              x = 3;    /* executed when the shell runs a shell procedure */
-        }
-
 It pulls this code out into routines which are when particular
 events occur.  The intent is to improve modularity by isolating
 the information about which modules need to be explicitly
@@ -79,12 +75,7 @@ EXCEPTIONS:  Code for dealing with exceptions appears in
 exceptions.c.  The C language doesn't include exception handling,
 so I implement it using setjmp and longjmp.  The global variable
 exception contains the type of exception.  EXERROR is raised by
-calling error.  EXINT is an interrupt.  EXSHELLPROC is an excep-
-tion which is raised when a shell procedure is invoked.  The pur-
-pose of EXSHELLPROC is to perform the cleanup actions associated
-with other exceptions.  After these cleanup actions, the shell
-can interpret a shell procedure itself without exec'ing a new
-copy of the shell.
+calling error.  EXINT is an interrupt.
 
 INTERRUPTS:  In an interactive shell, an interrupt will cause an
 EXINT exception to return to the main command loop.  (Exception:
diff --git a/src/error.h b/src/error.h
index ad1e55b..f236d9f 100644
--- a/src/error.h
+++ b/src/error.h
@@ -66,7 +66,6 @@ extern int exception;
 /* exceptions */
 #define EXINT 0		/* SIGINT received */
 #define EXERROR 1	/* a generic error */
-#define EXSHELLPROC 2	/* execute a shell procedure */
 #define EXEXIT 4	/* exit the shell */