commit - b9403fe70a539ab5a6d174e5a800082c542ea06b
commit + 99f40290902d69956f7ef57b33599c4092021d01
blob - 15b1467045b911a358ab3df19b7f1ae00906c4e1
blob + cb9dc67d0444f32ba6770b6b8be48ee66d28d324
--- src/cmd/acme/exec.c
+++ src/cmd/acme/exec.c
while(q1<t->file->b.nc && isexecc(c=textreadc(t, q1)) && c!=':')
q1++;
while(q0>0 && isexecc(c=textreadc(t, q0-1)) && c!=':')
+ q0--;
+ if(q0>0 && textreadc(t, q0-1)=='$')
q0--;
if(q1 == q0)
return;
blob - 2257d681a094ea3569e7af968285b005d7bf5d21
blob + ba3e1d1721f22e0eddcad4cf054ff5a34bfc5b51
--- src/cmd/acme/fns.h
+++ src/cmd/acme/fns.h
void flushwarnings(void);
void startplumbing(void);
+int expandenv(Rune**, uint*);
+int abbrevenv(Rune**, uint*);
+
Runestr runestr(Rune*, uint);
Range range(int, int);
blob - fb4ae5c4e931ca72d8df0186622634c9524a1580
blob + 67f6c8969d454d3a5e02aa9f0ca37127dbcd1ea2
--- src/cmd/acme/fsys.c
+++ src/cmd/acme/fsys.c
if(n <= 0){
if(closing)
break;
+ if(n == 0)
+ werrstr("short read");
error("i/o error on server channel");
}
if(x == nil){
blob - f892640a27e28e1daceefd8555e14051fbafa9aa
blob + ce2f772fa55e854f4daf53fc0e1cc4eecbcee703
--- src/cmd/acme/look.c
+++ src/cmd/acme/look.c
#include "dat.h"
#include "fns.h"
+#define debug 0
+
FsFid *plumbsendfid;
FsFid *plumbeditfid;
b = nil;
if(t==nil || t->w==nil)
goto Rescue;
+ if(n>=1 && r[0]=='$')
+ expandenv(&r, &n);
nt = t->w->tag.file->b.nc;
if(nt == 0)
goto Rescue;
- if(n>=1 && r[0]=='/')
+ if(n>=1 && r[0]=='/')
goto Rescue;
b = runemalloc(nt+n+1);
bufread(&t->w->tag.file->b, 0, b, nt);
}
if(slash < 0)
goto Rescue;
- runemove(b+slash+1, r, n);
+ slash++;
+ if(expandenv(&b, &slash))
+ b = runerealloc(b, slash+n);
+ runemove(b+slash, r, n);
free(r);
- return cleanrname(runestr(b, slash+1+n));
+ return cleanrname(runestr(b, slash+n));
Rescue:
free(b);
n = q1-q0;
if(n == 0)
return FALSE;
+
/* see if it's a file name */
- r = runemalloc(n);
+ r = runemalloc(n+1); /* +1 for $ below */
bufread(&t->file->b, q0, r, n);
+
/* first, does it have bad chars? */
nname = -1;
for(i=0; i<n; i++){
}
if(nname == -1)
nname = n;
- for(i=0; i<nname; i++)
+ for(i=0; i<nname; i++){
+ if(i==0 && r[0]=='$')
+ continue;
if(!isfilec(r[i]))
goto Isntfile;
+ }
+
/*
* See if it's a file name in <>, and turn that into an include
* file name if so. Should probably do it for "" too, but that's not
else if(amin == q0)
goto Isfile;
else{
- rs = dirname(t, r, nname);
- r = rs.r;
- nname = rs.nr;
+ if(debug) fprint(2, "x1 %.*S\n", nname, r);
+ if(r[0] != '$'){
+ rs = dirname(t, r, nname);
+ r = rs.r;
+ nname = rs.nr;
+ if(debug) fprint(2, "x1.5 %.*S\n", nname, r);
+ }
+ if(r[0]=='$')
+ expandenv(&r, &nname);
+ if(debug) fprint(2, "x2 %.*S\n", nname, r);
}
+
e->bname = runetobyte(r, nname);
/* if it's already a window name, it's a file */
w = lookfile(r, nname);
blob - f72a5bf90244e53039f21c9c7b9768c79aadea00
blob + f4747c623d4d4edef86230a057cbf068eab36b15
--- src/cmd/acme/util.c
+++ src/cmd/acme/util.c
colgrow(w->col, w, 1);
return w;
}
+
blob - 90c440707ddd2fb77f95c7d9ab83ca782d276fa8
blob + 96e2fb706db26a188c0307a4548fba8c14a1d175
--- src/cmd/acme/wind.c
+++ src/cmd/acme/wind.c
int i;
static Rune Lslashguide[] = { '/', 'g', 'u', 'i', 'd', 'e', 0 };
static Rune Lpluserrors[] = { '+', 'E', 'r', 'r', 'o', 'r', 's', 0 };
+
t = &w->body;
if(runeeq(t->file->name, t->file->nname, name, n) == TRUE)
return;
void
winsettag1(Window *w)
{
- int i, j, k, n, bar, dirty;
- Rune *new, *old, *r;
+ int i, j, k, n, ntagname, bar, dirty;
+ Rune *new, *old, *tagname, *r;
Image *b;
uint q0, q1;
Rectangle br;
static Rune Lput[] = { ' ', 'P', 'u', 't', 0 };
static Rune Llook[] = { ' ', 'L', 'o', 'o', 'k', ' ', 0 };
static Rune Lpipe[] = { ' ', '|', 0 };
+
/* there are races that get us here with stuff in the tag cache, so we take extra care to sync it */
if(w->tag.ncache!=0 || w->tag.file->mod)
wincommit(w, &w->tag); /* check file name; also guarantees we can modify tag contents */
for(i=0; i<w->tag.file->b.nc; i++)
if(old[i]==' ' || old[i]=='\t')
break;
- if(runeeq(old, i, w->body.file->name, w->body.file->nname) == FALSE){
+
+ /* make sure the file name is set correctly in the tag */
+ ntagname = w->body.file->nname;
+ tagname = runemalloc(ntagname);
+ runemove(tagname, w->body.file->name, ntagname);
+ abbrevenv(&tagname, &ntagname);
+
+ if(runeeq(old, i, tagname, ntagname) == FALSE){
textdelete(&w->tag, 0, i, TRUE);
- textinsert(&w->tag, 0, w->body.file->name, w->body.file->nname, TRUE);
+ textinsert(&w->tag, 0, tagname, ntagname, TRUE);
free(old);
old = runemalloc(w->tag.file->b.nc+1);
bufread(&w->tag.file->b, 0, old, w->tag.file->b.nc);
old[w->tag.file->b.nc] = '\0';
}
- new = runemalloc(w->body.file->nname+100);
+
+ /* compute the text for the whole tag, replacing current only if it differs */
+ new = runemalloc(ntagname+100);
i = 0;
- runemove(new+i, w->body.file->name, w->body.file->nname);
- i += w->body.file->nname;
+ runemove(new+i, tagname, ntagname);
+ i += ntagname;
runemove(new+i, Ldelsnarf, 10);
i += 10;
if(w->filemenu){
if(runestrlen(new) != i)
fprint(2, "s '%S' len not %d\n", new, i);
assert(i==runestrlen(new));
+
+ /* replace tag if the new one is different */
if(runeeq(new, i, old, k) == FALSE){
n = k;
if(n > i)
}
}
}
+ free(tagname);
free(old);
free(new);
w->tag.file->mod = FALSE;
for(i=0; i<w->tag.file->b.nc; i++)
if(r[i]==' ' || r[i]=='\t')
break;
+ expandenv(&r, &i);
if(runeeq(r, i, w->body.file->name, w->body.file->nname) == FALSE){
seq++;
filemark(w->body.file);
sendp(x->c, nil);
}
}
+
+int
+expandenv(Rune **rp, uint *np)
+{
+ char *s, *t;
+ Rune *p, *r, *q;
+ uint n, pref;
+ int nb, nr, slash;
+ Runestr rs;
+
+ r = *rp;
+ n = *np;
+ if(n == 0 || r[0] != '$')
+ return FALSE;
+ for(p=r+1; *p && *p != '/'; p++)
+ ;
+ pref = p-r;
+ s = runetobyte(r+1, pref-1);
+ if((t = getenv(s)) == nil){
+ free(s);
+ return FALSE;
+ }
+
+ q = runemalloc(utflen(t)+(n-pref));
+ cvttorunes(t, strlen(t), q, &nb, &nr, nil);
+ assert(nr==utflen(t));
+ runemove(q+nr, p, n-pref);
+ free(r);
+ rs = runestr(q, nr+(n-pref));
+ slash = rs.nr>0 && q[rs.nr-1] == '/';
+ rs = cleanrname(rs);
+ if(slash){
+ rs.r = runerealloc(rs.r, rs.nr+1);
+ rs.r[rs.nr++] = '/';
+ }
+ *rp = rs.r;
+ *np = rs.nr;
+ return TRUE;
+}
+
+extern char **environ;
+Rune **runeenv;
+
+/*
+ * Weird sort order -- shorter names first,
+ * prefer lowercase over uppercase ($home over $HOME),
+ * then do normal string comparison.
+ */
+int
+runeenvcmp(const void *va, const void *vb)
+{
+ Rune *a, *b;
+ int na, nb;
+
+ a = *(Rune**)va;
+ b = *(Rune**)vb;
+ na = runestrchr(a, '=') - a;
+ nb = runestrchr(b, '=') - b;
+ if(na < nb)
+ return -1;
+ if(nb > na)
+ return 1;
+ if(na == 0)
+ return 0;
+ if(islowerrune(a[0]) && !islowerrune(b[0]))
+ return -1;
+ if(islowerrune(b[0]) && !islowerrune(a[0]))
+ return 1;
+ return runestrncmp(a, b, na);
+}
+
+void
+mkruneenv(void)
+{
+ int i, bad, n, nr;
+ char *p;
+ Rune *r, *q;
+
+ n = 0;
+ for(i=0; environ[i]; i++){
+ /*
+ * Ignore some pollution.
+ */
+ if(environ[i][0] == '_')
+ continue;
+ if(strncmp(environ[i], "PWD=", 4) == 0)
+ continue;
+ if(strncmp(environ[i], "OLDPWD=", 7) == 0)
+ continue;
+
+ /*
+ * Must be a rooted path.
+ */
+ if((p = strchr(environ[i], '=')) == nil || *(p+1) != '/')
+ continue;
+
+ /*
+ * Only use the ones that we accept in look - all isfilec
+ */
+ bad = 0;
+ r = bytetorune(environ[i], &nr);
+ for(q=r; *q != '='; q++)
+ if(!isfilec(*q)){
+ free(r);
+ bad = 1;
+ break;
+ }
+ if(!bad){
+ runeenv = erealloc(runeenv, (n+1)*sizeof(runeenv[0]));
+ runeenv[n++] = r;
+ }
+ }
+ runeenv = erealloc(runeenv, (n+1)*sizeof(runeenv[0]));
+ runeenv[n] = nil;
+ qsort(runeenv, n, sizeof(runeenv[0]), runeenvcmp);
+}
+
+int
+abbrevenv(Rune **rp, uint *np)
+{
+ int i, len, alen;
+ Rune *r, *p, *q;
+ uint n;
+
+ r = *rp;
+ n = *np;
+ if(n == 0 || r[0] != '/')
+ return FALSE;
+
+ if(runeenv == nil)
+ mkruneenv();
+
+ for(i=0; runeenv[i]; i++){
+ p = runestrchr(runeenv[i], '=')+1;
+ len = runestrlen(p);
+ if(len <= n && (r[len]==0 || r[len]=='/') && runeeq(r, len, p, len)==TRUE){
+ alen = (p-1) - runeenv[i];
+ q = runemalloc(1+alen+n-len);
+ q[0] = '$';
+ runemove(q+1, runeenv[i], alen);
+ runemove(q+1+alen, r+len, n-len);
+ free(r);
+ *rp = q;
+ *np = 1+alen+n-len;
+ return TRUE;
+ }
+ }
+ return FALSE;
+}
+
