diff options
| author | Jeremy Allison <jra@samba.org> | 2002-04-30 13:28:41 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2002-04-30 13:28:41 +0000 |
| commit | d04b55f2186fb8af998cf61c576771a5f72f4892 (patch) | |
| tree | 9ff8c3a7cf34cefc0ee9a550a3bb1236a9e77595 /source/include/safe_string.h | |
| parent | 73267ca42d9eddabb71b31b4c5068ebbe7bc9f7c (diff) | |
| download | samba-d04b55f2186fb8af998cf61c576771a5f72f4892.tar.gz samba-d04b55f2186fb8af998cf61c576771a5f72f4892.tar.xz samba-d04b55f2186fb8af998cf61c576771a5f72f4892.zip | |
Start of merge to 2_2_RELEASE branch for release.
Jeremy.
Diffstat (limited to 'source/include/safe_string.h')
| -rw-r--r-- | source/include/safe_string.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/source/include/safe_string.h b/source/include/safe_string.h index 2c3d2eda01f..4517d824a58 100644 --- a/source/include/safe_string.h +++ b/source/include/safe_string.h @@ -22,6 +22,11 @@ #ifndef _SAFE_STRING_H #define _SAFE_STRING_H +#ifdef bcopy +#undef bcopy +#endif /* bcopy */ +#define bcopy(src,dest,size) __ERROR__XX__NEVER_USE_BCOPY___; + #ifdef strcpy #undef strcpy #endif /* strcpy */ @@ -42,6 +47,9 @@ #define fstrcpy(d,s) safe_strcpy((d),(s),sizeof(fstring)-1) #define fstrcat(d,s) safe_strcat((d),(s),sizeof(fstring)-1) +#define fstrterminate(d) (((d)[sizeof(fstring)-1]) = '\0') +#define pstrterminate(d) (((d)[sizeof(pstring)-1]) = '\0') + #define wpstrcpy(d,s) safe_strcpy_w((d),(s),sizeof(wpstring)) #define wpstrcat(d,s) safe_strcat_w((d),(s),sizeof(wpstring)) #define wfstrcpy(d,s) safe_strcpy_w((d),(s),sizeof(wfstring)) |