--- parser3/src/main/pa_common.C 2002/02/08 08:31:31 1.101 +++ parser3/src/main/pa_common.C 2002/08/05 13:48:51 1.115 @@ -1,12 +1,12 @@ /** @file Parser: commonly functions. - Copyright(c) 2001, 2002 ArtLebedev Group(http://www.artlebedev.com) + Copyright(c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) - - $Id: pa_common.C,v 1.101 2002/02/08 08:31:31 paf Exp $ */ +static const char* IDENT_COMMON_C="$Date: 2002/08/05 13:48:51 $"; + #include "pa_common.h" #include "pa_types.h" #include "pa_exception.h" @@ -78,6 +78,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; @@ -133,9 +137,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 +159,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) { @@ -165,7 +192,7 @@ bool file_read(Pool& pool, const String& return true; if(int(data_size)<0 || data_size>max_size) - throw Exception(0, 0, + 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 @@ -178,7 +205,7 @@ bool file_read(Pool& pool, const String& return true; } if(fail_on_read_problem) - throw Exception(0, 0, + throw Exception(errno==EACCES?"file.access":errno==ENOENT?"file.missing":0, &file_spec, "read failed: %s (%d), actual filename '%s'", strerror(errno), errno, fname); @@ -199,7 +226,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 @@ -208,9 +236,15 @@ bool file_write_action_under_lock( if((f=open(fname, O_CREAT|O_RDWR |(as_text?_O_TEXT:_O_BINARY) - |(do_append?O_APPEND:0), 0664))>=0) { + |(do_append?O_APPEND:O_TRUNC), 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; } @@ -218,7 +252,8 @@ bool file_write_action_under_lock( action(f, context); } catch(...) { #if O_TRUNC==0 - ftruncate(f, tell(f)); + if(!do_append) + ftruncate(f, tell(f)); #endif unlock(f); close(f); @@ -226,13 +261,14 @@ bool file_write_action_under_lock( } #if O_TRUNC==0 - ftruncate(f, tell(f)); + if(!do_append) + ftruncate(f, tell(f)); #endif 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 +282,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) { + size_t written=write(f, info.data, info.size); + if(errno) + throw Exception(0, + 0, + "write failed: %s (%d)", strerror(errno), errno); + } } void file_write( const String& file_spec, @@ -274,7 +315,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 +332,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,7 +345,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=finfo.st_mode&S_IFDIR != 0; + bool is_dir=(finfo.st_mode&S_IFDIR) != 0; return is_dir==need_dir; } return false; @@ -336,7 +377,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 +433,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) {