From 65d37f432fbeab150207016ed7c3355871c3dd2f Mon Sep 17 00:00:00 2001
From: Giacomo Tesio <giacomo@tesio.it>
Date: Fri, 20 Oct 2017 00:14:43 +0200
Subject: [PATCH] rc: rename $cflag in $rccmd

---
 arch/rc/lib/rcmain    | 6 +++---
 sys/src/cmd/rc/exec.c | 4 ++--
 sys/src/cmd/rc/rc.h   | 2 ++
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/arch/rc/lib/rcmain b/arch/rc/lib/rcmain
index c8f019e..fdea870 100644
--- a/arch/rc/lib/rcmain
+++ b/arch/rc/lib/rcmain
@@ -12,13 +12,13 @@ if(~ $rcname ?.out) prompt=('broken! ' '	')
 if(flag p) path=/cmd
 if not{
 	finit
-	if(~ $#path 0) path=(. /cmd)
+	if(~ $#path 0) path=(/cmd .)
 }
 fn sigexit
-if(! ~ $#cflag 0){
+if(! ~ $#rccmd 0){
 	if(flag l && /cmd/test -r $home/lib/profile) . $home/lib/profile
 	status=''
-	eval $cflag
+	eval $rccmd
 }
 if not if(flag i){
 	if(flag l && /cmd/test -r $home/lib/profile) . $home/lib/profile
diff --git a/sys/src/cmd/rc/exec.c b/sys/src/cmd/rc/exec.c
index ef0faa7..af821f0 100644
--- a/sys/src/cmd/rc/exec.c
+++ b/sys/src/cmd/rc/exec.c
@@ -177,9 +177,9 @@ main(int argc, char *argv[])
 	Vinit();
 	inttoascii(num, mypid = getpid());
 	setvar(ENV_PID, newword(num, (word *)0));
-	setvar("cflag", flag['c']?newword(flag['c'][0], (word *)0)
+	setvar(ENV_RCCMD, flag['c']?newword(flag['c'][0], (word *)0)
 				:(word *)0);
-	setvar("rcname", newword(argv[0], (word *)0));
+	setvar(ENV_RCNAME, newword(argv[0], (word *)0));
 	i = 0;
 	bootstrap[i++].i = 1;
 	bootstrap[i++].f = Xmark;
diff --git a/sys/src/cmd/rc/rc.h b/sys/src/cmd/rc/rc.h
index 63373b4..3b694d7 100644
--- a/sys/src/cmd/rc/rc.h
+++ b/sys/src/cmd/rc/rc.h
@@ -18,6 +18,8 @@
 #define ENV_PROMPT	"prompt"
 #define ENV_STATUS	"status"
 #define ENV_CDPATH	"cdpath"
+#define ENV_RCNAME	"rcname"
+#define ENV_RCCMD	"rccmd"
 
 #define	NSIG	32
 #define	SIGINT	2