parser3/src/include/pa_string.h - diff

Return to pa_string.h CVS log

Up to [parser3project] / parser3 / src / include

Diff for /parser3/src/include/pa_string.h between versions 1.80 and 1.91

version 1.80, 2001/04/11 08:36:16	version 1.91, 2001/05/15 15:51:05
Line 27 class Table;	Line 27 class Table;
- first for buffer length	- first for buffer length
- second for replacements themselves	- second for replacements themselves
*/	*/
#define UNTAINT_TIMES_BIGGER 10	#define UNTAINT_TIMES_BIGGER 20

#ifndef NO_STRING_ORIGIN	#ifndef NO_STRING_ORIGIN
# define STRING_APPEND_PARAMS \	# define STRING_APPEND_PARAMS \
Line 46 class Table;	Line 46 class Table;
# define APPEND(src, size, lang, file, line) \	# define APPEND(src, size, lang, file, line) \
real_append(src, size, lang)	real_append(src, size, lang)
#endif	#endif
/// appends clean piece to String @see String::real_append	/// appends clean piece to String @see String::real_append
#define APPEND_CLEAN(src, size, file, line) \	#define APPEND_CLEAN(src, size, file, line) \
APPEND(src, size, String::UL_CLEAN, file, line)	APPEND(src, size, String::UL_CLEAN, file, line)
	/// appends piece to String as-is @see String::real_append
	#define APPEND_AS_IS(src, size, file, line) \
	APPEND(src, size, String::UL_AS_IS, file, line)
/// appends tainted piece to String @see String::real_append	/// appends tainted piece to String @see String::real_append
#define APPEND_TAINTED(src, size, file, line) \	#define APPEND_TAINTED(src, size, file, line) \
APPEND(src, size, String::UL_TAINTED, file, line)	APPEND(src, size, String::UL_TAINTED, file, line)
/// handy: appends const char* piece to String @see String::real_append	/// handy: appends const char* piece to String @see String::real_append
#define APPEND_CONST(src) APPEND_CLEAN(src, 0, 0, 0)	#define APPEND_CONST(src) APPEND_AS_IS(src, 0, 0, 0)

class Array;	class Array;
class SQL_Connection;	class SQL_Connection;
Line 82 class String : public Pooled {	Line 85 class String : public Pooled {
public:	public:

enum {	enum {
CR_PREALLOCATED_COUNT=5, ///< default preallocated item count	CR_PREALLOCATED_COUNT=2, ///< default preallocated item count
CR_GROW_PERCENT=60 ///< each time the Array chunk_is_full() array expanded()	CR_GROW_COUNT=2 ///< each time the String chunk_is_full() string expanded()
};	};

/// piece is tainted or not. the language to use when detaint	/// piece is tainted or not. the language to use when detaint
Line 106 public:	Line 109 public:
UL_SQL, ///< ^table:sql body	UL_SQL, ///< ^table:sql body
UL_JS, ///< JavaScript code	UL_JS, ///< JavaScript code
UL_HTML, ///< HTML code (for editing)	UL_HTML, ///< HTML code (for editing)
UL_HTML_TYPO ///< HTML code with TYPOgraphic replacements (for showing)	UL_USER_HTML ///< HTML code with USER chars
};	};

