Changeset 934

Timestamp:

01/29/12 18:38:29 (17 months ago)

Author:

rudi_de

Message:

Aktualisierung auf Rev. 1622 internationaler Branch: Release-1.0
​http://trac.assembla.com/chdk/changeset/1622/branches/release-1_0

Betrifft alle DryOS Kameras

• Korrektur der Reihenfolge von Änderungs- und Zugriffszeit in DryOS utime()
• Testskript llibtst.lua aktualisiert

Location:

trunk

Files:

• CHDK/SCRIPTS/TEST/llibtst.lua (modified) (2 diffs)
• platform/generic/wrappers.c (modified) (1 diff)

trunk/CHDK/SCRIPTS/TEST/llibtst.lua

@@ -366 +366 @@
 end
 
-function tstat(name)
+function tstat(name,expect)
         log('os.stat("',tostring(name),'"): ')
         local r,msg = os.stat(name)
         if r then
+                local fail
+                if type(expect) == 'table' then
+                        for k,v in pairs(expect) do
+                                -- special case, dryos >= R39 doesn't set atime
+                                if r[k] ~= v and not (k == 'atime' and r[k] == nil) then
+                                        logfail("expected "..tostring(k).."="..tostring(v).." not "..tostring(r[k]))
+                                        fail = true
+                                end
+                        end
+                end
+                if not fail then
+                        logok()
+                end
 --              local keys={ "dev", "ino", "mode", "nlink", "uid", "gid", "rdev", "size", "atime", "mtime", "ctime", "blksize", "blocks", "attrib", "reserved1", "reserved2", "reserved3", "reserved4", "reserved5", "reserved6",}
                 local keys={ "dev", "mode", "size", "atime", "mtime", "ctime", "blksize", "blocks", "attrib","is_dir","is_file",}
-                logok()
                 log("{\n")
                 for _,v in ipairs(keys) do
@@ -443 +455 @@
                 tf:close()
                 local fn=tdir0..tdat0
-                tstat(fn)
+                tstat(fn,{is_file=true,is_dir=false})
                 tutime(fn) -- utime, current
                 tstat(fn)
-                tutime(fn,os.time({year=1984,month=1,day=1}),os.time({year=1984,month=12,day=25}))
-                tstat(fn)
-                tstat(tdir0)
+                tutime(fn,os.time({year=1984,month=1,day=1,hour=0}),os.time({year=1984,month=12,day=25,hour=0}))
+                tstat(fn,{mtime=os.time({year=1984,month=1,day=1,hour=0}),atime=os.time({year=1984,month=12,day=25,hour=0})})
+                tstat(tdir0,{is_file=false,is_dir=true})
                 tren(tdir0..tdat0,tdir0..tdat1)
                 tlistdir(tdir0)

trunk/platform/generic/wrappers.c

@@ -577 +577 @@
 
 #ifdef CAM_DRYOS_2_3_R39
-   if (fd>=0) {
-       _close(fd);
-       res=_SetFileTimeStamp(file, ((int*)newTimes)[0] , ((int*)newTimes)[1]);
-   }
-#else
-     if (fd>=0) {
-      res=_SetFileTimeStamp(fd, ((int*)newTimes)[0] , ((int*)newTimes)[1]);
-      _close(fd);
-     }
-     // return value compatibe with utime: ok=0 fail=-1
+    if (fd>=0) {
+        _close(fd);
+        res=_SetFileTimeStamp(file, newTimes->modtime, newTimes->actime);
+    }
+#else
+    if (fd>=0) {
+        res=_SetFileTimeStamp(fd, newTimes->modtime, newTimes->actime);
+        _close(fd);
+    }
+    // return value compatibe with utime: ok=0 fail=-1
 #endif
   return (res)?0:-1;