Merge branch 'jc/mv'

diff --git a/server-info.c b/server-info.c
index df19e49b5be75f2cc75e24ba6cda0c94631b434d..05bce7da3b4935675465f993c24bb1188439d6d9 100644 (file)
--- a/server-info.c
+++ b/server-info.c
@@ -99,7 +99,10 @@ static int read_pack_info_file(const char *infofile)
        while (fgets(line, sizeof(line), fp)) {
                int len = strlen(line);
                if (line[len-1] == '\n')
-                       line[len-1] = 0;
+                       line[--len] = 0;
+
+               if (!len)
+                       continue;
 
                switch (line[0]) {
                case 'P': /* P name */
@@ -200,6 +203,7 @@ static void write_pack_info_file(FILE *fp)
        int i;
        for (i = 0; i < num_pack; i++)
                fprintf(fp, "P %s\n", info[i]->p->pack_name + objdirlen + 6);
+       fputc('\n', fp);
 }
 
 static int update_info_packs(int force)