parser3/src/classes/file.C - diff

Return to file.C CVS log

Up to [parser3project] / parser3 / src / classes

Diff for /parser3/src/classes/file.C between versions 1.32 and 1.41

version 1.32, 2001/04/28 08:43:47	version 1.41, 2001/07/18 16:11:11
Line 7	Line 7

$Id$	$Id$
*/	*/
	static const char *RCSId="$Id$";

#include "classes.h"	#include "classes.h"
#include "pa_request.h"	#include "pa_request.h"
Line 14	Line 15
#include "pa_table.h"	#include "pa_table.h"
#include "pa_vint.h"	#include "pa_vint.h"
#include "pa_exec.h"	#include "pa_exec.h"
	#include "pa_vdate.h"

	// consts

// defines	// defines

Line 26 public: // VStateless_class	Line 30 public: // VStateless_class

Value *create_new_value(Pool& pool) { return new(pool) VFile(pool); }	Value *create_new_value(Pool& pool) { return new(pool) VFile(pool); }

	public: // Methoded
	bool used_directly() { return true; }

public:	public:
MFile(Pool& pool);	MFile(Pool& pool);
bool used_directly() { return true; }
};	};

// consts	// consts
Line 38 const int FIND_MONKEY_MAX_HOPS=10;	Line 45 const int FIND_MONKEY_MAX_HOPS=10;
// methods	// methods

