Changeset 816 for branches/client-2.1/src

Timestamp:

Sep 24, 2013, 5:37:22 PM (12 years ago)

Author:

Silvan Scherrer

Message:

Samba Client 2.1: some more timestamp work

Location:

branches/client-2.1/src

Files:

• ndpsmb.c (modified) (2 diffs)
• smbwrp.c (modified) (1 diff)

branches/client-2.1/src/ndpsmb.c

@@ -62 +62 @@
         struct tm gmtime = { 0 };
 
-        debug_printf( "fsphDosDateToUnixTime time %02d:%02d\n", ftime.hours, ftime.minutes);
+        debug_printf( "fsphDosDateToUnixTime time %02d:%02d:%02d\n", ftime.hours, ftime.minutes, ftime.twosecs*2);
         gmtime.tm_mday = fdate.day;
         gmtime.tm_mon = fdate.month-1;
@@ -80 +80 @@
         *time += 3600;
         }
+        debug_printf( "fsphDosDateToUnixTime time2 %d %s", *time, ctime( (time_t*)time));
 #endif
-        debug_printf( "fsphDosDateToUnixTime time2 %d %s", *time, ctime( (time_t*)time));
 }
         

branches/client-2.1/src/smbwrp.c

@@ -688 +688 @@
         }
 
+        debuglocal(4,"smpwrp_close updatetime: %d\n", file->updatetime);
+
+        if (file->updatetime == 1)
+        {
+                file->mtime = time(NULL);
+                debuglocal(4,"cli_close new mtime %lu\n", file->mtime);
+        }
+
+        if (file->updatetime == 2 && !cli_setattrE(cli, file->fd, file->ctime, 0, file->mtime))
+        {
+                debuglocal(4,"Set attrE on close failed %d\n", os2cli_errno(cli));
+        }
         
         if (!cli_close(cli, file->fd))
         {
-                return os2cli_errno(cli);
-        }
-        if (file->updatetime == 2 && !cli_setattrE(cli, file->fd, file->ctime, 0, file->mtime))
-        {
-                debuglocal(4,"Set attrE on close failed %d\n", os2cli_errno(cli));
-        }
-        if (file->updatetime == 1)
-        {
-                file->mtime = time(NULL);
-                debuglocal(4,"cli_close new mtime %lu\n", file->mtime);
-        }
+                rc = os2cli_errno(cli);
+        }
+
+        if (!rc && (file->openattr || file->mtime))
+        {
+                debuglocal(4,"Set attr on close %s %08x %d %d\n", file->fname, file->openattr, file->mtime, file->mtime);
+                if (!cli_setatr(cli, file->fname, file->openattr, file->mtime)) 
+                {
+                        debuglocal(4,"Set attr on close failed %d\n", os2cli_errno(cli));
+                        //rc = os2cli_errno(cli);
+                }
+                
+        }
+
+        file->openattr = 0;
+        file->mtime = 0;
         file->updatetime = 0;           
         file->fd = -1;
         file->offset = 0;
-        if (file->openattr || file->mtime)
-        {
-                debuglocal(4,"Set attr on close %s %08x %d %d\n", file->fname, file->openattr, file->mtime, file->mtime);
-                if (!cli_setatr(cli, file->fname, file->openattr, file->mtime)) 
-                {
-                        debuglocal(4,"Set attr on close failed %d\n", os2cli_errno(cli));
-                        //rc = os2cli_errno(cli);
-                }
-                
-                file->openattr = 0;
-                file->mtime = 0;
-        }
         *file->fname = 0;
         return rc;