Mercurial > dropbear
view includes.h @ 1631:292f79307600
fix some gcc warnings (#73)
* tweak string size
fix gcc8 warnings
```
svr-agentfwd.c: In function 'bindagent':
svr-agentfwd.c:254:53: warning: '%s' directive output may be truncated writing up to 107 bytes into a region of size between 0 and 107 [-Wformat-truncation=]
snprintf(addr.sun_path, sizeof(addr.sun_path), "%s/%s", path, sockfile);
^~ ~~~~~~~~
svr-agentfwd.c:254:2: note: 'snprintf' output between 2 and 216 bytes into a destination of size 108
snprintf(addr.sun_path, sizeof(addr.sun_path), "%s/%s", path, sockfile);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
```
* cleanup signed/unsigned comparison
fix gcc8 warnings
```
scp.c: In function 'do_local_cmd':
scp.c:132:17: warning: comparison of integer expressions of different signedness: 'u_int' {aka 'unsigned int'} and 'int' [-Wsign-compare]
for (i = 0; i < a->num; i++)
^
scpmisc.c: In function 'addargs':
scpmisc.c:161:25: warning: comparison of integer expressions of different signedness: 'int' and 'u_int' {aka 'unsigned int'} [-Wsign-compare]
} else if (args->num+2 >= nalloc)
^~
scpmisc.c: In function 'replacearg':
scpmisc.c:183:12: warning: comparison of integer expressions of different signedness: 'u_int' {aka 'unsigned int'} and 'int' [-Wsign-compare]
if (which >= args->num)
^~
scpmisc.c: In function 'freeargs':
scpmisc.c:196:17: warning: comparison of integer expressions of different signedness: 'u_int' {aka 'unsigned int'} and 'int' [-Wsign-compare]
for (i = 0; i < args->num; i++)
^
```
see https://cvsweb.openbsd.org/cgi-bin/cvsweb/src/usr.bin/ssh/misc.h.diff?r1=1.16&r2=1.17
author | François Perrad <francois.perrad@gadz.org> |
---|---|
date | Wed, 20 Mar 2019 15:25:15 +0100 |
parents | c66c49ebf77d |
children | 76189c9ffea2 |
line wrap: on
line source
/* * Dropbear - a SSH2 server * * Copyright (c) 2002,2003 Matt Johnston * All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal * in the Software without restriction, including without limitation the rights * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * copies of the Software, and to permit persons to whom the Software is * furnished to do so, subject to the following conditions: * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ #ifndef DROPBEAR_INCLUDES_H_ #define DROPBEAR_INCLUDES_H_ #include "options.h" #include "debug.h" #include <sys/types.h> #include <sys/ioctl.h> #include <sys/param.h> /* required for BSD4_4 define */ #include <sys/socket.h> #include <sys/stat.h> #include <sys/time.h> #include <sys/un.h> #include <sys/wait.h> #include <sys/resource.h> #include <stdio.h> #include <errno.h> #include <fcntl.h> #include <grp.h> #include <limits.h> #include <pwd.h> #include <signal.h> #include <stdlib.h> #include <string.h> #include <termios.h> #include <unistd.h> #include <syslog.h> #include <netdb.h> #include <ctype.h> #include <stdarg.h> #include <dirent.h> #include <time.h> #include <setjmp.h> #ifdef HAVE_UTMP_H #include <utmp.h> #endif #ifdef HAVE_UTMPX_H #include <utmpx.h> #endif #ifdef HAVE_PATHS_H #include <paths.h> #endif #ifdef HAVE_LASTLOG_H #include <lastlog.h> #endif #ifdef HAVE_NETINET_IN_H #include <netinet/in.h> #endif #include <arpa/inet.h> /* netbsd 1.6 needs this to be included before netinet/ip.h for some * undocumented reason */ #ifdef HAVE_NETINET_IN_SYSTM_H #include <netinet/in_systm.h> #endif #include <netinet/ip.h> #ifdef HAVE_NETINET_TCP_H #include <netinet/tcp.h> #endif #ifdef HAVE_INTTYPES_H #include <inttypes.h> #endif #ifdef HAVE_LIBUTIL_H #include <libutil.h> #endif #ifdef HAVE_CRYPT_H #include <crypt.h> #endif #ifndef DISABLE_ZLIB #include <zlib.h> #endif #ifdef HAVE_UTIL_H #include <util.h> #endif #ifdef HAVE_SHADOW_H #include <shadow.h> #endif #ifdef HAVE_LIBGEN_H #include <libgen.h> #endif #ifdef HAVE_SYS_UIO_H #include <sys/uio.h> #endif #ifdef BUNDLED_LIBTOM #include "libtomcrypt/src/headers/tomcrypt.h" #include "libtommath/tommath.h" #else #include <tomcrypt.h> #include <tommath.h> #endif #include "compat.h" #ifndef HAVE_U_INT8_T typedef unsigned char u_int8_t; #endif /* HAVE_U_INT8_T */ #ifndef HAVE_UINT8_T typedef u_int8_t uint8_t; #endif /* HAVE_UINT8_T */ #ifndef HAVE_U_INT16_T typedef unsigned short u_int16_t; #endif /* HAVE_U_INT16_T */ #ifndef HAVE_UINT16_T typedef u_int16_t uint16_t; #endif /* HAVE_UINT16_T */ #ifndef HAVE_U_INT32_T typedef unsigned int u_int32_t; #endif /* HAVE_U_INT32_T */ #ifndef HAVE_UINT32_T typedef u_int32_t uint32_t; #endif /* HAVE_UINT32_T */ #ifndef SIZE_T_MAX #define SIZE_T_MAX ULONG_MAX #endif /* SIZE_T_MAX */ #ifdef HAVE_LINUX_PKT_SCHED_H #include <linux/types.h> #include <linux/pkt_sched.h> #endif #include "fake-rfc2553.h" #include "fuzz.h" #ifndef LOG_AUTHPRIV #define LOG_AUTHPRIV LOG_AUTH #endif /* so we can avoid warnings about unused params (ie in signal handlers etc) */ #ifdef UNUSED #elif defined(__GNUC__) # define UNUSED(x) UNUSED_ ## x __attribute__((unused)) #elif defined(__LCLINT__) # define UNUSED(x) /*@unused@*/ x #else # define UNUSED(x) x #endif #endif /* DROPBEAR_INCLUDES_H_ */