]> git.pld-linux.org Git - packages/strace.git/blob - strace-quota.patch
- pass -DHAVE_STRUCT_DQBLK_DQB_CURBLOCKS (makes it build)
[packages/strace.git] / strace-quota.patch
1 --- strace-4.5.12/resource.c_   2004-10-07 00:14:53.000000000 +0200
2 +++ strace-4.5.12/resource.c    2005-08-09 14:06:55.724035664 +0200
3 @@ -27,7 +27,7 @@
4   * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
5   * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
6   *
7 - *     $Id$
8 + *     $Id$
9   */
10  
11  #include "defs.h"
12 @@ -464,6 +464,7 @@
13  
14  #ifdef LINUX
15  
16 +#define OLD_CMD(c)     ((c)<<8)
17  #define NEW_CMD(c)      ((0x80<<16)+(c))
18  #define XQM_CMD(c)      (('X'<<8)+(c))
19  #define NEW_COMMAND(c) (( ((c) >> SUBCMDSHIFT) & (0x80 << 16)))
20 @@ -471,15 +472,15 @@
21  #define OLD_COMMAND(c) (!NEW_COMMAND(c) && !XQM_COMMAND(c))
22  
23  static const struct xlat quotacmds[] = {
24 -       { Q_QUOTAON,    "Q_QUOTAON"     },
25 -       { Q_QUOTAOFF,   "Q_QUOTAOFF"    },
26 -       { Q_GETQUOTA,   "Q_GETQUOTA"    },
27 -       { Q_SETQUOTA,   "Q_SETQUOTA"    },
28 -       { Q_SETUSE,     "Q_SETUSE"      },
29 -       { Q_SYNC,       "Q_SYNC"        },
30 -       { Q_SETQLIM,    "Q_SETQLIM"     },
31 -       { Q_GETSTATS,   "Q_GETSTATS"    },
32 -       { Q_RSQUASH,    "Q_RSQUASH"     },
33 +       { OLD_CMD(0x1), "Q_QUOTAON"     },
34 +       { OLD_CMD(0x2), "Q_QUOTAOFF"    },
35 +       { OLD_CMD(0x3), "Q_GETQUOTA"    },
36 +       { OLD_CMD(0x4), "Q_SETQUOTA"    },
37 +       { OLD_CMD(0x5), "Q_SETUSE"      },
38 +       { OLD_CMD(0x6), "Q_SYNC"        },
39 +       { OLD_CMD(0x7), "Q_SETQLIM"     },
40 +       { OLD_CMD(0x8), "Q_GETSTATS"    },
41 +       { OLD_CMD(0x10),"Q_RSQUASH"     },
42         { NEW_CMD(0x1), "Q_SYNC"        },
43         { NEW_CMD(0x2), "Q_QUOTAON"     },
44         { NEW_CMD(0x3), "Q_QUOTAOFF"    },
45 @@ -528,21 +529,29 @@
46  
47                 if (!tcp->u_arg[3])
48                         tprintf("NULL");
49 -               else if (!verbose(tcp) || !OLD_COMMAND(cmd))
50 +               else if (!verbose(tcp) ||
51 +#ifdef HAVE_STRUCT_DQBLK_DQB_CURBLOCKS
52 +                       !
53 +#endif
54 +                       OLD_COMMAND(cmd))
55                         tprintf("%#lx", tcp->u_arg[3]);
56                  else if (umoven(tcp, tcp->u_arg[3], sizeof(struct dqblk),
57                      (char *) &dq) < 0)
58                          tprintf("???");
59                 else {
60                          tprintf("{");
61 -                       tprintf("%u, ", dq.dqb_bhardlimit);
62 -                       tprintf("%u, ", dq.dqb_bsoftlimit);
63 -                       tprintf("%u, ", dq.dqb_curblocks);
64 -                       tprintf("%u, ", dq.dqb_ihardlimit);
65 -                       tprintf("%u, ", dq.dqb_isoftlimit);
66 -                       tprintf("%u, ", dq.dqb_curinodes);
67 -                       tprintf("%lu, ", dq.dqb_btime);
68 -                       tprintf("%lu", dq.dqb_itime);
69 +                       tprintf("%llu, ", (unsigned long long) dq.dqb_bhardlimit);
70 +                       tprintf("%llu, ", (unsigned long long) dq.dqb_bsoftlimit);
71 +#ifdef HAVE_STRUCT_DQBLK_DQB_CURBLOCKS
72 +                       tprintf("%llu, ", (unsigned long long) dq.dqb_curblocks);
73 +#else
74 +                       tprintf("%llu, ", (unsigned long long) dq.dqb_curspace);
75 +#endif
76 +                       tprintf("%llu, ", (unsigned long long) dq.dqb_ihardlimit);
77 +                       tprintf("%llu, ", (unsigned long long) dq.dqb_isoftlimit);
78 +                       tprintf("%llu, ", (unsigned long long) dq.dqb_curinodes);
79 +                       tprintf("%llu, ", (unsigned long long) dq.dqb_btime);
80 +                       tprintf("%llu", (unsigned long long) dq.dqb_itime);
81                          tprintf("}");
82                 }
83  
This page took 0.048384 seconds and 3 git commands to generate.