aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Djärv2006-08-09 06:56:16 +0000
committerJan Djärv2006-08-09 06:56:16 +0000
commitea90c5d3bdb03846cbe7845b65d5be1343eddbe3 (patch)
tree5ff313931f02137b9f6ebd27b9cfcb035f170079
parent1f4edc37b89c6981092342ed44328bbdf7efd73a (diff)
downloademacs-ea90c5d3bdb03846cbe7845b65d5be1343eddbe3.tar.gz
emacs-ea90c5d3bdb03846cbe7845b65d5be1343eddbe3.zip
(readline): Change position on %n and \" in sscanf.
-rw-r--r--lib-src/ChangeLog1
-rw-r--r--lib-src/etags.c5
2 files changed, 4 insertions, 2 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 3e7d9efad31..3328f010846 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,6 +1,7 @@
12006-08-09 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> 12006-08-09 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
2 2
3 * etags.c (readline): expect sscanf returns >= 1. 3 * etags.c (readline): expect sscanf returns >= 1.
4 (readline): Change position on %n and \" in sscanf.
4 5
52006-08-07 Masatake YAMATO <jet@gyve.org> 62006-08-07 Masatake YAMATO <jet@gyve.org>
6 7
diff --git a/lib-src/etags.c b/lib-src/etags.c
index c7d18d34849..b02268ac218 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -6259,9 +6259,10 @@ readline (lbp, stream)
6259 int start, lno; 6259 int start, lno;
6260 6260
6261 if (DEBUG) start = 0; /* shut up the compiler */ 6261 if (DEBUG) start = 0; /* shut up the compiler */
6262 if (sscanf (lbp->buffer, "#line %d \"%n", &lno, &start) >= 1) 6262 if (sscanf (lbp->buffer, "#line %d %n\"", &lno, &start) >= 1
6263 && inp[start] == '"')
6263 { 6264 {
6264 char *endp = lbp->buffer + start; 6265 char *endp = lbp->buffer + ++start;
6265 6266
6266 assert (start > 0); 6267 assert (start > 0);
6267 while ((endp = etags_strchr (endp, '"')) != NULL 6268 while ((endp = etags_strchr (endp, '"')) != NULL