diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2003-03-17 22:56:13 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2003-03-17 22:56:13 +0000 |
| commit | ad0d6509a761154c113e040a82ad78e72a3ccf30 (patch) | |
| tree | 13f4b6188945bfd1ada57e76c612f45a21bce5e2 /source3/include/safe_string.h | |
| parent | f06d1b240a0cc15bc50c907198c06fcd826d63b2 (diff) | |
| download | samba-ad0d6509a761154c113e040a82ad78e72a3ccf30.tar.gz samba-ad0d6509a761154c113e040a82ad78e72a3ccf30.tar.bz2 samba-ad0d6509a761154c113e040a82ad78e72a3ccf30.zip | |
Merge from HEAD:
- Make ReadDirName return a const char*.
- Consequential changes from that
- mark our fstring/pstring assumptions in function prototypes
Andrew Bartlett
(This used to be commit 10b53d7c6fd77f23433dd2ef12bb14b227147a48)
Diffstat (limited to 'source3/include/safe_string.h')
| -rw-r--r-- | source3/include/safe_string.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source3/include/safe_string.h b/source3/include/safe_string.h index 431dc400aa..95cf23df83 100644 --- a/source3/include/safe_string.h +++ b/source3/include/safe_string.h @@ -96,4 +96,7 @@ char * __unsafe_string_function_usage_here__(void); #define push_pstring_base(dest, src, pstring_base) \ push_ascii(dest, src, sizeof(pstring)-PTR_DIFF(dest,pstring_base)-1, STR_TERMINATE) +#define safe_strcpy_base(dest, src, base, size) \ + safe_strcpy(dest, src, size-PTR_DIFF(dest,base)-1) + #endif |