gofmt

common.go

@@ -13,8 +13,9 @@ type JshOutput struct {
 
 // Size prefixes as integers, using binary representation
 type Unit int
+
 const (
-	B Unit = 2 ^ 0
+	B  Unit = 2 ^ 0
 	KB Unit = 2 ^ 10
 	MB Unit = 2 ^ 20
 	GB Unit = 2 ^ 30

free.go

@@ -3,6 +3,6 @@
 package jsh
 
 type MemStat struct {
-	Stat int
+	Stat  int
 	Units Unit
 }

free/main.go

@@ -6,8 +6,8 @@ import (
 	"flag"
 	"fmt"
 	"jsh"
-	"regexp"
 	"os"
+	"regexp"
 	"strconv"
 )
 

ls/main.go

@@ -1,76 +1,75 @@
 package main
 
 import (
-  "io/ioutil"
+	"flag"
-  "fmt"
+	"fmt"
-  "flag"
+	"io/ioutil"
-  "log"
+	"log"
-  "syscall"
+	"strconv"
-  "strconv"
+	"syscall"
 )
 
-
+func get_fileinfo(f string, size bool, mode bool, inode bool) string {
-func get_fileinfo(f string, size bool, mode bool, inode bool) string{
+	var stat syscall.Stat_t
-  var stat syscall.Stat_t
+	var ret string
-  var ret string 
+	ret = "{\"name\":\"" + f + "\""
-  ret = "{\"name\":\"" + f + "\""
+	if err := syscall.Stat(f, &stat); err != nil {
-  if err := syscall.Stat(f, &stat); err != nil {
+		log.Fatal(err)
-    log.Fatal(err)
+	}
-  }
+	if size {
-  if(size){
+		ret = ret + ", \"size\":" + strconv.FormatInt(stat.Size, 10)
-    ret = ret + ", \"size\":" + strconv.FormatInt(stat.Size,10)
+	}
-  }
+	if mode {
-  if(mode){
+		ret = ret + ", \"mode\":" + strconv.Itoa(int(stat.Mode))
-    ret = ret + ", \"mode\":" + strconv.Itoa(int(stat.Mode))
+	}
-  }
+	if inode {
-  if(inode){
+		ret = ret + ", \"inode\":" + strconv.FormatUint(stat.Ino, 10)
-    ret = ret + ", \"inode\":" + strconv.FormatUint(stat.Ino,10)
+	}
-  }
+	ret = ret + "}"
-  ret = ret + "}"
+	return ret
-  return ret 
 }
 
 func main() {
-  // here be the ls flags
+	// here be the ls flags
 
-  var a_flag bool                      // all files, even ones starting with .
+	var a_flag bool     // all files, even ones starting with .
-  var mode_flag bool                   // flags
+	var mode_flag bool  // flags
-  var inode_flag bool		       // inode
+	var inode_flag bool // inode
-  var size_flag	bool		       // size
+	var size_flag bool  // size
-  var first = true
+	var first = true
 
-  flag.BoolVar(&a_flag, "a", false, "lists all files in directory, even hidden ones")
+	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(&mode_flag, "f", false, "include flags for file")
-  flag.BoolVar(&inode_flag, "i", 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")  
+	flag.BoolVar(&size_flag, "s", false, "include flags for file")
-  // end ls flag
+	// end ls flag
 
-  flag.Parse()
+	flag.Parse()
-  root := "."//flag.Arg(0)
+	root := "." //flag.Arg(0)
-  dir,_ := ioutil.ReadDir(root)
+	dir, _ := ioutil.ReadDir(root)
 
-  fmt.Printf("[\n")
+	fmt.Printf("[\n")
 
-  if(!a_flag){
+	if !a_flag {
-    for _,entry := range dir{
+		for _, entry := range dir {
-      if(entry.Name()[0]!='.'){
+			if entry.Name()[0] != '.' {
-        if(!first){
+				if !first {
-          fmt.Printf(",")
+					fmt.Printf(",")
-        }else{
+				} else {
-          first = false
+					first = false
+				}
+				fmt.Printf("%s\n", get_fileinfo(entry.Name(), size_flag, mode_flag, inode_flag))
+			}
+		}
+	} else {
+		for _, entry := range dir {
+			if !first {
+				fmt.Printf(",")
+			} else {
+				first = false
+			}
+			fmt.Printf("%s\n", get_fileinfo(entry.Name(), size_flag, mode_flag, inode_flag))
+		}
 	}
-        fmt.Printf("%s\n", get_fileinfo(entry.Name(), size_flag, mode_flag, inode_flag))
+	fmt.Printf("]\n")
-      }  
-    }
-  }else{
-    for _,entry := range dir{
-        if(!first){
-          fmt.Printf(",")
-        }else{
-          first = false
-	}
-        fmt.Printf("%s\n", get_fileinfo(entry.Name(), size_flag, mode_flag, inode_flag))
-    }
-  }
-  fmt.Printf("]\n")
 }

ps/main.go

@@ -25,7 +25,7 @@ func PsOutputToProcesses(out string) *[]jsh.Process {
 
 func runJsonMode() {
 	// Run procps-ng "ps" with full output
-	psOut := string(*jsh.FallbackWithArgs("/usr/bin/ps",  []string{"auxww"}))
+	psOut := string(*jsh.FallbackWithArgs("/usr/bin/ps", []string{"auxww"}))
 
 	processesPtr := PsOutputToProcesses(psOut)
 	finalOut := jsh.JshOutput{*processesPtr, []string{}}

utils.go

@@ -2,9 +2,9 @@ package jsh
 
 import (
 	"math"
-	"unicode"
 	"os"
 	"os/exec"
+	"unicode"
 )
 
 // FieldsN slices s into substrings after each instance of a whitespace