LILiK
/
openwrt-packages-dist
5
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
14694 Commits
1 Branch
46 MiB
Tree: ba0c98be0a
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from 'ba0c98be0a'
${ noResults }
openwrt-packages-dist/libs/tcp_wrappers/patches/006-compilation-warnings.patch

765 lines
22 KiB
Raw Normal View History

tcp_wrappers: fix compilation warnings Set `Wall` and address sources of reported warnings. Signed-off-by: Tom Sullivan <tom@msbit.com.au>
7 years ago
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
 
  1. diff -u tcp_wrappers_7.6.orig/clean_exit.c tcp_wrappers_7.6/clean_exit.c

  2. --- tcp_wrappers_7.6.orig/clean_exit.c	1994-12-29 03:42:20.000000000 +1100

  3. +++ tcp_wrappers_7.6/clean_exit.c	2017-11-14 22:50:48.000000000 +1100

  4. @@ -9,10 +9,11 @@

  5.    */
  6.  
  7.  #ifndef lint
  8. -static char sccsid[] = "@(#) clean_exit.c 1.4 94/12/28 17:42:19";

  9. +static char sccsid[] __attribute__((__unused__)) = "@(#) clean_exit.c 1.4 94/12/28 17:42:19";

  10.  #endif
  11.  
  12.  #include <stdio.h>
  13. +#include <unistd.h>

  14.  
  15.  extern void exit();
  16.  
  17. diff -u tcp_wrappers_7.6.orig/diag.c tcp_wrappers_7.6/diag.c

  18. --- tcp_wrappers_7.6.orig/diag.c	1994-12-29 03:42:20.000000000 +1100

  19. +++ tcp_wrappers_7.6/diag.c	2017-11-14 22:51:09.000000000 +1100

  20. @@ -10,7 +10,7 @@

  21.    */
  22.  
  23.  #ifndef lint
  24. -static char sccsid[] = "@(#) diag.c 1.1 94/12/28 17:42:20";

  25. +static char sccsid[] __attribute__((__unused__)) = "@(#) diag.c 1.1 94/12/28 17:42:20";

  26.  #endif
  27.  
  28.  /* System libraries */
  29. diff -u tcp_wrappers_7.6.orig/eval.c tcp_wrappers_7.6/eval.c

  30. --- tcp_wrappers_7.6.orig/eval.c	1995-01-31 05:51:46.000000000 +1100

  31. +++ tcp_wrappers_7.6/eval.c	2017-11-14 22:51:50.000000000 +1100

  32. @@ -19,7 +19,7 @@

  33.    */
  34.  
  35.  #ifndef lint
  36. -static char sccsid[] = "@(#) eval.c 1.3 95/01/30 19:51:45";

  37. +static char sccsid[] __attribute__((__unused__)) = "@(#) eval.c 1.3 95/01/30 19:51:45";

  38.  #endif
  39.  
  40.  /* System libraries. */
  41. diff -u tcp_wrappers_7.6.orig/fakelog.c tcp_wrappers_7.6/fakelog.c

  42. --- tcp_wrappers_7.6.orig/fakelog.c	1994-12-29 03:42:22.000000000 +1100

  43. +++ tcp_wrappers_7.6/fakelog.c	2017-11-14 22:52:07.000000000 +1100

  44. @@ -6,7 +6,7 @@

  45.    */
  46.  
  47.  #ifndef lint
  48. -static char sccsid[] = "@(#) fakelog.c 1.3 94/12/28 17:42:21";

  49. +static char sccsid[] __attribute__((__unused__)) = "@(#) fakelog.c 1.3 94/12/28 17:42:21";

  50.  #endif
  51.  
  52.  #include <stdio.h>
  53. @@ -17,7 +17,7 @@

  54.  
  55.  /* ARGSUSED */
  56.  
  57. -openlog(name, logopt, facility)

  58. +void    openlog(name, logopt, facility)

  59.  char   *name;
  60.  int     logopt;
  61.  int     facility;
  62. @@ -27,7 +27,7 @@

  63.  
  64.  /* vsyslog - format one record */
  65.  
  66. -vsyslog(severity, fmt, ap)

  67. +void    vsyslog(severity, fmt, ap)

  68.  int     severity;
  69.  char   *fmt;
  70.  va_list ap;
  71. @@ -43,7 +43,7 @@

  72.  
  73.  /* VARARGS */
  74.  
  75. -VARARGS(syslog, int, severity)

  76. +void    VARARGS(syslog, int, severity)

  77.  {
  78.      va_list ap;
  79.      char   *fmt;
  80. @@ -56,7 +56,7 @@

  81.  
  82.  /* closelog - dummy */
  83.  
  84. -closelog()

  85. +void    closelog()

  86.  {
  87.      /* void */
  88.  }
  89. diff -u tcp_wrappers_7.6.orig/fix_options.c tcp_wrappers_7.6/fix_options.c

  90. --- tcp_wrappers_7.6.orig/fix_options.c	2017-11-13 09:29:08.000000000 +1100

  91. +++ tcp_wrappers_7.6/fix_options.c	2017-11-14 22:52:22.000000000 +1100

  92. @@ -6,7 +6,7 @@

  93.    */
  94.  
  95.  #ifndef lint
  96. -static char sccsid[] = "@(#) fix_options.c 1.6 97/04/08 02:29:19";

  97. +static char sccsid[] __attribute__((__unused__)) = "@(#) fix_options.c 1.6 97/04/08 02:29:19";

  98.  #endif
  99.  
  100.  #include <sys/types.h>
  101. @@ -29,14 +29,14 @@

  102.  
  103.  /* fix_options - get rid of IP-level socket options */
  104.  
  105. -fix_options(request)

  106. -struct request_info *request;

  107. +void    fix_options(request)

  108. +struct  request_info *request;

  109.  {
  110.  #ifdef IP_OPTIONS
  111.      unsigned char optbuf[BUFFER_SIZE / 3], *cp;
  112.      char    lbuf[BUFFER_SIZE], *lp;
  113.  #if !defined(__GLIBC__)
  114. -    int     optsize = sizeof(optbuf), ipproto;

  115. +    unsigned int  optsize = sizeof(optbuf), ipproto;

  116.  #else /* __GLIBC__ */
  117.      size_t  optsize = sizeof(optbuf);
  118.      int     ipproto;
  119. diff -u tcp_wrappers_7.6.orig/fromhost.c tcp_wrappers_7.6/fromhost.c

  120. --- tcp_wrappers_7.6.orig/fromhost.c	1994-12-29 03:42:24.000000000 +1100

  121. +++ tcp_wrappers_7.6/fromhost.c	2017-11-14 22:52:33.000000000 +1100

  122. @@ -11,7 +11,7 @@

  123.    */
  124.  
  125.  #ifndef lint
  126. -static char sccsid[] = "@(#) fromhost.c 1.17 94/12/28 17:42:23";

  127. +static char sccsid[] __attribute__((__unused__)) = "@(#) fromhost.c 1.17 94/12/28 17:42:23";

  128.  #endif
  129.  
  130.  #if defined(TLI) || defined(PTX) || defined(TLI_SEQUENT)
  131. diff -u tcp_wrappers_7.6.orig/hosts_access.c tcp_wrappers_7.6/hosts_access.c

  132. --- tcp_wrappers_7.6.orig/hosts_access.c	2017-11-13 09:29:25.000000000 +1100

  133. +++ tcp_wrappers_7.6/hosts_access.c	2017-11-14 22:52:48.000000000 +1100

  134. @@ -18,7 +18,7 @@

  135.    */
  136.  
  137.  #ifndef lint
  138. -static char sccsid[] = "@(#) hosts_access.c 1.21 97/02/12 02:13:22";

  139. +static char sccsid[] __attribute__((__unused__)) = "@(#) hosts_access.c 1.21 97/02/12 02:13:22";

  140.  #endif
  141.  
  142.  /* System libraries. */
  143. diff -u tcp_wrappers_7.6.orig/hosts_ctl.c tcp_wrappers_7.6/hosts_ctl.c

  144. --- tcp_wrappers_7.6.orig/hosts_ctl.c	1994-12-29 03:42:28.000000000 +1100

  145. +++ tcp_wrappers_7.6/hosts_ctl.c	2017-11-14 22:53:01.000000000 +1100

  146. @@ -12,7 +12,7 @@

  147.    */
  148.  
  149.  #ifndef lint
  150. -static char sccsid[] = "@(#) hosts_ctl.c 1.4 94/12/28 17:42:27";

  151. +static char sccsid[] __attribute__((__unused__)) = "@(#) hosts_ctl.c 1.4 94/12/28 17:42:27";

  152.  #endif
  153.  
  154.  #include <stdio.h>
  155. diff -u tcp_wrappers_7.6.orig/inetcf.c tcp_wrappers_7.6/inetcf.c

  156. --- tcp_wrappers_7.6.orig/inetcf.c	1997-02-12 12:13:24.000000000 +1100

  157. +++ tcp_wrappers_7.6/inetcf.c	2017-11-14 22:53:11.000000000 +1100

  158. @@ -6,7 +6,7 @@

  159.    */
  160.  
  161.  #ifndef lint
  162. -static char sccsid[] = "@(#) inetcf.c 1.7 97/02/12 02:13:23";

  163. +static char sccsid[] __attribute__((__unused__)) = "@(#) inetcf.c 1.7 97/02/12 02:13:23";

  164.  #endif
  165.  
  166.  #include <sys/types.h>
  167. @@ -14,6 +14,7 @@

  168.  #include <stdio.h>
  169.  #include <errno.h>
  170.  #include <string.h>
  171. +#include <stdlib.h>

  172.  
  173.  extern int errno;
  174.  extern void exit();
  175. @@ -21,6 +22,8 @@

  176.  #include "tcpd.h"
  177.  #include "inetcf.h"
  178.  
  179. +extern int check_path(char *, struct stat *);

  180. +

  181.   /*
  182.    * Network configuration files may live in unusual places. Here are some
  183.    * guesses. Shorter names follow longer ones.
  184. diff -u tcp_wrappers_7.6.orig/misc.c tcp_wrappers_7.6/misc.c

  185. --- tcp_wrappers_7.6.orig/misc.c	2017-11-13 09:29:25.000000000 +1100

  186. +++ tcp_wrappers_7.6/misc.c	2017-11-14 22:53:23.000000000 +1100

  187. @@ -5,7 +5,7 @@

  188.    */
  189.  
  190.  #ifndef lint
  191. -static char sccsic[] = "@(#) misc.c 1.2 96/02/11 17:01:29";

  192. +static char sccsid[] __attribute__((__unused__)) = "@(#) misc.c 1.2 96/02/11 17:01:29";

  193.  #endif
  194.  
  195.  #include <sys/types.h>
  196. diff -u tcp_wrappers_7.6.orig/myvsyslog.c tcp_wrappers_7.6/myvsyslog.c

  197. --- tcp_wrappers_7.6.orig/myvsyslog.c	1994-12-29 03:42:34.000000000 +1100

  198. +++ tcp_wrappers_7.6/myvsyslog.c	2017-11-14 22:53:35.000000000 +1100

  199. @@ -8,7 +8,7 @@

  200.    */
  201.  
  202.  #ifndef lint
  203. -static char sccsid[] = "@(#) myvsyslog.c 1.1 94/12/28 17:42:33";

  204. +static char sccsid[] __attribute__((__unused__)) = "@(#) myvsyslog.c 1.1 94/12/28 17:42:33";

  205.  #endif
  206.  
  207.  #ifdef vsyslog
  208. diff -u tcp_wrappers_7.6.orig/options.c tcp_wrappers_7.6/options.c

  209. --- tcp_wrappers_7.6.orig/options.c	2017-11-13 09:29:08.000000000 +1100

  210. +++ tcp_wrappers_7.6/options.c	2017-11-14 22:53:50.000000000 +1100

  211. @@ -29,7 +29,7 @@

  212.    */
  213.  
  214.  #ifndef lint
  215. -static char sccsid[] = "@(#) options.c 1.17 96/02/11 17:01:31";

  216. +static char sccsid[] __attribute__((__unused__)) = "@(#) options.c 1.17 96/02/11 17:01:31";

  217.  #endif
  218.  
  219.  /* System libraries. */
  220. @@ -47,6 +47,8 @@

  221.  #include <ctype.h>
  222.  #include <setjmp.h>
  223.  #include <string.h>
  224. +#include <stdlib.h>

  225. +#include <unistd.h>

  226.  
  227.  #ifndef MAXPATHNAMELEN
  228.  #define MAXPATHNAMELEN  BUFSIZ
  229. @@ -108,21 +110,21 @@

  230.  /* List of known keywords. Add yours here. */
  231.  
  232.  static struct option option_table[] = {
  233. -    "user", user_option, NEED_ARG,

  234. -    "group", group_option, NEED_ARG,

  235. -    "umask", umask_option, NEED_ARG,

  236. -    "linger", linger_option, NEED_ARG,

  237. -    "keepalive", keepalive_option, 0,

  238. -    "spawn", spawn_option, NEED_ARG | EXPAND_ARG,

  239. -    "twist", twist_option, NEED_ARG | EXPAND_ARG | USE_LAST,

  240. -    "rfc931", rfc931_option, OPT_ARG,

  241. -    "setenv", setenv_option, NEED_ARG | EXPAND_ARG,

  242. -    "nice", nice_option, OPT_ARG,

  243. -    "severity", severity_option, NEED_ARG,

  244. -    "allow", allow_option, USE_LAST,

  245. -    "deny", deny_option, USE_LAST,

  246. -    "banners", banners_option, NEED_ARG,

  247. -    0,

  248. +   { "user", user_option, NEED_ARG },

  249. +   { "group", group_option, NEED_ARG },

  250. +   { "umask", umask_option, NEED_ARG },

  251. +   { "linger", linger_option, NEED_ARG },

  252. +   { "keepalive", keepalive_option, 0 },

  253. +   { "spawn", spawn_option, NEED_ARG | EXPAND_ARG },

  254. +   { "twist", twist_option, NEED_ARG | EXPAND_ARG | USE_LAST },

  255. +   { "rfc931", rfc931_option, OPT_ARG },

  256. +   { "setenv", setenv_option, NEED_ARG | EXPAND_ARG },

  257. +   { "nice", nice_option, OPT_ARG },

  258. +   { "severity", severity_option, NEED_ARG },

  259. +   { "allow", allow_option, USE_LAST },

  260. +   { "deny", deny_option, USE_LAST },

  261. +   { "banners", banners_option, NEED_ARG },

  262. +   { 0 },

  263.  };
  264.  
  265.  /* process_options - process access control options */
  266. @@ -447,88 +449,88 @@

  267.  
  268.  static struct syslog_names log_fac[] = {
  269.  #ifdef LOG_KERN
  270. -    "kern", LOG_KERN,

  271. +    { "kern", LOG_KERN },

  272.  #endif
  273.  #ifdef LOG_USER
  274. -    "user", LOG_USER,

  275. +    { "user", LOG_USER },

  276.  #endif
  277.  #ifdef LOG_MAIL
  278. -    "mail", LOG_MAIL,

  279. +    { "mail", LOG_MAIL },

  280.  #endif
  281.  #ifdef LOG_DAEMON
  282. -    "daemon", LOG_DAEMON,

  283. +    { "daemon", LOG_DAEMON },

  284.  #endif
  285.  #ifdef LOG_AUTH
  286. -    "auth", LOG_AUTH,

  287. +    { "auth", LOG_AUTH },

  288.  #endif
  289.  #ifdef LOG_LPR
  290. -    "lpr", LOG_LPR,

  291. +    { "lpr", LOG_LPR },

  292.  #endif
  293.  #ifdef LOG_NEWS
  294. -    "news", LOG_NEWS,

  295. +    { "news", LOG_NEWS },

  296.  #endif
  297.  #ifdef LOG_UUCP
  298. -    "uucp", LOG_UUCP,

  299. +    { "uucp", LOG_UUCP },

  300.  #endif
  301.  #ifdef LOG_CRON
  302. -    "cron", LOG_CRON,

  303. +    { "cron", LOG_CRON },

  304.  #endif
  305.  #ifdef LOG_FTP
  306. -    "ftp", LOG_FTP,

  307. +    { "ftp", LOG_FTP },

  308.  #endif
  309.  #ifdef LOG_LOCAL0
  310. -    "local0", LOG_LOCAL0,

  311. +    { "local0", LOG_LOCAL0 },

  312.  #endif
  313.  #ifdef LOG_LOCAL1
  314. -    "local1", LOG_LOCAL1,

  315. +    { "local1", LOG_LOCAL1 },

  316.  #endif
  317.  #ifdef LOG_LOCAL2
  318. -    "local2", LOG_LOCAL2,

  319. +    { "local2", LOG_LOCAL2 },

  320.  #endif
  321.  #ifdef LOG_LOCAL3
  322. -    "local3", LOG_LOCAL3,

  323. +    { "local3", LOG_LOCAL3 },

  324.  #endif
  325.  #ifdef LOG_LOCAL4
  326. -    "local4", LOG_LOCAL4,

  327. +    { "local4", LOG_LOCAL4 },

  328.  #endif
  329.  #ifdef LOG_LOCAL5
  330. -    "local5", LOG_LOCAL5,

  331. +    { "local5", LOG_LOCAL5 },

  332.  #endif
  333.  #ifdef LOG_LOCAL6
  334. -    "local6", LOG_LOCAL6,

  335. +    { "local6", LOG_LOCAL6 },

  336.  #endif
  337.  #ifdef LOG_LOCAL7
  338. -    "local7", LOG_LOCAL7,

  339. +    { "local7", LOG_LOCAL7 },

  340.  #endif
  341. -    0,

  342. +    { 0 },

  343.  };
  344.  
  345.  static struct syslog_names log_sev[] = {
  346.  #ifdef LOG_EMERG
  347. -    "emerg", LOG_EMERG,

  348. +    { "emerg", LOG_EMERG },

  349.  #endif
  350.  #ifdef LOG_ALERT
  351. -    "alert", LOG_ALERT,

  352. +    { "alert", LOG_ALERT },

  353.  #endif
  354.  #ifdef LOG_CRIT
  355. -    "crit", LOG_CRIT,

  356. +    { "crit", LOG_CRIT },

  357.  #endif
  358.  #ifdef LOG_ERR
  359. -    "err", LOG_ERR,

  360. +    { "err", LOG_ERR },

  361.  #endif
  362.  #ifdef LOG_WARNING
  363. -    "warning", LOG_WARNING,

  364. +    { "warning", LOG_WARNING },

  365.  #endif
  366.  #ifdef LOG_NOTICE
  367. -    "notice", LOG_NOTICE,

  368. +    { "notice", LOG_NOTICE },

  369.  #endif
  370.  #ifdef LOG_INFO
  371. -    "info", LOG_INFO,

  372. +    { "info", LOG_INFO },

  373.  #endif
  374.  #ifdef LOG_DEBUG
  375. -    "debug", LOG_DEBUG,

  376. +    { "debug", LOG_DEBUG },

  377.  #endif
  378. -    0,

  379. +    { 0 },

  380.  };
  381.  
  382.  /* severity_map - lookup facility or severity value */
  383. @@ -589,7 +591,7 @@

  384.      if (src[0] == 0)
  385.  	return (0);
  386.  
  387. -    while (ch = *src) {

  388. +    while ((ch = *src)) {

  389.  	if (ch == ':') {
  390.  	    if (*++src == 0)
  391.  		tcpd_warn("rule ends in \":\"");
  392. diff -u tcp_wrappers_7.6.orig/patchlevel.h tcp_wrappers_7.6/patchlevel.h

  393. --- tcp_wrappers_7.6.orig/patchlevel.h	1997-03-22 05:27:24.000000000 +1100

  394. +++ tcp_wrappers_7.6/patchlevel.h	2017-11-14 22:54:15.000000000 +1100

  395. @@ -1,3 +1,3 @@

  396.  #ifndef lint
  397. -static char patchlevel[] = "@(#) patchlevel 7.6 97/03/21 19:27:23";

  398. +static char patchlevel[] __attribute__((__unused__)) = "@(#) patchlevel 7.6 97/03/21 19:27:23";

  399.  #endif
  400. diff -u tcp_wrappers_7.6.orig/percent_m.c tcp_wrappers_7.6/percent_m.c

  401. --- tcp_wrappers_7.6.orig/percent_m.c	2017-11-13 09:29:08.000000000 +1100

  402. +++ tcp_wrappers_7.6/percent_m.c	2017-11-14 22:54:31.000000000 +1100

  403. @@ -5,7 +5,7 @@

  404.    */
  405.  
  406.  #ifndef lint
  407. -static char sccsid[] = "@(#) percent_m.c 1.1 94/12/28 17:42:37";

  408. +static char sccsid[] __attribute__((__unused__)) = "@(#) percent_m.c 1.1 94/12/28 17:42:37";

  409.  #endif
  410.  
  411.  #include <stdio.h>
  412. @@ -27,7 +27,7 @@

  413.      char   *bp = obuf;
  414.      char   *cp = ibuf;
  415.  
  416. -    while (*bp = *cp)

  417. +    while ((*bp = *cp))

  418.  	if (*cp == '%' && cp[1] == 'm') {
  419.  #ifdef HAVE_STRERROR
  420.              strcpy(bp, strerror(errno));
  421. diff -u tcp_wrappers_7.6.orig/percent_x.c tcp_wrappers_7.6/percent_x.c

  422. --- tcp_wrappers_7.6.orig/percent_x.c	1994-12-29 03:42:38.000000000 +1100

  423. +++ tcp_wrappers_7.6/percent_x.c	2017-11-14 22:54:40.000000000 +1100

  424. @@ -11,7 +11,7 @@

  425.    */
  426.  
  427.  #ifndef lint
  428. -static char sccsid[] = "@(#) percent_x.c 1.4 94/12/28 17:42:37";

  429. +static char sccsid[] __attribute__((__unused__)) = "@(#) percent_x.c 1.4 94/12/28 17:42:37";

  430.  #endif
  431.  
  432.  /* System libraries. */
  433. @@ -19,6 +19,7 @@

  434.  #include <stdio.h>
  435.  #include <syslog.h>
  436.  #include <string.h>
  437. +#include <unistd.h>

  438.  
  439.  extern void exit();
  440.  
  441. diff -u tcp_wrappers_7.6.orig/refuse.c tcp_wrappers_7.6/refuse.c

  442. --- tcp_wrappers_7.6.orig/refuse.c	1994-12-29 03:42:40.000000000 +1100

  443. +++ tcp_wrappers_7.6/refuse.c	2017-11-14 22:54:50.000000000 +1100

  444. @@ -8,7 +8,7 @@

  445.    */
  446.  
  447.  #ifndef lint
  448. -static char sccsid[] = "@(#) refuse.c 1.5 94/12/28 17:42:39";

  449. +static char sccsid[] __attribute__((__unused__)) = "@(#) refuse.c 1.5 94/12/28 17:42:39";

  450.  #endif
  451.  
  452.  /* System libraries. */
  453. diff -u tcp_wrappers_7.6.orig/rfc931.c tcp_wrappers_7.6/rfc931.c

  454. --- tcp_wrappers_7.6.orig/rfc931.c	2017-11-13 09:29:08.000000000 +1100

  455. +++ tcp_wrappers_7.6/rfc931.c	2017-11-14 22:54:58.000000000 +1100

  456. @@ -10,7 +10,7 @@

  457.    */
  458.  
  459.  #ifndef lint
  460. -static char sccsid[] = "@(#) rfc931.c 1.10 95/01/02 16:11:34";

  461. +static char sccsid[] __attribute__((__unused__)) = "@(#) rfc931.c 1.10 95/01/02 16:11:34";

  462.  #endif
  463.  
  464.  /* System libraries. */
  465. @@ -23,6 +23,7 @@

  466.  #include <setjmp.h>
  467.  #include <signal.h>
  468.  #include <string.h>
  469. +#include <unistd.h>

  470.  
  471.  /* Local stuff. */
  472.  
  473. @@ -152,7 +153,7 @@

  474.  		     * protocol, not part of the data.
  475.  		     */
  476.  
  477. -		    if (cp = strchr(user, '\r'))

  478. +		    if ((cp = strchr(user, '\r')))

  479.  			*cp = 0;
  480.  		    result = user;
  481.  		}
  482. diff -u tcp_wrappers_7.6.orig/safe_finger.c tcp_wrappers_7.6/safe_finger.c

  483. --- tcp_wrappers_7.6.orig/safe_finger.c	2017-11-13 09:29:08.000000000 +1100

  484. +++ tcp_wrappers_7.6/safe_finger.c	2017-11-14 22:55:08.000000000 +1100

  485. @@ -15,7 +15,7 @@

  486.    */
  487.  
  488.  #ifndef lint
  489. -static char sccsid[] = "@(#) safe_finger.c 1.4 94/12/28 17:42:41";

  490. +static char sccsid[] __attribute__((__unused__)) = "@(#) safe_finger.c 1.4 94/12/28 17:42:41";

  491.  #endif
  492.  
  493.  /* System libraries */
  494. @@ -27,6 +27,10 @@

  495.  #include <ctype.h>
  496.  #include <pwd.h>
  497.  #include <syslog.h>
  498. +#include <fcntl.h>

  499. +#include <stdlib.h>

  500. +#include <sys/wait.h>

  501. +#include <unistd.h>

  502.  
  503.  extern void exit();
  504.  
  505. @@ -45,6 +49,8 @@

  506.  int	allow_severity = SEVERITY;
  507.  int	deny_severity = LOG_WARNING;
  508.  
  509. +int     pipe_stdin();

  510. +

  511.  void    cleanup(sig)
  512.  int     sig;
  513.  {
  514. @@ -52,7 +58,7 @@

  515.      exit(0);
  516.  }
  517.  
  518. -main(argc, argv)

  519. +int     main(argc, argv)

  520.  int     argc;
  521.  char  **argv;
  522.  {
  523. diff -u tcp_wrappers_7.6.orig/scaffold.c tcp_wrappers_7.6/scaffold.c

  524. --- tcp_wrappers_7.6.orig/scaffold.c	2017-11-13 09:29:21.000000000 +1100

  525. +++ tcp_wrappers_7.6/scaffold.c	2017-11-14 22:55:32.000000000 +1100

  526. @@ -5,7 +5,7 @@

  527.    */
  528.  
  529.  #ifndef lint
  530. -static char sccs_id[] = "@(#) scaffold.c 1.6 97/03/21 19:27:24";

  531. +static char sccsid[] __attribute__((__unused__)) = "@(#) scaffold.c 1.6 97/03/21 19:27:24";

  532.  #endif
  533.  
  534.  /* System libraries. */
  535. diff -u tcp_wrappers_7.6.orig/shell_cmd.c tcp_wrappers_7.6/shell_cmd.c

  536. --- tcp_wrappers_7.6.orig/shell_cmd.c	1994-12-29 03:42:44.000000000 +1100

  537. +++ tcp_wrappers_7.6/shell_cmd.c	2017-11-14 22:55:45.000000000 +1100

  538. @@ -9,7 +9,7 @@

  539.    */
  540.  
  541.  #ifndef lint
  542. -static char sccsid[] = "@(#) shell_cmd.c 1.5 94/12/28 17:42:44";

  543. +static char sccsid[] __attribute__((__unused__)) = "@(#) shell_cmd.c 1.5 94/12/28 17:42:44";

  544.  #endif
  545.  
  546.  /* System libraries. */
  547. @@ -20,6 +20,9 @@

  548.  #include <stdio.h>
  549.  #include <syslog.h>
  550.  #include <string.h>
  551. +#include <fcntl.h>

  552. +#include <sys/wait.h>

  553. +#include <unistd.h>

  554.  
  555.  extern void exit();
  556.  
  557. diff -u tcp_wrappers_7.6.orig/socket.c tcp_wrappers_7.6/socket.c

  558. --- tcp_wrappers_7.6.orig/socket.c	2017-11-13 09:29:08.000000000 +1100

  559. +++ tcp_wrappers_7.6/socket.c	2017-11-14 22:55:57.000000000 +1100

  560. @@ -16,7 +16,7 @@

  561.    */
  562.  
  563.  #ifndef lint
  564. -static char sccsid[] = "@(#) socket.c 1.15 97/03/21 19:27:24";

  565. +static char sccsid[] __attribute__((__unused__)) = "@(#) socket.c 1.15 97/03/21 19:27:24";

  566.  #endif
  567.  
  568.  /* System libraries. */
  569. @@ -77,7 +77,7 @@

  570.      static struct sockaddr_in client;
  571.      static struct sockaddr_in server;
  572.  #if !defined (__GLIBC__)
  573. -    int     len;

  574. +    unsigned int  len;

  575.  #else /* __GLIBC__ */
  576.      size_t  len;
  577.  #endif /* __GLIBC__ */
  578. @@ -229,7 +229,7 @@

  579.      char    buf[BUFSIZ];
  580.      struct sockaddr_in sin;
  581.  #if !defined(__GLIBC__)
  582. -    int     size = sizeof(sin);

  583. +    unsigned int  size = sizeof(sin);

  584.  #else /* __GLIBC__ */
  585.      size_t  size = sizeof(sin);
  586.  #endif /* __GLIBC__ */
  587. diff -u tcp_wrappers_7.6.orig/tcpd.c tcp_wrappers_7.6/tcpd.c

  588. --- tcp_wrappers_7.6.orig/tcpd.c	1996-02-12 03:01:33.000000000 +1100

  589. +++ tcp_wrappers_7.6/tcpd.c	2017-11-14 22:56:09.000000000 +1100

  590. @@ -11,7 +11,7 @@

  591.    */
  592.  
  593.  #ifndef lint
  594. -static char sccsid[] = "@(#) tcpd.c 1.10 96/02/11 17:01:32";

  595. +static char sccsid[] __attribute__((__unused__)) = "@(#) tcpd.c 1.10 96/02/11 17:01:32";

  596.  #endif
  597.  
  598.  /* System libraries. */
  599. @@ -24,6 +24,7 @@

  600.  #include <stdio.h>
  601.  #include <syslog.h>
  602.  #include <string.h>
  603. +#include <unistd.h>

  604.  
  605.  #ifndef MAXPATHNAMELEN
  606.  #define MAXPATHNAMELEN	BUFSIZ
  607. @@ -38,10 +39,12 @@

  608.  #include "patchlevel.h"
  609.  #include "tcpd.h"
  610.  
  611. +extern void fix_options(struct request_info *);

  612. +

  613.  int     allow_severity = SEVERITY;	/* run-time adjustable */
  614.  int     deny_severity = LOG_WARNING;	/* ditto */
  615.  
  616. -main(argc, argv)

  617. +int     main(argc, argv)

  618.  int     argc;
  619.  char  **argv;
  620.  {
  621. diff -u tcp_wrappers_7.6.orig/tcpd.h tcp_wrappers_7.6/tcpd.h

  622. --- tcp_wrappers_7.6.orig/tcpd.h	2017-11-13 09:29:25.000000000 +1100

  623. +++ tcp_wrappers_7.6/tcpd.h	2017-11-14 22:36:40.000000000 +1100

  624. @@ -182,10 +182,10 @@

  625.  
  626.  #ifdef __STDC__
  627.  extern void tcpd_warn(char *, ...);	/* report problem and proceed */
  628. -extern void tcpd_jump(char *, ...);	/* report problem and jump */

  629. +extern void tcpd_jump(char *, ...) __attribute__((__noreturn__));	/* report problem and jump */

  630.  #else
  631.  extern void tcpd_warn();
  632. -extern void tcpd_jump();

  633. +extern void tcpd_jump() __attribute__((__noreturn__));

  634.  #endif
  635.  
  636.  struct tcpd_context {
  637. diff -u tcp_wrappers_7.6.orig/tcpdchk.c tcp_wrappers_7.6/tcpdchk.c

  638. --- tcp_wrappers_7.6.orig/tcpdchk.c	2017-11-13 09:29:08.000000000 +1100

  639. +++ tcp_wrappers_7.6/tcpdchk.c	2017-11-14 22:56:21.000000000 +1100

  640. @@ -15,7 +15,7 @@

  641.    */
  642.  
  643.  #ifndef lint
  644. -static char sccsid[] = "@(#) tcpdchk.c 1.8 97/02/12 02:13:25";

  645. +static char sccsid[] __attribute__((__unused__)) = "@(#) tcpdchk.c 1.8 97/02/12 02:13:25";

  646.  #endif
  647.  
  648.  /* System libraries. */
  649. @@ -30,6 +30,7 @@

  650.  #include <errno.h>
  651.  #include <netdb.h>
  652.  #include <string.h>
  653. +#include <unistd.h>

  654.  
  655.  extern int errno;
  656.  extern void exit();
  657. @@ -199,13 +200,15 @@

  658.      char    sv_list[BUFLEN];		/* becomes list of daemons */
  659.      char   *cl_list;			/* becomes list of requests */
  660.      char   *sh_cmd;			/* becomes optional shell command */
  661. +#ifndef PROCESS_OPTIONS

  662.      char    buf[BUFSIZ];
  663. +#endif

  664.      int     verdict;
  665.      struct tcpd_context saved_context;
  666.  
  667.      saved_context = tcpd_context;		/* stupid compilers */
  668.  
  669. -    if (fp = fopen(table, "r")) {

  670. +    if ((fp = fopen(table, "r"))) {

  671.  	tcpd_context.file = table;
  672.  	tcpd_context.line = 0;
  673.  	while (xgets(sv_list, sizeof(sv_list), fp)) {
  674. @@ -331,7 +334,7 @@

  675.  	    clients = 0;
  676.  	} else {
  677.  	    clients++;
  678. -	    if (host = split_at(cp + 1, '@')) {	/* user@host */

  679. +	    if ((host = split_at(cp + 1, '@'))) {	/* user@host */

  680.  		check_user(cp);
  681.  		check_host(host);
  682.  	    } else {
  683. @@ -446,7 +449,7 @@

  684.          } else if (errno != ENOENT) {
  685.              tcpd_warn("open %s: %m", pat);
  686.          }
  687. -    } else if (mask = split_at(pat, '/')) {	/* network/netmask */

  688. +    } else if ((mask = split_at(pat, '/'))) {	/* network/netmask */

  689.  	if (dot_quad_addr(pat) == INADDR_NONE
  690.  	    || dot_quad_addr(mask) == INADDR_NONE)
  691.  	    tcpd_warn("%s/%s: bad net/mask pattern", pat, mask);
  692. diff -u tcp_wrappers_7.6.orig/tcpdmatch.c tcp_wrappers_7.6/tcpdmatch.c

  693. --- tcp_wrappers_7.6.orig/tcpdmatch.c	1996-02-12 03:01:36.000000000 +1100

  694. +++ tcp_wrappers_7.6/tcpdmatch.c	2017-11-14 22:56:40.000000000 +1100

  695. @@ -14,7 +14,7 @@

  696.    */
  697.  
  698.  #ifndef lint
  699. -static char sccsid[] = "@(#) tcpdmatch.c 1.5 96/02/11 17:01:36";

  700. +static char sccsid[] __attribute__((__unused__)) = "@(#) tcpdmatch.c 1.5 96/02/11 17:01:36";

  701.  #endif
  702.  
  703.  /* System libraries. */
  704. @@ -29,6 +29,8 @@

  705.  #include <syslog.h>
  706.  #include <setjmp.h>
  707.  #include <string.h>
  708. +#include <stdlib.h>

  709. +#include <unistd.h>

  710.  
  711.  extern void exit();
  712.  extern int optind;
  713. diff -u tcp_wrappers_7.6.orig/tli.c tcp_wrappers_7.6/tli.c

  714. --- tcp_wrappers_7.6.orig/tli.c	1997-03-22 05:27:26.000000000 +1100

  715. +++ tcp_wrappers_7.6/tli.c	2017-11-14 22:56:50.000000000 +1100

  716. @@ -15,7 +15,7 @@

  717.    */
  718.  
  719.  #ifndef lint
  720. -static char sccsid[] = "@(#) tli.c 1.15 97/03/21 19:27:25";

  721. +static char sccsid[] __attribute__((__unused__)) = "@(#) tli.c 1.15 97/03/21 19:27:25";

  722.  #endif
  723.  
  724.  #ifdef TLI
  725. diff -u tcp_wrappers_7.6.orig/try-from.c tcp_wrappers_7.6/try-from.c

  726. --- tcp_wrappers_7.6.orig/try-from.c	1994-12-29 03:42:55.000000000 +1100

  727. +++ tcp_wrappers_7.6/try-from.c	2017-11-14 22:56:59.000000000 +1100

  728. @@ -11,7 +11,7 @@

  729.    */
  730.  
  731.  #ifndef lint
  732. -static char sccsid[] = "@(#) try-from.c 1.2 94/12/28 17:42:55";

  733. +static char sccsid[] __attribute__((__unused__)) = "@(#) try-from.c 1.2 94/12/28 17:42:55";

  734.  #endif
  735.  
  736.  /* System libraries. */
  737. @@ -37,7 +37,7 @@

  738.  int     allow_severity = SEVERITY;	/* run-time adjustable */
  739.  int     deny_severity = LOG_WARNING;	/* ditto */
  740.  
  741. -main(argc, argv)

  742. +int     main(argc, argv)

  743.  int     argc;
  744.  char  **argv;
  745.  {
  746. diff -u tcp_wrappers_7.6.orig/update.c tcp_wrappers_7.6/update.c

  747. --- tcp_wrappers_7.6.orig/update.c	1994-12-29 03:42:56.000000000 +1100

  748. +++ tcp_wrappers_7.6/update.c	2017-11-14 22:57:09.000000000 +1100

  749. @@ -14,7 +14,7 @@

  750.    */
  751.  
  752.  #ifndef lint
  753. -static char sccsid[] = "@(#) update.c 1.1 94/12/28 17:42:56";

  754. +static char sccsid[] __attribute__((__unused__)) = "@(#) update.c 1.1 94/12/28 17:42:56";

  755.  #endif
  756.  
  757.  /* System libraries */
  758. @@ -22,6 +22,7 @@

  759.  #include <stdio.h>
  760.  #include <syslog.h>
  761.  #include <string.h>
  762. +#include <unistd.h>

  763.  
  764.  /* Local stuff. */
  765.