This is an automated email from the ASF dual-hosted git repository.
jmuehlner pushed a commit to branch staging/1.1.0
in repository https://gitbox.apache.org/repos/asf/guacamole-server.git
commit dd4c3968d17bd166a9e294c1437c1e554518e5b3
Merge: 3989c40 f8ec709
Author: James Muehlner <james.muehl...@guac-dev.org>
AuthorDate: Tue Apr 9 21:49:16 2019 -0700
GUACAMOLE-637: Merge migration to new libguac string functions.
.gitignore | 4 +
README-unit-testing.md | 2 +-
configure.ac | 17 ++
src/{common => common-ssh}/.gitignore | 6 +-
src/common-ssh/Makefile.am | 1 +
src/common-ssh/common-ssh/sftp.h | 25 +++
src/common-ssh/sftp.c | 211 +++++++------------
src/{common => common-ssh}/tests/Makefile.am | 34 ++-
src/common-ssh/tests/sftp/normalize_path.c | 263 ++++++++++++++++++++++++
src/common/.gitignore | 4 -
src/common/clipboard.c | 4 +-
src/common/tests/Makefile.am | 2 +-
src/guacd/.gitignore | 35 ----
src/libguac/.gitignore | 4 -
src/libguac/Makefile.am | 4 +-
src/libguac/audio.c | 11 +-
src/libguac/client.c | 30 +--
src/libguac/encode-jpeg.c | 6 +-
src/libguac/encode-jpeg.h | 4 +-
src/libguac/encode-png.c | 6 +-
src/libguac/encode-png.h | 4 +-
src/libguac/encode-webp.c | 6 +-
src/libguac/encode-webp.h | 4 +-
src/libguac/error.c | 2 +-
src/libguac/guacamole/string.h | 161 +++++++++++++++
src/libguac/id.c | 2 +-
src/libguac/parser.c | 8 +-
src/libguac/pool.c | 2 +-
src/libguac/protocol.c | 14 +-
src/libguac/raw_encoder.c | 12 +-
src/libguac/raw_encoder.h | 2 +-
src/libguac/socket-broadcast.c | 8 +-
src/libguac/socket-fd.c | 4 +-
src/libguac/socket-nest.c | 6 +-
src/libguac/socket-ssl.c | 6 +-
src/libguac/socket-tee.c | 2 +-
src/libguac/socket-wsa.c | 4 +-
src/libguac/socket.c | 8 +-
src/libguac/string.c | 107 ++++++++++
src/libguac/tests/Makefile.am | 5 +-
src/libguac/tests/string/strlcat.c | 153 ++++++++++++++
src/libguac/tests/string/strlcpy.c | 102 +++++++++
src/libguac/tests/string/strljoin.c | 148 +++++++++++++
src/libguac/timestamp.c | 2 +-
src/libguac/unicode.c | 2 +-
src/libguac/user-handlers.c | 12 +-
src/libguac/user-handlers.h | 4 +-
src/libguac/user-handshake.c | 12 +-
src/libguac/user.c | 16 +-
src/protocols/rdp/.gitignore | 37 +---
src/protocols/rdp/Makefile.am | 1 +
src/protocols/rdp/guac_svc/svc_service.c | 3 +-
src/protocols/rdp/keymaps/generate.pl | 2 +-
src/protocols/rdp/rdp_fs.c | 98 ++++-----
src/protocols/rdp/rdp_fs.h | 5 +
src/protocols/rdp/rdp_settings.c | 9 +-
src/protocols/rdp/rdp_stream.c | 5 +-
src/protocols/rdp/rdp_svc.c | 14 +-
src/protocols/rdp/rdp_svc.h | 7 +-
src/{common => protocols/rdp}/tests/Makefile.am | 34 ++-
src/protocols/rdp/tests/fs/normalize_path.c | 256 +++++++++++++++++++++++
src/protocols/ssh/.gitignore | 36 ----
src/protocols/telnet/.gitignore | 36 ----
src/protocols/vnc/.gitignore | 36 ----
util/generate-test-runner.pl | 2 +-
65 files changed, 1521 insertions(+), 551 deletions(-)
diff --cc src/libguac/Makefile.am
index 16b0e2c,ffcfffc..dc96a87
--- a/src/libguac/Makefile.am
+++ b/src/libguac/Makefile.am
@@@ -122,10 -124,10 +124,10 @@@ libguacinc_HEADERS += guacamole/socket-
endif
libguac_la_CFLAGS = \
- -Werror -Wall -pedantic -I$(srcdir)/guacamole
+ -Werror -Wall -pedantic
libguac_la_LDFLAGS = \
- -version-info 16:0:0 \
+ -version-info 17:0:0 \
-no-undefined \
@CAIRO_LIBS@ \
@DL_LIBS@ \
