--- parser3/src/main/pa_common.C 2002/02/07 17:41:36 1.99 +++ parser3/src/main/pa_common.C 2002/11/21 07:26:29 1.122 @@ -1,20 +1,15 @@ /** @file Parser: commonly functions. - Copyright(c) 2001 ArtLebedev Group(http://www.artlebedev.com) - Author: Alexander Petrosyan (http://paf.design.ru) - - $Id: pa_common.C,v 1.99 2002/02/07 17:41:36 paf Exp $ + Copyright(c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) + Author: Alexandr Petrosian (http://paf.design.ru) */ +static const char* IDENT_COMMON_C="$Date: 2002/11/21 07:26:29 $"; + #include "pa_common.h" -#include "pa_types.h" #include "pa_exception.h" -#include "pa_pool.h" #include "pa_globals.h" -#include "pa_value.h" -#include "pa_hash.h" -#include "pa_string.h" #ifdef WIN32 # include @@ -28,9 +23,6 @@ #ifndef _O_BINARY # define _O_BINARY 0 #endif -#ifndef O_TRUNC -# define O_TRUNC 0 -#endif // locking constants @@ -78,6 +70,10 @@ static int unlock(int fd) { FLOCK(F_TLOC #endif static char *strnchr(char *buf, size_t size, char c) { + // sanity check + if(!buf) + return 0; + for(; size-->0; buf++) { if(*buf==c) return buf; @@ -120,7 +116,6 @@ 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_SPEC); -//printf("file_read(%s)\n", fname); int f; struct stat finfo; @@ -133,9 +128,19 @@ 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) { - lock_shared_blocking(f); + if(lock_shared_blocking(f)!=0) { + Exception e("file.lock", + &file_spec, + "shared lock failed: %s (%d), actual filename '%s'", + strerror(errno), errno, fname); + unlock(f); + close(f); + if(fail_on_read_problem) + throw e; + return false; + } if(stat(fname, &finfo)!=0) { - Exception e(0, 0, + Exception e("file.missing", &file_spec, "stat failed: %s (%d), actual filename '%s'", strerror(errno), errno, fname); @@ -145,6 +150,19 @@ bool file_read(Pool& pool, const String& throw e; return false; } +#ifdef NO_FOREIGN_GROUP_FILES + if(finfo.st_gid/*foreign?*/!=getegid()) { + Exception e("parser.runtime", + &file_spec, + "parser reading files of foreign group disabled [recompile parser without --disable-foreign-group-files configure option], actual filename '%s'", + fname); + unlock(f); + close(f); + if(fail_on_read_problem) + throw e; + return false; + } +#endif size_t max_size=limit?min(offset+limit, (size_t)finfo.st_size)-offset:finfo.st_size; if(!max_size) { // eof if(as_text) { @@ -164,8 +182,8 @@ bool file_read(Pool& pool, const String& if(!max_size) // eof return true; - if(int(data_size)<0 || data_size>max_size) - throw Exception(0, 0, + if(ssize_t(data_size)<0 || data_size>max_size) + throw Exception(0, &file_spec, "read failed: actually read %d bytes count not in [0..%lu] valid range", data_size, (unsigned long)max_size); //never @@ -176,13 +194,14 @@ bool file_read(Pool& pool, const String& ((char*&)data)[data_size]=0; } return true; - } - if(fail_on_read_problem) - throw Exception(0, 0, - &file_spec, - "read failed: %s (%d), actual filename '%s'", - strerror(errno), errno, fname); - return false; + } else { + if(fail_on_read_problem) + throw Exception(errno==EACCES?"file.access":errno==ENOENT?"file.missing":0, + &file_spec, + "read failed: %s (%d), actual filename '%s'", + strerror(errno), errno, fname); + return false; + } } static void create_dir_for_file(const String& file_spec) { @@ -199,7 +218,8 @@ bool file_write_action_under_lock( const char *action_name, void (*action)(int, void *), void *context, bool as_text, bool do_append, - bool do_block) { + bool do_block, + bool fail_on_lock_problem) { const char *fname=file_spec.cstr(String::UL_FILE_SPEC); int f; if(access(fname, W_OK)!=0) // no @@ -210,29 +230,33 @@ bool file_write_action_under_lock( |(as_text?_O_TEXT:_O_BINARY) |(do_append?O_APPEND:0), 0664))>=0) { if((do_block?lock_exclusive_blocking(f):lock_exclusive_nonblocking(f))!=0) { + Exception e("file.lock", + &file_spec, + "shared lock failed: %s (%d), actual filename '%s'", + strerror(errno), errno, fname); close(f); + if(fail_on_lock_problem) + throw e; return false; } try { action(f, context); } catch(...) { -#if O_TRUNC==0 - ftruncate(f, tell(f)); -#endif + if(!do_append) + ftruncate(f, tell(f)); // one can not use O_TRUNC, read lower unlock(f); close(f); /*re*/throw; } -#if O_TRUNC==0 - ftruncate(f, tell(f)); -#endif + if(!do_append) + ftruncate(f, tell(f)); // O_TRUNC truncates even exclusevely write-locked file [thanks to Igor Milyakov for discovering] unlock(f); close(f); return true; } else - throw Exception(0, 0, + throw Exception(errno==EACCES?"file.access":0, &file_spec, "%s failed: %s (%d), actual filename '%s'", action_name, strerror(errno), errno, fname); @@ -246,8 +270,13 @@ struct File_write_action_info { #endif static void file_write_action(int f, void *context) { File_write_action_info& info=*static_cast(context); - if(info.size) - write(f, info.data, info.size); + if(info.size) { + int written=write(f, info.data, info.size); + if(written<0) + throw Exception(0, + 0, + "write failed: %s (%d)", strerror(errno), errno); + } } void file_write( const String& file_spec, @@ -274,7 +303,7 @@ bool file_delete(const String& file_spec const char *fname=file_spec.cstr(String::UL_FILE_SPEC); if(unlink(fname)!=0) if(fail_on_read_problem) - throw Exception(0, 0, + throw Exception(errno==EACCES?"file.access":errno==ENOENT?"file.missing":0, &file_spec, "unlink failed: %s (%d), actual filename '%s'", strerror(errno), errno, fname); @@ -291,7 +320,7 @@ void file_move(const String& old_spec, c create_dir_for_file(new_spec); if(rename(old_spec_cstr, new_spec_cstr)!=0) - throw Exception(0, 0, + throw Exception(errno==EACCES?"file.access":errno==ENOENT?"file.missing":0, &old_spec, "rename failed: %s (%d), actual filename '%s' to '%s'", strerror(errno), errno, old_spec_cstr, new_spec_cstr); @@ -300,11 +329,34 @@ void file_move(const String& old_spec, c } +bool entry_exists(const char *fname, struct stat *afinfo) { + struct stat lfinfo; + bool result=stat(fname, &lfinfo)==0; + if(afinfo) + *afinfo=lfinfo; + return result; +} + +bool entry_exists(const String& file_spec) { + const char *fname=file_spec.cstr(String::UL_FILE_SPEC); + return entry_exists(fname, 0); +} + static bool entry_readable(const String& file_spec, bool need_dir) { - const char *fname=file_spec.cstr(String::UL_FILE_SPEC); + char *fname=file_spec.cstr(String::UL_FILE_SPEC); + if(need_dir) { + size_t size=strlen(fname); + while(size) { + char c=fname[size-1]; + if(c=='/' || c=='\\') + fname[--size]=0; + else + break; + } + } struct stat finfo; - if(access(fname, R_OK)==0 && stat(fname, &finfo)==0) { - bool is_dir=finfo.st_mode&S_IFDIR != 0; + if(access(fname, R_OK)==0 && entry_exists(fname, &finfo)) { + bool is_dir=(finfo.st_mode&S_IFDIR) != 0; return is_dir==need_dir; } return false; @@ -336,7 +388,7 @@ bool file_stat(const String& file_spec, struct stat finfo; if(stat(fname, &finfo)!=0) if(fail_on_read_problem) - throw Exception(0, 0, + throw Exception("file.missing", &file_spec, "getting file size failed: %s (%d), real filename '%s'", strerror(errno), errno, fname); @@ -392,19 +444,23 @@ char *rsplit(char *string, char delim) { /// @todo less stupid type detection char *format(Pool& pool, double value, char *fmt) { - char *result=(char *)pool.malloc(MAX_NUMBER, 4); + char local_buf[MAX_NUMBER]; + size_t size; + if(fmt) if(strpbrk(fmt, "diouxX")) if(strpbrk(fmt, "ouxX")) - snprintf(result, MAX_NUMBER, fmt, (uint)value ); + size=snprintf(local_buf, sizeof(local_buf), fmt, (uint)value); else - snprintf(result, MAX_NUMBER, fmt, (int)value ); + size=snprintf(local_buf, sizeof(local_buf), fmt, (int)value); else - snprintf(result, MAX_NUMBER, fmt, value); + size=snprintf(local_buf, sizeof(local_buf), fmt, value); else - snprintf(result, MAX_NUMBER, "%d", (int)value); + size=snprintf(local_buf, sizeof(local_buf), "%d", (int)value); - return result; + char *pool_buf=(char *)pool.malloc(size+1, 4); + memcpy(pool_buf, local_buf, size+1); + return pool_buf; } size_t stdout_write(const void *buf, size_t size) { @@ -461,43 +517,6 @@ char *unescape_chars(Pool& pool, const c return s; } -/// used by attributed_meaning_to_string / append_attribute_subattribute -struct Attributed_meaning_info { - 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) { - if(akey==VALUE_NAME) - return; - - Attributed_meaning_info& ami=*static_cast(info); - - // ...; charset=windows1251 - *ami.header << "; "; - ami.header->append(akey, ami.lang); - *ami.header << "="; - 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(0)) { - // $value(value) $subattribute(subattribute value) - if(Value *value=static_cast(hash->get(*value_name))) - result.append(value->as_string(), lang, true); - - Attributed_meaning_info attributed_meaning_info={ - &result, - lang - }; - hash->for_each(append_attribute_subattribute, &attributed_meaning_info); - } else // result value - result.append(meaning.as_string(), lang, true); - - return result; -} - #ifdef WIN32 void back_slashes_to_slashes(char *s) { if(s)