src/usr.bin/ftp/main.c - diff

Return to main.c CVS log

Up to [local] / src / usr.bin / ftp

Diff for /src/usr.bin/ftp/main.c between version 1.81 and 1.82

version 1.81, 2010/06/29 23:12:33

version 1.82, 2012/04/30 13:41:26

Line 114

hist = NULL;

cookiefile = NULL;

resume = 0;

srcaddr = NULL;

marg_sl = sl_init();

#endif /* !SMALL */

mark = HASHBYTES;

Line 174

Line 175

cookiefile = getenv("http_cookies");

#endif /* !SMALL */

while ((ch = getopt(argc, argv, "46AaCc:dEegik:mno:pP:r:tvV")) != -1) {

while ((ch = getopt(argc, argv, "46AaCc:dEegik:mno:pP:r:s:tvV")) != -1) {

switch (ch) {

case '4':

family = PF_INET;

Line 275

Line 276

}

break;

case 's':

#ifndef SMALL

srcaddr = optarg;

#endif /* !SMALL */

break;

case 't':

trace = 1;

break;

Line 756

Line 763

" %s [-C] "

#endif /* !SMALL */

"[-o output] "

#ifndef SMALL

"[-s srcaddr] "

#endif /* !SMALL */

"ftp://[user:password@]host[:port]/file[/] ...\n"

" %s "

#ifndef SMALL

"[-C] [-c cookie] "

#endif /* !SMALL */

"[-o output] "

#ifndef SMALL

"[-s srcaddr] "

#endif /* !SMALL */

"http://host[:port]/file ...\n"

#ifndef SMALL

" %s [-C] [-c cookie] [-o output] "

" %s [-C] [-c cookie] [-o output] [-s srcaddr] "

"https://host[:port]/file ...\n"

#endif /* !SMALL */

" %s "

Line 772

Line 785

"[-C] "

#endif /* !SMALL */

"[-o output] "

#ifndef SMALL

"[-s srcaddr] "

#endif /* !SMALL */

"file:file ...\n"

" %s "

#ifndef SMALL

"[-C] "

#endif /* !SMALL */

"[-o output] host:/file[/] ...\n",

"[-o output] "

#ifndef SMALL

"[-s srcaddr] "

#endif /* !SMALL */

"host:/file[/] ...\n",

#ifndef SMALL

__progname, __progname, __progname, __progname, __progname,

__progname);