head 1.6; access; symbols pkgsrc-2013Q2:1.6.0.16 pkgsrc-2013Q2-base:1.6 pkgsrc-2012Q4:1.6.0.14 pkgsrc-2012Q4-base:1.6 pkgsrc-2011Q4:1.6.0.12 pkgsrc-2011Q4-base:1.6 pkgsrc-2011Q2:1.6.0.10 pkgsrc-2011Q2-base:1.6 pkgsrc-2009Q4:1.6.0.8 pkgsrc-2009Q4-base:1.6 pkgsrc-2008Q4:1.6.0.6 pkgsrc-2008Q4-base:1.6 pkgsrc-2008Q3:1.6.0.4 pkgsrc-2008Q3-base:1.6 cube-native-xorg:1.6.0.2 cube-native-xorg-base:1.6 pkgsrc-2008Q2:1.5.0.18 pkgsrc-2008Q2-base:1.5 cwrapper:1.5.0.16 pkgsrc-2008Q1:1.5.0.14 pkgsrc-2008Q1-base:1.5 pkgsrc-2007Q4:1.5.0.12 pkgsrc-2007Q4-base:1.5 pkgsrc-2007Q3:1.5.0.10 pkgsrc-2007Q3-base:1.5 pkgsrc-2007Q2:1.5.0.8 pkgsrc-2007Q2-base:1.5 pkgsrc-2007Q1:1.5.0.6 pkgsrc-2007Q1-base:1.5 pkgsrc-2006Q4:1.5.0.4 pkgsrc-2006Q4-base:1.5 pkgsrc-2006Q3:1.5.0.2 pkgsrc-2006Q3-base:1.5 pkgsrc-2006Q2:1.4.0.4 pkgsrc-2006Q2-base:1.4 pkgsrc-2006Q1:1.4.0.2 pkgsrc-2006Q1-base:1.4 pkgsrc-2005Q4:1.3.0.12 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.3.0.10 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.3.0.8 pkgsrc-2005Q2-base:1.3 pkgsrc-2005Q1:1.3.0.6 pkgsrc-2005Q1-base:1.3 pkgsrc-2004Q4:1.3.0.4 pkgsrc-2004Q4-base:1.3 pkgsrc-2004Q3:1.3.0.2 pkgsrc-2004Q3-base:1.3 pkgsrc-2004Q2:1.2.0.6 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.4 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.2.0.2 pkgsrc-2003Q4-base:1.2 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.6 date 2008.07.29.16.16.24; author taca; state dead; branches; next 1.5; 1.5 date 2006.09.22.18.58.59; author joerg; state Exp; branches; next 1.4; 1.4 date 2006.01.08.19.30.02; author joerg; state Exp; branches; next 1.3; 1.3 date 2004.09.10.10.42.00; author agc; state Exp; branches; next 1.2; 1.2 date 2003.10.05.04.25.15; author taca; state Exp; branches; next 1.1; 1.1 date 2001.11.15.23.21.31; author taca; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2001.11.15.23.21.31; author taca; state Exp; branches; next ; desc @@ 1.6 log @Remove yatsvrs package. It's time to say good-by to yatsvrs and its client WinYAT. @ text @$NetBSD: patch-as,v 1.5 2006/09/22 18:58:59 joerg Exp $ --- yatd/dfree.c.orig 2001-07-09 03:32:52.000000000 +0000 +++ yatd/dfree.c @@@@ -39,6 +39,13 @@@@ typedef u_long quota_size_t; # include #endif /* HAVE_SYS_QUOTA_H */ +#ifdef __DragonFly__ +#include +#if __DragonFly_version >= 160000 +#define dqblk ufs_dqblk +#endif +#endif + static int quotactl_wrapper __P((const char *pPath, struct dqblk *quota_block)); static int @@@@ -72,12 +79,6 @@@@ quota_get_inode_current __P(( struct dqb #define DEBUG_LOCAL -#ifndef LONGLONG_OPTC -/* LONGLONG_OPTCが定義されていない場合には 空白を定義して， - リテラルの糊として使う */ -#define LONGLONG_OPTC /* */ -#endif - int DFreeCheck(pPath, pSizFree, pNodFree) char * pPath; /* ユーザーのホームディレクトリの位置 */ OFF_T * pSizFree; /* 空きブロック数 */ @@@@ -99,7 +100,7 @@@@ int DFreeCheck(pPath, pSizFree, pNodFree nodLimit = *pNodFree; /* リミットのノード数を指定する */ #ifdef DEBUG_LOCAL - LogDEBUG("sizLimit:%" LONGLONG_OPTC "d, nodLimit:%d, sizof(OFF_T):%d", + LogDEBUG("sizLimit:%" LONGLONG_OPTC "d, nodLimit:%ld, sizof(OFF_T):%d", sizLimit, nodLimit, sizeof (OFF_T)); #endif /* DEBUG_LOCAL */ @@@@ -122,23 +123,30 @@@@ int DFreeCheck(pPath, pSizFree, pNodFree #ifdef DEBUG_LOCAL # ifdef BSD44 LogDEBUG("statfs() returns:"); +# ifdef HAVE_STATVFS + LogDEBUG(" flags: 0x%lx", statfsBuf.f_flag); +# else LogDEBUG(" type: %d", statfsBuf.f_type); - LogDEBUG(" flags: 0x%x", statfsBuf.f_flags); -# ifdef __NetBSD__ + LogDEBUG(" flags: 0x%lx", statfsBuf.f_flags); +# ifdef __NetBSD__ LogDEBUG(" oflags: 0x%x", statfsBuf.f_oflags); -# endif +# endif /* __NetBSD__ */ +# endif /* HAVE_STATVFS */ # ifdef BSDOS1 LogDEBUG(" fsize: %d", statfsBuf.f_fsize); # endif - LogDEBUG(" bsize: %d", statfsBuf.f_bsize); - LogDEBUG(" iosize: %d", statfsBuf.f_iosize); - LogDEBUG(" blocks: %d", statfsBuf.f_blocks); - LogDEBUG(" bfree: %d", statfsBuf.f_bfree); - LogDEBUG(" bavail: %d", statfsBuf.f_bavail); - LogDEBUG(" files: %d", statfsBuf.f_files); - LogDEBUG(" ffree: %d", statfsBuf.f_ffree); - LogDEBUG(" fsid: %d", statfsBuf.f_fsid); - LogDEBUG(" owner %d", statfsBuf.f_owner); + LogDEBUG(" bsize: %ld", statfsBuf.f_bsize); + LogDEBUG(" iosize: %ld", statfsBuf.f_iosize); + LogDEBUG(" blocks: %ld", statfsBuf.f_blocks); + LogDEBUG(" bfree: %ld", statfsBuf.f_bfree); + LogDEBUG(" bavail: %ld", statfsBuf.f_bavail); + LogDEBUG(" files: %ld", statfsBuf.f_files); + LogDEBUG(" ffree: %ld", statfsBuf.f_ffree); +# ifdef HAVE_STATVFS + LogDEBUG(" fsid: %d-%d", statfsBuf.f_fsidx.__fsid_val[0], statfsBuf.f_fsidx.__fsid_val[1]); +# else + LogDEBUG(" fsid: %d-%d", statfsBuf.f_fsid.val[0], statfsBuf.f_fsid.val[1]); +# endif /* HAVE_STATVFS */ #ifdef STRUCT_STATFS_HAVE_F_FSTYPENAME LogDEBUG(" fstypename: %.256s", statfsBuf.f_fstypename); #endif @@@@ -311,7 +319,7 @@@@ int FuncDFree() nodFree = SysData.nodLimitFree; #ifdef DEBUG_LOCAL - LogDEBUG("FuncDFree(): sizFree:%" LONGLONG_OPTC "d, nodFree:%d", + LogDEBUG("FuncDFree(): sizFree:%" LONGLONG_OPTC "d, nodFree:%ld", sizFree, nodFree); #endif @@@@ -325,7 +333,7 @@@@ int FuncDFree() if (DFreeCheck(SysData.szUserFldrDir, &sizFree, &nodFree)){ return FAILURE; } - Msg2Cli(SUCCESS, "%" LONGLONG_OPTC "d %d", sizFree, nodFree); + Msg2Cli(SUCCESS, "%" LONGLONG_OPTC "d %ld", sizFree, nodFree); #endif /* DONT_CHECKDFREE */ return SUCCESS; } @@@@ -427,7 +435,7 @@@@ static inline quota_size_t quota_get_ino #ifdef STRUCT_DQBLK_CURRENT_FILES retval = (quota_size_t)quota_block->dqb_curfiles; -#endif STRUCT_DQBLK_CURRENT_FILES +#endif /* STRUCT_DQBLK_CURRENT_FILES */ return retval; } @@@@ -449,12 +457,12 @@@@ static int quotactl_wrapper(pPath,quota_ switch( status ){ case SUCCESS: LogDEBUG("quotactl() returns:"); - LogDEBUG(" bhardlimit: %d",quota_get_block_hard_limit(quota_block)); - LogDEBUG(" bsoftlimit: %d",quota_get_block_soft_limit(quota_block)); - LogDEBUG(" curblocks : %d",quota_get_block_current(quota_block)); - LogDEBUG(" ihardlimit: %d",quota_get_inode_hard_limit(quota_block)); - LogDEBUG(" isoftlimit: %d",quota_get_inode_soft_limit(quota_block)); - LogDEBUG(" curinodes : %d", quota_get_inode_current(quota_block)); + LogDEBUG(" bhardlimit: %ld",quota_get_block_hard_limit(quota_block)); + LogDEBUG(" bsoftlimit: %ld",quota_get_block_soft_limit(quota_block)); + LogDEBUG(" curblocks : %ld",quota_get_block_current(quota_block)); + LogDEBUG(" ihardlimit: %ld",quota_get_inode_hard_limit(quota_block)); + LogDEBUG(" isoftlimit: %ld",quota_get_inode_soft_limit(quota_block)); + LogDEBUG(" curinodes : %ld", quota_get_inode_current(quota_block)); return SUCCESS; case FAILURE: return FAILURE; @@@@ -494,7 +502,7 @@@@ static int quotactl_systemcall_support( status = quotactl(QCMD(Q_GETQUOTA, USRQUOTA),SysData.szMntFrom, SysData.pPwd->pw_uid, (caddr_t)quota_block); -#elif defined(__bsdi__) || defined(__FreeBSD__) || defined(__NetBSD__) +#elif defined(__bsdi__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) /* Get disk quota limits and current usage for the user or group (as determined by the command type) with identifier id. addr @ 1.5 log @Fix build on DragonFly 1.6+. @ text @d1 1 a1 1 $NetBSD$ @ 1.4 log @Add DragonFly support. Don't use statvfs on DragonFly for now. @ text @d5 15 a19 1 @@@@ -72,12 +72,6 @@@@ quota_get_inode_current __P(( struct dqb d32 1 a32 1 @@@@ -99,7 +93,7 @@@@ int DFreeCheck(pPath, pSizFree, pNodFree d41 1 a41 1 @@@@ -122,23 +116,30 @@@@ int DFreeCheck(pPath, pSizFree, pNodFree d84 1 a84 1 @@@@ -311,7 +312,7 @@@@ int FuncDFree() d93 1 a93 1 @@@@ -325,7 +326,7 @@@@ int FuncDFree() d102 1 a102 1 @@@@ -427,7 +428,7 @@@@ static inline quota_size_t quota_get_ino d111 1 a111 1 @@@@ -449,12 +450,12 @@@@ static int quotactl_wrapper(pPath,quota_ d130 1 a130 1 @@@@ -494,7 +495,7 @@@@ static int quotactl_systemcall_support( @ 1.3 log @Make this package a bit more statvfs-friendly, enables build on NetBSD-current systems. @ text @d1 1 a1 1 $NetBSD: patch-as,v 1.2 2003/10/05 04:25:15 taca Exp $ d3 1 a3 1 --- yatd/dfree.c.orig 2001-07-09 12:32:52.000000000 +0900 d5 1 a5 1 @@@@ -72,12 +72,6 @@@@ d18 1 a18 1 @@@@ -99,7 +93,7 @@@@ d27 1 a27 1 @@@@ -122,23 +116,30 @@@@ d70 1 a70 1 @@@@ -311,7 +312,7 @@@@ d79 1 a79 1 @@@@ -325,7 +326,7 @@@@ d88 1 a88 1 @@@@ -427,7 +428,7 @@@@ d97 1 a97 1 @@@@ -449,12 +450,12 @@@@ d116 9 @ 1.2 log @- Add --enable-shadow since this package could work on platform which have shadow password (SunOS at least). - Reduce warning with GCC 3.3.1. - Bump package revision. @ text @d1 1 a1 1 $NetBSD: patch-as,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $ d5 1 a5 1 @@@@ -72,12 +72,6 @@@@ quota_get_inode_current __P(( struct dqb d18 1 a18 1 @@@@ -99,7 +93,7 @@@@ int DFreeCheck(pPath, pSizFree, pNodFree d27 2 a28 1 @@@@ -123,22 +117,21 @@@@ int DFreeCheck(pPath, pSizFree, pNodFree d31 3 d36 1 d38 1 a38 1 # ifdef __NetBSD__ d40 3 a42 1 # endif d62 3 d66 1 d70 1 a70 1 @@@@ -311,7 +304,7 @@@@ int FuncDFree() d79 1 a79 1 @@@@ -325,7 +318,7 @@@@ int FuncDFree() d88 1 a88 1 @@@@ -427,7 +420,7 @@@@ static inline quota_size_t quota_get_ino d97 1 a97 1 @@@@ -449,12 +442,12 @@@@ static int quotactl_wrapper(pPath,quota_ @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD: patch-as,v 1.1.1.1 2001/11/15 16:08:44 taca Exp $ d3 1 a3 1 --- yatd/dfree.c.orig Mon Jul 9 11:13:56 2001 d5 1 a5 1 @@@@ -72,12 +72,6 @@@@ d18 1 a18 1 @@@@ -99,7 +93,7 @@@@ d27 1 a27 1 @@@@ -123,22 +117,21 @@@@ d55 1 a55 1 + LogDEBUG(" fsid: %" LONGLONG_OPTC "u", statfsBuf.f_fsid); d59 1 a59 1 @@@@ -311,7 +304,7 @@@@ d68 1 a68 1 @@@@ -325,7 +318,7 @@@@ d77 10 a86 1 @@@@ -449,12 +442,12 @@@@ @ 1.1.1.1 log @Re-import yatsvrs with correct directory name. @ text @@