head 1.2; access; symbols pkgsrc-2013Q2:1.2.0.14 pkgsrc-2013Q2-base:1.2 pkgsrc-2012Q4:1.2.0.12 pkgsrc-2012Q4-base:1.2 pkgsrc-2011Q4:1.2.0.10 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q2:1.2.0.8 pkgsrc-2011Q2-base:1.2 pkgsrc-2009Q4:1.2.0.6 pkgsrc-2009Q4-base:1.2 pkgsrc-2008Q4:1.2.0.4 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.2 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.1.0.50 cube-native-xorg-base:1.1 pkgsrc-2008Q2:1.1.0.48 pkgsrc-2008Q2-base:1.1 cwrapper:1.1.0.46 pkgsrc-2008Q1:1.1.0.44 pkgsrc-2008Q1-base:1.1 pkgsrc-2007Q4:1.1.0.42 pkgsrc-2007Q4-base:1.1 pkgsrc-2007Q3:1.1.0.40 pkgsrc-2007Q3-base:1.1 pkgsrc-2007Q2:1.1.0.38 pkgsrc-2007Q2-base:1.1 pkgsrc-2007Q1:1.1.0.36 pkgsrc-2007Q1-base:1.1 pkgsrc-2006Q4:1.1.0.34 pkgsrc-2006Q4-base:1.1 pkgsrc-2006Q3:1.1.0.32 pkgsrc-2006Q3-base:1.1 pkgsrc-2006Q2:1.1.0.30 pkgsrc-2006Q2-base:1.1 pkgsrc-2006Q1:1.1.0.28 pkgsrc-2006Q1-base:1.1 pkgsrc-2005Q4:1.1.0.26 pkgsrc-2005Q4-base:1.1 pkgsrc-2005Q3:1.1.0.24 pkgsrc-2005Q3-base:1.1 pkgsrc-2005Q2:1.1.0.22 pkgsrc-2005Q2-base:1.1 pkgsrc-2005Q1:1.1.0.20 pkgsrc-2005Q1-base:1.1 pkgsrc-2004Q4:1.1.0.18 pkgsrc-2004Q4-base:1.1 pkgsrc-2004Q3:1.1.0.16 pkgsrc-2004Q3-base:1.1 pkgsrc-2004Q2:1.1.0.14 pkgsrc-2004Q2-base:1.1 pkgsrc-2004Q1:1.1.0.12 pkgsrc-2004Q1-base:1.1 pkgsrc-2003Q4:1.1.0.10 pkgsrc-2003Q4-base:1.1 netbsd-1-6-1:1.1.0.6 netbsd-1-6-1-base:1.1 netbsd-1-6:1.1.0.8 netbsd-1-6-RELEASE-base:1.1 pkgviews:1.1.0.4 pkgviews-base:1.1 buildlink2:1.1.0.2 buildlink2-base:1.1 netbsd-1-5-PATCH003:1.1; locks; strict; comment @# @; 1.2 date 2008.09.16.16.07.33; author wiz; state dead; branches; next 1.1; 1.1 date 2001.11.16.09.08.05; author jlam; state Exp; branches; next ; desc @@ 1.2 log @Remove remaining qt1 and qt2 packages, as announced on pkgsrc-users on Sep 7 2008. No complaints received. @ text @$NetBSD: patch-al,v 1.1 2001/11/16 09:08:05 jlam Exp $ --- src/tools/qdir_unix.cpp.orig Wed Jun 13 04:53:47 2001 +++ src/tools/qdir_unix.cpp @@@@ -95,13 +95,39 @@@@ bool QDir::mkdir( const QString &dirName, bool acceptAbsPath ) const { - return MKDIR( QFile::encodeName(filePath(dirName,acceptAbsPath)), 0777 ) + // Remove trailing slashes from the directory name. + QString tmp = QFile::encodeName(filePath(dirName,acceptAbsPath)); + int pos = tmp.length(); + if (pos > 0) { + while ( (pos - 1) >= 0 && tmp[pos - 1] == '/' ) { + --pos; + }; + if ( pos == 0 ) { + tmp = QDir::rootDirPath(); + } else { + tmp.truncate( pos ); + } + } + return MKDIR( tmp, 0777 ) == 0; } bool QDir::rmdir( const QString &dirName, bool acceptAbsPath ) const { - return RMDIR( QFile::encodeName(filePath(dirName,acceptAbsPath)) ) == 0; + // Remove trailing slashes from the directory name. + QString tmp = QFile::encodeName(filePath(dirName,acceptAbsPath)); + int pos = tmp.length(); + if (pos > 0) { + while ( (pos - 1) >= 0 && tmp[pos - 1] == '/' ) { + --pos; + }; + if ( pos == 0 ) { + tmp = QDir::rootDirPath(); + } else { + tmp.truncate( pos ); + } + } + return RMDIR( tmp ) == 0; } bool QDir::isReadable() const @ 1.1 log @Update qt2-libs to 2.3.1nb1. Changes from version 2.3.1 are making QDir::mkdir and QDir::rmdir work when passed a directory name with trailing slashes by removing the trailing slashes prior to making the mkdir(2) and rmdir(2) system calls. KDE2 seems to rely heavily on this behaviour. @ text @d1 1 a1 1 $NetBSD$ @