Skip to content

Quote rc commands if necessary #136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cptaffe wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Quote rc commands if necessary #136

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion acme/Watch/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ import (
"9fans.net/go/acme"
)

const rcspecial = "#;&|^$=`'{}()<> \t\n"

var args []string
var win *acme.Win
var needrun = make(chan bool, 1)
Expand All @@ -64,6 +66,8 @@ func main() {
flag.Parse()
args = flag.Args()

escaped := rcquote(args)

var err error
win, err = acme.New()
if err != nil {
Expand All @@ -80,7 +84,7 @@ func main() {
}
win.Ctl(cmd)
win.Fprintf("tag", "Get Kill Quit ")
win.Fprintf("body", "%% %s\n", strings.Join(args, " "))
win.Fprintf("body", "%% %s\n", escaped)

needrun <- true
go events()
Expand Down Expand Up @@ -329,3 +333,18 @@ func runBackground(id int, dir string) {
// Continue loop with lock held
}
}

func rcquote(args []string) string {
var b strings.Builder
for i, arg := range args {
if i != 0 {
b.WriteRune(' ')
}
if strings.ContainsAny(arg, rcspecial) {
fmt.Fprintf(&b, "'%s'", strings.ReplaceAll(arg, "'", "''"))
} else {
b.WriteString(arg)
}
}
return b.String()
}