Ticket #9524: 0001-iso9660-fat-and-exfat-fs-add-ons-corrects-time-conve.patch

src/add-ons/kernel/file_systems/exfat/Inode.cpp

@@ -271 +271 @@
 
     time_t days = daze[(date>>5)&15] + ((date>>9)+10)*365 + leaps((date>>9)+10,((date>>5)&15)-1)+(date&31)-1;
 
-    timespec.tv_sec = ((days * 24 + (time >> 11)) * 60 + ((time>>5)&63) + tzoffset) * 60 + 2*(time&31);
+    timespec.tv_sec = ((days * 24 + (time >> 11)) * 60 + ((time>>5)&63) - tzoffset) * 60 + 2*(time&31);
     timespec.tv_nsec = 0;
 }
 

src/add-ons/kernel/file_systems/fat/util.c

@@ -106 +106 @@
 
     days = daze[(t>>21)&15] + ((t>>25)+10)*365 + leaps((t>>25)+10,((t>>21)&15)-1)+((t>>16)&31)-1;
 
-    return (((days * 24) + ((t>>11)&31)) * 60 + ((t>>5)&63) + tzoffset) * 60 + 2*(t&31);
+    return (((days * 24) + ((t>>11)&31)) * 60 + ((t>>5)&63) - tzoffset) * 60 + 2*(t&31);
 }
 
 
@@ -118 +118 @@
 
     get_tzoffset();
 
-    t = (s % 60) / 2;   s /= 60; s -= tzoffset;
+    t = (s % 60) / 2;   s /= 60; s += tzoffset;
     t += (s % 60) << 5; s /= 60;
     t += (s % 24) << 11;s /= 24;
 

src/add-ons/kernel/file_systems/iso9660/iso9660.cpp

@@ -1002 +1002 @@
             tz |= (-1 << 8);
 
         if (-48 <= tz && tz <= 52)
-            time += tz *15 * 60;
+            time -= tz *15 * 60;
     }
     *outDate = time;
     return 0;