Merge branch 'a2-4am-master'

mach-kernel · Feb 22, 2018 · a9dd04a · a9dd04a
2 parents b5d413c + 6600cd9
commit a9dd04a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -37,7 +37,10 @@ Any and all contributions are welcome. Included is also a `cadius.pro` file you
 
 ## Changelog
 
-#### 1.3
+#### 1.3.1
+- Resolves timestamp bugs in [#10](https://github.com/mach-kernel/cadius/issues/10). Thanks, @a2-4am!
+
+#### 1.3.0
 - Adds ability to specify a file's `type` and `auxtype` via the filename, resolving [#4](https://github.com/mach-kernel/cadius/issues/4). A big thank you to @JohnMBrooks for testing this PR!
 - `REPLACEFILE` command, `DELETEFILE` support for type/auxtype suffix. 
 

diff --git a/Src/Main.c b/Src/Main.c
@@ -78,7 +78,7 @@ int main(int argc, char *argv[])
   verbose = 0;
 
   /* Message Information */
-  printf("%s v 1.3, (c) Brutal Deluxe 2011-2013.\n",argv[0]);
+  printf("%s v 1.3.1, (c) Brutal Deluxe 2011-2013.\n",argv[0]);
 
   /* Vérification des paramètres */
   if(argc < 3)

diff --git a/Src/os/posix.c b/Src/os/posix.c
@@ -163,9 +163,9 @@ void os_GetFileCreationModificationDate(char *path, struct prodos_file *file) {
   struct tm *time = localtime(&filestat.st_mtime);
   if (time == NULL) return;
 
-  file->file_creation_date = BuildProdosDate(time->tm_mday, time->tm_mon, time->tm_year);
+  file->file_creation_date = BuildProdosDate(time->tm_mday, time->tm_mon + 1, time->tm_year + 1900);
   file->file_creation_time = BuildProdosTime(time->tm_min, time->tm_hour);
-  file->file_modification_date = BuildProdosDate(time->tm_mday, time->tm_mon, time->tm_year);
+  file->file_modification_date = BuildProdosDate(time->tm_mday, time->tm_mon + 1, time->tm_year + 1900);
   file->file_modification_time = BuildProdosTime(time->tm_min, time->tm_hour);
 }