Changeset 493 for branches/client-1.5

Timestamp:

Oct 27, 2010, 2:05:20 PM (15 years ago)

Author:

Silvan Scherrer

Message:

sambaclient 1.5: attemp to fix tz problems fixes ticket:56

Location:

branches/client-1.5/src

Files:

• help/ndpsmb.ipf (modified) (1 diff)
• help/ndpsmb_de.ipf (modified) (1 diff)
• help/ndpsmb_fr.ipf (modified) (1 diff)
• help/readme.txt (modified) (1 diff)
• help/readme_de.txt (modified) (1 diff)
• help/readme_fr.txt (modified) (1 diff)
• ndpsmb.c (modified) (6 diffs)
• smbwrp.c (modified) (2 diffs)

branches/client-1.5/src/help/ndpsmb.ipf

@@ -253 +253 @@
 :li.Fix help files
 :eul.
+:li.1.5.3
+:ul.
+:li.Fix timestamp problem
+:eul.
 :eul.
 .******************************************************

branches/client-1.5/src/help/ndpsmb_de.ipf

@@ -258 +258 @@
 :li.Korrekturen in den Hilfedateien
 :eul.
+:li.1.5.3
+:ul.
+:li.Zeitzonenproblem behoben
+:eul.
 :eul.
 .******************************************************

branches/client-1.5/src/help/ndpsmb_fr.ipf

@@ -343 +343 @@
 :li.Corriger les fichier d'aide
 :eul.
+:li.1.5.3
+:ul.
+:li.Fix timestamp problem
+:eul.
 :eul.
 :p.

branches/client-1.5/src/help/readme.txt

@@ -251 +251 @@
    - Fix help files
 
+v1.5.3
+   - Fix timestamp problem
+

branches/client-1.5/src/help/readme_de.txt

@@ -261 +261 @@
 v1.5.2
    - Korrekturen an den Hilfedateien
+
+v1.5.3
+   - Zeitzonenproblem behoben
+

branches/client-1.5/src/help/readme_fr.txt

@@ -323 +323 @@
    - Corriger les fichiers d'aide
 
+ v1.5.3
+   - Fix timestamp problem
+
+
 Traduction fran‡aise : Guillaume Gay <guillaume.gay@bigfoot.com>
 Version : 2010-07-06

branches/client-1.5/src/ndpsmb.c

@@ -52 +52 @@
 {
     struct tm* gmt = localtime( &time);
+#if 0 // as localtime() already does dst we don't need to add something 
     if (gmt->tm_isdst>0) {
         debug_printf( "daylight saving in effect %d, timezone %d\n",gmt->tm_isdst, timezone); 
@@ -57 +58 @@
         gmt = localtime( &time);
     }
+#endif
     fdate->day  = gmt->tm_mday;
     fdate->month  = gmt->tm_mon+1;
@@ -63 +65 @@
     ftime->minutes = gmt->tm_min;
     ftime->hours = gmt->tm_hour;
+    debug_printf("fsphUnixDateToDosDate\n");
 }
 
@@ -68 +71 @@
 {
     struct tm gmtime = { 0 };
-    struct tm* gmt;
 
     debug_printf( "fsphDosDateToUnixTime time %02d:%02d\n", ftime.hours, ftime.minutes);
@@ -81 +83 @@
     *time = mktime( &gmtime);
     debug_printf( "fsphDosDateToUnixTime time1 %d %s", *time, ctime( (time_t*)time));
+#if 0 // as mktime() already does dst we don't need to add something
+    struct tm* gmt;
     gmt = localtime( (time_t*) time);
     if (gmt->tm_isdst>0) {
@@ -86 +90 @@
         *time += 3600;
     }
+#endif
     debug_printf( "fsphDosDateToUnixTime time2 %d %s", *time, ctime( (time_t*)time));
 }

branches/client-1.5/src/smbwrp.c

@@ -591 +591 @@
                 time_t t;
                 file->mtime = time(NULL);
+#if 0 //as time() delivers elapsed time in epoch we already have UTC
                 t = get_time_zone(file->mtime);
                 debuglocal(4,"cli_open mtime %lu %lu\n", file->mtime, t);
-                file->mtime -= t;
+                file->mtime += t;
+#endif
+                debuglocal(4,"cli_open new mtime %lu\n", file->mtime); 
         }
         file->offset = 0;
@@ -728 +731 @@
         }
 
-        debuglocal(4,"cli_setnewfileszie(%s) %lld\n", file->fname, newsize);
+        debuglocal(4,"cli_setnewfilesize(%s) %lld\n", file->fname, newsize);
         if (!cli_setfilenewsize(cli, file->fd, newsize))
         {