head 1.2; access; symbols pkgsrc-2013Q2:1.2.0.50 pkgsrc-2013Q2-base:1.2 pkgsrc-2012Q4:1.2.0.48 pkgsrc-2012Q4-base:1.2 pkgsrc-2011Q4:1.2.0.46 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q2:1.2.0.44 pkgsrc-2011Q2-base:1.2 pkgsrc-2009Q4:1.2.0.42 pkgsrc-2009Q4-base:1.2 pkgsrc-2008Q4:1.2.0.40 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.38 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.36 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.34 pkgsrc-2008Q2-base:1.2 pkgsrc-2008Q1:1.2.0.32 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.30 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.28 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.26 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.24 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.22 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.20 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.18 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.16 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.14 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.12 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.10 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.8 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.6 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.4 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.2 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.1.1.1.0.12 pkgsrc-2004Q1-base:1.1.1.1 pkgsrc-2003Q4:1.1.1.1.0.10 pkgsrc-2003Q4-base:1.1.1.1 netbsd-1-6-1:1.1.1.1.0.6 netbsd-1-6-1-base:1.1.1.1 netbsd-1-6:1.1.1.1.0.8 netbsd-1-6-RELEASE-base:1.1.1.1 pkgviews:1.1.1.1.0.4 pkgviews-base:1.1.1.1 buildlink2:1.1.1.1.0.2 buildlink2-base:1.1.1.1 netbsd-1-5-PATCH003:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.2 date 2004.05.03.20.56.36; author mrauch; state dead; branches; next 1.1; 1.1 date 2002.02.13.18.09.22; author mrauch; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2002.02.13.18.09.22; author mrauch; state Exp; branches; next ; desc @@ 1.2 log @Update to version 1.1.1. New features include: * PDF, DocBook/XML, XHTML and Macromedia Flash (SWF) export * Accessibility * Support for Complex Text Layout (CTL) * User installation automated @ text @$NetBSD: patch-bi,v 1.1 2002/02/13 18:09:22 mrauch Exp $ --- ../sal/osl/unx/file.c.orig Thu Oct 4 15:09:21 2001 +++ ../sal/osl/unx/file.c @@@@ -123,11 +123,16 @@@@ #include static const sal_Char* MOUNTTAB="/etc/mtab"; -#elif defined(NETBSD) +#elif defined(NETBSD) || defined(FREEBSD) +#include +#include #include #include #include -static const sal_Char* MOUNTTAB="/etc/mtab"; +#define HAVE_STATFS_H +/* No mounting table on *BSD + * This information is stored only in the kernel. */ +/* static const sal_Char* MOUNTTAB="/etc/mtab"; */ #elif defined(IRIX) #include @@@@ -137,7 +142,7 @@@@ #include static const sal_Char* MOUNTTAB="/etc/mtab"; -#elif defined(MACOSX) || defined(FREEBSD) +#elif defined(MACOSX) #include #include static const sal_Char* MOUNTTAB="/etc/mtab"; @@@@ -4224,10 +4229,20 @@@@ mntfile = fopen(MOUNTTAB,"r"); #endif /* SOLARIS */ +#if defined(NETBSD) || defined(FREEBSD) + struct statfs *mntbufp; + int mntentries,i; + mntentries = getmntinfo(&mntbufp,MNT_WAIT); buffer[0] = '\0'; + if(mntentries == 0) +#else + + buffer[0] = '\0'; + if ( mntfile == 0 ) +#endif { nRet=errno; #ifdef DEBUG_OSL_FILE @@@@ -4286,7 +4301,21 @@@@ } #endif /* SOLARIS */ +#if defined(NETBSD) || defined(FREEBSD) + i=0; + while ( i < mntentries ) + { + if ( strcmp(mntbufp[i].f_mntonname,buffer) == 0 ) + { + *bMountPoint=sal_True; + return osl_File_E_None; + } + i++; + } +#endif +#if ! ( defined(NETBSD) || defined(FREEBSD) ) fclose(mntfile); +#endif *bMountPoint=sal_False; return osl_File_E_None; } @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ @ 1.1.1.1 log @OpenOffice.org is an Open Source, community-developed, multi-platform office productivity suite. It includes the key desktop applications, such as a word processor, spreadsheet, presentation manager, and drawing program, with a user interface and feature set similar to other office suites. @ text @@