Changeset 115 for trunk/lua/cli.lua

Timestamp:

01/23/12 05:47:33 (16 months ago)

Author:

reyalp

Message:

move make_camera_path to fsutil

File:

• trunk/lua/cli.lua (modified) (6 diffs)

trunk/lua/cli.lua

@@ -265 +265 @@
 end
 
--- add/correct A/ as needed, replace \ with /
-function cli:make_camera_path(path)
-        if not path then
-                return 'A/'
-        end
-        -- fix slashes
-        path = string.gsub(path,'\\','/')
-        local pfx = string.sub(path,1,2)
-        if pfx == 'A/' then
-                return path
-        end
-        if pfx == 'a/' then
-                return 'A' .. string.sub(path,2,-1)
-        end
-        return 'A/' .. path
-end
-
 cli:add_commands{
         {
@@ -520 +503 @@
                         -- no dst, use filename of source
                         if dst then
-                                dst = cli:make_camera_path(dst)
+                                dst = fsutil.make_camera_path(dst)
                                 if string.find(dst,'[\\/]$') then
                                         -- trailing slash, append filename of source
@@ -543 +526 @@
                                 end
                         else
-                                dst = cli:make_camera_path(fsutil.basename(src))
+                                dst = fsutil.make_camera_path(fsutil.basename(src))
                         end
 
@@ -592 +575 @@
                         end
 
-                        src = cli:make_camera_path(src)
+                        src = fsutil.make_camera_path(src)
                         if not args.nolua then
                                 local src_st,err = con:stat(src)
@@ -734 +717 @@
                         local listops
                         local path=args[1]
-                        path = cli:make_camera_path(path)
+                        path = fsutil.make_camera_path(path)
                         if args.l then
                                 listopts = { stat='*' }
@@ -781 +764 @@
                         local bootfile=args[1]
                         if bootfile then
-                                bootfile = cli:make_camera_path(bootfile)
+                                bootfile = fsutil.make_camera_path(bootfile)
                                 bootfile = string.format("'%s'",bootfile)
                         else