Changeset 126 for branches/samba-3.0/source/ndpsmb/ndpsmb.c

Timestamp:

Apr 7, 2008, 9:33:39 AM (17 years ago)

Author:

Yuri Dario

Message:

Fixes timezone handling for os2->xp->os2, os2->samba->os2. Partially fixes ticket:56.

File:

• branches/samba-3.0/source/ndpsmb/ndpsmb.c (modified) (11 diffs)

branches/samba-3.0/source/ndpsmb/ndpsmb.c

@@ -12 +12 @@
 #define NULL ((void *)0)
 
+#ifndef DEBUG_PRINTF
+#define debug_printf( ...)
+#endif
+
 void log(const char *fmt, ...)
 {  
@@ -39 +43 @@
 }
 
+// -------------------------------------------------------------
+
+/* time conversion functions: SMB protocol sends timestamps in GMT time,
+*  os2 api uses localtime,
+*  emx/klibc uses timezone and daylight saving to convert GMT timestamps,
+*  so only the timezone must be counted in conversion.
+*/
+void fsphUnixTimeToDosDate( time_t time, FDATE* fdate, FTIME *ftime)
+{
+    struct tm* gmt = localtime( &time);
+    if (gmt->tm_isdst>0) {
+        debug_printf( "daylight saving in effect %d, timezone %d\n",gmt->tm_isdst, timezone); 
+        time -= 3600;
+        gmt = localtime( &time);
+    }
+    fdate->day  = gmt->tm_mday;
+    fdate->month  = gmt->tm_mon+1;
+    fdate->year = gmt->tm_year + 1900 - 1980;
+    ftime->twosecs = gmt->tm_sec/2;
+    ftime->minutes = gmt->tm_min;
+    ftime->hours = gmt->tm_hour;
+}
+
+void fsphDosDateToUnixTime( FDATE fdate, FTIME ftime, unsigned long* time)
+{
+    struct tm gmtime = { 0 };
+    struct tm* gmt;
+
+    debug_printf( "fsphDosDateToUnixTime time %02d:%02d\n", ftime.hours, ftime.minutes);
+    gmtime.tm_mday = fdate.day;
+    gmtime.tm_mon = fdate.month-1;
+    gmtime.tm_year = fdate.year + 1980 - 1900;
+    gmtime.tm_sec = ftime.twosecs*2;
+    gmtime.tm_min = ftime.minutes;
+    gmtime.tm_hour = ftime.hours;
+    gmtime.tm_isdst = -1; // force libc to check dst saving
+
+    *time = mktime( &gmtime);
+    debug_printf( "fsphDosDateToUnixTime time1 %d %s", *time, ctime( time));
+    gmt = localtime( (time_t*) time);
+    if (gmt->tm_isdst>0) {
+        debug_printf( "fsphDosDateToUnixTime daylight saving in effect %d, timezone %d\n",gmt->tm_isdst, timezone); 
+        *time += 3600;
+    }
+    debug_printf( "fsphDosDateToUnixTime time2 %d %s", *time, ctime( time));
+}
+
+// -------------------------------------------------------------
+        
 int StrLen(char * s)
 {
@@ -339 +392 @@
         stat->attrFile = (finfo->attr & 0x37);
 
-        ph->fsphUnixTimeToDosDate(finfo->mtime, &stat->fdateLastWrite, &stat->ftimeLastWrite);
-        ph->fsphUnixTimeToDosDate(finfo->ctime, &stat->fdateCreation, &stat->ftimeCreation);
-        ph->fsphUnixTimeToDosDate(finfo->atime, &stat->fdateLastAccess, &stat->ftimeLastAccess);
+        fsphUnixTimeToDosDate(finfo->mtime, &stat->fdateLastWrite, &stat->ftimeLastWrite);
+        fsphUnixTimeToDosDate(finfo->ctime, &stat->fdateCreation, &stat->ftimeCreation);
+        fsphUnixTimeToDosDate(finfo->atime, &stat->fdateLastAccess, &stat->ftimeLastAccess);
 }
 
