| … | |
… | |
| 152 | char buf[MAX_BUF], *cp; |
152 | char buf[MAX_BUF], *cp; |
| 153 | New_Face *on_face = NULL; |
153 | New_Face *on_face = NULL; |
| 154 | FILE *fp; |
154 | FILE *fp; |
| 155 | |
155 | |
| 156 | sprintf (buf, "%s/faces", settings.datadir); |
156 | sprintf (buf, "%s/faces", settings.datadir); |
| 157 | LOG (llevDebug, "Reading faces from %s...", buf); |
157 | LOG (llevDebug, "Reading faces from %s...\n", buf); |
| 158 | if ((fp = fopen (buf, "r")) == NULL) |
158 | if ((fp = fopen (buf, "r")) == NULL) |
| 159 | { |
159 | { |
| 160 | LOG (llevError, "Cannot open faces file %s: %s\n", buf, strerror (errno)); |
160 | LOG (llevError, "Cannot open faces file %s: %s\n", buf, strerror (errno)); |
| 161 | exit (-1); |
161 | exit (-1); |
| 162 | } |
162 | } |
| … | |
… | |
| 236 | int value, nrofbmaps = 0, i; |
236 | int value, nrofbmaps = 0, i; |
| 237 | size_t l; |
237 | size_t l; |
| 238 | |
238 | |
| 239 | bmaps_checksum = 0; |
239 | bmaps_checksum = 0; |
| 240 | sprintf (buf, "%s/bmaps", settings.datadir); |
240 | sprintf (buf, "%s/bmaps", settings.datadir); |
| 241 | LOG (llevDebug, "Reading bmaps from %s...", buf); |
241 | LOG (llevDebug, "Reading bmaps from %s...\n", buf); |
| 242 | if ((fp = fopen (buf, "r")) == NULL) |
242 | if ((fp = fopen (buf, "r")) == NULL) |
| 243 | { |
243 | { |
| 244 | LOG (llevError, "Cannot open bmaps file %s: %s\n", buf, strerror (errno)); |
244 | LOG (llevError, "Cannot open bmaps file %s: %s\n", buf, strerror (errno)); |
| 245 | exit (-1); |
245 | exit (-1); |
| 246 | } |
246 | } |
| … | |
… | |
| 264 | { |
264 | { |
| 265 | LOG (llevDebug, "Warning, syntax error: %s\n", buf); |
265 | LOG (llevDebug, "Warning, syntax error: %s\n", buf); |
| 266 | continue; |
266 | continue; |
| 267 | } |
267 | } |
| 268 | value = atoi (p); |
268 | value = atoi (p); |
| 269 | xbm[nroffiles].name = strdup_local (q); |
269 | xbm[nroffiles].name = strdup (q); |
| 270 | |
270 | |
| 271 | /* We need to calculate the checksum of the bmaps file |
271 | /* We need to calculate the checksum of the bmaps file |
| 272 | * name->number mapping to send to the client. This does not |
272 | * name->number mapping to send to the client. This does not |
| 273 | * need to match what sum or other utility may come up with - |
273 | * need to match what sum or other utility may come up with - |
| 274 | * as long as we get the same results on the same real file |
274 | * as long as we get the same results on the same real file |
| … | |
… | |
| 387 | FILE *fp; |
387 | FILE *fp; |
| 388 | int smoothcount = 0; |
388 | int smoothcount = 0; |
| 389 | |
389 | |
| 390 | bmaps_checksum = 0; |
390 | bmaps_checksum = 0; |
| 391 | sprintf (buf, "%s/smooth", settings.datadir); |
391 | sprintf (buf, "%s/smooth", settings.datadir); |
| 392 | LOG (llevDebug, "Reading smooth from %s...", buf); |
392 | LOG (llevDebug, "Reading smooth from %s...\n", buf); |
| 393 | if ((fp = fopen (buf, "r")) == NULL) |
393 | if ((fp = fopen (buf, "r")) == NULL) |
| 394 | { |
394 | { |
| 395 | LOG (llevError, "Cannot open smooth file %s: %s\n", strerror (errno)); |
395 | LOG (llevError, "Cannot open smooth file %s: %s\n", strerror (errno)); |
| 396 | exit (-1); |
396 | exit (-1); |
| 397 | } |
397 | } |
