[PATCH] Fix compilation error in readline/util.c in environments with missing strcasecmp

[PATCH] Fix compilation error in readline/util.c in environments with missing strcasecmp

[Martin Benda]

[-- Attachment #1: Type: text/plain, Size: 782 bytes --]

Hi,

when building GDB 7.6.1 in MinGW (Windows 7) for the arm-none-eabi target, I got compilation error in readline/util.c:392 --- missing semicolon after do { ... } while (...) loop. The attached patch fixes this trivial error.


2013-09-21  Martin Benda  <martin.benda@omsquare.com>

	* readline/util.c: Add missing semicolon to fix compilation error
	in environments with missing strcasecmp (e.g. MinGW).


diff -Naur gdb-7.6.1/readline/util.c dist-patched/gdb-7.6.1/readline/util.c
--- gdb-7.6.1/readline/util.c	2013-09-21 09:28:03.000000000 +0200
+++ gdb-7.6.1-patched/readline/util.c	2013-09-21 09:41:12.000000000 +0200
@@ -389,7 +389,7 @@
       break;
     s2++;
   }
-  while (--count != 0)
+  while (--count != 0);

 return (0);
}


Martin Benda

[-- Attachment #2: gdb-7.6.1.patch --]
[-- Type: application/octet-stream, Size: 341 bytes --]

diff -Naur gdb-7.6.1/readline/util.c dist-patched/gdb-7.6.1/readline/util.c
--- gdb-7.6.1/readline/util.c	2013-09-21 09:28:03.000000000 +0200
+++ gdb-7.6.1-patched/readline/util.c	2013-09-21 09:41:12.000000000 +0200
@@ -389,7 +389,7 @@
         break;
       s2++;
     }
-  while (--count != 0)
+  while (--count != 0);
 
   return (0);
 }

[-- Attachment #3: changelog.txt --]
[-- Type: text/plain, Size: 177 bytes --]

2013-09-21  Martin Benda  <martin.benda@omsquare.com>

	* readline/util.c: Add missing semicolon to fix compilation error
	in environments with missing strcasecmp (e.g. MinGW).

Re: [PATCH] Fix compilation error in readline/util.c in environments with missing strcasecmp

[Joel Brobecker]

Hi Chet,

Martin just sent us this patch, which indedd looks trivial, but we
thought we'd run it by you first so you could apply it in the official
repository first if you agree. On our end, we'll apply the fix you
decide to apply.

Thank you both!

> when building GDB 7.6.1 in MinGW (Windows 7) for the arm-none-eabi
> target, I got compilation error in readline/util.c:392 --- missing
> semicolon after do { ... } while (...) loop. The attached patch fixes
> this trivial error.
> 
> 
> 2013-09-21  Martin Benda  <martin.benda@omsquare.com>
> 
> 	* readline/util.c: Add missing semicolon to fix compilation error
> 	in environments with missing strcasecmp (e.g. MinGW).
> 
> 
> diff -Naur gdb-7.6.1/readline/util.c dist-patched/gdb-7.6.1/readline/util.c
> --- gdb-7.6.1/readline/util.c	2013-09-21 09:28:03.000000000 +0200
> +++ gdb-7.6.1-patched/readline/util.c	2013-09-21 09:41:12.000000000 +0200
> @@ -389,7 +389,7 @@
>        break;
>      s2++;
>    }
> -  while (--count != 0)
> +  while (--count != 0);
> 
>  return (0);
> }
> 
> 
> Martin Benda

> diff -Naur gdb-7.6.1/readline/util.c dist-patched/gdb-7.6.1/readline/util.c
> --- gdb-7.6.1/readline/util.c	2013-09-21 09:28:03.000000000 +0200
> +++ gdb-7.6.1-patched/readline/util.c	2013-09-21 09:41:12.000000000 +0200
> @@ -389,7 +389,7 @@
>          break;
>        s2++;
>      }
> -  while (--count != 0)
> +  while (--count != 0);
>  
>    return (0);
>  }

> 2013-09-21  Martin Benda  <martin.benda@omsquare.com>
> 
> 	* readline/util.c: Add missing semicolon to fix compilation error
> 	in environments with missing strcasecmp (e.g. MinGW).


-- 
Joel

Re: [Bug-readline] [PATCH] Fix compilation error in readline/util.c in environments with missing strcasecmp

[Chet Ramey]

On 9/21/13 9:48 AM, Joel Brobecker wrote:
> Hi Chet,
> 
> Martin just sent us this patch, which indedd looks trivial, but we
> thought we'd run it by you first so you could apply it in the official
> repository first if you agree. On our end, we'll apply the fix you
> decide to apply.

Yes, I applied that fix to the bash devel branch, which is where readline
development takes place.

Chet

-- 
``The lyf so short, the craft so long to lerne.'' - Chaucer
		 ``Ars longa, vita brevis'' - Hippocrates
Chet Ramey, ITS, CWRU    chet@case.edu    http://cnswww.cns.cwru.edu/~chet/

Re: [Bug-readline] [PATCH] Fix compilation error in readline/util.c in environments with missing strcasecmp

[Joel Brobecker]

> > Martin just sent us this patch, which indedd looks trivial, but we
> > thought we'd run it by you first so you could apply it in the official
> > repository first if you agree. On our end, we'll apply the fix you
> > decide to apply.
> 
> Yes, I applied that fix to the bash devel branch, which is where readline
> development takes place.

Thank you, Chet.

I've applied the change to the GDB copy of readline, with the following
ChangeLog entry:

2013-09-23  Martin Benda  <martin.benda@omsquare.com>

        Checked in by Joel Brobecker  <brobecker@adacore.com>
        * readline/util.c (_rl_strnicmp): Add missing semicolon.

Thanks for the patch, Martin.
-- 
Joel