hardcoresushi
/
libgocryptfs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

cli: Create our own FlagSet so we can set the policy to ExitOnError

This commit is contained in:
Jakob Unterwurzacher 2015-11-09 23:11:38 +01:00
parent 99dfc84992
commit 273d8086ae
1 changed files with 36 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
main.go
View File

@ -60,36 +60,42 @@ func initDir(dirArg string, plaintextNames bool) {
func usageText() { func usageText() {
fmt.Fprintf(os.Stderr, "Usage: %s [OPTIONS] CIPHERDIR MOUNTPOINT\n", PROGRAM_NAME) fmt.Fprintf(os.Stderr, "Usage: %s [OPTIONS] CIPHERDIR MOUNTPOINT\n", PROGRAM_NAME)
fmt.Fprintf(os.Stderr, "\nOptions:\n") fmt.Fprintf(os.Stderr, "\nOptions:\n")
flag.PrintDefaults() flagSet.PrintDefaults()
} }
type argContainer struct {
debug, init, zerokey, fusedebug, openssl, passwd, foreground, version,
plaintextnames, quiet bool
masterkey, mountpoint, cipherdir string
cpuprofile *string
sendusr1 int
}
var flagSet *flag.FlagSet
func main() { func main() {
runtime.GOMAXPROCS(4) runtime.GOMAXPROCS(4)
// Parse command line arguments // Parse command line arguments
var args struct { var args argContainer
debug, init, zerokey, fusedebug, openssl, passwd, foreground, version, flagSet = flag.NewFlagSet(PROGRAM_NAME, flag.ExitOnError)
plaintextnames, quiet bool flagSet.Usage = usageText
masterkey, mountpoint, cipherdir string flagSet.BoolVar(&args.debug, "debug", false, "Enable debug output")
cpuprofile *string flagSet.BoolVar(&args.fusedebug, "fusedebug", false, "Enable fuse library debug output")
} flagSet.BoolVar(&args.init, "init", false, "Initialize encrypted directory")
flagSet.BoolVar(&args.zerokey, "zerokey", false, "Use all-zero dummy master key")
flag.Usage = usageText flagSet.BoolVar(&args.openssl, "openssl", true, "Use OpenSSL instead of built-in Go crypto")
flag.BoolVar(&args.debug, "debug", false, "Enable debug output") flagSet.BoolVar(&args.passwd, "passwd", false, "Change password")
flag.BoolVar(&args.fusedebug, "fusedebug", false, "Enable fuse library debug output") flagSet.BoolVar(&args.foreground, "f", false, "Stay in the foreground")
flag.BoolVar(&args.init, "init", false, "Initialize encrypted directory") flagSet.BoolVar(&args.version, "version", false, "Print version and exit")
flag.BoolVar(&args.zerokey, "zerokey", false, "Use all-zero dummy master key") flagSet.BoolVar(&args.plaintextnames, "plaintextnames", false,
flag.BoolVar(&args.openssl, "openssl", true, "Use OpenSSL instead of built-in Go crypto")
flag.BoolVar(&args.passwd, "passwd", false, "Change password")
flag.BoolVar(&args.foreground, "f", false, "Stay in the foreground")
flag.BoolVar(&args.version, "version", false, "Print version and exit")
flag.BoolVar(&args.plaintextnames, "plaintextnames", false,
"Do not encrypt file names - can only be used together with -init") "Do not encrypt file names - can only be used together with -init")
flag.BoolVar(&args.quiet, "q", false, "Quiet - silence informational messages") flagSet.BoolVar(&args.quiet, "q", false, "Quiet - silence informational messages")
flag.StringVar(&args.masterkey, "masterkey", "", "Mount with explicit master key") flagSet.StringVar(&args.masterkey, "masterkey", "", "Mount with explicit master key")
args.cpuprofile = flag.String("cpuprofile", "", "Write cpu profile to specified file") args.cpuprofile = flagSet.String("cpuprofile", "", "Write cpu profile to specified file")
flagSet.IntVar(&args.sendusr1, "sendusr1", 0,
flag.Parse() "Send USR1 to the specified process after successful mount - used internally for daemonization")
flagSet.Parse(os.Args[1:])
if args.version { if args.version {
fmt.Printf("%s %s; on-disk format %d\n", PROGRAM_NAME, GitVersion, cryptfs.HEADER_CURRENT_VERSION) fmt.Printf("%s %s; on-disk format %d\n", PROGRAM_NAME, GitVersion, cryptfs.HEADER_CURRENT_VERSION)
os.Exit(0) os.Exit(0)
@ -118,31 +124,31 @@ func main() {
cryptfs.Info.Printf("Openssl disabled\n") cryptfs.Info.Printf("Openssl disabled\n")
} }
if args.init { if args.init {
if flag.NArg() != 1 && args.plaintextnames == false { if flagSet.NArg() != 1 && args.plaintextnames == false {
fmt.Printf("Usage: %s --init [--plaintextnames] CIPHERDIR\n", PROGRAM_NAME) fmt.Printf("Usage: %s --init [--plaintextnames] CIPHERDIR\n", PROGRAM_NAME)
os.Exit(ERREXIT_USAGE) os.Exit(ERREXIT_USAGE)
} }
initDir(flag.Arg(0), args.plaintextnames) // does not return initDir(flagSet.Arg(0), args.plaintextnames) // does not return
} }
if args.passwd { if args.passwd {
if flag.NArg() != 1 { if flagSet.NArg() != 1 {
fmt.Printf("Usage: %s --passwd CIPHERDIR\n", PROGRAM_NAME) fmt.Printf("Usage: %s --passwd CIPHERDIR\n", PROGRAM_NAME)
os.Exit(ERREXIT_USAGE) os.Exit(ERREXIT_USAGE)
} }
} else { } else {
// Normal mount // Normal mount
if flag.NArg() < 2 { if flagSet.NArg() < 2 {
usageText() usageText()
os.Exit(ERREXIT_USAGE) os.Exit(ERREXIT_USAGE)
} }
args.mountpoint, _ = filepath.Abs(flag.Arg(1)) args.mountpoint, _ = filepath.Abs(flagSet.Arg(1))
err := checkDirEmpty(args.mountpoint) err := checkDirEmpty(args.mountpoint)
if err != nil { if err != nil {
fmt.Printf("Invalid MOUNTPOINT: %v\n", err) fmt.Printf("Invalid MOUNTPOINT: %v\n", err)
os.Exit(ERREXIT_MOUNTPOINT) os.Exit(ERREXIT_MOUNTPOINT)
} }
} }
args.cipherdir, _ = filepath.Abs(flag.Arg(0)) args.cipherdir, _ = filepath.Abs(flagSet.Arg(0))
err := checkDir(args.cipherdir) err := checkDir(args.cipherdir)
if err != nil { if err != nil {
fmt.Printf("Invalid CIPHERDIR: %v\n", err) fmt.Printf("Invalid CIPHERDIR: %v\n", err)
@ -165,7 +171,7 @@ func main() {
_, err = os.Stat(cfname) _, err = os.Stat(cfname)
if err != nil { if err != nil {
fmt.Printf("Error: %s not found in CIPHERDIR\n", cryptfs.ConfDefaultName) fmt.Printf("Error: %s not found in CIPHERDIR\n", cryptfs.ConfDefaultName)
fmt.Printf("Please run \"%s --init %s\" first\n", os.Args[0], flag.Arg(0)) fmt.Printf("Please run \"%s --init %s\" first\n", os.Args[0], flagSet.Arg(0))
os.Exit(ERREXIT_LOADCONF) os.Exit(ERREXIT_LOADCONF)
} }
if args.passwd == true { if args.passwd == true {