Changeset 806 for branches/client-2.1/src

Timestamp:

Sep 16, 2013, 6:41:23 PM (12 years ago)

Author:

Herwig Bauernfeind

Message:

Samba Client 2.1: Fix Ticket #227 (updated timestamp during read access)

Location:

branches/client-2.1/src

Files:

• smbwrp.c (modified) (4 diffs)
• smbwrp.h (modified) (1 diff)

branches/client-2.1/src/smbwrp.c

@@ -620 +620 @@
                 return os2cli_errno(cli);
         }
-        if (file->openmode & (O_WRONLY | O_RDWR | O_TRUNC | O_CREAT))
-        {
-                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;
-#endif
-                debuglocal(4,"cli_open new mtime %lu\n", file->mtime);
-        }
+        file->newmtime = 0;
         file->offset = 0;
         return 0;
@@ -681 +671 @@
         }
 
+        file->newmtime = 1;
         file->offset += ret;
         *result = ret;
@@ -702 +693 @@
                 return os2cli_errno(cli);
         }
+        if (file->newmtime)
+        {
+                file->mtime = time(NULL);
+                debuglocal(4,"cli_close new mtime %lu\n", file->mtime);
+        }
         file->fd = -1;
         file->offset = 0;
@@ -709 +705 @@
                 if (!cli_setatr(cli, file->fname, file->openattr, file->mtime)) 
                 {
+                        file->newmtime = 0;
                         debuglocal(4,"Set attr on close failed %d\n", os2cli_errno(cli));
                         //rc = os2cli_errno(cli);
-                }       
+                }
+                
                 file->openattr = 0;
                 file->mtime = 0;

branches/client-2.1/src/smbwrp.h

@@ -91 +91 @@
         int denymode;
         unsigned long mtime;
+        int newmtime;
         char fullname[261];
         char fname[261];