bug-inetutils
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH] ftpd: Fix multiple definition of 'errcatch' (gcc 10)


From: Tim Rühsen
Subject: [PATCH] ftpd: Fix multiple definition of 'errcatch' (gcc 10)
Date: Sun, 16 Feb 2020 19:54:55 +0100

---
 ftpd/extern.h | 2 +-
 ftpd/ftpd.c   | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ftpd/extern.h b/ftpd/extern.h
index 50e16ed1..3e2200fd 100644
--- a/ftpd/extern.h
+++ b/ftpd/extern.h
@@ -88,7 +88,7 @@ extern void user (const char *);
 extern char *sgetsave (const char *);

 /* Exported from ftpd.c.  */
-jmp_buf errcatch;
+extern jmp_buf errcatch;
 extern struct sockaddr_storage data_dest;
 extern socklen_t data_dest_len;
 extern struct sockaddr_storage his_addr;
diff --git a/ftpd/ftpd.c b/ftpd/ftpd.c
index 08ff5227..7af1dc50 100644
--- a/ftpd/ftpd.c
+++ b/ftpd/ftpd.c
@@ -144,6 +144,8 @@ char portstr[8];            /* Numeric port as string.  */
 /* Requester credentials.  */
 struct credentials cred;

+jmp_buf errcatch;
+
 static struct sockaddr_storage ctrl_addr;      /* Control address.  */
 static socklen_t ctrl_addrlen;
 static struct sockaddr_storage data_source;    /* Port address.  */
--
2.25.0




reply via email to

[Prev in Thread] Current Thread [Next in Thread]