Skip to content

feat: show lineno on error also in interactive shells#3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
akinomyoga wants to merge 1 commit into
base:devel
Choose a base branch
from
Draft

feat: show lineno on error also in interactive shells #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions builtins/common.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -87,7 +87,9 @@ builtin_error_prolog (void)
name = get_name_for_error ();
fprintf (stderr, "%s: ", name);

#ifndef INTERACTIVE_SHELL_PRINT_LINENO
if (interactive_shell == 0)
#endif
fprintf (stderr, _("line %d: "), executing_line_number ());

if (this_command_name && *this_command_name)
Expand Down
2 changes: 2 additions & 0 deletions config-bot.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -194,3 +194,5 @@

/* If you don't want bash to provide a default mail file to check. */
/* #undef DEFAULT_MAIL_DIRECTORY */

#define INTERACTIVE_SHELL_PRINT_LINENO
6 changes: 6 additions & 0 deletions error.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -77,7 +77,11 @@ error_prolog (int print_lineno)
int line;

ename = get_name_for_error ();
#ifdef INTERACTIVE_SHELL_PRINT_LINENO
line = print_lineno ? executing_line_number () : -1;
#else
line = (print_lineno && interactive_shell == 0) ? executing_line_number () : -1;
#endif

if (line > 0)
fprintf (stderr, "%s:%s%d: ", ename, gnu_error_format ? "" : _(" line "), line);
Expand All@@ -96,7 +100,9 @@ get_name_for_error (void)
#endif

name = (char *)NULL;
#ifndef INTERACTIVE_SHELL_PRINT_LINENO
if (interactive_shell == 0)
#endif
{
#if defined (ARRAY_VARS)
bash_source_v = find_variable ("BASH_SOURCE");
Expand Down