static void _save(Request& r, const String&, MethodParams *params) {	static void _save(Request& r, const String&, MethodParams *params) {
Value& vfile_name=params->get_no_junction(0, "file name must not be code");	Value& vfile_name=params->as_no_junction(0, "file name must not be code");

// save	// save
static_cast<VFile *>(r.self)->save(r.absolute(vfile_name.as_string()));	static_cast<VFile *>(r.self)->save(r.absolute(vfile_name.as_string()));
Line 46 static void _save(Request& r, const Stri	Line 53 static void _save(Request& r, const Stri

static void _delete(Request& r, const String&, MethodParams *params) {	static void _delete(Request& r, const String&, MethodParams *params) {
Pool& pool=r.pool();	Pool& pool=r.pool();
Value& vfile_name=params->get_no_junction(0, "file name must not be code");	Value& vfile_name=params->as_no_junction(0, "file name must not be code");

// unlink	// unlink
file_delete(pool, r.absolute(vfile_name.as_string()));	file_delete(pool, r.absolute(vfile_name.as_string()));
Line 54 static void _delete(Request& r, const St	Line 61 static void _delete(Request& r, const St

static void _find(Request& r, const String& method_name, MethodParams *params) {	static void _find(Request& r, const String& method_name, MethodParams *params) {
Pool& pool=r.pool();	Pool& pool=r.pool();
Value& vfile_name=params->get_no_junction(0, "file name must not be code");	Value& vfile_name=params->as_no_junction(0, "file name must not be code");

const String &lfile_name=vfile_name.as_string();	const String &lfile_name=vfile_name.as_string();

Line 78 static void _find(Request& r, const Stri	Line 85 static void _find(Request& r, const Stri

// not found	// not found
if(params->size()==2) {	if(params->size()==2) {
Value& not_found_code=params->get_junction(1, "not-found param must be code");	Value& not_found_code=params->as_junction(1, "not-found param must be code");
r.write_pass_lang(r.process(not_found_code));	r.write_pass_lang(r.process(not_found_code));
}	}
}	}

static void _load(Request& r, const String& method_name, MethodParams *params) {	static void _load(Request& r, const String& method_name, MethodParams *params) {
Pool& pool=r.pool();	Pool& pool=r.pool();
Value& vfile_name=params->get_no_junction(0, "file name must not be code");	Value& vfile_name=params->as_no_junction(0, "file name must not be code");

const String& lfile_name=vfile_name.as_string();	const String& lfile_name=vfile_name.as_string();

Line 101 static void _load(Request& r, const Stri	Line 108 static void _load(Request& r, const Stri

static void _stat(Request& r, const String& method_name, MethodParams *params) {	static void _stat(Request& r, const String& method_name, MethodParams *params) {
Pool& pool=r.pool();	Pool& pool=r.pool();
Value& vfile_name=params->get_no_junction(0, "file name must not be code");	Value& vfile_name=params->as_no_junction(0, "file name must not be code");

const String& lfile_name=vfile_name.as_string();	const String& lfile_name=vfile_name.as_string();

size_t size=file_size(r.absolute(lfile_name));	size_t size;
	time_t atime, mtime, ctime;
	file_stat(r.absolute(lfile_name),
	size,
	atime, mtime, ctime);

static_cast<VFile >(r.self)->set(true/tainted/, 0/no bytes*/, size);	VFile& vfile=static_cast<VFile >(r.self);
	vfile.set(true/tainted/, 0/no bytes/, size);
	Hash& ff=vfile.fields();
	ff.put(*new(pool) String(pool, "adate"), new(pool) VDate(pool, atime));
	ff.put(*new(pool) String(pool, "mdate"), new(pool) VDate(pool, mtime));
	ff.put(*new(pool) String(pool, "cdate"), new(pool) VDate(pool, ctime));
}	}

static void append_env_pair(const Hash::Key& key, Hash::Val value, void info) {	static void append_env_pair(const Hash::Key& key, Hash::Val value, void info) {
Line 123 static void pass_cgi_header_attribute(Ar	Line 139 static void pass_cgi_header_attribute(Ar
hash.put(string.mid(0, colon_pos),	hash.put(string.mid(0, colon_pos),
new(string.pool()) VString(string.mid(colon_pos+1, string.size())));	new(string.pool()) VString(string.mid(colon_pos+1, string.size())));
}	}
/**	/// @todo fix `` in perl - they produced flipping consoles and no output to perl
^exec[file-name]	static void _exec_cgi(Request& r, const String& method_name, MethodParams *params,
^exec[file-name;env hash]	bool cgi) {
^exec[file-name;env hash;cmd;line;arg;s]
@todo fix `` in perl - they produced flipping consoles and no output to perl
*/
static void _cgi(Request& r, const String& method_name, MethodParams *params) {
Pool& pool=r.pool();	Pool& pool=r.pool();

Value& vfile_name=params->get_no_junction(0, "file name must not be code");	Value& vfile_name=params->as_no_junction(0, "file name must not be code");

const String& script_name=r.absolute(vfile_name.as_string());	const String& script_name=r.absolute(vfile_name.as_string());

Line 181 static void _cgi(Request& r, const Strin	Line 193 static void _cgi(Request& r, const Strin
#endif	#endif

if(params->size()>1) {	if(params->size()>1) {
Value& venv=params->get_no_junction(1, "env must not be code");	Value& venv=params->as_no_junction(1, "env must not be code");
if(Hash *user_env=venv.get_hash())	if(Hash *user_env=venv.get_hash())
user_env->for_each(append_env_pair, &env);	user_env->for_each(append_env_pair, &env);
else
PTHROW(0, 0,
&method_name,
"env must be hash");
}	}

Array *argv=0;	Array *argv=0;
Line 205 static void _cgi(Request& r, const Strin	Line 213 static void _cgi(Request& r, const Strin
int exit_code=pa_exec(script_name, &env, argv, in, out, err);	int exit_code=pa_exec(script_name, &env, argv, in, out, err);

VFile& self=static_cast<VFile >(r.self);	VFile& self=static_cast<VFile >(r.self);
// construct with 'out' body and header
int delim_size;
const char *eol_marker="\r\n"; size_t eol_marker_size=2;
int pos=out.pos("\r\n\r\n", delim_size=4);
if(pos<0) {
eol_marker="\n"; eol_marker_size=1;
pos=out.pos("\n\n", delim_size=2);
}
if(pos<0) {
delim_size=0; // calm down, compiler
PTHROW(0, 0,
&method_name,
"output does not contain CGI header; exit code=%d; size=%u; text: \"%s\"",
exit_code, (uint)out.size(), out.cstr());
}

const String& header=out.mid(0, pos);	const String *body=&out; // ^file:exec
const String& body=out.mid(pos+delim_size, out.size());	if(cgi) { // ^file:cgi
	// construct with 'out' body and header
	int delim_size;
	const char *eol_marker="\r\n"; size_t eol_marker_size=2;
	int pos=out.pos("\r\n\r\n", delim_size=4);
	if(pos<0) {
	eol_marker="\n"; eol_marker_size=1;
	pos=out.pos("\n\n", delim_size=2);
	}
	if(pos<0) {
	delim_size=0; // calm down, compiler
	PTHROW(0, 0,
	&method_name,
	"output does not contain CGI header; exit code=%d; size=%u; text: \"%s\"",
	exit_code, (uint)out.size(), out.cstr());
	}

// body	const String& header=out.mid(0, pos);
self.set(false/not tainted/, body.cstr(String::UL_AS_IS), body.size());	body=&out.mid(pos+delim_size, out.size());

// header to $fields	// header to $fields
{	{
Array rows(pool);	Array rows(pool);
header.split(rows, 0, eol_marker, eol_marker_size, String::UL_CLEAN);	header.split(rows, 0, eol_marker, eol_marker_size, String::UL_CLEAN);
rows.for_each(pass_cgi_header_attribute, &self.fields());	rows.for_each(pass_cgi_header_attribute, &self.fields());
	}
}	}
	// body
	self.set(false/not tainted/, body->cstr(String::UL_AS_IS), body->size());

// $exit-code	// $exit-code
self.fields().put(	self.fields().put(
Line 245 static void _cgi(Request& r, const Strin	Line 256 static void _cgi(Request& r, const Strin
*new(pool) String(pool, "stderr"),	*new(pool) String(pool, "stderr"),
new(pool) VString(err));	new(pool) VString(err));

SAPI::log(pool, "cgi: %s", err.cstr());	SAPI::log(pool, "file:cgi: %s", err.cstr());
}	}
}	}
	static void _exec(Request& r, const String& method_name, MethodParams *params) {
	_exec_cgi(r, method_name, params, false);
	}
	static void _cgi(Request& r, const String& method_name, MethodParams *params) {
	_exec_cgi(r, method_name, params, true);
	}


// constructor	// constructor

Line 272 MFile::MFile(Pool& apool) : Methoded(apo	Line 290 MFile::MFile(Pool& apool) : Methoded(apo
// ^stat[disk-name]	// ^stat[disk-name]
add_native_method("stat", Method::CT_DYNAMIC, _stat, 1, 1);	add_native_method("stat", Method::CT_DYNAMIC, _stat, 1, 1);

	// ^cgi[file-name]
	// ^cgi[file-name;env hash]
	// ^cgi[file-name;env hash;1cmd;2line;3ar;4g;5s]
	add_native_method("cgi", Method::CT_DYNAMIC, _cgi, 1, 2+10);

// ^exec[file-name]	// ^exec[file-name]
// ^exec[file-name;env hash]	// ^exec[file-name;env hash]
// ^exec[file-name;env hash;1cmd;2line;3ar;4g;5s]	// ^exec[file-name;env hash;1cmd;2line;3ar;4g;5s]
add_native_method("cgi", Method::CT_DYNAMIC, _cgi, 1, 2+5);	add_native_method("exec", Method::CT_DYNAMIC, _exec, 1, 2+10);
}	}

// global variable	// global variable

E-mail:

Removed from v.1.32
changed lines
	Added in v.1.41