Merge remote-tracking branch 'upstream/master'

3 files changed, 7 insertions, 7 deletions

diff --git a/src/cmd/acme/addr.c b/src/cmd/acme/addr.c
index 2ccae960..6aee8993 100644
--- a/src/cmd/acme/addr.c
+++ b/src/cmd/acme/addr.c
@@ -240,12 +240,12 @@ address(uint showerr, Text *t, Range lim, Range ar, void *a, uint q0, uint q1, i
 		case '5': case '6': case '7': case '8': case '9':
 			n = c -'0';
 			while(q<q1){
-				c = (*getc)(a, q++);
-				if(c<'0' || '9'<c){
+				nc = (*getc)(a, q++);
+				if(nc<'0' || '9'<nc){
 					q--;
 					break;
 				}
-				n = n*10+(c-'0');
+				n = n*10+(nc-'0');
 			}
 			if(*evalp)
 				r = number(showerr, t, r, n, dir, size, evalp);
diff --git a/src/cmd/fontsrv/osx.c b/src/cmd/fontsrv/osx.c
index 4d969290..b28ee252 100644
--- a/src/cmd/fontsrv/osx.c
+++ b/src/cmd/fontsrv/osx.c
@@ -104,7 +104,7 @@ static char *lines[] = {
 	"ABCDEFGHIJKLMNOPQRSTUVWXYZ",
 	"abcdefghijklmnopqrstuvwxyz",
 	"g",
-	"┌┬┐├┼┤└┴┘│─",
+	"ÁĂÇÂÄĊÀČĀĄÅÃĥľƒ",
 	"ὕαλον ϕαγεῖν δύναμαι· τοῦτο οὔ με βλάπτει.",
 	"私はガラスを食べられます。それは私を傷つけません。",
 	"Aš galiu valgyti stiklą ir jis manęs nežeidžia",
diff --git a/src/cmd/grep/main.c b/src/cmd/grep/main.c
index d37aeb10..a847d73f 100644
--- a/src/cmd/grep/main.c
+++ b/src/cmd/grep/main.c
@@ -5,7 +5,7 @@ char *validflags = "bchiLlnsv";
 void
 usage(void)
 {
-	fprint(2, "usage: grep [-%s] [-f file] [-e expr] [file ...]\n", validflags);
+	fprint(2, "usage: grep [-%s] [-e pattern] [-f patternfile] [file ...]\n", validflags);
 	exits("usage");
 }
 
@@ -31,12 +31,12 @@ main(int argc, char *argv[])
 	case 'e':
 		flags['e']++;
 		lineno = 0;
-		str2top(ARGF());
+		str2top(EARGF(usage()));
 		break;
 
 	case 'f':
 		flags['f']++;
-		filename = ARGF();
+		filename = EARGF(usage());
 		rein = Bopen(filename, OREAD);
 		if(rein == 0) {
 			fprint(2, "grep: can't open %s: %r\n", filename);