parser3/src/main/pa_common.C - diff

Return to pa_common.C CVS log

Up to [parser3project] / parser3 / src / main

Diff for /parser3/src/main/pa_common.C between versions 1.71 and 1.83

version 1.71, 2001/10/08 15:14:07	version 1.83, 2001/10/31 16:19:58
Line 16	Line 16
#include "pa_hash.h"	#include "pa_hash.h"
#include "pa_string.h"	#include "pa_string.h"

#ifndef WIN32	#ifndef _O_TEXT
# ifndef _O_TEXT	# define _O_TEXT 0
# define _O_TEXT 0	#endif
# endif	#ifndef _O_BINARY
# ifndef _O_BINARY	# define _O_BINARY 0
# define _O_BINARY 0	#endif
# endif	#ifndef O_TRUNC
	# define O_TRUNC 0
#endif	#endif

#if _MSC_VER	#if _MSC_VER
Line 42 int __snprintf(char *b, size_t s, const	Line 43 int __snprintf(char *b, size_t s, const

#endif	#endif

	void fix_line_breaks(char *cstr, size_t& size) {
	char *dest=cstr;
	// fix DOS: \r\n -> \n
	// fix Macintosh: \r -> \n
	char *bol=cstr;
	while(char *eol=strchr(bol, '\r')) {
	size_t len=eol-bol;
	if(dest!=bol)
	memcpy(dest, bol, len);
	dest+=len;
	*dest++='\n';

	if(eol[1]=='\n') { // \r,\n = DOS
	bol=eol+2;
	size--;
	} else // \r,not \n = Macintosh
	bol=eol+1;
	}
	// last piece without \r, including terminating 0
	if(dest!=bol)
	strcpy(dest, bol);
	}

char *file_read_text(Pool& pool, const String& file_spec, bool fail_on_read_problem) {	char *file_read_text(Pool& pool, const String& file_spec, bool fail_on_read_problem) {
void *result;	void *result; size_t size;
size_t size;	return file_read(pool, file_spec, result, size, true, fail_on_read_problem)?(char *)result:0;
return file_read(pool, file_spec, result, size, true,
fail_on_read_problem)?(char *)result:0;
}	}
bool file_read(Pool& pool, const String& file_spec,	bool file_read(Pool& pool, const String& file_spec,
void*& data, size_t& read_size, bool as_text,	void*& data, size_t& read_size, bool as_text,
Line 67 bool file_read(Pool& pool, const String&	Line 88 bool file_read(Pool& pool, const String&
// they delay update till open, so we would receive "!^test[" string	// they delay update till open, so we would receive "!^test[" string
// if would do stat, next open.	// if would do stat, next open.
if(	if(
(f=open(fname, O_RDONLY\|(as_text?_O_TEXT:_O_BINARY)))>=0 &&	(f=open(fname, O_RDONLY\|(as_text?_O_BINARY/_O_TEXT/:_O_BINARY)))>=0 &&
stat(fname, &finfo)==0) {	stat(fname, &finfo)==0) {
/*if(exclusive)	/*if(exclusive)
flock(f, LOCK_EX);*/	flock(f, LOCK_EX);*/
size_t max_size=limit?min(offset+limit, finfo.st_size)-offset:finfo.st_size;	size_t max_size=limit?min(offset+limit, finfo.st_size)-offset:finfo.st_size;
if(!max_size) { // eof	if(!max_size) { // eof
data=0;	if(as_text) {
	data=pool.malloc(1);
	(char)data=0;
	} else
	data=0;
read_size=0;	read_size=0;
} else {	} else {
data=pool.malloc(max_size+(as_text?1:0));	data=pool.malloc(max_size+(as_text?1:0), 3);
if(offset)	if(offset)
lseek(f, offset, SEEK_SET);	lseek(f, offset, SEEK_SET);
read_size=read(f, data, max_size);	read_size=read(f, data, max_size);
Line 91 bool file_read(Pool& pool, const String&	Line 116 bool file_read(Pool& pool, const String&
if(as_text)	if(as_text)
((char*&)data)[read_size]=0;	((char*&)data)[read_size]=0;
} else	} else
PTHROW(0, 0,	throw Exception(0, 0,
&file_spec,	&file_spec,
"read failed: actually read %d bytes count not in [0..%lu] valid range",	"read failed: actually read %d bytes count not in [0..%lu] valid range",
read_size, (unsigned long)max_size); //never	read_size, (unsigned long)max_size); //never

return true;//prepare_config(result, remove_empty_lines);	if(as_text)
	fix_line_breaks((char *)data, read_size);
	return true;
}	}
if(fail_on_read_problem)	if(fail_on_read_problem)
PTHROW(0, 0,	throw Exception(0, 0,
&file_spec,	&file_spec,
"read failed: %s (%d), actual filename '%s'",	"read failed: %s (%d), actual filename '%s'",
strerror(errno), errno, fname);	strerror(errno), errno, fname);
Line 118 static void create_dir_for_file(const St	Line 145 static void create_dir_for_file(const St
void file_write(Pool& pool,	void file_write(Pool& pool,
const String& file_spec,	const String& file_spec,
const void *data, size_t size,	const void *data, size_t size,
bool as_text/*,	bool as_text,
	bool do_append/*,
bool exclusive*/) {	bool exclusive*/) {
const char *fname=file_spec.cstr(String::UL_FILE_SPEC);	const char *fname=file_spec.cstr(String::UL_FILE_SPEC);
int f;	int f;
if(access(fname, W_OK)!=0) {/no/	if(access(fname, W_OK)!=0) // no
create_dir_for_file(file_spec);	create_dir_for_file(file_spec);

if((f=open(fname, O_WRONLY\|O_CREAT\|_O_BINARY, 0666))>0)	if((f=open(fname,
close(f);	O_CREAT\|O_RDWR
}	\|(as_text?_O_TEXT:_O_BINARY)
if(access(fname, R_OK\|W_OK)==0) {	\|(do_append?O_APPEND:O_TRUNC), 0666))>=0) {
int mode=O_RDWR\|(as_text?_O_TEXT:_O_BINARY)	/*if(exclusive)
#ifdef WIN32	flock(f, LOCK_EX);*/
\|O_TRUNC
#endif	if(size) write(f, data, size);
;	#if O_TRUNC==0
if((f=open(fname, mode, 0666))>=0) {	ftruncate(f, size);
/*if(exclusive)
flock(f, LOCK_EX);*/

if(size) write(f, data, size);
#ifndef WIN32
ftruncate(f, size);
#endif	#endif
/*if(exclusive)	/*if(exclusive)
flock(f, LOCK_UN);*/	flock(f, LOCK_UN);*/
close(f);	close(f);
return;	} else
}	throw Exception(0, 0,
}	&file_spec,
PTHROW(0, 0,	"write failed: %s (%d), actual filename '%s'",
&file_spec,	strerror(errno), errno, fname);
"write failed: %s (%d), actual filename '%s'",
strerror(errno), errno, fname);
}	}

// throws nothing! [this is required in file_move & file_delete]	// throws nothing! [this is required in file_move & file_delete]
Line 165 static void rmdir(const String& file_spe	Line 185 static void rmdir(const String& file_spe
void file_delete(Pool& pool, const String& file_spec) {	void file_delete(Pool& pool, const String& file_spec) {
const char *fname=file_spec.cstr(String::UL_FILE_SPEC);	const char *fname=file_spec.cstr(String::UL_FILE_SPEC);
if(unlink(fname)!=0)	if(unlink(fname)!=0)
PTHROW(0, 0,	throw Exception(0, 0,
&file_spec,	&file_spec,
"unlink failed: %s (%d), actual filename '%s'",	"unlink failed: %s (%d), actual filename '%s'",
strerror(errno), errno, fname);	strerror(errno), errno, fname);
Line 179 void file_move(Pool& pool, const String&	Line 199 void file_move(Pool& pool, const String&
create_dir_for_file(new_spec);	create_dir_for_file(new_spec);

if(rename(old_spec_cstr, new_spec_cstr)!=0)	if(rename(old_spec_cstr, new_spec_cstr)!=0)
PTHROW(0, 0,	throw Exception(0, 0,
&old_spec,	&old_spec,
"rename failed: %s (%d), actual filename '%s' to '%s'",	"rename failed: %s (%d), actual filename '%s' to '%s'",
strerror(errno), errno, old_spec_cstr, new_spec_cstr);	strerror(errno), errno, old_spec_cstr, new_spec_cstr);
Line 192 static bool entry_readable(const String&	Line 212 static bool entry_readable(const String&
const char *fname=file_spec.cstr(String::UL_FILE_SPEC);	const char *fname=file_spec.cstr(String::UL_FILE_SPEC);
struct stat finfo;	struct stat finfo;
if(access(fname, R_OK)==0 && stat(fname, &finfo)==0) {	if(access(fname, R_OK)==0 && stat(fname, &finfo)==0) {
bool is_dir=(bool)(finfo.st_mode&S_IFDIR);	bool is_dir=finfo.st_mode&S_IFDIR != 0;
return is_dir==need_dir;	return is_dir==need_dir;
}	}
return false;	return false;
Line 224 bool file_stat(const String& file_spec,	Line 244 bool file_stat(const String& file_spec,
struct stat finfo;	struct stat finfo;
if(stat(fname, &finfo)!=0)	if(stat(fname, &finfo)!=0)
if(fail_on_read_problem)	if(fail_on_read_problem)
PTHROW(0, 0,	throw Exception(0, 0,
&file_spec,	&file_spec,
"getting file size failed: %s (%d), real filename '%s'",	"getting file size failed: %s (%d), real filename '%s'",
strerror(errno), errno, fname);	strerror(errno), errno, fname);
Line 280 char rsplit(char string, char delim) {	Line 300 char rsplit(char string, char delim) {

/// @todo less stupid type detection	/// @todo less stupid type detection
char format(Pool& pool, double value, char fmt) {	char format(Pool& pool, double value, char fmt) {
char result=(char )pool.malloc(MAX_NUMBER);	char result=(char )pool.malloc(MAX_NUMBER, 4);
if(fmt)	if(fmt)
if(strpbrk(fmt, "diouxX"))	if(strpbrk(fmt, "diouxX"))
if(strpbrk(fmt, "ouxX"))	if(strpbrk(fmt, "ouxX"))
Line 311 size_t stdout_write(const void *buf, siz	Line 331 size_t stdout_write(const void *buf, siz
#endif	#endif
}	}

const char unescape_chars(Pool& pool, const char cp, int len) {	char unescape_chars(Pool& pool, const char cp, int len) {
char s=(char )pool.malloc(len + 1);	char s=(char )pool.malloc(len + 1, 5);
enum EscapeState {	enum EscapeState {
EscapeRest,	EscapeRest,
EscapeFirst,	EscapeFirst,
Line 370 static void append_attribute_subattribut	Line 390 static void append_attribute_subattribut
const String& attributed_meaning_to_string(Value& meaning,	const String& attributed_meaning_to_string(Value& meaning,
String::Untaint_lang lang) {	String::Untaint_lang lang) {
String &result=*new(meaning.pool()) String(meaning.pool());	String &result=*new(meaning.pool()) String(meaning.pool());
if(Hash *hash=meaning.get_hash()) {	if(Hash *hash=meaning.get_hash(0)) {
// $value(value) $subattribute(subattribute value)	// $value(value) $subattribute(subattribute value)
if(Value value=static_cast<Value >(hash->get(*value_name)))	if(Value value=static_cast<Value >(hash->get(*value_name)))
result.append(value->as_string(), lang, true);	result.append(value->as_string(), lang, true);
Line 452 void remove_crlf(char start, char end)	Line 472 void remove_crlf(char start, char end)
case '\n': *p='\|'; break;	case '\n': *p='\|'; break;
case '\r': *p=' '; break;	case '\r': *p=' '; break;
}	}
}

	}

E-mail:

Removed from v.1.71
changed lines
	Added in v.1.83