modify

bjjansure · Oct 9, 2019 · b1bdfb7 · b1bdfb7
1 parent f2e0740
commit b1bdfb7
Show file tree

Hide file tree

Showing 24 changed files with 15 additions and 4 deletions.
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/__MACOSX/._lua-5 b/__MACOSX/._lua-5
diff --git a/__MACOSX/lua-5/._.DS_Store b/__MACOSX/lua-5/._.DS_Store
diff --git a/__MACOSX/lua-5/._include b/__MACOSX/lua-5/._include
diff --git a/__MACOSX/lua-5/._lua5.1.dll b/__MACOSX/lua-5/._lua5.1.dll
diff --git a/__MACOSX/lua-5/._lua5.1.lib b/__MACOSX/lua-5/._lua5.1.lib
diff --git a/__MACOSX/lua-5/._lua51.dll b/__MACOSX/lua-5/._lua51.dll
diff --git a/__MACOSX/lua-5/._lua51.lib b/__MACOSX/lua-5/._lua51.lib
diff --git a/__MACOSX/lua-5/include/._lauxlib.h b/__MACOSX/lua-5/include/._lauxlib.h
diff --git a/__MACOSX/lua-5/include/._lua.h b/__MACOSX/lua-5/include/._lua.h
diff --git a/__MACOSX/lua-5/include/._lua.hpp b/__MACOSX/lua-5/include/._lua.hpp
diff --git a/__MACOSX/lua-5/include/._luaconf.h b/__MACOSX/lua-5/include/._luaconf.h
diff --git a/__MACOSX/lua-5/include/._lualib.h b/__MACOSX/lua-5/include/._lualib.h
diff --git a/commands.go b/commands.go
@@ -44,8 +44,8 @@ func (c *Command) GetPathParam(s string) string {
 	return strings.Trim(c.Params[s], "/")
 }
 
-func (c *Command) GetChildPathParam(s string) string {
-	return strings.Trim(c.Params[s], "/") + "/"
+func (c *Command) GetChildPathParam() string {
+	return strings.Trim(c.Params["childDirName"], "/") + "/"
 }
 
 
@@ -92,16 +92,21 @@ func list_files(c *Command) int {
 		c.status = 1
 		return 1
 	}
+	if len(c.GetChildPathParam()) == 0  {
+		c.Stderr = "Params childDirName is empty"
+		c.status = 1
+		return 1
+	}
 	var aout DirFiles
 	for _, dir := range dirs {
-		d := c.GetPath()  + dir
+		d := c.GetPath()  + dir + c.GetChildPathParam()
 		files, err := ioutil.ReadDir(d)
 		if err != nil {
 			c.Stderr = err.Error()
 			c.status = 1
 			return 1
 		}
-		f, err := os.Stat(d)
+		f, err := os.Stat(c.GetPath()  + dir )
 		if err != nil {
 			c.Stderr = err.Error()
 			c.status = 1

diff --git a/file_server-master b/file_server-master
diff --git a/lua-5/include/lauxlib.h b/lua-5/include/lauxlib.h
diff --git a/lua-5/include/lua.h b/lua-5/include/lua.h
diff --git a/lua-5/include/lua.hpp b/lua-5/include/lua.hpp
diff --git a/lua-5/include/luaconf.h b/lua-5/include/luaconf.h
diff --git a/lua-5/include/lualib.h b/lua-5/include/lualib.h
diff --git a/lua-5/lua5.1.dll b/lua-5/lua5.1.dll
diff --git a/lua-5/lua5.1.lib b/lua-5/lua5.1.lib
diff --git a/lua-5/lua51.dll b/lua-5/lua51.dll
diff --git a/lua-5/lua51.lib b/lua-5/lua51.lib