diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2019-01-17 15:43:47 +0400 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2019-02-07 15:49:08 +0200 |
| commit | d1c4b3e97db42abc83921deabd26cc87bfef1af5 (patch) | |
| tree | 597c314fdea6c8a8b818bfd851a8bff41bc7b5bb /slirp | |
| parent | ba1be965311c8a63e809a2a93d1a2a9395ddd138 (diff) | |
slirp: add slirp own version of pstrcpy
Remove a dependency on qemu util.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Diffstat (limited to 'slirp')
| -rw-r--r-- | slirp/slirp.c | 4 | ||||
| -rw-r--r-- | slirp/tftp.c | 2 | ||||
| -rw-r--r-- | slirp/util.c | 17 | ||||
| -rw-r--r-- | slirp/util.h | 2 |
4 files changed, 22 insertions, 3 deletions
diff --git a/slirp/slirp.c b/slirp/slirp.c index 9ec1e4c62f..b5c4788489 100644 --- a/slirp/slirp.c +++ b/slirp/slirp.c @@ -320,8 +320,8 @@ Slirp *slirp_init(int restricted, bool in_enabled, struct in_addr vnetwork, slirp->vprefix_len = vprefix_len; slirp->vhost_addr6 = vhost6; if (vhostname) { - pstrcpy(slirp->client_hostname, sizeof(slirp->client_hostname), - vhostname); + slirp_pstrcpy(slirp->client_hostname, sizeof(slirp->client_hostname), + vhostname); } slirp->tftp_prefix = g_strdup(tftp_path); slirp->bootp_filename = g_strdup(bootfile); diff --git a/slirp/tftp.c b/slirp/tftp.c index 6fb381ef33..f0bcc72c92 100644 --- a/slirp/tftp.c +++ b/slirp/tftp.c @@ -216,7 +216,7 @@ static void tftp_send_error(struct tftp_session *spt, tp->tp_op = htons(TFTP_ERROR); tp->x.tp_error.tp_error_code = htons(errorcode); - pstrcpy((char *)tp->x.tp_error.tp_msg, sizeof(tp->x.tp_error.tp_msg), msg); + slirp_pstrcpy((char *)tp->x.tp_error.tp_msg, sizeof(tp->x.tp_error.tp_msg), msg); m->m_len = sizeof(struct tftp_t) - (TFTP_BLOCKSIZE_MAX + 2) + 3 + strlen(msg) - sizeof(struct udphdr); diff --git a/slirp/util.c b/slirp/util.c index 59f6713c8b..84f5afdbc3 100644 --- a/slirp/util.c +++ b/slirp/util.c @@ -188,3 +188,20 @@ int slirp_closesocket(int fd) return ret; } #endif /* WIN32 */ + +void slirp_pstrcpy(char *buf, int buf_size, const char *str) +{ + int c; + char *q = buf; + + if (buf_size <= 0) + return; + + for(;;) { + c = *str++; + if (c == 0 || q >= buf + buf_size - 1) + break; + *q++ = c; + } + *q = '\0'; +} diff --git a/slirp/util.h b/slirp/util.h index 4f6e80c3ed..586517bb30 100644 --- a/slirp/util.h +++ b/slirp/util.h @@ -91,4 +91,6 @@ static inline int slirp_socket_set_fast_reuse(int fd) #endif } +void slirp_pstrcpy(char *buf, int buf_size, const char *str); + #endif |