1 diff -ur netkit-ftp-0.17.orig/ftp/domacro.c netkit-ftp-0.17/ftp/domacro.c
2 --- netkit-ftp-0.17.orig/ftp/domacro.c Thu Aug 15 01:27:28 1996
3 +++ netkit-ftp-0.17/ftp/domacro.c Tue Aug 8 15:38:49 2000
5 if (c->c_handler_v) c->c_handler_v(margc, margv);
6 else if (c->c_handler_0) c->c_handler_0();
7 else c->c_handler_1(marg);
11 + case 0: case 1: /* ommit "good" */
12 + case 200: case 221: /* codes */
16 + printf("%d Macro failed.\n", code);
21 if (bell && c->c_bell) {
22 (void) putchar('\007');
23 diff -ur netkit-ftp-0.17.orig/ftp/ftp.1 netkit-ftp-0.17/ftp/ftp.1
24 --- netkit-ftp-0.17.orig/ftp/ftp.1 Tue Dec 14 13:52:50 1999
25 +++ netkit-ftp-0.17/ftp/ftp.1 Tue Aug 8 14:19:00 2000
40 as report on data transfer statistics.
44 +Quit if some macro command failed.
47 The client host with which
48 diff -ur netkit-ftp-0.17.orig/ftp/ftp_var.h netkit-ftp-0.17/ftp/ftp_var.h
49 --- netkit-ftp-0.17.orig/ftp/ftp_var.h Sat Oct 2 20:39:17 1999
50 +++ netkit-ftp-0.17/ftp/ftp_var.h Tue Aug 8 14:14:48 2000
52 Extern int mcase; /* map upper to lower case for mget names */
53 Extern int ntflag; /* use ntin ntout tables for name xlation */
54 Extern int mapflag; /* use mapin mapout templates on file names */
55 +Extern int quitflag; /* quit if macro command failed */
56 Extern int code; /* return/reply code for ftp command */
57 Extern int crflag; /* if 1, strip car. rets. on ascii gets */
58 Extern char pasv[64]; /* passive port for proxy data connection */
59 diff -ur netkit-ftp-0.17.orig/ftp/main.c netkit-ftp-0.17/ftp/main.c
60 --- netkit-ftp-0.17.orig/ftp/main.c Sat Oct 2 15:25:23 1999
61 +++ netkit-ftp-0.17/ftp/main.c Tue Aug 8 14:29:49 2000
63 printf("\t -v: verbose mode\n");
64 printf("\t -t: enable packet tracing [nonfunctional]\n");
65 printf("\t -d: enable debugging\n");
66 + printf("\t -q: enable macro error quits\n");
76 cp = strrchr(argv[0], '/');
77 cp = (cp == NULL) ? argv[0] : cp+1;