diff options
author | kcwu <kcwu@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2005-02-10 16:11:48 +0800 |
---|---|---|
committer | kcwu <kcwu@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2005-02-10 16:11:48 +0800 |
commit | a217ab596a269fa0d681a908fa2e41d6667464ee (patch) | |
tree | fc60dda7c01ef0558a0f96b57283f65b9518b22e | |
parent | edb1ab8186f0fdf6cb783186468edf39775ae1bc (diff) | |
download | pttbbs-a217ab596a269fa0d681a908fa2e41d6667464ee.tar pttbbs-a217ab596a269fa0d681a908fa2e41d6667464ee.tar.gz pttbbs-a217ab596a269fa0d681a908fa2e41d6667464ee.tar.bz2 pttbbs-a217ab596a269fa0d681a908fa2e41d6667464ee.tar.lz pttbbs-a217ab596a269fa0d681a908fa2e41d6667464ee.tar.xz pttbbs-a217ab596a269fa0d681a908fa2e41d6667464ee.tar.zst pttbbs-a217ab596a269fa0d681a908fa2e41d6667464ee.zip |
make valgrind happy
git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@2490 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
-rw-r--r-- | mbbsd/mbbsd.c | 10 | ||||
-rw-r--r-- | mbbsd/more.c | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/mbbsd/mbbsd.c b/mbbsd/mbbsd.c index 2a6d71e1..7d8b2839 100644 --- a/mbbsd/mbbsd.c +++ b/mbbsd/mbbsd.c @@ -59,6 +59,7 @@ start_daemon() #endif /* rocker.011018: it's a good idea to close all unexcept fd!! */ +#ifndef VALGRIND n = getdtablesize(); while (n) close(--n); @@ -68,6 +69,7 @@ start_daemon() dup2(fd, 2); close(fd); } +#endif if(getenv("SSH_CLIENT")) unsetenv("SSH_CLIENT"); @@ -196,7 +198,9 @@ abort_bbs_debug(int sig) reentrant = 1; if (currmode) u_exit("AXXED"); +#ifndef VALGRIND setproctitle("debug me!(%d)(%s,%d)", sig, cuser.userid, currstat); +#endif sleep(3600); /* wait 60 mins for debug */ } #endif @@ -900,7 +904,9 @@ user_login() } log_usies("ENTER", fromhost); +#ifndef VALGRIND setproctitle("%s: %s", margs, cuser.userid); +#endif resolve_fcache(); /* resolve_boards(); */ numboards = SHM->Bnumber; @@ -1350,7 +1356,9 @@ daemon_login(int argc, char *argv[], char *envp[]) exit(1); } initsetproctitle(argc, argv, envp); +#ifndef VALGRIND setproctitle("%s: listening ", margs); +#endif /* Give up root privileges: no way back from here */ setgid(BBSGID); @@ -1433,7 +1441,9 @@ daemon_login(int argc, char *argv[], char *envp[]) } /* here is only child running */ +#ifndef VALGRIND setproctitle("%s: ...login wait... ", margs); +#endif close(msock); dup2(csock, 0); close(csock); diff --git a/mbbsd/more.c b/mbbsd/more.c index 342d457b..dfa7761c 100644 --- a/mbbsd/more.c +++ b/mbbsd/more.c @@ -227,7 +227,7 @@ more(char *fpath, int promptend) word = NULL; } /* ※處理引用者 & 引言 */ - if ((buf[1] == ' ') && (buf[0] == ':' || buf[0] == '>')) + if ((buf[0] == ':' || buf[0] == '>') && (buf[1] == ' ')) word = "\033[36m"; else if (!strncmp(buf, "※", 2) || !strncmp(buf, "==>", 3)) word = "\033[32m"; |