Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame] | 1 | From 7d39930468e272c740b0eed3c7e5b7fb3abf29e8 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Wed, 5 Aug 2020 10:36:22 -0700 |
| 4 | Subject: [PATCH] ftpd,telnetd: Fix multiple definitions of errcatch and not42 |
| 5 | |
| 6 | This helps fix build failures when -fno-common option is used |
| 7 | |
| 8 | Upstream-Status: Pending |
| 9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 10 | |
| 11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 12 | --- |
| 13 | ftpd/extern.h | 2 +- |
| 14 | ftpd/ftpcmd.c | 1 + |
| 15 | telnetd/utility.c | 2 +- |
| 16 | 3 files changed, 3 insertions(+), 2 deletions(-) |
| 17 | |
| 18 | diff --git a/ftpd/extern.h b/ftpd/extern.h |
| 19 | index ab33cf3..91dbbee 100644 |
| 20 | --- a/ftpd/extern.h |
| 21 | +++ b/ftpd/extern.h |
| 22 | @@ -90,7 +90,7 @@ extern void user (const char *); |
| 23 | extern char *sgetsave (const char *); |
| 24 | |
| 25 | /* Exported from ftpd.c. */ |
| 26 | -jmp_buf errcatch; |
| 27 | +extern jmp_buf errcatch; |
| 28 | extern struct sockaddr_storage data_dest; |
| 29 | extern socklen_t data_dest_len; |
| 30 | extern struct sockaddr_storage his_addr; |
| 31 | diff --git a/ftpd/ftpcmd.c b/ftpd/ftpcmd.c |
| 32 | index beb1f06..d272e9d 100644 |
| 33 | --- a/ftpd/ftpcmd.c |
| 34 | +++ b/ftpd/ftpcmd.c |
| 35 | @@ -106,6 +106,7 @@ |
| 36 | #endif |
| 37 | |
| 38 | off_t restart_point; |
| 39 | +jmp_buf errcatch; |
| 40 | |
| 41 | static char cbuf[512]; /* Command Buffer. */ |
| 42 | static char *fromname; |
| 43 | diff --git a/telnetd/utility.c b/telnetd/utility.c |
| 44 | index e7ffb8e..46bf91e 100644 |
| 45 | --- a/telnetd/utility.c |
| 46 | +++ b/telnetd/utility.c |
| 47 | @@ -63,7 +63,7 @@ static int ncc; |
| 48 | static char ptyibuf[BUFSIZ], *ptyip; |
| 49 | static int pcc; |
| 50 | |
| 51 | -int not42; |
| 52 | +extern int not42; |
| 53 | |
| 54 | static int |
| 55 | readstream (int p, char *ibuf, int bufsize) |
| 56 | -- |
| 57 | 2.28.0 |
| 58 | |