diff options
| author | Michał Łyszczek <michal.lyszczek@bofc.pl> | 2019-08-21 23:24:47 +0200 |
|---|---|---|
| committer | Michał Łyszczek <michal.lyszczek@bofc.pl> | 2019-08-21 23:24:47 +0200 |
| commit | b155c0f99495e4f7886d710dfe4a4891240b1fd2 (patch) | |
| tree | efd1fdf6041051b5ec5ef36d10768cdcaab40354 | |
| parent | 84ee02edb8676027f590c2d25dd1e53061906e66 (diff) | |
| download | termsend-b155c0f99495e4f7886d710dfe4a4891240b1fd2.tar.gz termsend-b155c0f99495e4f7886d710dfe4a4891240b1fd2.tar.bz2 termsend-b155c0f99495e4f7886d710dfe4a4891240b1fd2.zip | |
src/server.c: return only link to user without anything else in the line
String returned was "Upload completed, link to file https://..."
which made it hard to put result into shell variable in scripts.
This patch fixes it.
Reported-by: Burdzi0
Signed-off-by: Michał Łyszczek <michal.lyszczek@bofc.pl>
| -rw-r--r-- | src/server.c | 2 | ||||
| -rwxr-xr-x | tst/test-server.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/server.c b/src/server.c index dbfee7f..2f2e6e3 100644 --- a/src/server.c +++ b/src/server.c @@ -761,7 +761,7 @@ upload_finished_with_fin: strcat(url, "/"); strcat(url, fname); el_oprint(OELI, "[%s] %s", inet_ntoa(client.sin_addr), fname); - server_reply(cfd, "upload complete, link to file %s\n", url); + server_reply(cfd, "%s\n", url); server_linger(cfd); if (cfd->ssl) ssl_close(cfd->ssl_fd); close(cfd->fd); diff --git a/tst/test-server.sh b/tst/test-server.sh index 6162802..ba16fa6 100755 --- a/tst/test-server.sh +++ b/tst/test-server.sh @@ -313,7 +313,7 @@ multi_thread_check() then touch "${1}.test_check" return 0 - elif [[ "${out}" = "upload complete, link to file localhost/"* ]] + elif [[ "${out}" = "localhost/"* ]] then file="$(echo "${out}" | rev | cut -d/ -f-1 | rev)" mt_fail "diff ${updir}/${file} ${data}.${fname}" |