oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

change -l' flag to use arg_collect (this makes -ll' work again)

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@7186 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1999-10-18 17:19:14 +00:00
parent 386db3e8b0
commit ecf66fc91e
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
appl/ftp/ftpd/ftpd.c
View File

@@ -208,12 +208,25 @@ int use_builtin_ls;
static int help_flag; static int help_flag;
static int version_flag; static int version_flag;
static int
log_collect(int short_flag, int argc, char **argv,
int *optind, int *optarg, void *data)
{
(*(int*)data)++;
return 0;
}
static getarg_collect_info log_collect_info = {
log_collect,
&logflag
};
struct getargs args[] = { struct getargs args[] = {
{ NULL, 'a', arg_string, &auth_string, "required authentication" }, { NULL, 'a', arg_string, &auth_string, "required authentication" },
{ NULL, 'i', arg_flag, &interactive_flag, "don't assume stdin is a socket" }, { NULL, 'i', arg_flag, &interactive_flag, "don't assume stdin is a socket" },
{ NULL, 'p', arg_string, &port_string, "what port to listen to" }, { NULL, 'p', arg_string, &port_string, "what port to listen to" },
{ NULL, 'g', arg_string, &guest_umask_string, "umask for guest logins" }, { NULL, 'g', arg_string, &guest_umask_string, "umask for guest logins" },
{ NULL, 'l', arg_flag, &logflag, "log more stuff" }, { NULL, 'l', arg_collect, &log_collect_info, "log more stuff", "" },
{ NULL, 't', arg_integer, &ftpd_timeout, "initial timeout" }, { NULL, 't', arg_integer, &ftpd_timeout, "initial timeout" },
{ NULL, 'T', arg_integer, &maxtimeout, "max timeout" }, { NULL, 'T', arg_integer, &maxtimeout, "max timeout" },
{ NULL, 'u', arg_string, &umask_string, "umask for user logins" }, { NULL, 'u', arg_string, &umask_string, "umask for user logins" },
@@ -236,7 +249,7 @@ usage (int code)
int int
main(int argc, char **argv) main(int argc, char **argv)
{ {
int addrlen, ch, on = 1, tos; int addrlen, on = 1, tos;
char *cp, line[LINE_MAX]; char *cp, line[LINE_MAX];
FILE *fd; FILE *fd;
int port; int port;
@@ -259,7 +272,7 @@ main(int argc, char **argv)
#endif #endif
if(getarg(args, num_args, argc, argv, &optind)) if(getarg(args, num_args, argc, argv, &optind))
usage(1); usage(1);
if(help_flag) if(help_flag)
usage(0); usage(0);