From e524e8d65a7573c46d7beb49e77bfc2d55a5563d Mon Sep 17 00:00:00 2001 From: amavect Date: Sat, 14 Aug 2021 19:50:23 +0000 Subject: exportfs: make -d log to stderr exportfs -d logs 9p traffic to /tmp/exportdb. -f allows writing to a different file. exportfs silently continues if it doesn't have permissions to create or write to /tmp/exportdb. These are poor behaviors. A better default is to write to stderr, since it is 9P debug info that is better immediately printed, and not user info that is better handled by syslog(). As a result, -f is obsolete and thus removed. Redirect responsibility is now on rc. As a side effect, rc will fail if it doesn't have permissions to write. exportfs(4) is updated to reflect all changes and with a better Synopsis. --- sys/src/cmd/exportfs/exportfs.c | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) (limited to 'sys/src/cmd/exportfs/exportfs.c') diff --git a/sys/src/cmd/exportfs/exportfs.c b/sys/src/cmd/exportfs/exportfs.c index b17cec499..86680e1f6 100644 --- a/sys/src/cmd/exportfs/exportfs.c +++ b/sys/src/cmd/exportfs/exportfs.c @@ -10,18 +10,16 @@ int readonly; void usage(void) { - fprint(2, "usage: %s [-dsR] [-f dbgfile] [-m msize] [-r root] " - "[-S srvfile] [-P exclusion-file]\n", argv0); + fprint(2, "usage: %s [-dsR] [-m msize] [-r root] " + "[-P patternfile] [-S srvfile]\n", argv0); fatal("usage"); } void main(int argc, char **argv) { - char *dbfile, *srv, *srvfdfile; - int n; + char *srv, *srvfdfile; - dbfile = "/tmp/exportdb"; srv = nil; srvfd = -1; srvfdfile = nil; @@ -31,10 +29,6 @@ main(int argc, char **argv) dbg++; break; - case 'f': - dbfile = EARGF(usage()); - break; - case 'm': messagesize = strtoul(EARGF(usage()), nil, 0); break; @@ -82,13 +76,7 @@ main(int argc, char **argv) exclusions(); - if(dbg) { - n = create(dbfile, OWRITE|OTRUNC, 0666); - dup(n, DFD); - close(n); - } - - DEBUG(DFD, "exportfs: started\n"); + DEBUG(2, "exportfs: started\n"); rfork(RFNOTEG|RFREND); @@ -106,13 +94,13 @@ main(int argc, char **argv) char ebuf[ERRMAX]; ebuf[0] = '\0'; errstr(ebuf, sizeof ebuf); - DEBUG(DFD, "chdir(\"%s\"): %s\n", srv, ebuf); + DEBUG(2, "chdir(\"%s\"): %s\n", srv, ebuf); mounterror(ebuf); } - DEBUG(DFD, "invoked as server for %s", srv); + DEBUG(2, "invoked as server for %s", srv); } - DEBUG(DFD, "\niniting root\n"); + DEBUG(2, "\niniting root\n"); initroot(); io(); } -- cgit v1.2.3