carets: properly display when no line feed is present

* src/location.c (location_caret): finish the line with one whether or not it
is present in input. Rewrite code without getline.
(cleanup_caret): Reset the caret_info global.
* bootstrap.conf: No longer require getline.

diff --git a/bootstrap.conf b/bootstrap.conf
index feff5ff0817f34e80c425aff4e09763f9615b10e..d6343137eef980b2ad3c2311a897bceba23ed743 100644 (file)
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -21,7 +21,6 @@ gnulib_modules='
   configmake
   dirname
   error extensions fdl fopen-safer
   configmake
   dirname
   error extensions fdl fopen-safer

-  getline

   getopt-gnu
   gettext git-version-gen gitlog-to-changelog
   gpl-3.0 hash inttypes isnan javacomp-script
   getopt-gnu
   gettext git-version-gen gitlog-to-changelog
   gpl-3.0 hash inttypes isnan javacomp-script

diff --git a/lib/.gitignore b/lib/.gitignore
index ff359203291c637af10ab94129dc2b6e73c4f513..94b5db2d57d856a80faf200bf7d24005d3196158 100644 (file)
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -267,8 +267,6 @@
 /xstrndup.h
 /binary-io.c
 /xsize.c
 /xstrndup.h
 /binary-io.c
 /xsize.c

-/getdelim.c
-/getline.c

 /bitrotate.c
 /math.c
 /sig-handler.c
 /bitrotate.c
 /math.c
 /sig-handler.c

diff --git a/m4/.gitignore b/m4/.gitignore
index 242ac2a7a7d60827b0f1b6fafb129afc59a2c816..2f440bf76a2374d476734b4b60a2cbb97e503c3c 100644 (file)
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -180,6 +180,4 @@
 /obstack-printf.m4
 /extern-inline.m4
 /non-recursive-gnulib-prefix-hack.m4
 /obstack-printf.m4
 /extern-inline.m4
 /non-recursive-gnulib-prefix-hack.m4

-/getdelim.m4
-/getline.m4

 /inline.m4
 /inline.m4

diff --git a/src/location.c b/src/location.c
index d48a0a1339e4bf1e865587603ce07543dcbf87a5..66b9ffa6679f939968fae2107cba3fc00e5e2b7b 100644 (file)
--- a/src/location.c
+++ b/src/location.c
@@ -155,6 +155,9 @@ cleanup_caret ()
 {
   if (caret_info.source)
     fclose (caret_info.source);
 {
   if (caret_info.source)
     fclose (caret_info.source);

+  caret_info.source = NULL;
+  caret_info.line = 1;
+  caret_info.offset = 0;

 }
 
 void
 }
 
 void


@@ -168,8 +171,8 @@ location_caret (FILE *out, location loc)
     return;
 
   /* If the line we want to quote is seekable (the same line as the previous
     return;
 
   /* If the line we want to quote is seekable (the same line as the previous

-     location), just seek it. If it was before, we lost track of it, so
-     return to the start of file.  */
+     location), just seek it. If it was a previous line, we lost track of it,
+     so return to the start of file.  */

   if (caret_info.line <= loc.start.line)
     fseek (caret_info.source, caret_info.offset, SEEK_SET);
   else
   if (caret_info.line <= loc.start.line)
     fseek (caret_info.source, caret_info.offset, SEEK_SET);
   else


@@ -181,35 +184,36 @@ location_caret (FILE *out, location loc)
 
   /* Advance to the line's position, keeping track of the offset.  */
   while (caret_info.line < loc.start.line)
 
   /* Advance to the line's position, keeping track of the offset.  */
   while (caret_info.line < loc.start.line)

-    caret_info.line += fgetc (caret_info.source) == '\n';
+    caret_info.line += getc (caret_info.source) == '\n';

   caret_info.offset = ftell (caret_info.source);
 
   /* Read the actual line.  Don't update the offset, so that we keep a pointer
      to the start of the line.  */
   {
   caret_info.offset = ftell (caret_info.source);
 
   /* Read the actual line.  Don't update the offset, so that we keep a pointer
      to the start of the line.  */
   {

-    char *buf = NULL;
-    size_t size = 0;
-    ssize_t len = getline (&buf, &size, caret_info.source);
-    if (0 < len)
+    char c = getc (caret_info.source);
+    if (c != EOF)

       {
       {

-        /* The caret of a multiline location ends with the first line.  */
-        int end = loc.start.line != loc.end.line ? len : loc.end.column;
-

         /* Quote the file, indent by a single column.  */
         /* Quote the file, indent by a single column.  */

-        fputc (' ', out);
-        fwrite (buf, 1, len, out);
+        putc (' ', out);
+        do
+          putc (c, out);
+        while ((c = getc (caret_info.source)) != EOF && c != '\n');
+        putc ('\n', out);

 
 

-        /* Print the caret, with the same indent as above.  */
-        fprintf (out, " %*s", loc.start.column - 1, "");

         {
         {

-          int i = loc.start.column;
-          do
-            fputc ('^', out);
-          while (++i < end);
-        }
-        fputc ('\n', out);
+          /* The caret of a multiline location ends with the first line.  */
+          size_t len = loc.start.line != loc.end.line
+            ? ftell (caret_info.source) - caret_info.offset
+            : loc.end.column;
+          int i;
+
+          /* Print the carets (at least one), with the same indent as above.*/
+          fprintf (out, " %*s", loc.start.column - 1, "");
+          for (i = loc.start.column; i == loc.start.column || i < len; ++i)
+            putc ('^', out);
+          }
+        putc ('\n', out);

       }
       }

-    free (buf);

   }
 }
 
   }
 }