--- parser3/src/main/pa_common.C 2001/04/26 14:55:28 1.52 +++ parser3/src/main/pa_common.C 2001/10/23 14:43:44 1.75 @@ -2,13 +2,11 @@ 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.52 2001/04/26 14:55:28 paf Exp $ + $Id: pa_common.C,v 1.75 2001/10/23 14:43:44 parser Exp $ */ -#include "pa_config_includes.h" #include "pa_common.h" #include "pa_types.h" #include "pa_exception.h" @@ -44,18 +42,40 @@ int __snprintf(char *b, size_t s, const #endif +// under WIN32 "t" mode fixes DOS chars OK, can't say that about other systems/ line break styles +static void fix_line_breaks(char *src, size_t& size) { + char *dest=src; + // fix DOS: \r\n -> \n + // fix Macintosh: \r -> \n + char *bol=src; + 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) { - void *result; - size_t size; - return file_read(pool, file_spec, result, size, true, - fail_on_read_problem)?(char *)result:0; + void *result; size_t size; + 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, void*& data, size_t& read_size, bool as_text, bool fail_on_read_problem, size_t offset, size_t limit) { - const char *fname=file_spec.cstr(String::UL_FILE_NAME); + const char *fname=file_spec.cstr(String::UL_FILE_SPEC); +//printf("file_read(%s)\n", fname); int f; struct stat finfo; @@ -68,7 +88,7 @@ bool file_read(Pool& pool, const String& // they delay update till open, so we would receive "!^test[" string // if would do stat, next open. 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) { /*if(exclusive) flock(f, LOCK_EX);*/ @@ -76,48 +96,57 @@ bool file_read(Pool& pool, const String& if(!max_size) { // eof data=0; read_size=0; - return true; + } else { + data=pool.malloc(max_size+(as_text?1:0)); + if(offset) + lseek(f, offset, SEEK_SET); + read_size=read(f, data, max_size); } - 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; } else - PTHROW(0, 0, + throw Exception(0, 0, &file_spec, "read failed: actually read %d bytes count not in [0..%lu] valid range", 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) - PTHROW(0, 0, + throw Exception(0, 0, &file_spec, - "read failed: %s (%d)", strerror(errno), errno); + "read failed: %s (%d), actual filename '%s'", + strerror(errno), errno, fname); return false; } +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_SPEC), 0775); + pos_after=pos_before+1; + } +} + void file_write(Pool& pool, const String& file_spec, const void *data, size_t size, bool as_text/*, bool exclusive*/) { - const char *fname=file_spec.cstr(String::UL_FILE_NAME); + const char *fname=file_spec.cstr(String::UL_FILE_SPEC); int f; if(access(fname, W_OK)!=0) {/*no*/ - 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; - } + create_dir_for_file(file_spec); if((f=open(fname, O_WRONLY|O_CREAT|_O_BINARY, 0666))>0) close(f); @@ -142,33 +171,51 @@ void file_write(Pool& pool, return; } } - PTHROW(0, 0, + throw Exception(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)); + rmdir(file_spec.mid(0, pos_after-1/* / */).cstr(String::UL_FILE_SPEC)); } void file_delete(Pool& pool, const String& file_spec) { - if(unlink(file_spec.cstr(String::UL_FILE_NAME))!=0) - PTHROW(0, 0, + const char *fname=file_spec.cstr(String::UL_FILE_SPEC); + if(unlink(fname)!=0) + throw Exception(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_SPEC); + const char *new_spec_cstr=new_spec.cstr(String::UL_FILE_SPEC); + + create_dir_for_file(new_spec); + + if(rename(old_spec_cstr, new_spec_cstr)!=0) + throw Exception(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); + const char *fname=file_spec.cstr(String::UL_FILE_SPEC); struct stat finfo; 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 false; @@ -179,19 +226,38 @@ bool file_readable(const String& file_sp bool dir_readable(const String& file_spec) { return entry_readable(file_spec, true); } +String *file_readable(const String& path, const String& name) { + String *result=new(path.pool()) String(path); + *result << "/"; + *result << name; + return file_readable(*result)?result:0; +} bool file_executable(const String& file_spec) { - return access(file_spec.cstr(String::UL_FILE_NAME), X_OK)==0; + return access(file_spec.cstr(String::UL_FILE_SPEC), X_OK)==0; } -size_t file_size(const String& file_spec) { +bool file_stat(const String& file_spec, + size_t& rsize, + time_t& ratime, + time_t& rmtime, + time_t& rctime, + bool fail_on_read_problem) { Pool& pool=file_spec.pool(); - const char *fname=file_spec.cstr(String::UL_FILE_NAME); + const char *fname=file_spec.cstr(String::UL_FILE_SPEC); struct stat finfo; if(stat(fname, &finfo)!=0) - PTHROW(0, 0, - &file_spec, - "write failed: %s (%d)", strerror(errno), errno); - return finfo.st_size; + if(fail_on_read_problem) + throw Exception(0, 0, + &file_spec, + "getting file size failed: %s (%d), real filename '%s'", + strerror(errno), errno, fname); + else + return false; + rsize=finfo.st_size; + ratime=finfo.st_atime; + rmtime=finfo.st_mtime; + rctime=finfo.st_ctime; + return true; } char *getrow(char **row_ref, char delim) { @@ -320,14 +386,14 @@ static void append_attribute_subattribut // ...; charset=windows1251 *ami.header << "; "; - ami.header->append(akey, ami.lang, true); + ami.header->append(akey, ami.lang); *ami.header << "="; - ami.header->append(static_cast(avalue)->as_string(), ami.lang, true); + ami.header->append(static_cast(avalue)->as_string(), ami.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()) { + if(Hash *hash=meaning.get_hash(0)) { // $value(value) $subattribute(subattribute value) if(Value *value=static_cast(hash->get(*value_name))) result.append(value->as_string(), lang, true); @@ -379,39 +445,34 @@ bool StrEqNc(const char *s1, const char } } -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]; +} + +void remove_crlf(char *start, char *end) { + for(char *p=start; p