[PATCH v1] scripts/decodecode: Make it take multiline Code line

[PATCH v1] scripts/decodecode: Make it take multiline Code line

[Andy Shevchenko]

In case of running scripts/decodecode without any parameters in order to give a
copy'n'pasted Code line from, for example, email it would parse only first line
of it, while in emails it's split to few.

So, add a logic to join this split back if and only if the following lines have
hex digits, or spaces, or '<', or '>' characters. It will be quite unlikely to
have a broken input in well formed Oops or dmesg, thus a simple regex is being
used.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 scripts/decodecode | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/scripts/decodecode b/scripts/decodecode
index 5ea071099330..9cef558528aa 100755
--- a/scripts/decodecode
+++ b/scripts/decodecode
@@ -21,12 +21,24 @@ trap cleanup EXIT
 
 T=`mktemp` || die "cannot create temp file"
 code=
+cont=
 
 while read i ; do
 
 case "$i" in
 *Code:*)
 	code=$i
+	cont=yes
+	;;
+*)
+	[ -n "$cont" ] && {
+		xdump="$(echo $i | grep '^[[:xdigit:]<>[:space:]]\+$')"
+		if [ -n "$xdump" ]; then
+			code="$code $xdump"
+		else
+			cont=
+		fi
+	}
 	;;
 esac
 
-- 
2.15.0

Re: [PATCH v1] scripts/decodecode: Make it take multiline Code line

[Andrew Morton]

On Tue, 12 Dec 2017 12:03:23 +0200 Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote:

> In case of running scripts/decodecode without any parameters in order to give a
> copy'n'pasted Code line from, for example, email it would parse only first line
> of it, while in emails it's split to few.
> 
> So, add a logic to join this split back if and only if the following lines have
> hex digits, or spaces, or '<', or '>' characters. It will be quite unlikely to
> have a broken input in well formed Oops or dmesg, thus a simple regex is being
> used.

That's rather hard to understand.  An example would help?

Re: [PATCH v1] scripts/decodecode: Make it take multiline Code line

[Andy Shevchenko]

On Tue, 2017-12-12 at 12:51 -0800, Andrew Morton wrote:
> On Tue, 12 Dec 2017 12:03:23 +0200 Andy Shevchenko <andriy.shevchenko@
> linux.intel.com> wrote:
> 
> > In case of running scripts/decodecode without any parameters in
> > order to give a
> > copy'n'pasted Code line from, for example, email it would parse only
> > first line
> > of it, while in emails it's split to few.
> > 
> > So, add a logic to join this split back if and only if the following
> > lines have
> > hex digits, or spaces, or '<', or '>' characters. It will be quite
> > unlikely to
> > have a broken input in well formed Oops or dmesg, thus a simple
> > regex is being
> > used.
> 
> That's rather hard to understand.  An example would help?

When you have a file out of oops the Code line looks like

Code: hh hh ... <hh> ... hh\n

When copy'n'paste from, for example, email where sender or some middle
MTA split it, the line looks like:

Code: hh hh ... hh\n
hh ... <hh> ... hh\n
hh hh ... hh\n

The Code line followed by another oops line usually contains characters
out of hex digit + space + < + > set. That's what second paragraph
describes.

Should I resend with information above included?

-- 
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Intel Finland Oy

Re: [PATCH v1] scripts/decodecode: Make it take multiline Code line

[Andrew Morton]

On Tue, 19 Dec 2017 17:05:19 +0200 Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote:

> > That's rather hard to understand.  An example would help?
> 
> When you have a file out of oops the Code line looks like
> 
> Code: hh hh ... <hh> ... hh\n
> 
> When copy'n'paste from, for example, email where sender or some middle
> MTA split it, the line looks like:
> 
> Code: hh hh ... hh\n
> hh ... <hh> ... hh\n
> hh hh ... hh\n
> 
> The Code line followed by another oops line usually contains characters
> out of hex digit + space + < + > set. That's what second paragraph
> describes.

Oh, OK, yeah, that's irritating.  I thought we fixed it ages ago!

> Should I resend with information above included?

I updated the changelog, thanks.