-rw-r--r-- | libopie2/opiecore/ofilenotify.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/libopie2/opiecore/ofilenotify.cpp b/libopie2/opiecore/ofilenotify.cpp index 270570e..5f2a1cc 100644 --- a/libopie2/opiecore/ofilenotify.cpp +++ b/libopie2/opiecore/ofilenotify.cpp @@ -58,49 +58,49 @@ OFileNotification::OFileNotification( QObject* parent, const char* name ) } OFileNotification::~OFileNotification() { qDebug( "OFileNotification::~OFileNotification()" ); } bool OFileNotification::isActive() const { return _active; } int OFileNotification::start( const QString& path, bool sshot, OFileNotificationType type ) { _path = QString::null; _fd = 0; if ( _active ) stop(); QString dirpath; // check if path exists and whether it is a file or a directory, if it exists at all int result = ::stat( (const char*) path, &_stat ); - if ( result == -1 ) + if ( !(type & Create) && result == -1 ) { qWarning( "OFileNotification::start(): Can't stat '%s': %s.", (const char*) path, strerror( errno ) ); return -1; } // if it is not a directory, we need to find out in which directory the file is bool isDirectory = S_ISDIR( _stat.st_mode ); if ( !isDirectory ) { int slashpos; slashpos = path.findRev( '/' ); if ( slashpos > 0 ) { _path = path; dirpath = path.left( slashpos ); } } else /* isDirectory */ { qWarning( "FIXME FIXME FIXME = Directory Notification Not Yet Implemented!" ); _path = path; dirpath = path; assert( 0 ); } @@ -181,53 +181,60 @@ int OFileNotification::fileno() const } bool OFileNotification::activate() { if ( hasChanged() ) { emit triggered(); _signal.activate(); return true; } else return false; } bool OFileNotification::hasChanged() { bool c = false; struct stat newstat; ::memset( &newstat, 0, sizeof newstat ); int result = ::stat( _path, &newstat ); // may fail if file has been renamed or deleted. that doesn't matter :) - qDebug( "result of newstat call is %d (%s=%d)", result, strerror( errno ), errno ); + qDebug( "result of newstat call is %d (%s=%d)", result, result == -1 ? strerror( errno ) : "success", errno ); qDebug( "stat.atime = %0lx, newstat.atime = %0lx", (long)_stat.st_atime, (long)newstat.st_atime ); qDebug( "stat.mtime = %0lx, newstat.mtime = %0lx", (long)_stat.st_mtime, (long)newstat.st_mtime ); qDebug( "stat.ctime = %0lx, newstat.ctime = %0lx", (long)_stat.st_ctime, (long)newstat.st_ctime ); + if ( !c && (_type & Create) && + (long)_stat.st_atime == 0 && (long)_stat.st_mtime == 0 && (long)_stat.st_ctime == 0 && + (long)newstat.st_atime > 0 && (long)newstat.st_mtime > 0 && (long)newstat.st_ctime > 0) + { + qDebug( "OFileNotification::hasChanged(): file has been created" ); + c = true; + } if ( !c && (_type & (Delete|Rename)) && (long)newstat.st_atime == 0 && (long)newstat.st_mtime == 0 && (long)newstat.st_ctime == 0) { qDebug( "OFileNotification::hasChanged(): file has been deleted or renamed" ); c = true; } if ( !c && (_type & Access) && (long)_stat.st_atime < (long)newstat.st_atime ) { qDebug( "OFileNotification::hasChanged(): atime changed" ); c = true; } if ( !c && (_type & Modify) && (long)_stat.st_mtime < (long)newstat.st_mtime ) { qDebug( "OFileNotification::hasChanged(): mtime changed" ); c = true; } if ( !c && (_type & Attrib) && (long)_stat.st_ctime < (long)newstat.st_ctime ) { qDebug( "OFileNotification::hasChanged(): ctime changed" ); c = true; } return c; } |