re PR libfortran/20163 ([4.0 only] gfortran - error opening direct access file)

2005-04-09  Thomas Koenig <Thomas.Koenig@online.de>

        PR libfortran/20163
        * runtime/string.c (compare0): Use fstrlen() to
        strip trailing blanks from option string.

From-SVN: r97923

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 9399d731fcea6a70dbd49fd06501139761ea2a3a..2f31127bc5a8150c9e1e25ece74d3e340c99a5c2 100644 (file)
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,9 @@
+2005-04-09  Thomas Koenig <Thomas.Koenig@online.de>
+
+       PR libfortran/20163
+       * runtime/string.c (compare0): Use fstrlen() to 
+       strip trailing blanks from option string.
+
 2005-04-09  Andrew Pinski  <pinskia@physics.uc.edu>
 
        PR fortran/13257

diff --git a/libgfortran/runtime/string.c b/libgfortran/runtime/string.c
index 07ed99bab366327d980c37e8d7b7de79b2211d3f..07f374eea048aa2902835ff3578ed75a71d242ff 100644 (file)
--- a/libgfortran/runtime/string.c
+++ b/libgfortran/runtime/string.c
@@ -41,17 +41,11 @@ static int
 compare0 (const char *s1, int s1_len, const char *s2)
 {
   int i;
+  int len;
 
-  if (strncasecmp (s1, s2, s1_len) != 0)
-    return 0;
-
-  /* The rest of s1 needs to be blanks for equality.  */
-
-  for (i = strlen (s2); i < s1_len; i++)
-    if (s1[i] != ' ')
-      return 0;
-
-  return 1;
+  /* Strip trailing blanks from the Fortran string.  */
+  len = fstrlen(s1, s1_len);
+  return strncasecmp(s1,s2,len) == 0;
 }