[src/trunk]: src/usr.bin/ftp use sigjmp_buf for sigsetjmp(), instead of jmp_buf.

[lukem <lukem%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7c0eae817c3e
branches:  trunk
changeset: 477090:7c0eae817c3e
user:      lukem <lukem%NetBSD.org@localhost>
date:      Sun Oct 10 22:33:54 1999 +0000

description:
use sigjmp_buf for sigsetjmp(), instead of jmp_buf.
noted by Havard.Eidnes%runit.sintef.no@localhost.

diffstat:

 usr.bin/ftp/cmds.c    |  10 +++++-----
 usr.bin/ftp/fetch.c   |   6 +++---
 usr.bin/ftp/ftp.c     |   8 ++++----
 usr.bin/ftp/ftp_var.h |   4 ++--
 4 files changed, 14 insertions(+), 14 deletions(-)

diffs (119 lines):

diff -r a52adc5ff821 -r 7c0eae817c3e usr.bin/ftp/cmds.c
--- a/usr.bin/ftp/cmds.c        Sun Oct 10 21:22:24 1999 +0000
+++ b/usr.bin/ftp/cmds.c        Sun Oct 10 22:33:54 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cmds.c,v 1.72 1999/10/09 03:00:55 lukem Exp $  */
+/*     $NetBSD: cmds.c,v 1.73 1999/10/10 22:33:54 lukem Exp $  */
 
 /*-
  * Copyright (c) 1996-1999 The NetBSD Foundation, Inc.
@@ -107,7 +107,7 @@
 #if 0
 static char sccsid[] = "@(#)cmds.c     8.6 (Berkeley) 10/9/94";
 #else
-__RCSID("$NetBSD: cmds.c,v 1.72 1999/10/09 03:00:55 lukem Exp $");
+__RCSID("$NetBSD: cmds.c,v 1.73 1999/10/10 22:33:54 lukem Exp $");
 #endif
 #endif /* not lint */
 
@@ -134,8 +134,8 @@
 
 #include "ftp_var.h"
 
-jmp_buf        jabort;
-char   *mname;
+sigjmp_buf      jabort;
+char           *mname;
 
 struct types {
        char    *t_name;
@@ -1658,7 +1658,7 @@
        (void)command("ACCT %s", ap);
 }
 
-jmp_buf abortprox;
+sigjmp_buf abortprox;
 
 void
 proxabort(notused)
diff -r a52adc5ff821 -r 7c0eae817c3e usr.bin/ftp/fetch.c
--- a/usr.bin/ftp/fetch.c       Sun Oct 10 21:22:24 1999 +0000
+++ b/usr.bin/ftp/fetch.c       Sun Oct 10 22:33:54 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fetch.c,v 1.88 1999/10/09 03:00:55 lukem Exp $ */
+/*     $NetBSD: fetch.c,v 1.89 1999/10/10 22:33:55 lukem Exp $ */
 
 /*-
  * Copyright (c) 1997-1999 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: fetch.c,v 1.88 1999/10/09 03:00:55 lukem Exp $");
+__RCSID("$NetBSD: fetch.c,v 1.89 1999/10/10 22:33:55 lukem Exp $");
 #endif /* not lint */
 
 /*
@@ -435,7 +435,7 @@
        return (0);
 }
 
-jmp_buf        httpabort;
+sigjmp_buf     httpabort;
 
 /*
  * Retrieve URL, via a proxy if necessary, using HTTP.
diff -r a52adc5ff821 -r 7c0eae817c3e usr.bin/ftp/ftp.c
--- a/usr.bin/ftp/ftp.c Sun Oct 10 21:22:24 1999 +0000
+++ b/usr.bin/ftp/ftp.c Sun Oct 10 22:33:54 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ftp.c,v 1.82 1999/10/09 12:48:12 lukem Exp $   */
+/*     $NetBSD: ftp.c,v 1.83 1999/10/10 22:33:55 lukem Exp $   */
 
 /*-
  * Copyright (c) 1996-1999 The NetBSD Foundation, Inc.
@@ -103,7 +103,7 @@
 #if 0
 static char sccsid[] = "@(#)ftp.c      8.6 (Berkeley) 10/27/94";
 #else
-__RCSID("$NetBSD: ftp.c,v 1.82 1999/10/09 12:48:12 lukem Exp $");
+__RCSID("$NetBSD: ftp.c,v 1.83 1999/10/10 22:33:55 lukem Exp $");
 #endif
 #endif /* not lint */
 
@@ -141,7 +141,7 @@
 
 volatile int   abrtflag = 0;
 volatile int   timeoutflag = 0;
-jmp_buf        ptabort;
+sigjmp_buf     ptabort;
 int    ptabflg;
 int    ptflag = 0;
 char   pasv[BUFSIZ];   /* passive port for proxy data connection */
@@ -685,7 +685,7 @@
        return nr;
 }
 
-jmp_buf        xferabort;
+sigjmp_buf     xferabort;
 
 void
 abortxfer(notused)
diff -r a52adc5ff821 -r 7c0eae817c3e usr.bin/ftp/ftp_var.h
--- a/usr.bin/ftp/ftp_var.h     Sun Oct 10 21:22:24 1999 +0000
+++ b/usr.bin/ftp/ftp_var.h     Sun Oct 10 22:33:54 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ftp_var.h,v 1.42 1999/10/05 01:16:13 lukem Exp $       */
+/*     $NetBSD: ftp_var.h,v 1.43 1999/10/10 22:33:55 lukem Exp $       */
 
 /*-
  * Copyright (c) 1996-1999 The NetBSD Foundation, Inc.
@@ -269,7 +269,7 @@
 GLOBAL char   *outfile;        /* filename to output URLs to */
 GLOBAL int     restartautofetch; /* restart auto-fetch */
 
-GLOBAL jmp_buf toplevel;       /* non-local goto stuff for cmd scanner */
+GLOBAL sigjmp_buf toplevel;    /* non-local goto stuff for cmd scanner */
 
 GLOBAL char    line[FTPBUFLEN]; /* input line buffer */
 GLOBAL char    *stringbase;    /* current scan point in line buffer */