--- parser3/src/main/pa_common.C 2001/09/14 15:41:59 1.64 +++ parser3/src/main/pa_common.C 2001/10/19 12:43:30 1.73 @@ -2,10 +2,10 @@ 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.73 2001/10/19 12:43:30 parser Exp $ */ -static const char *RCSId="$Id: pa_common.C,v 1.64 2001/09/14 15:41:59 parser Exp $"; #include "pa_common.h" #include "pa_types.h" @@ -42,12 +42,33 @@ 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, @@ -67,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);*/ @@ -91,15 +112,17 @@ bool file_read(Pool& pool, const String& 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), actual filename '%s'", strerror(errno), errno, fname); @@ -148,7 +171,7 @@ void file_write(Pool& pool, return; } } - PTHROW(0, 0, + throw Exception(0, 0, &file_spec, "write failed: %s (%d), actual filename '%s'", strerror(errno), errno, fname); @@ -165,7 +188,7 @@ static void rmdir(const String& file_spe void file_delete(Pool& pool, const String& file_spec) { const char *fname=file_spec.cstr(String::UL_FILE_SPEC); if(unlink(fname)!=0) - PTHROW(0, 0, + throw Exception(0, 0, &file_spec, "unlink failed: %s (%d), actual filename '%s'", strerror(errno), errno, fname); @@ -179,7 +202,7 @@ void file_move(Pool& pool, const String& create_dir_for_file(new_spec); if(rename(old_spec_cstr, new_spec_cstr)!=0) - PTHROW(0, 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); @@ -192,7 +215,7 @@ static bool entry_readable(const String& 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; @@ -203,6 +226,12 @@ 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_SPEC), X_OK)==0; } @@ -218,7 +247,7 @@ bool file_stat(const String& file_spec, struct stat finfo; if(stat(fname, &finfo)!=0) if(fail_on_read_problem) - PTHROW(0, 0, + throw Exception(0, 0, &file_spec, "getting file size failed: %s (%d), real filename '%s'", strerror(errno), errno, fname); @@ -357,9 +386,9 @@ 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) { @@ -416,43 +445,6 @@ 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)) @@ -476,3 +468,11 @@ int getMonthDays(int year, int month) { }; return monthDays[month]; } + +void remove_crlf(char *start, char *end) { + for(char *p=start; p