#include <unistd.h> /* for unlink(), acess() */
#include <stdlib.h> /* for calloc(), free() */
#include <string.h> /* for strlen(), strcmp(), memcpy() */
-#include <stdint.h> /* for uint16_t */
+#include <stdint.h> /* for uint8_t, uint16_t */
#include "readwrite.h" /* for [read/write]_uint[8/16/32][_bigendian]() */
#include "map_objects.h" /* for struct Monster, write_map_objects(), */
#include "map_object_actions.h" /* for is_passable(), move_monster() */
-extern void textfile_sizes(FILE * file, uint16_t * linemax_p,
- uint16_t * n_lines_p)
+extern uint8_t textfile_sizes(FILE * file, uint16_t * linemax_p,
+ uint16_t * n_lines_p)
{
- uint16_t n_lines = 0;
int c = 0;
- uint16_t linemax = 0;
uint16_t c_count = 0;
- while (EOF != c)
+ uint16_t n_lines = 0;
+ uint16_t linemax = 0;
+ while (1)
{
- c_count++;
c = getc(file);
+ if (EOF == c)
+ {
+ break;
+ }
+ c_count++;
if ('\n' == c)
{
if (c_count > linemax)
{
- linemax = c_count + 1;
+ linemax = c_count;
}
c_count = 0;
if (n_lines_p)
}
}
}
- fseek(file, 0, SEEK_SET);
+ if (0 == linemax && 0 < c_count) /* Handle files that consist of only one */
+ { /* line / lack newline chars. */
+ linemax = c_count;
+ }
+
+ if (-1 == fseek(file, 0, SEEK_SET))
+ {
+ return 1;
+ }
* linemax_p = linemax;
if (n_lines_p)
{
* n_lines_p = n_lines;
}
+ return 0;
}
extern void update_log(struct World * world, char * text)
{
- static char * last_msg;
- if (0 == last_msg)
- {
- last_msg = calloc(1, sizeof(char));
+ static char * last_msg; /* TODO: valgrind is dissatisfied */
+ if (0 == last_msg) /* with this calloc'd pointer */
+ { /* never being freed. */
+ last_msg = calloc(1, sizeof(char)); /* Rectify this ? */
}
char * new_text;
uint16_t len_old = strlen(world->log);