Mercurial > ~dholland > hg > tradcpp > index.cgi
annotate files.c @ 186:9637bf434f8e
Don't report unclosed comments as "no newline at end of file".
If we get EOF in the "middle" of a line but there's a newline at the
end of the buffer we've got, it's because we're in the middle of a
comment. So, say so.
| author | David A. Holland |
|---|---|
| date | Fri, 12 Jun 2015 04:13:41 -0400 |
| parents | 4c3375895c6e |
| children | 8c7e508da6cc |
| rev | line source |
|---|---|
| 30 | 1 /*- |
|
99
60184aa42604
add 2013 to copyrights where it seems warranted
David A. Holland
parents:
81
diff
changeset
|
2 * Copyright (c) 2010, 2013 The NetBSD Foundation, Inc. |
| 30 | 3 * All rights reserved. |
| 4 * | |
| 5 * This code is derived from software contributed to The NetBSD Foundation | |
| 6 * by David A. Holland. | |
| 7 * | |
| 8 * Redistribution and use in source and binary forms, with or without | |
| 9 * modification, are permitted provided that the following conditions | |
| 10 * are met: | |
| 11 * 1. Redistributions of source code must retain the above copyright | |
| 12 * notice, this list of conditions and the following disclaimer. | |
| 13 * 2. Redistributions in binary form must reproduce the above copyright | |
| 14 * notice, this list of conditions and the following disclaimer in the | |
| 15 * documentation and/or other materials provided with the distribution. | |
| 16 * | |
| 17 * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS | |
| 18 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | |
| 19 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | |
| 20 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS | |
| 21 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | |
| 22 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | |
| 23 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | |
| 24 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | |
| 25 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | |
| 26 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | |
| 27 * POSSIBILITY OF SUCH DAMAGE. | |
| 28 */ | |
| 29 | |
| 6 | 30 #include <stdio.h> |
| 31 #include <stdlib.h> | |
| 13 | 32 #include <string.h> |
| 6 | 33 #include <unistd.h> |
| 34 #include <fcntl.h> | |
|
113
1e7144176a42
Print a warning if we get an unexpected error trying to open a file.
David A. Holland
parents:
112
diff
changeset
|
35 #include <errno.h> |
| 6 | 36 |
|
183
4c3375895c6e
Don't use <stdbool.h> unless __STDC__ is large enough.
David A. Holland
parents:
175
diff
changeset
|
37 #include "bool.h" |
| 6 | 38 #include "array.h" |
| 15 | 39 #include "mode.h" |
| 8 | 40 #include "place.h" |
| 6 | 41 #include "files.h" |
| 15 | 42 #include "directive.h" |
| 6 | 43 |
| 44 struct incdir { | |
| 45 const char *name; | |
| 46 bool issystem; | |
| 47 }; | |
| 48 | |
| 107 | 49 DECLARRAY(incdir, static UNUSED); |
|
47
2e25e55dba6b
Fix inline usage as per the version in dholland-make2.
David A. Holland
parents:
39
diff
changeset
|
50 DEFARRAY(incdir, static); |
| 6 | 51 |
| 52 static struct incdirarray quotepath, bracketpath; | |
| 53 | |
| 54 //////////////////////////////////////////////////////////// | |
| 55 // management | |
| 56 | |
| 57 static | |
| 58 struct incdir * | |
| 59 incdir_create(const char *name, bool issystem) | |
| 60 { | |
| 61 struct incdir *id; | |
| 62 | |
| 63 id = domalloc(sizeof(*id)); | |
| 64 id->name = name; | |
| 65 id->issystem = issystem; | |
| 66 return id; | |
| 67 } | |
| 68 | |
| 69 static | |
| 70 void | |
| 71 incdir_destroy(struct incdir *id) | |
| 72 { | |
|
39
337110e7240a
Pass the size to free; it makes debug checking easier.
David A. Holland
parents:
38
diff
changeset
|
73 dofree(id, sizeof(*id)); |
| 6 | 74 } |
| 75 | |
| 76 void | |
| 77 files_init(void) | |
| 78 { | |
| 79 incdirarray_init("epath); | |
| 80 incdirarray_init(&bracketpath); | |
| 81 } | |
| 82 | |
| 9 | 83 DESTROYALL_ARRAY(incdir, ); |
| 6 | 84 |
| 85 void | |
| 86 files_cleanup(void) | |
| 87 { | |
| 88 incdirarray_destroyall("epath); | |
| 89 incdirarray_cleanup("epath); | |
| 90 incdirarray_destroyall(&bracketpath); | |
| 91 incdirarray_cleanup(&bracketpath); | |
| 92 } | |
| 93 | |
| 94 //////////////////////////////////////////////////////////// | |
| 95 // path setup | |
| 96 | |
| 97 void | |
| 98 files_addquotepath(const char *dir, bool issystem) | |
| 99 { | |
| 100 struct incdir *id; | |
| 101 | |
| 102 id = incdir_create(dir, issystem); | |
| 103 incdirarray_add("epath, id, NULL); | |
| 104 } | |
| 105 | |
| 106 void | |
| 107 files_addbracketpath(const char *dir, bool issystem) | |
| 108 { | |
| 109 struct incdir *id; | |
| 110 | |
| 111 id = incdir_create(dir, issystem); | |
| 112 incdirarray_add(&bracketpath, id, NULL); | |
| 113 } | |
| 114 | |
| 115 //////////////////////////////////////////////////////////// | |
| 116 // parsing | |
| 117 | |
| 75 | 118 /* |
| 119 * Find the end of the logical line. End of line characters that are | |
| 120 * commented out do not count. | |
| 121 */ | |
| 15 | 122 static |
| 123 size_t | |
| 75 | 124 findeol(const char *buf, size_t start, size_t limit) |
| 15 | 125 { |
| 126 size_t i; | |
| 75 | 127 int incomment = 0; |
|
81
27c9aafcaca1
Don't recognize comments within double-quote strings.
David A. Holland
parents:
75
diff
changeset
|
128 bool inquote = false; |
|
128
1cda505ddc78
Don't expand macros within character constants.
David A. Holland
parents:
113
diff
changeset
|
129 char quote = '\0'; |
| 75 | 130 |
| 131 for (i=start; i<limit; i++) { | |
| 132 if (incomment) { | |
| 133 if (i+1 < limit && buf[i] == '*' && buf[i+1] == '/') { | |
| 134 i++; | |
| 135 incomment = 0; | |
| 136 } | |
|
81
27c9aafcaca1
Don't recognize comments within double-quote strings.
David A. Holland
parents:
75
diff
changeset
|
137 } else if (!inquote && i+1 < limit && |
|
27c9aafcaca1
Don't recognize comments within double-quote strings.
David A. Holland
parents:
75
diff
changeset
|
138 buf[i] == '/' && buf[i+1] == '*') { |
|
27c9aafcaca1
Don't recognize comments within double-quote strings.
David A. Holland
parents:
75
diff
changeset
|
139 i++; |
|
27c9aafcaca1
Don't recognize comments within double-quote strings.
David A. Holland
parents:
75
diff
changeset
|
140 incomment = 1; |
|
27c9aafcaca1
Don't recognize comments within double-quote strings.
David A. Holland
parents:
75
diff
changeset
|
141 } else if (i+1 < limit && |
|
128
1cda505ddc78
Don't expand macros within character constants.
David A. Holland
parents:
113
diff
changeset
|
142 buf[i] == '\\' && buf[i+1] != '\n') { |
|
81
27c9aafcaca1
Don't recognize comments within double-quote strings.
David A. Holland
parents:
75
diff
changeset
|
143 i++; |
|
128
1cda505ddc78
Don't expand macros within character constants.
David A. Holland
parents:
113
diff
changeset
|
144 } else if (!inquote && (buf[i] == '"' || buf[i] == '\'')) { |
|
1cda505ddc78
Don't expand macros within character constants.
David A. Holland
parents:
113
diff
changeset
|
145 inquote = true; |
|
1cda505ddc78
Don't expand macros within character constants.
David A. Holland
parents:
113
diff
changeset
|
146 quote = buf[i]; |
|
1cda505ddc78
Don't expand macros within character constants.
David A. Holland
parents:
113
diff
changeset
|
147 } else if (inquote && buf[i] == quote) { |
|
1cda505ddc78
Don't expand macros within character constants.
David A. Holland
parents:
113
diff
changeset
|
148 inquote = false; |
|
81
27c9aafcaca1
Don't recognize comments within double-quote strings.
David A. Holland
parents:
75
diff
changeset
|
149 } else if (buf[i] == '\n') { |
|
27c9aafcaca1
Don't recognize comments within double-quote strings.
David A. Holland
parents:
75
diff
changeset
|
150 return i; |
| 75 | 151 } |
| 152 } | |
| 153 return limit; | |
| 154 } | |
| 155 | |
| 156 static | |
| 157 unsigned | |
| 158 countnls(const char *buf, size_t start, size_t limit) | |
| 159 { | |
| 160 size_t i; | |
| 161 unsigned count = 0; | |
| 15 | 162 |
| 163 for (i=start; i<limit; i++) { | |
| 164 if (buf[i] == '\n') { | |
| 75 | 165 count++; |
| 15 | 166 } |
| 167 } | |
| 75 | 168 return count; |
| 15 | 169 } |
| 170 | |
| 171 static | |
| 6 | 172 void |
| 28 | 173 file_read(const struct placefile *pf, int fd, const char *name, bool toplevel) |
| 15 | 174 { |
|
154
a2c2fe8dbea3
Wrap up the current and next line position when invoking directives.
David A. Holland
parents:
143
diff
changeset
|
175 struct lineplace places; |
|
a2c2fe8dbea3
Wrap up the current and next line position when invoking directives.
David A. Holland
parents:
143
diff
changeset
|
176 struct place ptmp; |
| 15 | 177 size_t bufend, bufmax, linestart, lineend, nextlinestart, tmp; |
| 178 ssize_t result; | |
| 179 bool ateof = false; | |
| 180 char *buf; | |
| 181 | |
|
154
a2c2fe8dbea3
Wrap up the current and next line position when invoking directives.
David A. Holland
parents:
143
diff
changeset
|
182 place_setfilestart(&places.current, pf); |
|
a2c2fe8dbea3
Wrap up the current and next line position when invoking directives.
David A. Holland
parents:
143
diff
changeset
|
183 places.nextline = places.current; |
| 15 | 184 |
| 185 bufmax = 128; | |
| 186 bufend = 0; | |
| 187 linestart = 0; | |
| 188 lineend = 0; | |
| 189 buf = domalloc(bufmax); | |
| 190 | |
| 191 while (1) { | |
| 192 if (lineend >= bufend) { | |
| 193 /* do not have a whole line in the buffer; read more */ | |
| 75 | 194 assert(bufend >= linestart); |
| 15 | 195 if (linestart > 0 && bufend > linestart) { |
| 196 /* slide to beginning of buffer */ | |
| 197 memmove(buf, buf+linestart, bufend-linestart); | |
| 198 bufend -= linestart; | |
| 199 lineend -= linestart; | |
| 200 linestart = 0; | |
| 201 } | |
| 202 if (bufend >= bufmax) { | |
| 203 /* need bigger buffer */ | |
|
39
337110e7240a
Pass the size to free; it makes debug checking easier.
David A. Holland
parents:
38
diff
changeset
|
204 buf = dorealloc(buf, bufmax, bufmax*2); |
|
337110e7240a
Pass the size to free; it makes debug checking easier.
David A. Holland
parents:
38
diff
changeset
|
205 bufmax = bufmax*2; |
| 15 | 206 } |
| 207 | |
| 208 if (ateof) { | |
| 209 /* don't read again, in case it's a socket */ | |
| 210 result = 0; | |
| 211 } else { | |
| 212 result = read(fd, buf+bufend, bufmax - bufend); | |
| 213 } | |
| 214 | |
| 215 if (result == -1) { | |
| 216 /* read error */ | |
| 143 | 217 complain(NULL, "%s: %s", |
| 218 name, strerror(errno)); | |
| 15 | 219 complain_fail(); |
| 220 } else if (result == 0 && bufend == linestart) { | |
| 221 /* eof */ | |
| 222 ateof = true; | |
| 223 break; | |
| 224 } else if (result == 0) { | |
| 225 /* eof in middle of line */ | |
| 226 ateof = true; | |
|
154
a2c2fe8dbea3
Wrap up the current and next line position when invoking directives.
David A. Holland
parents:
143
diff
changeset
|
227 ptmp = places.current; |
| 15 | 228 ptmp.column += bufend - linestart; |
|
186
9637bf434f8e
Don't report unclosed comments as "no newline at end of file".
David A. Holland
parents:
183
diff
changeset
|
229 if (buf[bufend - 1] == '\n') { |
|
9637bf434f8e
Don't report unclosed comments as "no newline at end of file".
David A. Holland
parents:
183
diff
changeset
|
230 complain(&ptmp, "Unclosed comment"); |
|
9637bf434f8e
Don't report unclosed comments as "no newline at end of file".
David A. Holland
parents:
183
diff
changeset
|
231 } else { |
|
9637bf434f8e
Don't report unclosed comments as "no newline at end of file".
David A. Holland
parents:
183
diff
changeset
|
232 complain(&ptmp, |
|
9637bf434f8e
Don't report unclosed comments as "no newline at end of file".
David A. Holland
parents:
183
diff
changeset
|
233 "No newline at end of file"); |
|
9637bf434f8e
Don't report unclosed comments as "no newline at end of file".
David A. Holland
parents:
183
diff
changeset
|
234 } |
| 15 | 235 if (mode.werror) { |
| 236 complain_fail(); | |
| 237 } | |
| 238 assert(bufend < bufmax); | |
| 239 lineend = bufend++; | |
| 240 buf[lineend] = '\n'; | |
| 241 } else { | |
| 242 bufend += (size_t)result; | |
|
81
27c9aafcaca1
Don't recognize comments within double-quote strings.
David A. Holland
parents:
75
diff
changeset
|
243 lineend = findeol(buf, linestart, bufend); |
| 15 | 244 } |
| 245 /* loop in case we still don't have a whole line */ | |
| 246 continue; | |
| 247 } | |
| 248 | |
| 249 /* have a line */ | |
| 250 assert(buf[lineend] == '\n'); | |
| 251 buf[lineend] = '\0'; | |
| 252 nextlinestart = lineend+1; | |
|
154
a2c2fe8dbea3
Wrap up the current and next line position when invoking directives.
David A. Holland
parents:
143
diff
changeset
|
253 places.nextline.line++; |
| 15 | 254 |
| 255 /* check for CR/NL */ | |
| 256 if (lineend > 0 && buf[lineend-1] == '\r') { | |
| 257 buf[lineend-1] = '\0'; | |
| 258 lineend--; | |
| 259 } | |
| 260 | |
| 261 /* check for continuation line */ | |
| 262 if (lineend > 0 && buf[lineend-1]=='\\') { | |
| 263 lineend--; | |
| 264 tmp = nextlinestart - lineend; | |
| 265 if (bufend > nextlinestart) { | |
| 266 memmove(buf+lineend, buf+nextlinestart, | |
| 267 bufend - nextlinestart); | |
| 268 } | |
| 269 bufend -= tmp; | |
| 270 nextlinestart -= tmp; | |
|
81
27c9aafcaca1
Don't recognize comments within double-quote strings.
David A. Holland
parents:
75
diff
changeset
|
271 lineend = findeol(buf, linestart, bufend); |
| 15 | 272 /* might not have a whole line, so loop */ |
| 273 continue; | |
| 274 } | |
| 275 | |
| 276 /* line now goes from linestart to lineend */ | |
| 277 assert(buf[lineend] == '\0'); | |
| 75 | 278 |
| 279 /* count how many commented-out newlines we swallowed */ | |
|
154
a2c2fe8dbea3
Wrap up the current and next line position when invoking directives.
David A. Holland
parents:
143
diff
changeset
|
280 places.nextline.line += countnls(buf, linestart, lineend); |
| 75 | 281 |
| 175 | 282 /* process the line (even if it's empty) */ |
| 283 directive_gotline(&places, buf+linestart, lineend-linestart); | |
| 15 | 284 |
| 285 linestart = nextlinestart; | |
| 75 | 286 lineend = findeol(buf, linestart, bufend); |
|
154
a2c2fe8dbea3
Wrap up the current and next line position when invoking directives.
David A. Holland
parents:
143
diff
changeset
|
287 places.current = places.nextline; |
| 15 | 288 } |
| 289 | |
| 28 | 290 if (toplevel) { |
|
154
a2c2fe8dbea3
Wrap up the current and next line position when invoking directives.
David A. Holland
parents:
143
diff
changeset
|
291 directive_goteof(&places.current); |
| 28 | 292 } |
|
39
337110e7240a
Pass the size to free; it makes debug checking easier.
David A. Holland
parents:
38
diff
changeset
|
293 dofree(buf, bufmax); |
| 15 | 294 } |
| 6 | 295 |
| 296 //////////////////////////////////////////////////////////// | |
| 297 // path search | |
| 298 | |
| 299 static | |
| 13 | 300 char * |
| 112 | 301 mkfilename(struct place *place, const char *dir, const char *file) |
| 13 | 302 { |
| 303 size_t dlen, flen, rlen; | |
| 304 char *ret; | |
| 305 bool needslash = false; | |
| 306 | |
| 112 | 307 if (dir == NULL) { |
| 308 dir = place_getparsedir(place); | |
| 309 } | |
| 310 | |
| 13 | 311 dlen = strlen(dir); |
| 312 flen = strlen(file); | |
| 313 if (dlen > 0 && dir[dlen-1] != '/') { | |
| 314 needslash = true; | |
| 315 } | |
| 316 | |
| 317 rlen = dlen + (needslash ? 1 : 0) + flen; | |
| 318 ret = domalloc(rlen + 1); | |
| 319 strcpy(ret, dir); | |
| 320 if (needslash) { | |
| 321 strcat(ret, "/"); | |
| 322 } | |
| 323 strcat(ret, file); | |
| 324 return ret; | |
| 325 } | |
| 326 | |
| 327 static | |
| 6 | 328 int |
| 329 file_tryopen(const char *file) | |
| 330 { | |
| 331 int fd; | |
| 332 | |
| 15 | 333 /* XXX check for non-regular files */ |
| 334 | |
| 6 | 335 fd = open(file, O_RDONLY); |
| 336 if (fd < 0) { | |
|
113
1e7144176a42
Print a warning if we get an unexpected error trying to open a file.
David A. Holland
parents:
112
diff
changeset
|
337 if (errno != ENOENT && errno != ENOTDIR) { |
| 143 | 338 complain(NULL, "%s: %s", file, strerror(errno)); |
|
113
1e7144176a42
Print a warning if we get an unexpected error trying to open a file.
David A. Holland
parents:
112
diff
changeset
|
339 } |
| 6 | 340 return -1; |
| 341 } | |
| 15 | 342 |
| 6 | 343 return fd; |
| 344 } | |
| 345 | |
| 346 static | |
| 347 void | |
| 348 file_search(struct place *place, struct incdirarray *path, const char *name) | |
| 349 { | |
| 350 unsigned i, num; | |
| 351 struct incdir *id; | |
| 13 | 352 const struct placefile *pf; |
| 6 | 353 char *file; |
| 354 int fd; | |
| 355 | |
| 356 assert(place != NULL); | |
| 357 | |
| 104 | 358 if (name[0] == '/') { |
| 359 fd = file_tryopen(name); | |
| 6 | 360 if (fd >= 0) { |
| 104 | 361 pf = place_addfile(place, name, true); |
| 362 file_read(pf, fd, name, false); | |
| 6 | 363 close(fd); |
| 364 return; | |
| 365 } | |
| 104 | 366 } else { |
| 367 num = incdirarray_num(path); | |
| 368 for (i=0; i<num; i++) { | |
| 369 id = incdirarray_get(path, i); | |
| 112 | 370 file = mkfilename(place, id->name, name); |
| 104 | 371 fd = file_tryopen(file); |
| 372 if (fd >= 0) { | |
| 373 pf = place_addfile(place, file, id->issystem); | |
| 374 file_read(pf, fd, file, false); | |
| 375 dostrfree(file); | |
| 376 close(fd); | |
| 377 return; | |
| 378 } | |
| 379 dostrfree(file); | |
| 380 } | |
| 6 | 381 } |
| 382 complain(place, "Include file %s not found", name); | |
| 383 complain_fail(); | |
| 384 } | |
| 385 | |
| 386 void | |
| 387 file_readquote(struct place *place, const char *name) | |
| 388 { | |
| 389 file_search(place, "epath, name); | |
| 390 } | |
| 391 | |
| 392 void | |
| 393 file_readbracket(struct place *place, const char *name) | |
| 394 { | |
| 395 file_search(place, &bracketpath, name); | |
| 396 } | |
| 397 | |
| 398 void | |
| 399 file_readabsolute(struct place *place, const char *name) | |
| 400 { | |
| 13 | 401 const struct placefile *pf; |
| 6 | 402 int fd; |
| 403 | |
| 404 assert(place != NULL); | |
| 405 | |
| 24 | 406 if (name == NULL) { |
| 407 fd = STDIN_FILENO; | |
| 408 pf = place_addfile(place, "<standard-input>", false); | |
| 409 } else { | |
| 410 fd = file_tryopen(name); | |
| 411 if (fd < 0) { | |
| 143 | 412 complain(NULL, "%s: %s", name, strerror(errno)); |
| 24 | 413 die(); |
| 414 } | |
| 415 pf = place_addfile(place, name, false); | |
| 6 | 416 } |
| 24 | 417 |
| 28 | 418 file_read(pf, fd, name, true); |
| 24 | 419 |
| 420 if (name != NULL) { | |
| 421 close(fd); | |
| 422 } | |
| 6 | 423 } |