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.33 and 1.34

version 1.33, 1997/06/10 19:39:54

version 1.34, 1997/07/25 21:56:22

Line 1

/* $OpenBSD$ */

/* $NetBSD: main.c,v 1.21 1997/04/05 03:27:39 lukem Exp $ */

/* $NetBSD: main.c,v 1.23 1997/07/20 09:45:58 lukem Exp $ */

Line 65

#include "ftp_var.h"

int main __P((int, char **));

int

main(argc, argv)

int argc;

char *argv[];

{

struct servent *sp;

int ch, top, port, rval;

int ch, top, rval;

long port;

struct passwd *pw = NULL;

char *cp, homedir[MAXPATHLEN];

int dumb_terminal = 0;

Line 115

Line 118

verbose = 1; /* verbose if from a tty */

#ifndef SMALL

if (!dumb_terminal)

editing = 1; /* editing mode on if from a tty */

editing = 1; /* editing mode on if tty is usable */

#endif

}

ttyout = stdout;

if (isatty(fileno(ttyout)) && !dumb_terminal && foregroundproc())

progress = 1; /* progress bar on if going to a tty */

progress = 1; /* progress bar on if tty is usable */

if (!isatty(fileno(ttyout))) {

outfd = fileno(stdout);

Line 162

Line 165

break;

case 'P':

port = atoi(optarg);

port = strtol(optarg, &cp, 10);

if (port <= 0)

if (port < 1 || port > 0xffff || *cp != '\0')

warnx("bad port number: %s (ignored)", optarg);

else

ftpport = htons(port);

ftpport = htons((in_port_t)port);

break;

case 'r':

Line 216

Line 219

setttywidth(0);

(void)signal(SIGWINCH, setttywidth);

#ifdef __GNUC__ /* XXX: to shut up gcc warnings */

(void)&argc;

(void)&argv;

#endif

if (argc > 0) {

if (strchr(argv[0], ':') != NULL) {

anonftp = 1; /* Handle "automatic" transfers. */

Line 361

Line 369

fputs("sorry, input line too long.\n", ttyout);

break;

}

memcpy(line, buf, num);

memcpy(line, buf, (size_t)num);

line[num] = '\0';

history(hist, H_ENTER, buf);

}