From 82abcd6fd693549b225e53c6c161ea3909f2cf00 Mon Sep 17 00:00:00 2001
From: Russ Cox <rsc@swtch.com>
Date: Mon, 12 Nov 2018 11:07:41 -0500
Subject: plumb: allow @ in file names

Helps Go module download cache, Upspin, maybe others.
---
 plumb/basic | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'plumb')

diff --git a/plumb/basic b/plumb/basic
index f728132f..438fc48f 100644
--- a/plumb/basic
+++ b/plumb/basic
@@ -37,8 +37,8 @@ plumb start wdoc2txt $file
 
 # image files go to page
 type is text
-data matches '[a-zA-Z¡-￿0-9_\-./]+'
-data matches '([a-zA-Z¡-￿0-9_\-./]+)\.(jpe?g|JPE?G|gif|GIF|tiff?|TIFF?|ppm|bit|png|PNG)'
+data matches '[a-zA-Z¡-￿0-9_\-./@]+'
+data matches '([a-zA-Z¡-￿0-9_\-./@]+)\.(jpe?g|JPE?G|gif|GIF|tiff?|TIFF?|ppm|bit|png|PNG)'
 arg isfile	$0
 plumb to image
 plumb start 9 page $file
@@ -46,22 +46,22 @@ plumb start 9 page $file
 # postscript/pdf/dvi go to page but not over the a plumb port
 # the port is here for reference but is unused
 type is text
-data matches '[a-zA-Z¡-￿0-9_\-./]+'
-data matches '([a-zA-Z¡-￿0-9_\-./]+)\.(ps|PS|eps|EPS|pdf|PDF|dvi|DVI)'
+data matches '[a-zA-Z¡-￿0-9_\-./@]+'
+data matches '([a-zA-Z¡-￿0-9_\-./@]+)\.(ps|PS|eps|EPS|pdf|PDF|dvi|DVI)'
 arg isfile	$0
 plumb to postscript
 plumb start 9 page $file
 
 # open office - s[xt][cdigmw], doc, xls, ppt
-data matches '[a-zA-Z¡-￿0-9_\-./]+'
-data matches '([a-zA-Z¡-￿0-9_\-./]+)\.([Ss][XxTt][CcDdIiGgMmWw]|[Dd][Oo][Cc]|[Xx][Ll][Ss]|[Pp][Pp][Tt])'
+data matches '[a-zA-Z¡-￿0-9_\-./@]+'
+data matches '([a-zA-Z¡-￿0-9_\-./@]+)\.([Ss][XxTt][CcDdIiGgMmWw]|[Dd][Oo][Cc]|[Xx][Ll][Ss]|[Pp][Pp][Tt])'
 arg isfile	$0
 plumb to openoffice
 plumb start openoffice $file
 
 # existing files tagged by line number:columnumber or linenumber.columnumber, twice, go to editor
 type is text
-data matches '([.a-zA-Z¡-￿0-9_/\-]*[a-zA-Z¡-￿0-9_/\-])':$twocolonaddr,$twocolonaddr
+data matches '([.a-zA-Z¡-￿0-9_/\-@]*[a-zA-Z¡-￿0-9_/\-])':$twocolonaddr,$twocolonaddr
 arg isfile     $1
 data set       $file
 attr add       addr=$2-#1+#$3,$4-#1+#$5
@@ -70,7 +70,7 @@ plumb client $editor
 
 # existing files tagged by line number:columnumber or linenumber.columnumber, twice, go to editor
 type is text
-data matches '([.a-zA-Z¡-￿0-9_/\-]*[a-zA-Z¡-￿0-9_/\-])':$twocolonaddr
+data matches '([.a-zA-Z¡-￿0-9_/\-@]*[a-zA-Z¡-￿0-9_/\-])':$twocolonaddr
 arg isfile     $1
 data set       $file
 attr add       addr=$2-#1+#$3
@@ -79,7 +79,7 @@ plumb client $editor
 
 # existing files, possibly tagged by line number, go to editor
 type is text
-data matches '([.a-zA-Z¡-￿0-9_/\-]*[a-zA-Z¡-￿0-9_/\-])('$addr')?'
+data matches '([.a-zA-Z¡-￿0-9_/\-@]*[a-zA-Z¡-￿0-9_/\-])('$addr')?'
 arg isfile	$1
 data set	$file
 attr add	addr=$3
-- 
cgit v1.2.3