public:	public:
Line 115 public:	Line 118 public:
String(const String& src);	String(const String& src);
size_t size() const { return fsize; }	size_t size() const { return fsize; }
/// convert to C string. if 'lang' known, forcing 'lang' to it	/// convert to C string. if 'lang' known, forcing 'lang' to it
char cstr(Untaint_lang lang=UL_UNSPECIFIED, SQL_Connection connection=0) const {	char *cstr(Untaint_lang lang=UL_UNSPECIFIED,
	SQL_Connection *connection=0,
	const char *charset=0) const {

char result=(char )malloc(size()*UNTAINT_TIMES_BIGGER+1);	char result=(char )malloc(size()*UNTAINT_TIMES_BIGGER+1);
char *eol=store_to(result, lang, connection);	char *eol=store_to(result, lang, connection, charset);
*eol=0;	*eol=0;
return result;	return result;
}	}
/** append fragment	/** append fragment
@see APPEND_CLEAN, APPEND_TAINTED, APPEND_CONST	@see APPEND_AS_IS, APPEND_CLEAN, APPEND_TAINTED, APPEND_CONST
*/	*/
String& real_append(STRING_APPEND_PARAMS);	String& real_append(STRING_APPEND_PARAMS);
/// @return <0 ==0 or >0 depending on comparison result	/// @return <0 ==0 or >0 depending on comparison result
Line 188 public:	Line 194 public:
void split(Array& result,	void split(Array& result,
size_t *pos_after_ref,	size_t *pos_after_ref,
const char *delim, size_t delim_size,	const char *delim, size_t delim_size,
Untaint_lang lang, int limit=-1) const;	Untaint_lang lang=UL_UNSPECIFIED, int limit=-1) const;
void split(Array& result,	void split(Array& result,
size_t *pos_after_ref,	size_t *pos_after_ref,
const String& delim,	const String& delim,
Untaint_lang lang, int limit=-1) const;	Untaint_lang lang=UL_UNSPECIFIED, int limit=-1) const;

typedef void (Row_action)(Table& table, Array row, int start, int finish,	typedef void (Row_action)(Table& table, Array row, int start, int finish,
void *info);	void *info);
bool match(const String *aorigin,	/**
	@return true if fills table.
	table format is defined and fixed[can be used by others]:
	@verbatim
	prematch/match/postmatch/1/2/3/...
	@endverbatim
	*/
	bool match(const unsigned char *pcre_tables,
	const String *aorigin,
const String& regexp,	const String& regexp,
const String *options,	const String *options,
Table **table,	Table **table,
Row_action row_action, void *info) const;	Row_action row_action, void *info) const;
	enum Change_case_kind {
	CC_UPPER,
	CC_LOWER
	};
	String& change_case(Pool& pool, const unsigned char *pcre_tables,
	Change_case_kind kind) const;

#ifndef NO_STRING_ORIGIN	#ifndef NO_STRING_ORIGIN
/// origin of string. calculated by first row	/// origin of string. calculated by first row
Line 209 public:	Line 229 public:

private:	private:

	/// several String fragments
struct Chunk {	struct Chunk {
// the number of rows in chunk	size_t count; ///< the number of rows in chunk
size_t count;	/// string fragment or a link to next chunk union
union Row {	union Row {
// fragment	/// fragment
struct {	struct {
const char *ptr; // pointer to the start	const char *ptr; ///< pointer to the start
size_t size; // length	size_t size; ///< length
Untaint_lang lang; // untaint flag, later untaint language	Untaint_lang lang; ///< untaint flag, later untaint language
#ifndef NO_STRING_ORIGIN	#ifndef NO_STRING_ORIGIN
Origin origin; // origin	Origin origin; ///< origin
#endif	#endif
} item;	} item;
Chunk *link; // link to the next chunk in chain	Chunk *link; ///< link to the next chunk in chain
} rows[CR_PREALLOCATED_COUNT];	} rows[CR_PREALLOCATED_COUNT];
// next rows are here	Chunk *preallocated_link; ///< next rows are here
Chunk *preallocated_link;
}	}
head; // the head chunk of the chunk chain	head; ///< the head chunk of the chunk chain

// next append would write to this record	/// next append would write to this record
Chunk::Row *append_here;	Chunk::Row *append_here;

// the address of place where lies address	/** the address of place where lies address
// of the link to the next chunk to allocate	of the link to the next chunk to allocate
	*/
Chunk::Row *link_row;	Chunk::Row *link_row;

private:	private:
Line 254 private:	Line 275 private:
void expand();	void expand();

/// convert to C string, store to 'dest' which must be big enough for proper untaint	/// convert to C string, store to 'dest' which must be big enough for proper untaint
char store_to(char dest,	char store_to(char dest, Untaint_lang lang=UL_UNSPECIFIED,
Untaint_lang lang=UL_UNSPECIFIED, SQL_Connection *connection=0) const;	SQL_Connection *connection=0,
	const char *charset=0) const;

private: //disabled	private: //disabled

E-mail:

Removed from v.1.80
changed lines
	Added in v.1.91