Mercurial > dropbear
view termcodes.c @ 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 | 8aed91ebf3c7 |
| children |
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. */ #include "includes.h" #include "termcodes.h" const struct TermCode termcodes[MAX_TERMCODE+1] = { {0, 0}, /* TTY_OP_END */ {VINTR, TERMCODE_CONTROLCHAR}, /* control character codes */ {VQUIT, TERMCODE_CONTROLCHAR}, {VERASE, TERMCODE_CONTROLCHAR}, {VKILL, TERMCODE_CONTROLCHAR}, {VEOF, TERMCODE_CONTROLCHAR}, {VEOL, TERMCODE_CONTROLCHAR}, #ifdef VEOL2 {VEOL2, TERMCODE_CONTROLCHAR}, #else {0, 0}, #endif {VSTART, TERMCODE_CONTROLCHAR}, {VSTOP, TERMCODE_CONTROLCHAR}, {VSUSP, TERMCODE_CONTROLCHAR}, #ifdef VDSUSP {VDSUSP, TERMCODE_CONTROLCHAR}, #else {0, 0}, #endif #ifdef VREPRINT {VREPRINT, TERMCODE_CONTROLCHAR}, #else {0, 0}, #endif #ifdef AIX {CERASE, TERMCODE_CONTROLCHAR}, #else #ifdef VWERASE {VWERASE, TERMCODE_CONTROLCHAR}, #else {0, 0}, #endif #endif #ifdef VLNEXT {VLNEXT, TERMCODE_CONTROLCHAR}, #else {0, 0}, #endif #ifdef VFLUSH {VFLUSH, TERMCODE_CONTROLCHAR}, #else {0, 0}, #endif #ifdef VSWTCH {VSWTCH, TERMCODE_CONTROLCHAR}, #else {0, 0}, #endif #ifdef VSTATUS {VSTATUS, TERMCODE_CONTROLCHAR}, #else {0, 0}, #endif #ifdef AIX {CKILL, TERMCODE_CONTROLCHAR}, #elif defined(VDISCARD) {VDISCARD, TERMCODE_CONTROLCHAR}, #else {0, 0}, #endif {0, 0}, /* 19 */ {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, /* 29 */ {IGNPAR, TERMCODE_INPUT}, /* input flags */ {PARMRK, TERMCODE_INPUT}, {INPCK, TERMCODE_INPUT}, {ISTRIP, TERMCODE_INPUT}, {INLCR, TERMCODE_INPUT}, {IGNCR, TERMCODE_INPUT}, {ICRNL, TERMCODE_INPUT}, #ifdef IUCLC {IUCLC, TERMCODE_INPUT}, #else {0, 0}, #endif {IXON, TERMCODE_INPUT}, {IXANY, TERMCODE_INPUT}, {IXOFF, TERMCODE_INPUT}, #ifdef IMAXBEL {IMAXBEL, TERMCODE_INPUT}, #else {0, 0}, #endif /* IUTF8 isn't standardised in rfc4254 but is likely soon. * Implemented by linux and darwin */ #ifdef IUTF8 {IUTF8, TERMCODE_INPUT}, #else {0, 0}, #endif {0, 0}, /* 43 */ {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, /* 49 */ {ISIG, TERMCODE_LOCAL}, /* local flags */ {ICANON, TERMCODE_LOCAL}, #ifdef XCASE {XCASE, TERMCODE_LOCAL}, #else {0, 0}, #endif {ECHO, TERMCODE_LOCAL}, {ECHOE, TERMCODE_LOCAL}, {ECHOK, TERMCODE_LOCAL}, {ECHONL, TERMCODE_LOCAL}, {NOFLSH, TERMCODE_LOCAL}, {TOSTOP, TERMCODE_LOCAL}, {IEXTEN, TERMCODE_LOCAL}, #ifdef ECHOCTL {ECHOCTL, TERMCODE_LOCAL}, #else {0, 0}, #endif #ifdef ECHOKE {ECHOKE, TERMCODE_LOCAL}, #else {0, 0}, #endif #ifdef PENDIN {PENDIN, TERMCODE_LOCAL}, #else {0, 0}, #endif {0, 0}, /* 63 */ {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, /* 69 */ {OPOST, TERMCODE_OUTPUT}, /* output flags */ #ifdef OLCUC {OLCUC, TERMCODE_OUTPUT}, #else {0, 0}, #endif {ONLCR, TERMCODE_OUTPUT}, #ifdef OCRNL {OCRNL, TERMCODE_OUTPUT}, #else {0, 0}, #endif #ifdef ONOCR {ONOCR, TERMCODE_OUTPUT}, #else {0, 0}, #endif #ifdef ONLRET {ONLRET, TERMCODE_OUTPUT}, #else {0, 0}, #endif {0, 0}, /* 76 */ {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, /* 89 */ {CS7, TERMCODE_CONTROL}, {CS8, TERMCODE_CONTROL}, {PARENB, TERMCODE_CONTROL}, {PARODD, TERMCODE_CONTROL} /* 94 */ };