Isolate basename stuff in a completely separate function bname(),

[neverball] / ball / demo.c

diff --git a/ball/demo.c b/ball/demo.c
index ecb9304..2d132c9 100644 (file)
--- a/ball/demo.c
+++ b/ball/demo.c
@@ -65,12 +65,35 @@ void demo_dump_info(const struct demo *d)
            d->time, d->goal, d->score, d->balls, d->times);
 }
 
+static time_t make_time_from_utc(struct tm *tm)
+{
+    struct tm local, *utc;
+    time_t t;
+
+    t = mktime(tm);
+
+    local = *localtime(&t);
+    utc   =  gmtime(&t);
+
+    local.tm_year += local.tm_year - utc->tm_year;
+    local.tm_mon  += local.tm_mon  - utc->tm_mon ;
+    local.tm_mday += local.tm_mday - utc->tm_mday;
+    local.tm_hour += local.tm_hour - utc->tm_hour;
+    local.tm_min  += local.tm_min  - utc->tm_min ;
+    local.tm_sec  += local.tm_sec  - utc->tm_sec ;
+
+    return mktime(&local);
+}
+
 static int demo_header_read(FILE *fp, struct demo *d)
 {
     int magic;
     int version;
     int t;
 
+    struct tm date;
+    char datestr[20];
+
     get_index(fp, &magic);
     get_index(fp, &version);
 
@@ -83,7 +106,26 @@ static int demo_header_read(FILE *fp, struct demo *d)
         get_index(fp, &d->coins);
         get_index(fp, &d->state);
         get_index(fp, &d->mode);
+
+#if 0
         get_index(fp, (int *) &d->date);
+#endif
+        fread(datestr, 1, 20, fp);
+        sscanf(datestr,
+               "%d-%d-%dT%d:%d:%d",
+               &date.tm_year,
+               &date.tm_mon,
+               &date.tm_mday,
+               &date.tm_hour,
+               &date.tm_min,
+               &date.tm_sec);
+
+        /* Convert certain values to valid structure member values. */
+
+        date.tm_year -= 1900;
+        date.tm_mon  -= 1;
+
+        d->date = make_time_from_utc(&date);
 
         fread(d->player, 1, MAXNAM, fp);
 
@@ -106,19 +148,58 @@ static int demo_header_read(FILE *fp, struct demo *d)
     return 0;
 }
 
+static char *bname(const char *name, const char *suffix)
+{
+    static char buf[MAXSTR];
+
+    char *base;
+    size_t l;
+
+    /* Remove the directory delimiter */
+
+    base = strrchr(name, '/');
+#ifdef _WIN32
+    if (!base)
+        base = strrchr(name, '\\');
+    else
+    {
+        char *tmp;
+        if ((tmp = strrchr(base, '\\')))
+            base = tmp;
+    }
+#endif
+    strncpy(buf, base ? base + 1 : name, MAXSTR);
+
+    /* Remove the extension */
+
+    l = strlen(buf) - strlen(suffix);
+    if ((l > 1) && (strcmp(buf + l, suffix) == 0))
+        buf[l] = '\0';
+
+    return buf;
+}
+
 static void demo_header_write(FILE *fp, struct demo *d)
 {
     int magic = MAGIC;
     int version = DEMO_VERSION;
     int zero  = 0;
 
+    char datestr[20];
+
+    strftime(datestr, 20, "%Y-%m-%dT%H:%M:%S", gmtime(&d->date));
+
     put_index(fp, &magic);
     put_index(fp, &version);
     put_index(fp, &zero);
     put_index(fp, &zero);
     put_index(fp, &zero);
     put_index(fp, &d->mode);
+
+#if 0
     put_index(fp, (int *) &d->date);
+#endif
+    fwrite(datestr, 1, 20, fp);
 
     fwrite(d->player, 1, MAXNAM, fp);
 
@@ -163,18 +244,8 @@ static void demo_scan_file(const char *filename)
     {
         if (demo_header_read(fp, d))
         {
-            char buf[PATHMAX];
-            int l;
-
-            strncpy(d->filename, config_user(filename), MAXSTR);
-
-            strncpy(buf, filename, PATHMAX);
-            l = strlen(buf) - strlen(REPLAY_EXT);
-
-            if ((l > 1) && (strcmp(buf + l, REPLAY_EXT) == 0))
-                buf[l] = '\0';
-
-            strncpy(d->name, buf, PATHMAX);
+            strncpy(d->filename, config_user(filename),       MAXSTR);
+            strncpy(d->name,     bname(filename, REPLAY_EXT), PATHMAX);
             d->name[PATHMAX - 1] = '\0';
 
             count++;
@@ -243,8 +314,8 @@ const struct demo *demo_get(int i)
 const char *date_to_str(time_t i)
 {
     static char str[MAXSTR];
-    struct tm *tm = localtime(&i);
-    strftime(str, MAXSTR, "%c", tm);
+
+    strftime(str, MAXSTR, "%c", localtime(&i));
     return str;
 }
 
@@ -360,6 +431,10 @@ void demo_play_save(const char *name)
         strncpy(dst, config_user(name), PATHMAX);
         strcat(dst, REPLAY_EXT);
 
+#ifdef _WIN32
+        if (demo_exists(name))
+            remove(dst);
+#endif
         rename(src, dst);
     }
 }
@@ -393,7 +468,8 @@ int demo_replay_init(const char *name, struct level_game *lg)
 
     if (demo_fp && demo_header_read(demo_fp, &demo_replay))
     {
-        strncpy(demo_replay.filename, name, MAXSTR);
+        strncpy(demo_replay.filename, name,                    MAXSTR);
+        strncpy(demo_replay.name,     bname(name, REPLAY_EXT), PATHMAX);
 
         if (!demo_load_level(&demo_replay, &demo_level_replay))
             return 0;