Skip to content

Commit

Permalink
Write to stdout in cat command
Browse files Browse the repository at this point in the history
  • Loading branch information
muesli committed Jan 19, 2018
1 parent bffbc96 commit dd526d6
Showing 1 changed file with 15 additions and 15 deletions.
30 changes: 15 additions & 15 deletions cat.go
Expand Up @@ -9,6 +9,7 @@ package main

import (
"fmt"
"os"

"github.com/knoxite/knoxite/lib"

Expand All @@ -35,24 +36,23 @@ func init() {

func executeCat(snapshotID string, file string) error {
repository, err := openRepository(globalOpts.Repo, globalOpts.Password)
if err == nil {
_, snapshot, ferr := repository.FindSnapshot(snapshotID)
if ferr != nil {
return ferr
}

if archive, ok := snapshot.Archives[file]; ok {
b, _, err := knoxite.DecodeArchiveData(repository, *archive)
if err != nil {
return err
}
if err != nil {
return err
}
_, snapshot, ferr := repository.FindSnapshot(snapshotID)
if ferr != nil {
return ferr
}

fmt.Print(string(b))
} else {
return fmt.Errorf("No such file or directory")
if archive, ok := snapshot.Archives[file]; ok {
b, _, erra := knoxite.DecodeArchiveData(repository, *archive)
if erra != nil {
return erra
}

_, err = os.Stdout.Write(b)
return err
}

return err
return fmt.Errorf("%s: No such file or directory", file)
}

0 comments on commit dd526d6

Please sign in to comment.