Mercurial > ~dholland > hg > tradcpp > index.cgi
annotate files.c @ 175:ffdb0b73856f
Suppress blank lines later.
Fixes the rest of the bizarre spacing behavior described in changeset
82cc6fa54b01.
Expand t39 to cover more cases, too.
| author | David A. Holland |
|---|---|
| date | Fri, 12 Jun 2015 02:38:04 -0400 |
| parents | f14f5352956c |
| children | 4c3375895c6e |
| 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 <stdbool.h> |
| 31 #include <stdio.h> | |
| 32 #include <stdlib.h> | |
| 13 | 33 #include <string.h> |
| 6 | 34 #include <unistd.h> |
| 35 #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
|
36 #include <errno.h> |
| 6 | 37 |
| 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; |
| 229 complain(&ptmp, "No newline at end of file"); | |
| 230 if (mode.werror) { | |
| 231 complain_fail(); | |
| 232 } | |
| 233 assert(bufend < bufmax); | |
| 234 lineend = bufend++; | |
| 235 buf[lineend] = '\n'; | |
| 236 } else { | |
| 237 bufend += (size_t)result; | |
|
81
27c9aafcaca1
Don't recognize comments within double-quote strings.
David A. Holland
parents:
75
diff
changeset
|
238 lineend = findeol(buf, linestart, bufend); |
| 15 | 239 } |
| 240 /* loop in case we still don't have a whole line */ | |
| 241 continue; | |
| 242 } | |
| 243 | |
| 244 /* have a line */ | |
| 245 assert(buf[lineend] == '\n'); | |
| 246 buf[lineend] = '\0'; | |
| 247 nextlinestart = lineend+1; | |
|
154
a2c2fe8dbea3
Wrap up the current and next line position when invoking directives.
David A. Holland
parents:
143
diff
changeset
|
248 places.nextline.line++; |
| 15 | 249 |
| 250 /* check for CR/NL */ | |
| 251 if (lineend > 0 && buf[lineend-1] == '\r') { | |
| 252 buf[lineend-1] = '\0'; | |
| 253 lineend--; | |
| 254 } | |
| 255 | |
| 256 /* check for continuation line */ | |
| 257 if (lineend > 0 && buf[lineend-1]=='\\') { | |
| 258 lineend--; | |
| 259 tmp = nextlinestart - lineend; | |
| 260 if (bufend > nextlinestart) { | |
| 261 memmove(buf+lineend, buf+nextlinestart, | |
| 262 bufend - nextlinestart); | |
| 263 } | |
| 264 bufend -= tmp; | |
| 265 nextlinestart -= tmp; | |
|
81
27c9aafcaca1
Don't recognize comments within double-quote strings.
David A. Holland
parents:
75
diff
changeset
|
266 lineend = findeol(buf, linestart, bufend); |
| 15 | 267 /* might not have a whole line, so loop */ |
| 268 continue; | |
| 269 } | |
| 270 | |
| 271 /* line now goes from linestart to lineend */ | |
| 272 assert(buf[lineend] == '\0'); | |
| 75 | 273 |
| 274 /* 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
|
275 places.nextline.line += countnls(buf, linestart, lineend); |
| 75 | 276 |
| 175 | 277 /* process the line (even if it's empty) */ |
| 278 directive_gotline(&places, buf+linestart, lineend-linestart); | |
| 15 | 279 |
| 280 linestart = nextlinestart; | |
| 75 | 281 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
|
282 places.current = places.nextline; |
| 15 | 283 } |
| 284 | |
| 28 | 285 if (toplevel) { |
|
154
a2c2fe8dbea3
Wrap up the current and next line position when invoking directives.
David A. Holland
parents:
143
diff
changeset
|
286 directive_goteof(&places.current); |
| 28 | 287 } |
|
39
337110e7240a
Pass the size to free; it makes debug checking easier.
David A. Holland
parents:
38
diff
changeset
|
288 dofree(buf, bufmax); |
| 15 | 289 } |
| 6 | 290 |
| 291 //////////////////////////////////////////////////////////// | |
| 292 // path search | |
| 293 | |
| 294 static | |
| 13 | 295 char * |
| 112 | 296 mkfilename(struct place *place, const char *dir, const char *file) |
| 13 | 297 { |
| 298 size_t dlen, flen, rlen; | |
| 299 char *ret; | |
| 300 bool needslash = false; | |
| 301 | |
| 112 | 302 if (dir == NULL) { |
| 303 dir = place_getparsedir(place); | |
| 304 } | |
| 305 | |
| 13 | 306 dlen = strlen(dir); |
| 307 flen = strlen(file); | |
| 308 if (dlen > 0 && dir[dlen-1] != '/') { | |
| 309 needslash = true; | |
| 310 } | |
| 311 | |
| 312 rlen = dlen + (needslash ? 1 : 0) + flen; | |
| 313 ret = domalloc(rlen + 1); | |
| 314 strcpy(ret, dir); | |
| 315 if (needslash) { | |
| 316 strcat(ret, "/"); | |
| 317 } | |
| 318 strcat(ret, file); | |
| 319 return ret; | |
| 320 } | |
| 321 | |
| 322 static | |
| 6 | 323 int |
| 324 file_tryopen(const char *file) | |
| 325 { | |
| 326 int fd; | |
| 327 | |
| 15 | 328 /* XXX check for non-regular files */ |
| 329 | |
| 6 | 330 fd = open(file, O_RDONLY); |
| 331 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
|
332 if (errno != ENOENT && errno != ENOTDIR) { |
| 143 | 333 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
|
334 } |
| 6 | 335 return -1; |
| 336 } | |
| 15 | 337 |
| 6 | 338 return fd; |
| 339 } | |
| 340 | |
| 341 static | |
| 342 void | |
| 343 file_search(struct place *place, struct incdirarray *path, const char *name) | |
| 344 { | |
| 345 unsigned i, num; | |
| 346 struct incdir *id; | |
| 13 | 347 const struct placefile *pf; |
| 6 | 348 char *file; |
| 349 int fd; | |
| 350 | |
| 351 assert(place != NULL); | |
| 352 | |
| 104 | 353 if (name[0] == '/') { |
| 354 fd = file_tryopen(name); | |
| 6 | 355 if (fd >= 0) { |
| 104 | 356 pf = place_addfile(place, name, true); |
| 357 file_read(pf, fd, name, false); | |
| 6 | 358 close(fd); |
| 359 return; | |
| 360 } | |
| 104 | 361 } else { |
| 362 num = incdirarray_num(path); | |
| 363 for (i=0; i<num; i++) { | |
| 364 id = incdirarray_get(path, i); | |
| 112 | 365 file = mkfilename(place, id->name, name); |
| 104 | 366 fd = file_tryopen(file); |
| 367 if (fd >= 0) { | |
| 368 pf = place_addfile(place, file, id->issystem); | |
| 369 file_read(pf, fd, file, false); | |
| 370 dostrfree(file); | |
| 371 close(fd); | |
| 372 return; | |
| 373 } | |
| 374 dostrfree(file); | |
| 375 } | |
| 6 | 376 } |
| 377 complain(place, "Include file %s not found", name); | |
| 378 complain_fail(); | |
| 379 } | |
| 380 | |
| 381 void | |
| 382 file_readquote(struct place *place, const char *name) | |
| 383 { | |
| 384 file_search(place, "epath, name); | |
| 385 } | |
| 386 | |
| 387 void | |
| 388 file_readbracket(struct place *place, const char *name) | |
| 389 { | |
| 390 file_search(place, &bracketpath, name); | |
| 391 } | |
| 392 | |
| 393 void | |
| 394 file_readabsolute(struct place *place, const char *name) | |
| 395 { | |
| 13 | 396 const struct placefile *pf; |
| 6 | 397 int fd; |
| 398 | |
| 399 assert(place != NULL); | |
| 400 | |
| 24 | 401 if (name == NULL) { |
| 402 fd = STDIN_FILENO; | |
| 403 pf = place_addfile(place, "<standard-input>", false); | |
| 404 } else { | |
| 405 fd = file_tryopen(name); | |
| 406 if (fd < 0) { | |
| 143 | 407 complain(NULL, "%s: %s", name, strerror(errno)); |
| 24 | 408 die(); |
| 409 } | |
| 410 pf = place_addfile(place, name, false); | |
| 6 | 411 } |
| 24 | 412 |
| 28 | 413 file_read(pf, fd, name, true); |
| 24 | 414 |
| 415 if (name != NULL) { | |
| 416 close(fd); | |
| 417 } | |
| 6 | 418 } |