--- parser3/src/main/pa_common.C 2002/02/13 11:59:29 1.103 +++ parser3/src/main/pa_common.C 2002/11/21 12:47:23 1.124 @@ -3,18 +3,13 @@ Copyright(c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) - - $Id: pa_common.C,v 1.103 2002/02/13 11:59:29 paf Exp $ */ +static const char* IDENT_COMMON_C="$Date: 2002/11/21 12:47:23 $"; + #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 @@ -119,14 +111,58 @@ char *file_read_text(Pool& pool, const S void *result; size_t size; return file_read(pool, file_spec, result, size, true, fail_on_read_problem)?(char *)result:0; } + +#ifndef DOXYGEN +struct File_read_action_info { + void **data; size_t *data_size; +}; +#endif +static void file_read_action(Pool& pool, + struct stat& finfo, + int f, + const String& file_spec, const char *fname, bool as_text, + void *context) { + File_read_action_info& info=*static_cast(context); + if(size_t to_read_size=(size_t)finfo.st_size) { + *info.data=pool.malloc(to_read_size+(as_text?1:0), 3); + *info.data_size=(size_t)read(f, *info.data, to_read_size); + + if(ssize_t(*info.data_size)<0 || *info.data_size>to_read_size) + throw Exception(0, + &file_spec, + "read failed: actually read %lu bytes count not in [0..%lu] valid range", + *info.data_size, to_read_size); + } else { // empty file + if(as_text) { + *info.data=pool.malloc(1); + *(char*)(*info.data)=0; + } else + *info.data=0; + *info.data_size=0; + return; + } + + if(as_text) { + fix_line_breaks((char *)(*info.data), *info.data_size); + // note: after fixing + ((char*&)(*info.data))[*info.data_size]=0; + } +} bool file_read(Pool& pool, const String& file_spec, void*& data, size_t& data_size, bool as_text, - bool fail_on_read_problem, - size_t offset, size_t limit) { + bool fail_on_read_problem) { + File_read_action_info info={&data, &data_size}; + return file_read_action_under_lock(pool, file_spec, + "read", file_read_action, &info, + as_text, fail_on_read_problem); +} + +bool file_read_action_under_lock(Pool& pool, const String& file_spec, + const char *action_name, File_read_action action, void *context, + bool as_text, + bool fail_on_read_problem) { const char *fname=file_spec.cstr(String::UL_FILE_SPEC); -//printf("file_read(%s)\n", fname); int f; - struct stat finfo; // first open, next stat: // directory update of NTFS hard links performed on open. @@ -136,57 +172,48 @@ bool file_read(Pool& pool, const String& // directory entry of b.html in NTFS not updated at once, // they delay update till open, so we would receive "!^test[" string // if would do stat, next open. + // later: it seems, even this does not help sometimes if((f=open(fname, O_RDONLY|(as_text?_O_TEXT:_O_BINARY)))>=0) { - lock_shared_blocking(f); - if(stat(fname, &finfo)!=0) { - Exception e(0, 0, + try { + if(lock_shared_blocking(f)!=0) + throw Exception("file.lock", + &file_spec, + "shared lock failed: %s (%d), actual filename '%s'", + strerror(errno), errno, fname); + + struct stat finfo; + if(stat(fname, &finfo)!=0) + throw Exception("file.missing", // hardly possible: we just opened it OK &file_spec, "stat failed: %s (%d), actual filename '%s'", strerror(errno), errno, fname); - unlock(f); - close(f); - if(fail_on_read_problem) - throw e; - return false; - } - size_t max_size=limit?min(offset+limit, (size_t)finfo.st_size)-offset:finfo.st_size; - if(!max_size) { // eof - if(as_text) { - data=pool.malloc(1); - *(char*)data=0; - } else - data=0; - data_size=0; - } else { - data=pool.malloc(max_size+(as_text?1:0), 3); - if(offset) - lseek(f, offset, SEEK_SET); - data_size=read(f, data, max_size); - } - unlock(f); - close(f); - if(!max_size) // eof - return true; - if(int(data_size)<0 || data_size>max_size) - throw Exception(0, 0, - &file_spec, - "read failed: actually read %d bytes count not in [0..%lu] valid range", - data_size, (unsigned long)max_size); //never +#ifdef NO_FOREIGN_GROUP_FILES + if(finfo.st_gid/*foreign?*/!=getegid()) { + throw Exception("parser.runtime", + &file_spec, + "parser reading files of foreign group disabled [recompile parser without --disable-foreign-group-files configure option], actual filename '%s'", + fname); +#endif - if(as_text) { - fix_line_breaks((char *)data, data_size); - // note: after fixing - ((char*&)data)[data_size]=0; - } + action(pool, finfo, f, file_spec, fname, as_text, context); + } catch(...) { + unlock(f);close(f); + if(fail_on_read_problem) + /*re*/throw; + return false; + } + + unlock(f);close(f); 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, + "%s failed: %s (%d), actual filename '%s'", + action_name, strerror(errno), errno, fname); + return false; + } } static void create_dir_for_file(const String& file_spec) { @@ -200,10 +227,11 @@ static void create_dir_for_file(const St bool file_write_action_under_lock( const String& file_spec, - const char *action_name, void (*action)(int, void *), void *context, + const char *action_name, File_write_action action, 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 @@ -214,29 +242,31 @@ 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 - unlock(f); - close(f); + 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 - unlock(f); - close(f); + 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); @@ -250,8 +280,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, @@ -278,7 +313,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); @@ -295,7 +330,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); @@ -304,11 +339,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; @@ -340,7 +398,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); @@ -396,19 +454,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) { @@ -465,43 +527,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)