MQP/jsh
Archived
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Modify ls to use our internal structure

Browse Source
This commit is contained in:
Ian Adam Naval 2014-10-14 16:33:01 -04:00
parent e2ed6a4111
commit af72e66f8b
3 changed files with 113 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -11,7 +11,7 @@ COVER_DIR=cover
# Package lists # Package lists
TOPLEVEL_PKG := jsh TOPLEVEL_PKG := jsh
CMD_LIST := jsh/ps jsh/free jsh/ls CMD_LIST := jsh/ps jsh/free jsh/ls jsh/cat jsh/df
# List building # List building
ALL_LIST = $(TOPLEVEL_PKG) $(CMD_LIST) ALL_LIST = $(TOPLEVEL_PKG) $(CMD_LIST)

14
files.go Normal file
View File

@ -0,0 +1,14 @@
package jsh
type File struct {
Name string
Size int
Mode int
Inode uint64
}
type Permission struct {
Read bool
Write bool
Execute bool
}

96
ls/main.go
View File

@ -4,72 +4,58 @@ import (
"flag" "flag"
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"jsh"
"log" "log"
"strconv"
"syscall" "syscall"
) )
func get_fileinfo(f string, size bool, mode bool, inode bool) string { // func get_fileinfo(f string) string {
var stat syscall.Stat_t
var ret string
ret = "{\"files\": [{\"name\":\"" + f + "\""
if err := syscall.Stat(f, &stat); err != nil {
log.Fatal(err)
}
if size {
ret = ret + ", \"size\":" + strconv.FormatInt(stat.Size, 10)
}
if mode {
ret = ret + ", \"mode\":" + strconv.Itoa(int(stat.Mode))
}
if inode {
ret = ret + ", \"inode\":" + strconv.FormatUint(stat.Ino, 10)
}
ret = ret + "}]}"
return ret
}
func main() { // ret = ret + ", \"size\":" + strconv.FormatInt(stat.Size, 10)
// here be the ls flags // ret = ret + ", \"mode\":" + strconv.Itoa(int(stat.Mode))
// ret = ret + ", \"inode\":" + strconv.FormatUint(stat.Ino, 10)
var a_flag bool // all files, even ones starting with . // ret = ret + "}]}"
var mode_flag bool // flags // return ret
var inode_flag bool // inode // }
var size_flag bool // size
var first = true
flag.BoolVar(&a_flag, "a", false, "lists all files in directory, even hidden ones")
flag.BoolVar(&mode_flag, "f", false, "include flags for file")
flag.BoolVar(&inode_flag, "i", false, "include flags for file")
flag.BoolVar(&size_flag, "s", false, "include flags for file")
// end ls flag
func listFiles(queue chan *jsh.JshFrame) {
flag.Parse() flag.Parse()
root := "." //flag.Arg(0) root := "." //flag.Arg(0)
dir, _ := ioutil.ReadDir(root) dir, _ := ioutil.ReadDir(root)
fmt.Printf("[{\"StdOut\": [\n")
if !a_flag {
for _, entry := range dir { for _, entry := range dir {
var stat syscall.Stat_t
if err := syscall.Stat(entry.Name(), &stat); err != nil {
log.Fatal(err)
}
if entry.Name()[0] != '.' { if entry.Name()[0] != '.' {
if !first { output := jsh.File{}
fmt.Printf(",") output.Name = entry.Name()
} else { output.Size = int(stat.Size)
first = false output.Mode = int(stat.Mode)
} output.Inode = stat.Ino
fmt.Printf("%s\n", get_fileinfo(entry.Name(), size_flag, mode_flag, inode_flag)) frame := jsh.JshFrame{output, ""}
queue <- &frame
} }
} }
} else { }
for _, entry := range dir {
if !first { func runJsonMode() {
fmt.Printf(",") queue := make(chan *jsh.JshFrame)
} else { done := make(chan bool)
first = false go jsh.OutputFrames(queue, done)
} listFiles(queue)
fmt.Printf("%s\n", get_fileinfo(entry.Name(), size_flag, mode_flag, inode_flag)) close(queue)
} <-done
} }
fmt.Printf("], \"StdErr\": []}]\n")
func main() {
// TODO: Support more flags
jsonModePtr := flag.Bool("json", false, "whether to use json mode for input and output")
flag.Parse()
if !*jsonModePtr {
fmt.Printf("%s", jsh.FallbackWithArgs("ls", flag.Args()))
} else {
runJsonMode()
}
} }