Changeset 3476 for trunk/src

Timestamp:

Sep 17, 2020, 11:32:45 PM (5 years ago)

Author:

bird

Message:

kash: sh_destroy should be mostly finished now.

File:

• trunk/src/kash/shinstance.c (modified) (5 diffs)

trunk/src/kash/shinstance.c

@@ -43 +43 @@
 #include "alias.h"
 #include "error.h"
+#include "input.h"
+#include "jobs.h"
 #include "memalloc.h"
 #include "nodes.h"
@@ -121 +123 @@
 }                   g_sig_state[NSIG];
 
+/*********************************************************************************************************************************
+*   Internal Functions                                                                                                           *
+*********************************************************************************************************************************/
+#ifndef SH_FORKED_MODE
+static void shsubshellstatus_signal_and_release(shinstance *psh, int iExit);
+#endif
+
 
 
@@ -308 +317 @@
     sh_free(psh, psh->threadarg);
     psh->threadarg = NULL;
+    assert(!psh->subshellstatus);
+    if (psh->subshellstatus)
+    {
+        shsubshellstatus_signal_and_release(psh, psh->exitstatus);
+        psh->subshellstatus = NULL;
+    }
 #endif
 
@@ -384 +399 @@
     }
 
-#if 0
-    /* input.h */
-    int                 plinno/* = 1 */;/**< input line number */
-    int                 parsenleft;     /**< number of characters left in input buffer */
-    char               *parsenextc;     /**< next character in input buffer */
-    int                 init_editline/* = 0 */;     /**< 0 == not setup, 1 == OK, -1 == failed */
-
-    /* input.c */
-    int                 parselleft;     /**< copy of parsefile->lleft */
-    struct parsefile    basepf;         /**< top level input file */
-    char                basebuf[BUFSIZ];/**< buffer for top level input file */
-    struct parsefile   *parsefile/* = &basepf*/;    /**< current input file */
-#ifndef SMALL
-    EditLine           *el;             /**< cookie for editline package */
-#endif
-
-    /* jobs.h */
-    shpid               backgndpid/* = -1 */;   /**< pid of last background process */
-    int                 job_warning;    /**< user was warned about stopped jobs */
-
-    /* jobs.c */
-    struct job         *jobtab;         /**< array of jobs */
-    int                 njobs;          /**< size of array */
-    int                 jobs_invalid;   /**< set in child */
-    shpid               initialpgrp;    /**< pgrp of shell on invocation */
-    int                 curjob/* = -1*/;/**< current job */
-    int                 ttyfd/* = -1*/;
-    int                 jobctl;         /**< job control enabled / disabled */
-    char               *cmdnextc;
-    int                 cmdnleft;
-
-
-    /* mail.c */
-#define MAXMBOXES 10
-    int                 nmboxes;        /**< number of mailboxes */
-    time_t              mailtime[MAXMBOXES]; /**< times of mailboxes */
+    /* input.h/c */
+    popallfiles(psh);
+    while (psh->basepf.strpush)
+        popstring(psh);
+
+    /* jobs.h/c */
+    if (psh->jobtab)
+    {
+        int j = psh->njobs;
+        while (j-- > 0)
+            if (psh->jobtab[j].used && psh->jobtab[j].ps != &psh->jobtab[j].ps0)
+            {
+                sh_free(psh, psh->jobtab[j].ps);
+                psh->jobtab[j].ps = &psh->jobtab[j].ps0;
+            }
+        sh_free(psh, psh->jobtab);
+        psh->jobtab = NULL;
+        psh->njobs = 0;
+    }
 
     /* myhistedit.h */
 #ifndef SMALL
+# error FIXME
     History            *hist;
     EditLine           *el;
-#endif
 #endif
 
@@ -456 +454 @@
     psh->argptr = NULL;
     psh->minusc = NULL;
-
-#if 0
-    /* parse.h */
-    int                 tokpushback;
-    int                 whichprompt;    /**< 1 == PS1, 2 == PS2 */
-
-    /* parser.c */
-    int                 noalias/* = 0*/;/**< when set, don't handle aliases */
-    struct heredoc     *heredoclist;    /**< list of here documents to read */
-    int                 parsebackquote; /**< nonzero if we are inside backquotes */
-    int                 doprompt;       /**< if set, prompt the user */
-    int                 needprompt;     /**< true if interactive and at start of line */
-    int                 lasttoken;      /**< last token read */
-    char               *wordtext;       /**< text of last word returned by readtoken */
-    int                 checkkwd;       /**< 1 == check for kwds, 2 == also eat newlines */
-    struct nodelist    *backquotelist;
-    union node         *redirnode;
-    struct heredoc     *heredoc;
-    int                 quoteflag;      /**< set if (part of) last token was quoted */
-    int                 startlinno;     /**< line # where last token started */
-#endif
 
     /* redir.c */