--- parser3/src/main/pa_common.C 2001/04/10 10:32:10 1.44 +++ parser3/src/main/pa_common.C 2001/08/28 09:39:30 1.63 @@ -1,22 +1,11 @@ - /** @file Parser: commonly functions. Copyright(c) 2001 ArtLebedev Group(http://www.artlebedev.com) Author: Alexander Petrosyan (http://design.ru/paf) - - $Id: pa_common.C,v 1.44 2001/04/10 10:32:10 paf Exp $ */ - -#include "pa_config_includes.h" - -#include -#include -#include -#include -#include -#include +static const char *RCSId="$Id: pa_common.C,v 1.63 2001/08/28 09:39:30 parser Exp $"; #include "pa_common.h" #include "pa_types.h" @@ -27,6 +16,15 @@ #include "pa_hash.h" #include "pa_string.h" +#ifndef WIN32 +# ifndef _O_TEXT +# define _O_TEXT 0 +# endif +# ifndef _O_BINARY +# define _O_BINARY 0 +# endif +#endif + #if _MSC_VER int __vsnprintf(char *b, size_t s, const char *f, va_list l) { @@ -56,11 +54,12 @@ bool file_read(Pool& pool, const String& bool fail_on_read_problem, size_t offset, size_t limit) { const char *fname=file_spec.cstr(String::UL_FILE_NAME); +//printf("file_read(%s)\n", fname); int f; struct stat finfo; // first open, next stat: - // directory update of NTFS symbolic links performed on open. + // directory update of NTFS hard links performed on open. // ex: // a.html:^test[] and b.html hardlink to a.html // user inserts ! before ^test in a.html @@ -73,15 +72,24 @@ bool file_read(Pool& pool, const String& /*if(exclusive) flock(f, LOCK_EX);*/ size_t max_size=limit?min(offset+limit, finfo.st_size)-offset:finfo.st_size; - data=pool.malloc(max_size+(as_text?1:0)); - read_size=read(f, data, max_size); + if(!max_size) { // eof + data=0; + read_size=0; + } else { + data=pool.malloc(max_size+(as_text?1:0)); + if(offset) + lseek(f, offset, SEEK_SET); + read_size=read(f, data, max_size); + } /*if(exclusive) flock(f, LOCK_UN);*/ close(f); + if(!max_size) // eof + return true; if(read_size>=0 && read_size<=max_size) { if(as_text) - ((char *)data)[read_size]=0; + ((char*&)data)[read_size]=0; } else PTHROW(0, 0, &file_spec, @@ -93,11 +101,20 @@ bool file_read(Pool& pool, const String& if(fail_on_read_problem) PTHROW(0, 0, &file_spec, - "read failed: %s (#%d)", strerror(errno), errno); + "read failed: %s (%d), actual filename '%s'", + strerror(errno), errno, fname); return false; } -/// @test mkdirs +static void create_dir_for_file(const String& file_spec) { + size_t pos_after=1; + int pos_before; + while((pos_before=file_spec.pos("/", 1, pos_after))>=0) { + mkdir(file_spec.mid(0, pos_before).cstr(String::UL_FILE_NAME), 0775); + pos_after=pos_before+1; + } +} + void file_write(Pool& pool, const String& file_spec, const void *data, size_t size, @@ -105,7 +122,9 @@ void file_write(Pool& pool, bool exclusive*/) { const char *fname=file_spec.cstr(String::UL_FILE_NAME); int f; - if(access(fname, F_OK)!=0) {/*no*/ + if(access(fname, W_OK)!=0) {/*no*/ + create_dir_for_file(file_spec); + if((f=open(fname, O_WRONLY|O_CREAT|_O_BINARY, 0666))>0) close(f); } @@ -131,32 +150,80 @@ void file_write(Pool& pool, } PTHROW(0, 0, &file_spec, - "write failed: %s (#%d)", strerror(errno), errno); + "write failed: %s (%d), actual filename '%s'", + strerror(errno), errno, fname); } +// throws nothing! [this is required in file_move & file_delete] +static void rmdir(const String& file_spec, size_t pos_after) { + int pos_before; + if((pos_before=file_spec.pos("/", 1, pos_after))>=0) + rmdir(file_spec, pos_before+1); + + rmdir(file_spec.mid(0, pos_after-1/* / */).cstr(String::UL_FILE_NAME)); +} void file_delete(Pool& pool, const String& file_spec) { - if(unlink(file_spec.cstr(String::UL_FILE_NAME))!=0) + const char *fname=file_spec.cstr(String::UL_FILE_NAME); + if(unlink(fname)!=0) PTHROW(0, 0, &file_spec, - "unlink failed: %s (#%d)", strerror(errno), errno); + "unlink failed: %s (%d), actual filename '%s'", + strerror(errno), errno, fname); + + rmdir(file_spec, 1); +} +void file_move(Pool& pool, const String& old_spec, const String& new_spec) { + const char *old_spec_cstr=old_spec.cstr(String::UL_FILE_NAME); + const char *new_spec_cstr=new_spec.cstr(String::UL_FILE_NAME); + + create_dir_for_file(new_spec); + + if(rename(old_spec_cstr, new_spec_cstr)!=0) + PTHROW(0, 0, + &old_spec, + "rename failed: %s (%d), actual filename '%s' to '%s'", + strerror(errno), errno, old_spec_cstr, new_spec_cstr); + + rmdir(old_spec, 1); } + +static bool entry_readable(const String& file_spec, bool need_dir) { + const char *fname=file_spec.cstr(String::UL_FILE_NAME); + struct stat finfo; + if(access(fname, R_OK)==0 && stat(fname, &finfo)==0) { + bool is_dir=(bool)(finfo.st_mode&S_IFDIR); + return is_dir==need_dir; + } + return false; +} bool file_readable(const String& file_spec) { - return access(file_spec.cstr(String::UL_FILE_NAME), R_OK)==0; + return entry_readable(file_spec, false); +} +bool dir_readable(const String& file_spec) { + return entry_readable(file_spec, true); } bool file_executable(const String& file_spec) { return access(file_spec.cstr(String::UL_FILE_NAME), X_OK)==0; } -size_t file_size(const String& file_spec) { +void file_stat(const String& file_spec, + size_t& rsize, + time_t& ratime, + time_t& rmtime, + time_t& rctime) { Pool& pool=file_spec.pool(); const char *fname=file_spec.cstr(String::UL_FILE_NAME); struct stat finfo; if(stat(fname, &finfo)!=0) PTHROW(0, 0, &file_spec, - "write failed: %s (#%d)", strerror(errno), errno); - return finfo.st_size; + "getting file size failed: %s (%d), real filename '%s'", + strerror(errno), errno, fname); + rsize=finfo.st_size; + ratime=finfo.st_atime; + rmtime=finfo.st_mtime; + rctime=finfo.st_ctime; } char *getrow(char **row_ref, char delim) { @@ -271,9 +338,10 @@ const char *unescape_chars(Pool& pool, c return s; } +/// used by attributed_meaning_to_string / append_attribute_subattribute struct Attributed_meaning_info { - String::Untaint_lang lang; - String *header; + String *header; // header line being constructed + String::Untaint_lang lang; // language in which to append to that line }; static void append_attribute_subattribute(const Hash::Key& akey, Hash::Val *avalue, void *info) { @@ -283,14 +351,13 @@ static void append_attribute_subattribut Attributed_meaning_info& ami=*static_cast(info); // ...; charset=windows1251 - if(ami.header->size()) - ami.header->APPEND_CONST("; "); + *ami.header << "; "; ami.header->append(akey, ami.lang, true); - ami.header->APPEND_CONST("="); - ami.header->append(static_cast(avalue)->as_string(), - ami.lang, true); + *ami.header << "="; + ami.header->append(static_cast(avalue)->as_string(), ami.lang, true); } -const String& attributed_meaning_to_string(Value& meaning, String::Untaint_lang lang) { +const String& attributed_meaning_to_string(Value& meaning, + String::Untaint_lang lang) { String &result=*new(meaning.pool()) String(meaning.pool()); if(Hash *hash=meaning.get_hash()) { // $value(value) $subattribute(subattribute value) @@ -298,8 +365,8 @@ const String& attributed_meaning_to_stri result.append(value->as_string(), lang, true); Attributed_meaning_info attributed_meaning_info={ - lang, - &result + &result, + lang }; hash->for_each(append_attribute_subattribute, &attributed_meaning_info); } else // result value @@ -343,3 +410,64 @@ bool StrEqNc(const char *s1, const char s2++; } } + +char *unquote(char*& current, char stop_at) { + char *result=current; + char *dest=current; + // skip leading WS + while(*current==' ' || *current=='\t') + current++; + if(!*current) + return current=0; + + bool quoted=*current=='"'; + if(quoted) + current++; + + for(; *current; ) { + if(quoted) + switch(*current) { + case '\\': // "...\c + if(current[1]) + current++; + break; + case '"': + current++; + goto break2; + } + else + if(*current==stop_at) + break; + + *dest++=*current++; + } +break2: + if(*current) + current++; // skip 'stop_at' + *dest=0; + return result; +} + +static int isLeap(int year) { + return !( + (year % 4) || ((year % 400) && !(year % 100)) + ); +} + +int getMonthDays(int year, int month) { + int monthDays[]={ + 31, + isLeap(year) ? 29 : 28, + 31, + 30, + 31, + 30, + 31, + 31, + 30, + 31, + 30, + 31 + }; + return monthDays[month]; +}