diff options
| author | Tim Potter <tpot@samba.org> | 1999-07-09 01:59:22 +0000 |
|---|---|---|
| committer | Tim Potter <tpot@samba.org> | 1999-07-09 01:59:22 +0000 |
| commit | 60e08bd35e78bff3a395090c1d41bb16da0252a5 (patch) | |
| tree | 189c05f08ea64ba3b937714ec48e7878d2521167 | |
| parent | 820c38221126392955eb221c72aa02189fa91c7e (diff) | |
| download | samba-60e08bd35e78bff3a395090c1d41bb16da0252a5.tar.gz samba-60e08bd35e78bff3a395090c1d41bb16da0252a5.tar.bz2 samba-60e08bd35e78bff3a395090c1d41bb16da0252a5.zip | |
Hived off string routines into a separate file.
(This used to be commit 4929513f1376d72409c1e5a39f723d1d2bd81dc0)
| -rw-r--r-- | source3/include/includes.h | 22 | ||||
| -rw-r--r-- | source3/include/safe_string.h | 45 |
2 files changed, 48 insertions, 19 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index b880689600..1a37eb20c1 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -579,25 +579,9 @@ extern int errno; /***** automatically generated prototypes *****/ #include "proto.h" -#ifdef strcpy -#undef strcpy -#endif /* strcpy */ -#define strcpy(dest,src) __ERROR__XX__NEVER_USE_STRCPY___; - -#ifdef strcat -#undef strcat -#endif /* strcat */ -#define strcat(dest,src) __ERROR__XX__NEVER_USE_STRCAT___; - -#ifdef sprintf -#undef sprintf -#endif /* sprintf */ -#define sprintf __ERROR__XX__NEVER_USE_SPRINTF__; - -#define pstrcpy(d,s) safe_strcpy((d),(s),sizeof(pstring)-1) -#define pstrcat(d,s) safe_strcat((d),(s),sizeof(pstring)-1) -#define fstrcpy(d,s) safe_strcpy((d),(s),sizeof(fstring)-1) -#define fstrcat(d,s) safe_strcat((d),(s),sizeof(fstring)-1) +/* String routines */ + +#include "safe_string.h" #ifdef __COMPAR_FN_T #define QSORT_CAST (__compar_fn_t) diff --git a/source3/include/safe_string.h b/source3/include/safe_string.h new file mode 100644 index 0000000000..3b2f2c32d6 --- /dev/null +++ b/source3/include/safe_string.h @@ -0,0 +1,45 @@ +/* + Unix SMB/Netbios implementation. + Version 1.9. + Safe string handling routines. + Copyright (C) Andrew Tridgell 1994-1998 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + +#ifndef _SAFE_STRING_H +#define _SAFE_STRING_H + +#ifdef strcpy +#undef strcpy +#endif /* strcpy */ +#define strcpy(dest,src) __ERROR__XX__NEVER_USE_STRCPY___; + +#ifdef strcat +#undef strcat +#endif /* strcat */ +#define strcat(dest,src) __ERROR__XX__NEVER_USE_STRCAT___; + +#ifdef sprintf +#undef sprintf +#endif /* sprintf */ +#define sprintf __ERROR__XX__NEVER_USE_SPRINTF__; + +#define pstrcpy(d,s) safe_strcpy((d),(s),sizeof(pstring)-1) +#define pstrcat(d,s) safe_strcat((d),(s),sizeof(pstring)-1) +#define fstrcpy(d,s) safe_strcpy((d),(s),sizeof(fstring)-1) +#define fstrcat(d,s) safe_strcat((d),(s),sizeof(fstring)-1) + +#endif |