Re: [9front] make faces generic

[ori@eigenstate.org]

I like the idea of a generic faces. I'm going
to look pretty closely at this.

Breaking compatibility is a pain, so if this
goes in, we'll probably want to make sure its
something that gets used.

> Hello,
> 
> When sending the previous email I found a bug in acme mail related to this patch (I only use acme mail to send mail.) The below patch is the same as the previous one and also fixes acme mail.
> 
> diff -r e05e4b6c6546 rc/bin/ircrc
> --- a/rc/bin/ircrc	Mon Oct 12 02:03:52 2020 +0200
> +++ b/rc/bin/ircrc	Wed Oct 14 19:02:10 2020 -0500
> @@ -169,6 +169,14 @@
>  		switch ($line) {
>  		case *PRIVMSG*
>  			line = `{echo -n $line | privmsg}
> +			switch($line) {
> +			case *^$nick^*
> +				digest = ircrc.$pid.`{date -n}
> +				sender = `{echo -n $line | sed 'y/«»/  /' | awk '{print $2}'}
> +				data = `{echo -n $line | sed 'y/()/  /' | awk '{print $1}'}
> +				winid = `{cat /dev/winid}
> +				plumb -dnotify -a 'digest='^$digest^' dst=irc sender='^$sender^'@'^$server^' winid='^$winid^' date='''^`"{date}^'''' -s ircrc $data
> +			}
>  		case *JOIN* *QUIT* *PART* *NICK*
>  			line = `{echo -n $line | misc}
>  		case *NOTICE*
> diff -r e05e4b6c6546 rc/bin/vwhois
> --- a/rc/bin/vwhois	Mon Oct 12 02:03:52 2020 +0200
> +++ b/rc/bin/vwhois	Wed Oct 14 19:02:10 2020 -0500
> @@ -2,16 +2,5 @@
>  
>  rfork e
>  
> -box=mbox
> -if(! test -d /mail/fs/$box)
> -	box=`{ls -p /mail/fs | grep -v ctl | sed 1q}
> -if(~ $#box 0)
> -	box=mbox	# we tried
> -
> -if(~ $#box 1 && test -f /mnt/plumb/seemail || test -f /mnt/term/mnt/plumb/seemail){
> -	for(i)
> -		plumb -dseemail -a 'filetype=vwhois digest='$i.$pid' mailtype=new sender='$i /mail/fs/$box/XXXvwhois
> -}
> -if not for (i){
> -	echo vwhois: vwhois: vwhois: delivered `{cat /dev/user} From $i '(vwho)' >> /sys/log/mail
> -}
> +for(i)
> +	plumb -dnotify -a 'digest='$i.$pid' sender='$i /XXXvwhois
> diff -r e05e4b6c6546 sys/lib/plumb/basic
> --- a/sys/lib/plumb/basic	Mon Oct 12 02:03:52 2020 +0200
> +++ b/sys/lib/plumb/basic	Wed Oct 14 19:02:10 2020 -0500
> @@ -4,8 +4,8 @@
>  include fileaddr
>  
>  # declarations of ports without rules
> -plumb to seemail
>  plumb to showmail
> +plumb to notify
>  
>  # open urls with web browser
>  type is text
> diff -r e05e4b6c6546 sys/src/cmd/faces/facedb.c
> --- a/sys/src/cmd/faces/facedb.c	Mon Oct 12 02:03:52 2020 +0200
> +++ b/sys/src/cmd/faces/facedb.c	Wed Oct 14 19:02:10 2020 -0500
> @@ -315,14 +315,14 @@
>  }
>  
>  static char*
> -tryfindfile(char *dom, char *user)
> +tryfindfile(char *dom, char *user, char *facedir)
>  {
>  	char *p;
>  
>  	while(dom && *dom){
>  		if(homeface && (p = tryfindfiledir(dom, user, homeface)) != nil)
>  			return p;
> -		if((p = tryfindfiledir(dom, user, "/lib/face")) != nil)
> +		if((p = tryfindfiledir(dom, user, facedir)) != nil)
>  			return p;
>  		if((dom = strchr(dom, '.')) == nil)
>  			break;
> @@ -351,13 +351,13 @@
>  	}
>  
>  	f->unknown = 0;
> -	if((p = tryfindfile(dom, user)) != nil)
> +	if((p = tryfindfile(dom, user, f->str[Sfacedir])) != nil)
>  		return p;
>  	f->unknown = 1;
> -	p = tryfindfile(dom, "unknown");
> +	p = tryfindfile(dom, "unknown", f->str[Sfacedir]);
>  	if(p != nil || strcmp(dom, facedom) == 0)
>  		return p;
> -	return tryfindfile("unknown", "unknown");
> +	return tryfindfile("unknown", "unknown", f->str[Sfacedir]);
>  }
>  
>  static
> diff -r e05e4b6c6546 sys/src/cmd/faces/faces.h
> --- a/sys/src/cmd/faces/faces.h	Mon Oct 12 02:03:52 2020 +0200
> +++ b/sys/src/cmd/faces/faces.h	Wed Oct 14 19:02:10 2020 -0500
> @@ -4,6 +4,11 @@
>  	Sdomain,
>  	Sshow,
>  	Sdigest,
> +	Sdst,
> +	Sfacedir,
> +	Sattrs,
> +	Swdir,
> +	Swinid,
>  	Nstring
>  };
>  
> @@ -42,9 +47,6 @@
>  };
>  
>  extern char	date[];
> -extern char	*maildir;
> -extern char	**maildirs;
> -extern int	nmaildirs;
>  
>  Face*	nextface(void);
>  void	findbit(Face*);
> @@ -54,7 +56,6 @@
>  void	showmail(Face*);
>  void	delete(char*, char*);
>  void	freefacefile(Facefile*);
> -Face*	dirface(char*, char*);
>  void	resized(void);
>  int	alreadyseen(char*);
>  ulong	dirlen(char*);
> @@ -63,4 +64,3 @@
>  void	*erealloc(void*, ulong);
>  char	*estrdup(char*);
>  char	*findfile(Face*, char*, char*);
> -void	addmaildir(char*);
> diff -r e05e4b6c6546 sys/src/cmd/faces/main.c
> --- a/sys/src/cmd/faces/main.c	Mon Oct 12 02:03:52 2020 +0200
> +++ b/sys/src/cmd/faces/main.c	Wed Oct 14 19:02:10 2020 -0500
> @@ -7,9 +7,6 @@
>  #include <bio.h>
>  #include "faces.h"
>  
> -int	history = 0;	/* use old interface, showing history of mailbox rather than current state */
> -int	initload = 0;	/* initialize program with contents of mail box */
> -
>  enum
>  {
>  	Facesep = 6,	/* must be even to avoid damaging background stipple */
> @@ -68,7 +65,6 @@
>  
>  char	date[64];
>  Face	**faces;
> -char	*maildir = "/mail/fs/mbox";
>  ulong	now;
>  
>  Point	datep = { 8, 6 };
> @@ -163,7 +159,7 @@
>  	Face *f;
>  
>  	if(!digest)
> -		return 0;
> +		return 1;
>  
>  	/* can do accurate check */
>  	for(i=0; i<nfaces; i++){
> @@ -358,25 +354,6 @@
>  }
>  
>  void
> -loadmboxfaces(char *maildir)
> -{
> -	int dirfd;
> -	Dir *d;
> -	int i, n;
> -
> -	dirfd = open(maildir, OREAD);
> -	if(dirfd >= 0){
> -		chdir(maildir);
> -		while((n = dirread(dirfd, &d)) > 0){
> -			for(i=0; i<n; i++)
> -				addface(dirface(maildir, d[i].name));
> -			free(d);
> -		}
> -		close(dirfd);
> -	}
> -}
> -
> -void
>  freeface(Face *f)
>  {
>  	int i;
> @@ -435,16 +412,8 @@
>  void
>  dodelete(int i)
>  {
> -	Face *f;
> -
> -	f = faces[i];
> -	if(history){
> -		free(f->str[Sshow]);
> -		f->str[Sshow] = estrdup("");
> -	}else{
> -		delface(i);
> -		flushimage(display, 1);
> -	}
> +	delface(i);
> +	flushimage(display, 1);
>  }
>  
>  void
> @@ -586,25 +555,12 @@
>  	case 1:
>  		if(scroll(1, p))
>  			break;
> -		if(history){
> -			/* click clears display */
> -			lockdisplay(display);
> -			for(i=0; i<nfaces; i++)
> -				freeface(faces[i]);
> -			free(faces);
> -			faces=nil;
> -			nfaces = 0;
> -			unlockdisplay(display);
> -			eresized(0);
> -			return;
> -		}else{
> -			for(i=first; i<last; i++)	/* clear vwhois faces */
> -				if(ptinrect(p, facerect(i-first)) 
> -				&& strstr(faces[i]->str[Sshow], "/XXXvwhois")){
> -					delface(i);
> -					flushimage(display, 1);
> -				}
> -		}
> +		for(i=first; i<last; i++)	/* clear vwhois faces */
> +			if(ptinrect(p, facerect(i-first)) 
> +			&& strstr(faces[i]->str[Sshow], "/XXXvwhois")){
> +				delface(i);
> +				flushimage(display, 1);
> +			}
>  		break;
>  	case 2:
>  		scroll(2, p);
> @@ -675,26 +631,14 @@
>  void
>  usage(void)
>  {
> -	fprint(2, "usage: faces [-hi] [-m maildir]\n");
> +	fprint(2, "usage: faces\n");
>  	exits("usage");
>  }
>  
>  void
>  main(int argc, char *argv[])
>  {
> -	int i;
> -
>  	ARGBEGIN{
> -	case 'h':
> -		history++;
> -		break;
> -	case 'i':
> -		initload++;
> -		break;
> -	case 'm':
> -		addmaildir(EARGF(usage()));
> -		maildir = nil;
> -		break;
>  	default:
>  		usage();
>  	}ARGEND
> @@ -703,8 +647,6 @@
>  		fprint(2, "faces: initdraw failed: %r\n");
>  		exits("initdraw");
>  	}
> -	if(maildir)
> -		addmaildir(maildir);
>  	init();
>  	unlockdisplay(display);	/* initdraw leaves it locked */
>  	display->locking = 1;	/* tell library we're using the display lock */
> @@ -714,9 +656,6 @@
>  	pids[Mainp] = getpid();
>  	startproc(timeproc, Timep);
>  	startproc(mouseproc, Mousep);
> -	if(initload)
> -		for(i = 0; i < nmaildirs; i++)
> -		 loadmboxfaces(maildirs[i]);
>  	faceproc();
>  	fprint(2, "faces: %s process exits\n", procnames[Mainp]);
>  	killall(nil);
> diff -r e05e4b6c6546 sys/src/cmd/faces/plumb.c
> --- a/sys/src/cmd/faces/plumb.c	Mon Oct 12 02:03:52 2020 +0200
> +++ b/sys/src/cmd/faces/plumb.c	Wed Oct 14 19:02:10 2020 -0500
> @@ -6,53 +6,56 @@
>  #include <bio.h>
>  #include "faces.h"
>  
> -static int	showfd = -1;
> -static int	seefd = -1;
> +static int		notefd = -1;
> +static int		showfd = -1;
>  static char	*user;
> -
> -char		**maildirs;
> -int		nmaildirs;
> +static char	*logtag;
>  
>  void
>  initplumb(void)
>  {
>  	if((showfd = plumbopen("send", OWRITE)) == -1)
>  		sysfatal("plumbopen send: %r");
> -	if((seefd = plumbopen("seemail", OREAD)) == -1)
> -		sysfatal("plumbopen seemail: %r");
> -}
> -
> -void
> -addmaildir(char *dir)
> -{
> -	maildirs = erealloc(maildirs, (nmaildirs+1)*sizeof(char*));
> -	maildirs[nmaildirs++] = dir;
> -}
> -
> -char*
> -attr(Face *f)
> -{
> -	static char buf[128];
> -
> -	if(f->str[Sdigest]){
> -		snprint(buf, sizeof buf, "digest=%s", f->str[Sdigest]);
> -		return buf;
> +	if((notefd = plumbopen("notify", OREAD)) == -1){
> +		sysfatal("plumbopen notify: %r);
>  	}
> -	return nil;
>  }
>  
>  void
>  showmail(Face *f)
>  {
> -	char *s;
> -	int n;
> +	char *s, buf[73], *fields[6];
> +	int n, len, wctl;
>  
> -	if(showfd<0 || f->str[Sshow]==nil || f->str[Sshow][0]=='\0')
> +	if(f->str[Sshow]==nil || f->str[Sshow][0]=='\0')
>  		return;
> -	s = emalloc(128+strlen(f->str[Sshow])+1);
> -	n = sprint(s, "faces\nshowmail\n/mail/fs/\ntext\n%s\n%ld\n%s", attr(f), strlen(f->str[Sshow]), f->str[Sshow]);
> -	write(showfd, s, n);
> -	free(s);
> +	if(f->str[Swinid][0] != '0'){
> +		snprint(buf, 73, "/dev/wsys/%s/wctl", f->str[Swinid]);
> +		wctl = open(buf, ORDWR);
> +		if(wctl < 0)
> +			return;
> +		if(read(wctl, buf, 72) != 72){
> +			close(wctl);
> +			return;
> +		}
> +		buf[72] = '\0';
> +		if(tokenize(buf, fields, 6) != 6){
> +			close(wctl);
> +			return;
> +		}
> +		if(strcmp(fields[5], "hidden") == 0)
> +			write(wctl, "unhide", 6);
> +		else
> +			write(wctl, "current", 7);
> +		close(wctl);
> +	}
> +	else {
> +		len = 128+strlen(f->str[Sdst])+strlen(f->str[Swdir])+strlen(f->str[Sattrs])+strlen(f->str[Sshow])+1;
> +		s = emalloc(len);
> +		n = snprint(s, len, "faces\n%s\n%s\ntext\n%s\n%ld\n%s", f->str[Sdst], f->str[Swdir], f->str[Sattrs], strlen(f->str[Sshow]), f->str[Sshow]);
> +		write(showfd, s, n);
> +		free(s);
> +	}
>  }
>  
>  char*
> @@ -69,7 +72,7 @@
>  void
>  setname(Face *f, char *sender)
>  {
> -	char *at, *bang;
> +	char *at;
>  	char *p;
>  
>  	/* works with UTF-8, although it's written as ASCII */
> @@ -82,13 +85,6 @@
>  		f->str[Sdomain] = estrdup(at);
>  		return;
>  	}
> -	bang = strchr(sender, '!');
> -	if(bang){
> -		*bang++ = '\0';
> -		f->str[Suser] = estrdup(bang);
> -		f->str[Sdomain] = sender;
> -		return;
> -	}
>  }
>  
>  ulong
> @@ -123,117 +119,57 @@
>  Face*
>  nextface(void)
>  {
> -	int i;
>  	Face *f;
>  	Plumbmsg *m;
> -	char *t, *senderp, *showmailp, *digestp;
> +	char *senderp, *showmailp, *digestp, *dstp, *facep, *winid;
>  	ulong xtime;
> +	Dir *facedir;
>  
>  	f = emalloc(sizeof(Face));
>  	for(;;){
> -		m = plumbrecv(seefd);
> +		m = plumbrecv(notefd);
>  		if(m == nil)
> -			killall("error on seemail plumb port");
> -		t = value(m->attr, "mailtype", "");
> -		if(strcmp(t, "modify") == 0)
> -			goto Ignore;
> -		else if(strcmp(t, "delete") == 0)
> -			delete(m->data, value(m->attr, "digest", nil));
> -		else if(strcmp(t, "new") == 0)
> -			for(i=0; i<nmaildirs; i++){
> -				if(strncmp(m->data, maildirs[i], strlen(maildirs[i])) == 0)
> -					goto Found;
> -			}
> -		else
> -			fprint(2, "faces: unknown plumb message type %s\n", t);
> -	Ignore:
> -		plumbfree(m);
> -		continue;
> -
> -	Found:
> -		xtime = parsedate(value(m->attr, "date", date));
> -		digestp = value(m->attr, "digest", nil);
> +			killall("error on notify plumb port");
> +		digestp = estrdup(value(m->attr, "digest", "inedible"));
>  		if(alreadyseen(digestp)){
> -			/* duplicate upas/fs can send duplicate messages */
> +			/* duplicate programs can send duplicate messages */
>  			plumbfree(m);
>  			continue;
>  		}
> -		senderp = estrdup(value(m->attr, "sender", "???"));
> +		facep = estrdup(value(m->attr, "facedir", "/lib/face"));
> +		if(access(facep, AEXIST) == 0){
> +			facedir = dirstat(facep);
> +			if(facedir == nil){
> +				plumbfree(m);
> +				continue;
> +			}
> +			if(facedir->qid.type != QTDIR){
> +				free(facedir);
> +				plumbfree(m);
> +				continue;
> +			}
> +			free(facedir);
> +		}
> +		else {
> +			plumbfree(m);
> +			continue;
> +		}
> +		dstp = estrdup(value(m->attr, "dst", "none"));
> +		senderp = estrdup(value(m->attr, "sender", "unknown"));
> +		winid = estrdup(value(m->attr, "winid", "0"));
> +		xtime = parsedate(value(m->attr, "date", date));
>  		showmailp = estrdup(m->data);
> -		if(digestp)
> -			digestp = estrdup(digestp);
> +		f->str[Sattrs] = plumbpackattr(m->attr);
> +		f->str[Swdir] = estrdup(m->wdir);
>  		plumbfree(m);
>  		setname(f, senderp);
>  		f->time = xtime;
>  		f->tm = *localtime(xtime);
>  		f->str[Sshow] = showmailp;
>  		f->str[Sdigest] = digestp;
> +		f->str[Sdst] = dstp;
> +		f->str[Sfacedir] = facep;
> +		f->str[Swinid] = winid;
>  		return f;
>  	}
>  }
> -
> -char*
> -iline(char *data, char **pp)
> -{
> -	char *p;
> -
> -	for(p=data; *p!='\0' && *p!='\n'; p++)
> -		;
> -	if(*p == '\n')
> -		*p++ = '\0';
> -	*pp = p;
> -	return data;
> -}
> -
> -Face*
> -dirface(char *dir, char *num)
> -{
> -	Face *f;
> -	char *from, *date;
> -	char buf[1024], pwd[1024], *info, *p, *digest;
> -	int n, fd;
> -	ulong len;
> -
> -	/*
> -	 * loadmbox leaves us in maildir, so we needn't
> -	 * walk /mail/fs/mbox for each face; this makes startup
> -	 * a fair bit quicker.
> -	 */
> -	if(getwd(pwd, sizeof pwd) != nil && strcmp(pwd, dir) == 0)
> -		sprint(buf, "%s/info", num);
> -	else
> -		sprint(buf, "%s/%s/info", dir, num);
> -	len = dirlen(buf);
> -	if(len <= 0)
> -		return nil;
> -	fd = open(buf, OREAD);
> -	if(fd < 0)
> -		return nil;
> -	info = emalloc(len+1);
> -	n = readn(fd, info, len);
> -	close(fd);
> -	if(n < 0){
> -		free(info);
> -		return nil;
> -	}
> -	info[n] = '\0';
> -	f = emalloc(sizeof(Face));
> -	from = iline(info, &p);	/* from */
> -	iline(p, &p);	/* to */
> -	iline(p, &p);	/* cc */
> -	iline(p, &p);	/* replyto */
> -	date = iline(p, &p);	/* date */
> -	setname(f, estrdup(from));
> -	f->time = parsedate(date);
> -	f->tm = *localtime(f->time);
> -	sprint(buf, "%s/%s", dir, num);
> -	f->str[Sshow] = estrdup(buf);
> -	iline(p, &p);	/* subject */
> -	iline(p, &p);	/* mime content type */
> -	iline(p, &p);	/* mime disposition */
> -	iline(p, &p);	/* filename */
> -	digest = iline(p, &p);	/* digest */
> -	f->str[Sdigest] = estrdup(digest);
> -	free(info);
> -	return f;
> -}
> diff -r e05e4b6c6546 sys/src/cmd/upas/Mail/mail.c
> --- a/sys/src/cmd/upas/Mail/mail.c	Mon Oct 12 02:03:52 2020 +0200
> +++ b/sys/src/cmd/upas/Mail/mail.c	Wed Oct 14 19:02:10 2020 -0500
> @@ -86,7 +86,7 @@
>  
>  	/* open these early so we won't miss notification of new mail messages while we read mbox */
>  	plumbsendfd = plumbopen("send", OWRITE|OCEXEC);
> -	plumbseemailfd = plumbopen("seemail", OREAD|OCEXEC);
> +	plumbseemailfd = plumbopen("notify", OREAD|OCEXEC);
>  	plumbshowmailfd = plumbopen("showmail", OREAD|OCEXEC);
>  
>  	shortmenu = 0;
> diff -r e05e4b6c6546 sys/src/cmd/upas/fs/mbox.c
> --- a/sys/src/cmd/upas/fs/mbox.c	Mon Oct 12 02:03:52 2020 +0200
> +++ b/sys/src/cmd/upas/fs/mbox.c	Wed Oct 14 19:02:10 2020 -0500
> @@ -1547,11 +1547,12 @@
>  static void
>  mailplumb(Mailbox *mb, Message *m)
>  {
> -	char buf[256], dbuf[SHA1dlen*2 + 1], len[10], date[32], *from, *subject;
> +	char buf[256], dbuf[SHA1dlen*2 + 1], len[10], date[32], addr[320], *from, *subject, *bang, *unixfrom;
>  	int ai;
>  	Plumbmsg p;
>  	Plumbattr a[7];
>  	static int fd = -1;
> +	int didflip;
>  
>  	subject = m->subject;
>  	if(subject == nil)
> @@ -1572,8 +1573,27 @@
>  	if(fd < 0)
>  		return;
>  
> +	/* convert uucp address for faces */
> +	didflip = 0;
> +	if(from == m->unixfrom){
> +		unixfrom = strdup(m->unixfrom);
> +		if(unixfrom == nil)
> +			return;
> +		bang = strchr(unixfrom, '!');
> +		*bang++ = '\0';
> +		strcpy(addr, bang);
> +		strcat(addr, "@");
> +		strcat(addr, unixfrom);
> +		from = strdup(addr);
> +		if(from == nil){
> +			free(unixfrom);
> +			return;
> +		}
> +		didflip++;
> +	}
> +
>  	p.src = "mailfs";
> -	p.dst = "seemail";
> +	p.dst = "notify";
>  	p.wdir = "/mail/fs";
>  	p.type = "text";
>  
> @@ -1603,12 +1623,18 @@
>  	a[ai].value = date;
>  	a[ai-1].next = &a[ai];
>  
> -	if(m->digest){
> -		snprint(dbuf, sizeof dbuf, "%A", m->digest);
> -		a[++ai].name = "digest";
> -		a[ai].value = dbuf;
> -		a[ai-1].next = &a[ai];
> -	}
> +	if(m->digest == nil)
> +		digestmessage(mb, m);
> +	snprint(dbuf, sizeof dbuf, "%A", m->digest);
> +	
> +	a[++ai].name = "digest";
> +	a[ai].value = dbuf;
> +	a[ai-1].next = &a[ai];
> +
> +	a[++ai].name = "dst";
> +	a[ai].value = "showmail";
> +	a[ai-1].next = &a[ai];
> +	
>  	a[ai].next = nil;
>  	p.attr = a;
>  	snprint(buf, sizeof buf, "%s/%s/%s",
> @@ -1617,6 +1643,11 @@
>  	p.data = buf;
>  
>  	myplumbsend(fd, &p);
> +
> +	if(didflip != 0){
> +		free(unixfrom);
> +		free(from);
> +	}
>  }
>  
>  /*