Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Main
Synchronet
Compare Revisions
f7489c8917e1e3f1824c23df81702dffbd4c2de2...40f46c7e366541954661cfa39bb7ef7eced2f849
Commits (2)
Fix issues with std::min() again...
· f9fe854e
Rob Swindell
authored
Mar 13, 2022
std::min() requires both arguments be of same type too.
f9fe854e
Add new strings: HashingFile and HashedFile
· 40f46c7e
Rob Swindell
authored
Mar 13, 2022
40f46c7e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
ctrl/text.dat
ctrl/text.dat
+3
-1
src/sbbs3/upload.cpp
src/sbbs3/upload.cpp
+2
-1
No files found.
ctrl/text.dat
View file @
40f46c7e
...
...
@@ -1043,4 +1043,6 @@
"%.0s\1n\1h\1m%s \1n\1msent you NetMail%s from \1h%s\1n\r\n" 858 FidoNetMailReceived
" with attachment" 859 WithAttachment
"%.0s\1n\1h\1m%s \1n\1msent you EchoMail on "\ 860 FidoEchoMailReceived
"\1h%s \1n\1m%s\1n\r\n"
\ No newline at end of file
"\1h%s \1n\1m%s\1n\r\n"
"\1_\1w\1hCalculating file's hash values @ELLIPSIS@\1n" 861 HashingFile
"\1[\1>" 862 HashedFile
src/sbbs3/upload.cpp
View file @
40f46c7e
...
...
@@ -22,6 +22,7 @@
#include "sbbs.h"
#include "sauce.h"
#include "filedat.h"
#include <algorithm>
/****************************************************************************/
/****************************************************************************/
...
...
@@ -170,7 +171,7 @@ bool sbbs_t::uploadfile(file_t* f)
}
if
(
cfg
.
dir
[
f
->
dir
]
->
misc
&
DIR_AONLY
)
/* Forced anonymous */
f
->
hdr
.
attr
|=
MSG_ANONYMOUS
;
uint32_t
cdt
=
(
uint32_t
)
min
(
length
,
UINT32_MAX
);
uint32_t
cdt
=
(
uint32_t
)
std
::
min
(
length
,
(
off_t
)
UINT32_MAX
);
smb_hfield_bin
(
f
,
SMB_COST
,
cdt
);
smb_hfield_str
(
f
,
SENDER
,
useron
.
alias
);
bprintf
(
text
[
FileNBytesReceived
],
f
->
name
,
i64toac
(
length
,
tmp
));
...
...