diff options
| author | max <max@FreeBSD.org> | 1997-01-12 03:58:56 +0000 |
|---|---|---|
| committer | max <max@FreeBSD.org> | 1997-01-12 03:58:56 +0000 |
| commit | 8a17bd301e9bdd523856fb5ff8e7d910ab9f6492 (patch) | |
| tree | 8ed0b292d597da01c023371cdcd72f8f0249cfe8 | |
| parent | 6ccdb438235c3ee4441e608a7c349e6669f9dca6 (diff) | |
| download | FreeBSD-ports-8a17bd301e9bdd523856fb5ff8e7d910ab9f6492.zip FreeBSD-ports-8a17bd301e9bdd523856fb5ff8e7d910ab9f6492.tar.gz | |
Merge the patch to btrspc.c submitted as part of PR #2428:
from bag@ua.net - correct free space check (without root's 10%)
Submitted by: dk@farm.org
Split this file (to patch to btrspc.c and to nntpbtr.c) and make the patch to
nntpbtr.c patch-ad. patch-ad will be added shortly with other patches
to nntpbtr.c submitted as PR #2428 merged.
| -rw-r--r-- | news/nntpbtr/files/patch-aa | 31 |
1 files changed, 13 insertions, 18 deletions
diff --git a/news/nntpbtr/files/patch-aa b/news/nntpbtr/files/patch-aa index d8ef101..dabc0c8 100644 --- a/news/nntpbtr/files/patch-aa +++ b/news/nntpbtr/files/patch-aa @@ -1,6 +1,9 @@ ---- btrspc.c 1995/03/05 15:32:21 1.3 -+++ btrspc.c 1996/07/02 05:26:51 -@@ -98,7 +98,10 @@ +This patch now contains: +from bag@ua.net - correct free space check (without root's 10%) + +--- btrspc.c.orig Sun Mar 5 21:32:24 1995 ++++ btrspc.c Sun Jan 12 12:33:16 1997 +@@ -98,13 +98,16 @@ #define blkavail(fs) ((int)((fs).fd_req.bfreen)) #define filavail(fs) ((int)((fs).fd_req.gfree)) @@ -12,19 +15,11 @@ #include <sys/mount.h> typedef struct statfs statfs_type; #define statfilesys statfs ---- nntpbtr.c 1995/06/11 13:13:12 1.7 -+++ nntpbtr.c 1996/07/02 06:05:51 -@@ -49,11 +49,12 @@ - struct passwd *getpwnam(); - #endif + #define bombed(call) ((call) < 0) +-#define blkavail(fs) ((int)((fs).f_bfree)) +-#define filavail(fs) ((int)((fs).f_ffree)) ++#define blkavail(fs) ((long)((fs).f_bavail)) ++#define filavail(fs) ((long)((fs).f_ffree)) --off_t bytecount = 0; - off_t bfdpos; - char batchtmp[] = BATCHTMP; - - #endif -+ -+off_t bytecount = 0; - - long MINfree = MINFREE; - int MAXINfiles = MAXINFILES; + #elif defined(SVR3) + #include <ustat.h> |
