1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
|
$NetBSD: patch-ac,v 1.1 2012/08/14 14:24:20 dholland Exp $
Extend Quota.xs to use the new NetBSD 6 libquota interface.
--- Quota.xs.orig 2011-01-02 18:25:40.000000000 +0100
+++ Quota.xs 2012-05-15 12:00:50.000000000 +0200
@@ -331,6 +331,12 @@
struct dqblk dqblk;
char *p = NULL;
int err;
+ int pushed = 0;
+#ifdef NETBSD_LIBQUOTA
+ struct quotahandle *qh;
+ struct quotakey qk;
+ struct quotaval qv;
+#endif
#ifdef USE_IOCTL
struct quotactl qp;
int fd = -1;
@@ -411,6 +417,35 @@
#endif /* NO_RPC */
}
else {
+#ifdef NETBSD_LIBQUOTA
+ err = 0;
+ qh = quota_open(dev);
+ if (qh != NULL) {
+ qk.qk_idtype = kind ? QUOTA_IDTYPE_GROUP : QUOTA_IDTYPE_USER;
+ qk.qk_id = uid;
+ qk.qk_objtype = QUOTA_OBJTYPE_BLOCKS;
+ if (quota_get(qh, &qk, &qv) >= 0) {
+ pushed = 1;
+ EXTEND(SP, 4);
+ PUSHs(sv_2mortal(newSViv(Q_DIV(qv.qv_usage))));
+ PUSHs(sv_2mortal(newSViv(Q_DIV(qv.qv_softlimit))));
+ PUSHs(sv_2mortal(newSViv(Q_DIV(qv.qv_hardlimit))));
+ PUSHs(sv_2mortal(newSViv(qv.qv_expiretime)));
+ qk.qk_objtype = QUOTA_OBJTYPE_FILES;
+ if (quota_get(qh, &qk, &qv) >= 0) {
+ EXTEND(SP, 4);
+ PUSHs(sv_2mortal(newSViv(qv.qv_usage)));
+ PUSHs(sv_2mortal(newSViv(qv.qv_softlimit)));
+ PUSHs(sv_2mortal(newSViv(qv.qv_hardlimit)));
+ PUSHs(sv_2mortal(newSViv(qv.qv_expiretime)));
+ }
+ else err = -1;
+ }
+ else err = -1;
+ quota_close(qh);
+ }
+ else err = -1;
+#else /* not NETBSD_LIBQUOTA */
#ifdef USE_IOCTL
qp.op = Q_GETQUOTA;
qp.uid = uid;
@@ -457,8 +492,9 @@
#endif /* not Q_CTL_V2 */
#endif /* Q_CTL_V3 */
#endif /* not USE_IOCTL */
+#endif /* not NETBSD_LIBQUOTA */
}
- if(!err) {
+ if(!err && !pushed) {
EXTEND(SP, 8);
PUSHs(sv_2mortal(newSViv(Q_DIV(dqblk.QS_BCUR))));
PUSHs(sv_2mortal(newSViv(Q_DIV(dqblk.QS_BSOFT))));
@@ -479,15 +515,21 @@
setqlim(dev,uid,bs,bh,fs,fh,timelimflag=0,kind=0)
char * dev
int uid
- long bs
- long bh
- long fs
- long fh
+ double bs
+ double bh
+ double fs
+ double fh
int timelimflag
int kind
CODE:
{
+#ifdef NETBSD_LIBQUOTA
+ struct quotahandle *qh;
+ struct quotakey qk;
+ struct quotaval qv;
+#else /* not NETBSD_LIBQUOTA */
struct dqblk dqblk;
+#endif /* NETBSD_LIBQUOTA */
#ifdef USE_IOCTL
struct quotactl qp;
int fd;
@@ -563,6 +605,33 @@
else
#endif /* HAVE_JFS2 */
{
+#ifdef NETBSD_LIBQUOTA
+ qh = quota_open(dev);
+ if (qh != NULL) {
+ qk.qk_idtype = kind ? QUOTA_IDTYPE_GROUP : QUOTA_IDTYPE_USER;
+ qk.qk_id = uid;
+ qk.qk_objtype = QUOTA_OBJTYPE_BLOCKS;
+
+ qv.qv_usage = 0;
+ qv.qv_hardlimit = Q_MUL(bh);
+ qv.qv_softlimit = Q_MUL(bs);
+ qv.qv_expiretime = timelimflag;
+ qv.qv_grace = 0; /* XXX should be able to manipulate this */
+ if (quota_put(qh, &qk, &qv) >= 0) {
+ qk.qk_objtype = QUOTA_OBJTYPE_FILES;
+
+ qv.qv_usage = 0;
+ qv.qv_hardlimit = fh;
+ qv.qv_softlimit = fs;
+ qv.qv_expiretime = timelimflag;
+ qv.qv_grace = 0; /* XXX should be able to manipulate this */
+ if (quota_put(qh, &qk, &qv) >= 0) {
+ RETVAL = 0;
+ } else RETVAL = -1;
+ } else RETVAL = -1;
+ quota_close(qh);
+ } else RETVAL = -1;
+#else /* not NETBSD_LIBQUOTA */
memset(&dqblk, 0, sizeof(dqblk));
dqblk.QS_BSOFT = Q_MUL(bs);
dqblk.QS_BHARD = Q_MUL(bh);
@@ -588,6 +657,7 @@
#endif
#endif
#endif
+#endif /* NETBSD_LIBQUOTA */
}
}
OUTPUT:
@@ -616,6 +686,9 @@
}
else
#endif
+#ifdef NETBSD_LIBQUOTA
+ RETVAL = 0;
+#else /* not NETBSD_LIBQUOTA */
#ifdef USE_IOCTL
{
struct quotactl qp;
@@ -698,6 +771,7 @@
#endif
}
#endif
+#endif /* NETBSD_LIBQUOTA */
OUTPUT:
RETVAL
|
