File:
[cvs.NetBSD.org] /
pkgsrc /
filesystems /
fuse-archivemount /
patches /
Attic /
patch-ab
Revision
1.2:
download - view:
text,
annotated -
select for diffs
Wed Feb 21 00:04:30 2007 UTC (17 years, 11 months ago) by
pooka
Branches:
MAIN
CVS tags:
pkgsrc-2021Q3-base,
pkgsrc-2021Q3,
pkgsrc-2021Q2-base,
pkgsrc-2021Q2,
pkgsrc-2021Q1-base,
pkgsrc-2021Q1,
pkgsrc-2020Q4-base,
pkgsrc-2020Q4,
pkgsrc-2020Q3-base,
pkgsrc-2020Q3,
pkgsrc-2020Q2-base,
pkgsrc-2020Q2,
pkgsrc-2020Q1-base,
pkgsrc-2020Q1,
pkgsrc-2019Q4-base,
pkgsrc-2019Q4,
pkgsrc-2019Q3-base,
pkgsrc-2019Q3,
pkgsrc-2019Q2-base,
pkgsrc-2019Q2,
pkgsrc-2019Q1-base,
pkgsrc-2019Q1,
pkgsrc-2018Q4-base,
pkgsrc-2018Q4,
pkgsrc-2018Q3-base,
pkgsrc-2018Q3,
pkgsrc-2018Q2-base,
pkgsrc-2018Q2,
pkgsrc-2018Q1-base,
pkgsrc-2018Q1,
pkgsrc-2017Q4-base,
pkgsrc-2017Q4,
pkgsrc-2017Q3-base,
pkgsrc-2017Q3,
pkgsrc-2017Q2-base,
pkgsrc-2017Q2,
pkgsrc-2017Q1-base,
pkgsrc-2017Q1,
pkgsrc-2016Q4-base,
pkgsrc-2016Q4,
pkgsrc-2016Q3-base,
pkgsrc-2016Q3,
pkgsrc-2016Q2-base,
pkgsrc-2016Q2,
pkgsrc-2016Q1-base,
pkgsrc-2016Q1,
pkgsrc-2015Q4-base,
pkgsrc-2015Q4,
pkgsrc-2015Q3-base,
pkgsrc-2015Q3,
pkgsrc-2015Q2-base,
pkgsrc-2015Q2,
pkgsrc-2015Q1-base,
pkgsrc-2015Q1,
pkgsrc-2014Q4-base,
pkgsrc-2014Q4,
pkgsrc-2014Q3-base,
pkgsrc-2014Q3,
pkgsrc-2014Q2-base,
pkgsrc-2014Q2,
pkgsrc-2014Q1-base,
pkgsrc-2014Q1,
pkgsrc-2013Q4-base,
pkgsrc-2013Q4,
pkgsrc-2013Q3-base,
pkgsrc-2013Q3,
pkgsrc-2013Q2-base,
pkgsrc-2013Q2,
pkgsrc-2013Q1-base,
pkgsrc-2013Q1,
pkgsrc-2012Q4-base,
pkgsrc-2012Q4,
pkgsrc-2012Q3-base,
pkgsrc-2012Q3,
pkgsrc-2012Q2-base,
pkgsrc-2012Q2,
pkgsrc-2012Q1-base,
pkgsrc-2012Q1,
pkgsrc-2011Q4-base,
pkgsrc-2011Q4,
pkgsrc-2011Q3-base,
pkgsrc-2011Q3,
pkgsrc-2011Q2-base,
pkgsrc-2011Q2,
pkgsrc-2011Q1-base,
pkgsrc-2011Q1,
pkgsrc-2010Q4-base,
pkgsrc-2010Q4,
pkgsrc-2010Q3-base,
pkgsrc-2010Q3,
pkgsrc-2010Q2-base,
pkgsrc-2010Q2,
pkgsrc-2010Q1-base,
pkgsrc-2010Q1,
pkgsrc-2009Q4-base,
pkgsrc-2009Q4,
pkgsrc-2009Q3-base,
pkgsrc-2009Q3,
pkgsrc-2009Q2-base,
pkgsrc-2009Q2,
pkgsrc-2009Q1-base,
pkgsrc-2009Q1,
pkgsrc-2008Q4-base,
pkgsrc-2008Q4,
pkgsrc-2008Q3-base,
pkgsrc-2008Q3,
pkgsrc-2008Q2-base,
pkgsrc-2008Q2,
pkgsrc-2008Q1-base,
pkgsrc-2008Q1,
pkgsrc-2007Q4-base,
pkgsrc-2007Q4,
pkgsrc-2007Q3-base,
pkgsrc-2007Q3,
pkgsrc-2007Q2-base,
pkgsrc-2007Q2,
pkgsrc-2007Q1-base,
pkgsrc-2007Q1,
cwrapper,
cube-native-xorg-base,
cube-native-xorg,
HEAD
use open(2) instead of mknod(2) to create regular files. while
the latter works on the most current NetBSD, I don't feel like running
file systems unnecessarily as the superuser
$NetBSD: patch-ab,v 1.2 2007/02/21 00:04:30 pooka Exp $
--- archivemount.c.orig 2006-12-28 17:32:47.000000000 +0200
+++ archivemount.c 2007-02-21 02:02:55.000000000 +0200
@@ -31,7 +31,11 @@
#include <fcntl.h>
#include <dirent.h>
#include <errno.h>
+#ifdef HAVE_STATVFS
+#include <sys/statvfs.h>
+#else
#include <sys/statfs.h>
+#endif
#include <sys/types.h>
#include <sys/stat.h>
#include <time.h>
@@ -1449,11 +1453,24 @@
return tmp;
}
/* create temp file */
- if( mknod( location, mode, rdev ) == -1 ) {
- log( "Could not create temporary file %s: %s",
- location, strerror( errno ) );
- free( location );
- return 0 - errno;
+ if( S_ISREG(mode) ) {
+ int fd;
+
+ if( fd = ( open( location, O_WRONLY | O_CREAT | O_EXCL,
+ mode) == -1 ) ) {
+ log( "Could not create temporary file %s: %s",
+ location, strerror( errno ) );
+ free( location );
+ return 0 - errno;
+ }
+ close( fd );
+ } else {
+ if( mknod( location, mode, rdev ) == -1 ) {
+ log( "Could not create temporary file %s: %s",
+ location, strerror( errno ) );
+ free( location );
+ return 0 - errno;
+ }
}
/* build node */
node = ( NODE * )malloc( sizeof( NODE ) );
@@ -1605,7 +1622,11 @@
}
static int
+#ifdef HAVE_STATVFS
+ar_statfs( const char *path, struct statvfs *stbuf )
+#else
ar_statfs( const char *path, struct statfs *stbuf )
+#endif
{
/* ENOSYS is ok for this, we have no statistics */
( void )path;
CVSweb <webmaster@jp.NetBSD.org>