Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c491fdc6 authored by The Android Open Source Project's avatar The Android Open Source Project Committed by Android Git Automerger
Browse files

am 6be163b1: merge from open-source master 

Merge commit '6be163b1' into kraken

* commit '6be163b1':
  Emit shell prompt even when in non-interactive mode.
parents 982a815c 6be163b1

sh/input.c

+3 −0
Original line number Diff line number Diff line
@@ -175,6 +175,9 @@ pgetc(void) 
	return pgetc_macro();

}



int in_interactive_mode() {

    return parsefile != NULL && parsefile->fd == 0;

}



static int

preadfd(void)

sh/input.h

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ extern int parsenleft; /* number of characters left in input buffer */ 
extern char *parsenextc;	/* next character in input buffer */

extern int init_editline;	/* 0 == not setup, 1 == OK, -1 == failed */



int in_interactive_mode();

char *pfgets(char *, int);

int pgetc(void);

int preadbuffer(void);

sh/parser.c

+2 −2
Original line number Diff line number Diff line
@@ -1629,9 +1629,9 @@ setprompt(int which) 
	if (!el)

#endif

#ifdef WITH_LINENOISE

#else

		out2str(getprompt(NULL));

        if (! in_interactive_mode() )

#endif

		out2str(getprompt(NULL));

}



/*