@@ -369 +422 @@
         stat.attrFile = (finfo->attr & 0x37);
 
-        ph->fsphUnixTimeToDosDate(finfo->mtime, &stat.fdateLastWrite, &stat.ftimeLastWrite);
-        ph->fsphUnixTimeToDosDate(finfo->ctime, &stat.fdateCreation, &stat.ftimeCreation);
-        ph->fsphUnixTimeToDosDate(finfo->atime, &stat.fdateLastAccess, &stat.ftimeLastAccess);
+        fsphUnixTimeToDosDate(finfo->mtime, &stat.fdateLastWrite, &stat.ftimeLastWrite);
+        fsphUnixTimeToDosDate(finfo->ctime, &stat.fdateCreation, &stat.ftimeCreation);
+        fsphUnixTimeToDosDate(finfo->atime, &stat.fdateLastAccess, &stat.ftimeLastAccess);
+        debug_printf( "fname %s\n", finfo->fname);
+        debug_printf( "mtime %d %s", finfo->mtime, ctime( &finfo->mtime));
+        debug_printf( "ftimeLastAccess %02d:%02d:%02d\n", stat.ftimeLastWrite.hours, stat.ftimeLastWrite.minutes, stat.ftimeLastWrite.twosecs*2);
 
         ph->fsphAddFile32L(plist, &stat, name, StrLen(name), finfo, sizeof(*finfo), 0);
@@ -1179 +1235 @@
         NDPATHELEMENT *pel = ph->fsphNameElem(0);
 
-        log("NdpFindStart in\n");
+        debug_printf("NdpFindStart in\n");
         do
         {
@@ -1282 +1338 @@
         do
           {
-                log("NdpQueryInfo in <%s>, retry = %d\n", szPath, retry);
+                debug_printf("NdpQueryInfo in <%s>, retry = %d\n", szPath, retry);
 
                 do {
@@ -1414 +1470 @@
         char path[CCHMAXPATH+1] = {0};
 
-        log("NdpSetPathInfo in\n");
+        debug_printf("NdpSetPathInfo in\n");
         do {
                 rc = checkconnection(pConn);
@@ -1431 +1487 @@
 
                 StrNCpy(finfo->fname, path, sizeof(finfo->fname) - 1);
-                ph->fsphDosDateToUnixTime(pfi->stat.fdateLastWrite, pfi->stat.ftimeLastWrite, (unsigned long *)&(finfo->mtime));
+                fsphDosDateToUnixTime(pfi->stat.fdateLastWrite, pfi->stat.ftimeLastWrite, &(finfo->mtime));
                 if (ifL)
                 {
@@ -2140 +2196 @@
         smbwrp_fileinfo * finfo = (smbwrp_fileinfo *)(pConn->mem + sizeof(pConn->file));
 
-        log("NdpFileQueryInfo in\n");
+        debug_printf("NdpFileQueryInfo in\n");
         do {
                 if (pConn->file.fd < 0 || !*pConn->file.fname)
@@ -2381 +2437 @@
         smbwrp_fileinfo * finfo = (smbwrp_fileinfo *)pConn->mem;
 
-        log("NdpFileSetInfo in\n");
+        debug_printf("NdpFileSetInfo in\n");
         do {
                 if (pConn->file.fd < 0 || !*pConn->file.fname)
@@ -2404 +2460 @@
                 // deferred setinfo - on closing the file
                 pConn->file.openattr = attrFile;
-                ph->fsphDosDateToUnixTime(pfi->stat.fdateLastWrite, pfi->stat.ftimeLastWrite, (unsigned long *)&(pConn->file.mtime));
+                fsphDosDateToUnixTime(pfi->stat.fdateLastWrite, pfi->stat.ftimeLastWrite, &(pConn->file.mtime));
+                debug_printf("NdpFileSetInfo mtime %d\n", pConn->file.mtime);
         } while (0);
         log("NdpFileSetInfo <%s> %08x %d %d\n", pConn->file.fd < 0 ? "!null!" : pConn->file.fname, attrFile, rc, pConn->rc);