[git commit] ash: one "current line = 1" might be missing, fix that

Denys Vlasenko vda.linux at googlemail.com
Mon Aug 14 17:46:56 UTC 2017


commit: https://git.busybox.net/busybox/commit/?id=0485b677d2ccd8cd60579446cd1addcb4f322db3
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master

I'm not sure this is necessary, but dash has this init here.
Just in case, do it too.

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 shell/ash.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/shell/ash.c b/shell/ash.c
index 1917b55..224d776 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -1229,6 +1229,10 @@ struct strpush {
 	int unget;
 };
 
+/*
+ * The parsefile structure pointed to by the global variable parsefile
+ * contains information about the current file being read.
+ */
 struct parsefile {
 	struct parsefile *prev; /* preceding file on stack */
 	int linno;              /* current line */
@@ -1902,10 +1906,6 @@ nextopt(const char *optstring)
 
 /* ============ Shell variables */
 
-/*
- * The parsefile structure pointed to by the global variable parsefile
- * contains information about the current file being read.
- */
 struct shparam {
 	int nparam;             /* # of positional parameters (without $0) */
 #if ENABLE_ASH_GETOPTS
@@ -13603,6 +13603,7 @@ init(void)
 {
 	/* we will never free this */
 	basepf.next_to_pgetc = basepf.buf = ckmalloc(IBUFSIZ);
+	basepf.linno = 1;
 
 	sigmode[SIGCHLD - 1] = S_DFL; /* ensure we install handler even if it is SIG_IGNed */
 	setsignal(SIGCHLD);


More information about the busybox-cvs mailing list