diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2013-11-06 16:20:21 +0100 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2013-11-11 10:08:08 +0100 |
| commit | 66659ff1ad6831b0ea7425fa6ecd8a8687523658 (patch) | |
| tree | 48e22b475fa8854128e0861a33fed6f78c8094b5 /freebsd/lib/libipsec | |
| parent | Define __GLOBL1() and __GLOBL() (diff) | |
| download | rtems-libbsd-66659ff1ad6831b0ea7425fa6ecd8a8687523658.tar.bz2 | |
Update to FreeBSD 9.2
Diffstat (limited to 'freebsd/lib/libipsec')
| -rw-r--r-- | freebsd/lib/libipsec/ipsec_dump_policy.c | 3 | ||||
| -rw-r--r-- | freebsd/lib/libipsec/policy_token.l | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/freebsd/lib/libipsec/ipsec_dump_policy.c b/freebsd/lib/libipsec/ipsec_dump_policy.c index 94275e89..33d4bb13 100644 --- a/freebsd/lib/libipsec/ipsec_dump_policy.c +++ b/freebsd/lib/libipsec/ipsec_dump_policy.c @@ -164,7 +164,8 @@ ipsec_dump_policy(policy, delimiter) return NULL; } buf = newbuf; - snprintf(buf, buflen, "%s%s%s", buf, delimiter, isrbuf); + snprintf(buf + strlen(buf), buflen - strlen(buf), + "%s%s", delimiter, isrbuf); off += xisr->sadb_x_ipsecrequest_len; } diff --git a/freebsd/lib/libipsec/policy_token.l b/freebsd/lib/libipsec/policy_token.l index cc70ea90..ec099d2b 100644 --- a/freebsd/lib/libipsec/policy_token.l +++ b/freebsd/lib/libipsec/policy_token.l @@ -58,6 +58,7 @@ int yylex(void); %option noyywrap %option nounput +%option noinput /* common section */ nl \n @@ -142,8 +143,8 @@ void __policy__strbuffer__init__(msg) char *msg; { - if (yy_current_buffer) - yy_delete_buffer(yy_current_buffer); + if (YY_CURRENT_BUFFER) + yy_delete_buffer(YY_CURRENT_BUFFER); strbuffer = (YY_BUFFER_STATE)yy_scan_string(msg); yy_switch_to_buffer(strbuffer); |