From ba20914d0158f7d5551785b1382efeaae98919cb Mon Sep 17 00:00:00 2001
From: cinap_lenrek <cinap_lenrek@felloff.net>
Date: Sat, 19 Dec 2020 15:50:30 +0100
Subject: acme: use global user string variable instead of getuser()

---
 sys/src/cmd/acme/acme.c | 2 +-
 sys/src/cmd/acme/dat.h  | 1 +
 sys/src/cmd/acme/disk.c | 2 +-
 sys/src/cmd/acme/rows.c | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'sys/src')

diff --git a/sys/src/cmd/acme/acme.c b/sys/src/cmd/acme/acme.c
index e874d3554..f26d23143 100644
--- a/sys/src/cmd/acme/acme.c
+++ b/sys/src/cmd/acme/acme.c
@@ -329,7 +329,7 @@ acmeerrorinit(void)
 
 	if(pipe(pfd) < 0)
 		error("can't create pipe");
-	sprint(acmeerrorfile, "/srv/acme.%s.%d", getuser(), mainpid);
+	sprint(acmeerrorfile, "/srv/acme.%s.%d", user, mainpid);
 	fd = create(acmeerrorfile, OWRITE, 0666);
 	if(fd < 0){
 		remove(acmeerrorfile);
diff --git a/sys/src/cmd/acme/dat.h b/sys/src/cmd/acme/dat.h
index 4739acc49..dfdb2413c 100644
--- a/sys/src/cmd/acme/dat.h
+++ b/sys/src/cmd/acme/dat.h
@@ -538,6 +538,7 @@ Column		*activecol;
 Buffer		snarfbuf;
 Rectangle		nullrect;
 int			fsyspid;
+char			*user;
 char			*cputype;
 char			*objtype;
 char			*home;
diff --git a/sys/src/cmd/acme/disk.c b/sys/src/cmd/acme/disk.c
index 8eb461a49..355c74281 100644
--- a/sys/src/cmd/acme/disk.c
+++ b/sys/src/cmd/acme/disk.c
@@ -19,7 +19,7 @@ tempfile(void)
 	char buf[128];
 	int i, fd;
 
-	snprint(buf, sizeof buf, "/tmp/X%d.%.4sacme", getpid(), getuser());
+	snprint(buf, sizeof buf, "/tmp/X%d.%.4sacme", getpid(), user);
 	for(i='A'; i<='Z'; i++){
 		buf[5] = i;
 		if(access(buf, AEXIST) == 0)
diff --git a/sys/src/cmd/acme/rows.c b/sys/src/cmd/acme/rows.c
index 9c2b64000..f26327072 100644
--- a/sys/src/cmd/acme/rows.c
+++ b/sys/src/cmd/acme/rows.c
@@ -667,7 +667,7 @@ rowload(Row *row, char *file, int initing)
 		textinsert(&w->tag, w->tag.file->nc, r+n+1, nr-(n+1), TRUE);
 		if(ndumped >= 0){
 			/* simplest thing is to put it in a file and load that */
-			sprint(buf, "/tmp/d%d.%.4sacme", getpid(), getuser());
+			sprint(buf, "/tmp/d%d.%.4sacme", getpid(), user);
 			fd = create(buf, OWRITE|ORCLOSE, 0600);
 			if(fd < 0){
 				free(r);
-- 
cgit v1.2.3