xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

cs: fix linefeeds in syslog(), cleanup

Browse source
This commit is contained in:
cinap_lenrek 2014-10-29 03:20:43 +01:00
parent fe23dcefd4
commit 4616c93e8d
1 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
sys/src/cmd/ndb/cs.c
View file

@ -251,14 +251,7 @@ main(int argc, char *argv[])
USED(argc); USED(argc);
USED(argv); USED(argv);
rfork(RFREND|RFNOTEG);
snprint(servefile, sizeof(servefile), "#s/cs%s", ext);
snprint(netndb, sizeof(netndb), "%s/ndb", mntpt); snprint(netndb, sizeof(netndb), "%s/ndb", mntpt);
if(!justsetname){
unmount(servefile, mntpt);
remove(servefile);
}
fmtinstall('E', eipfmt); fmtinstall('E', eipfmt);
fmtinstall('I', eipfmt); fmtinstall('I', eipfmt);
@ -269,6 +262,11 @@ main(int argc, char *argv[])
netinit(0); netinit(0);
if(!justsetname){ if(!justsetname){
snprint(servefile, sizeof(servefile), "#s/cs%s", ext);
unmount(servefile, mntpt);
remove(servefile);
rfork(RFREND|RFNOTEG);
csuser = estrdup(getuser()); csuser = estrdup(getuser());
mountinit(servefile, mntpt); mountinit(servefile, mntpt);
io(); io();
@ -1007,7 +1005,7 @@ readipinterfaces(void)
ipmove(ipa, IPnoaddr); ipmove(ipa, IPnoaddr);
sprint(ipaddr, "%I", ipa); sprint(ipaddr, "%I", ipa);
if (debug) if (debug)
syslog(0, logfile, "ipaddr is %s\n", ipaddr); syslog(0, logfile, "ipaddr is %s", ipaddr);
} }
/* /*
@ -1151,7 +1149,7 @@ netinit(int background)
ipid(); ipid();
if(debug) if(debug)
syslog(0, logfile, "mysysname %s eaddr %s ipaddr %s ipa %I\n", syslog(0, logfile, "mysysname %s eaddr %s ipaddr %s ipa %I",
mysysname?mysysname:"???", eaddr, ipaddr, ipa); mysysname?mysysname:"???", eaddr, ipaddr, ipa);
if(background){ if(background){