Make cluefs a package

See airnandez#1

.gitignore

@@ -24,7 +24,7 @@ _testmain.go
 *.prof
 
 # This project
-cluefs
+/cluefs
 .DS_Store
 *.tar.gz
 misc/

doc/ToDo.md

@@ -2,7 +2,7 @@
 
 This is the list of items we would like to implement, in no particular order:
 
-* Create a `cluefs` package which could be embedded in other applications
+* Create a `cluefs` package which could be embedded in other applications (in progress)
 * Develop a proper set of automated tests
 * Add support for lock-related operations (see `fcntl(3)`)
 * Finish documentation of the few event formats still remaining

access.go → lib/cluefs/access.go

@@ -1,5 +1,5 @@
 // +build linux darwin
-package main
+package cluefs
 
 /*
 #include <unistd.h>

args.go → lib/cluefs/args.go

@@ -1,4 +1,4 @@
-package main
+package cluefs
 
 import (
 	"flag"

config.go → lib/cluefs/config.go

@@ -1,4 +1,4 @@
-package main
+package cluefs
 
 type Config struct {
 	entries map[string]string

debug.go → lib/cluefs/debug.go

@@ -1,4 +1,4 @@
-package main
+package cluefs
 
 import (
 	"fmt"

dir.go → lib/cluefs/dir.go

@@ -1,4 +1,4 @@
-package main
+package cluefs
 
 import (
 	"fmt"

file.go → lib/cluefs/file.go

@@ -1,4 +1,4 @@
-package main
+package cluefs
 
 import (
 	"io"

fs.go → lib/cluefs/fs.go

@@ -1,4 +1,4 @@
-package main
+package cluefs
 
 import (
 	"fmt"

fsops.go → lib/cluefs/fsops.go

@@ -1,4 +1,4 @@
-package main
+package cluefs
 
 import (
 	"encoding/json"

globals.go → lib/cluefs/globals.go

@@ -1,4 +1,4 @@
-package main
+package cluefs
 
 import (
 	"fmt"
@@ -10,6 +10,8 @@ import (
 var (
 	programName string
 	errlog      *log.Logger
+	// Log destination for errors in main()
+	ErrlogMain  *log.Logger
 
 	// The two variables below are set at build time for official releases
 	// (see Makefile)
@@ -20,4 +22,5 @@ var (
 func init() {
 	programName = filepath.Base(os.Args[0])
 	errlog = log.New(os.Stderr, fmt.Sprintf("%s: ", programName), 0)
+	ErrlogMain = errlog
 }

group_unix.go → lib/cluefs/group_unix.go

@@ -1,6 +1,6 @@
 // +build linux darwin
 
-package main
+package cluefs
 
 /*
 #include <unistd.h>

handle.go → lib/cluefs/handle.go

@@ -1,4 +1,4 @@
-package main
+package cluefs
 
 import (
 	"fmt"

node.go → lib/cluefs/node.go

@@ -1,4 +1,4 @@
-package main
+package cluefs
 
 import (
 	"fmt"

proc_darwin.go → lib/cluefs/proc_darwin.go

@@ -1,4 +1,4 @@
-package main
+package cluefs
 
 // #cgo LDFLAGS: -lproc
 

proc_linux.go → lib/cluefs/proc_linux.go

@@ -1,4 +1,4 @@
-package main
+package cluefs
 
 import (
 	"fmt"

process.go → lib/cluefs/process.go

@@ -1,4 +1,4 @@
-package main
+package cluefs
 
 import (
 	"path/filepath"

stat_darwin.go → lib/cluefs/stat_darwin.go

@@ -1,4 +1,4 @@
-package main
+package cluefs
 
 import (
 	"os"

stat_linux.go → lib/cluefs/stat_linux.go

@@ -1,4 +1,4 @@
-package main
+package cluefs
 
 import (
 	"os"

tracer.go → lib/cluefs/tracer.go

@@ -1,4 +1,4 @@
-package main
+package cluefs
 
 import (
 	"encoding/csv"

user.go → lib/cluefs/user.go

@@ -1,4 +1,4 @@
-package main
+package cluefs
 
 import (
 	"fmt"

main.go

@@ -2,32 +2,33 @@ package main
 
 import (
 	"os"
+	"github.com/rfjakob/cluefs/lib/cluefs"
 )
 
 func main() {
 	// Parse command line arguments
-	conf, err := ParseArguments()
+	conf, err := cluefs.ParseArguments()
 	if err != nil {
 		os.Exit(1)
 	}
 
 	// Create the tracer
-	tracer, err := NewTracer(conf.GetOutputFormat(), conf.GetTraceDestination())
+	tracer, err := cluefs.NewTracer(conf.GetOutputFormat(), conf.GetTraceDestination())
 	if err != nil {
-		errlog.Printf("%s", err)
+		cluefs.ErrlogMain.Printf("%s", err)
 		os.Exit(2)
 	}
 
 	// Create the file system object
-	cfs, err := NewClueFS(conf.GetShadowDir(), tracer)
+	cfs, err := cluefs.NewClueFS(conf.GetShadowDir(), tracer)
 	if err != nil {
-		errlog.Printf("could not create file system [%s]", err)
+		cluefs.ErrlogMain.Printf("could not create file system [%s]", err)
 		os.Exit(2)
 	}
 
 	// Mount and serve file system requests
 	if err = cfs.MountAndServe(conf.GetMountPoint(), conf.GetReadOnly()); err != nil {
-		errlog.Printf("could not mount file system [%s]", err)
+		cluefs.ErrlogMain.Printf("could not mount file system [%s]", err)
 		os.Exit(3)
 	}