rc: implement $"x in terms of Xdol() and new Xqw() instruction

[plan9front.git] / sys / src / cmd / rc / exec.c

diff --git a/sys/src/cmd/rc/exec.c b/sys/src/cmd/rc/exec.c
index 4400e45bc732dbcd2f1103f695f998802c995d8f..3d1b0ac5a519e4eaa706a6891e5fb04dac2026b0 100644 (file)
--- a/sys/src/cmd/rc/exec.c
+++ b/sys/src/cmd/rc/exec.c
@@ -233,7 +233,7 @@ main(int argc, char *argv[])
  * Xdelfn(name)                                delete function definition
  * Xdeltraps(names)                    delete named traps
  * Xdol(name)                          get variable value
- * Xqdol(name)                         concatenate variable components
+ * Xqw(list)                           quote list, push result
  * Xdup[i j]                           dup file descriptor
  * Xexit                               rc exits with status
  * Xfalse{...}                         execute {} if false
@@ -697,18 +697,22 @@ Xdol(void)
 }
 
 void
-Xqdol(void)
+Xqw(void)
 {
        char *s;
        word *a;
-       if(count(runq->argv->words)!=1){
-               Xerror1("variable name not singleton!");
+
+       a = runq->argv->words;
+       if(a && a->next == 0){
+               runq->argv->words = 0;
+               poplist();
+               a->next = runq->argv->words;
+               runq->argv->words = a;
                return;
        }
-       s = Str(runq->argv->words);
-       a = vlook(s)->val;
+       s = list2str(a);
        poplist();
-       Pushword(list2str(a));
+       Pushword(s);
 }
 
 word*