diff options
| author | markm <markm@FreeBSD.org> | 2002-03-21 23:42:52 +0000 |
|---|---|---|
| committer | markm <markm@FreeBSD.org> | 2002-03-21 23:42:52 +0000 |
| commit | b38a0011c18c49fcb516cc2b4f5d751565e53f44 (patch) | |
| tree | 1ec99b3b189dcbff75d7f05f7c29bd03c4d795da /contrib/opie/ftpcmd.y | |
| parent | 084b4588f24346b3d369eaf49193461c380e8521 (diff) | |
| download | FreeBSD-src-b38a0011c18c49fcb516cc2b4f5d751565e53f44.zip FreeBSD-src-b38a0011c18c49fcb516cc2b4f5d751565e53f44.tar.gz | |
Resolve conflicts.
Diffstat (limited to 'contrib/opie/ftpcmd.y')
| -rw-r--r-- | contrib/opie/ftpcmd.y | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/contrib/opie/ftpcmd.y b/contrib/opie/ftpcmd.y index ea5bb36..abcffdc 100644 --- a/contrib/opie/ftpcmd.y +++ b/contrib/opie/ftpcmd.y @@ -1,7 +1,7 @@ /* ftpcmd.y: yacc parser for the FTP daemon. %%% portions-copyright-cmetz-96 -Portions of this software are Copyright 1996-1998 by Craig Metz, All Rights +Portions of this software are Copyright 1996-1999 by Craig Metz, All Rights Reserved. The Inner Net License Version 2 applies to these portions of the software. You should have received a copy of the license with this software. If @@ -9,6 +9,7 @@ you didn't get a copy, you may request one from <license@inner.net>. History: + Modified by cmetz for OPIE 2.4. Use DOTITLE rather than SETPROCTITLE. Modified by cmetz for OPIE 2.3. Moved LS_COMMAND here. Modified by cmetz for OPIE 2.2. Fixed a *lot* of warnings. Use FUNCTION declaration et al. Removed useless strings. @@ -964,10 +965,10 @@ int yylex FUNCTION_NOARGS dologout(0); } (void) alarm(0); -#ifdef SETPROCTITLE +#if DOTITLE if (strncasecmp(cbuf, "PASS", 4) != NULL) setproctitle("%s: %s", proctitle, cbuf); -#endif /* SETPROCTITLE */ +#endif /* DOTITLE */ if ((cp = strchr(cbuf, '\r'))) { *cp++ = '\n'; *cp = '\0'; |
