shithub: patch

Info  •  Files  •  Log

mothra, kbdfs: update for latest changes

--- a/kbdfs-fshalt

+++ b/kbdfs-fshalt

@@ -1,6 +1,7 @@

---- //.git/fs/object/90ce513fb0df41c0d6c5cea8dbd612c1859d4392/tree/sys/src/cmd/aux/kbdfs/kbdfs.c

-+++ sys/src/cmd/aux/kbdfs/kbdfs.c

-@@ -348,6 +348,24 @@

+diff 27a63ae22975171efbee5549d100f416ccb4066a uncommitted

+--- a/sys/src/cmd/aux/kbdfs/kbdfs.c

++++ b/sys/src/cmd/aux/kbdfs/kbdfs.c

+@@ -366,6 +366,25 @@

  }

  void

@@ -11,26 +12,28 @@

 +	if(debug)

 +		return;

 +

-+	if(access("#s/cwfs.cmd", AEXIST) == 0 && (fd = eopen("#s/cwfs.cmd", OWRITE)) >= 0){

++	if(access("/srv/cwfs.cmd", AEXIST) == 0 && (fd = eopen("/srv/cwfs.cmd", OWRITE)) >= 0){

 +		fprint(fd, "halt\n");

 +		close(fd);

 +	}

-+	if(access("#s/hjfs.cmd", AEXIST) == 0 && (fd = eopen("#s/hjfs.cmd", OWRITE)) >= 0){

++	if(access("/srv/hjfs.cmd", AEXIST) == 0 && (fd = eopen("/srv/hjfs.cmd", OWRITE)) >= 0){

 +		fprint(fd, "halt\n");

 +		close(fd);

 +	}

++	reboot();

 +}

 +

 +void

- reboot(void)

+ shutdown(void)

  {

- 	int fd;

-@@ -440,6 +458,8 @@

+ 	if(notefd >= 0)

+@@ -443,6 +462,9 @@

+ 

  	if(scan->caps && key.r<='z' && key.r>='a')

  		key.r += 'A' - 'a';

- 

++

 +	if(scan->ctl && scan->altgr && key.r == Kdel)

 +		emergencywarp();

+ 

  	if(scan->ctl && scan->alt && key.r == Kdel){

  		if(scan->shift)

- 			shiftup();

--- a/mothra-font

+++ b/mothra-font

@@ -42,4 +42,4 @@

 +	"terminus/unicode.16", 0, 0,

  };

- Font *pl_whichfont(int f, int s, int *space){

+ static struct{