Attachment #65843 for bug #102080




 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *
 *	$Id: resource.c,v 1.15 2005/08/03 12:18:09 roland Exp $
 */

#include "defs.h"


#ifdef LINUX

#define OLD_CMD(c)	((c)<<8)
#define NEW_CMD(c)      ((0x80<<16)+(c))
#define XQM_CMD(c)      (('X'<<8)+(c))
#define NEW_COMMAND(c) (( ((c) >> SUBCMDSHIFT) & (0x80 << 16)))

#define OLD_COMMAND(c) (!NEW_COMMAND(c) && !XQM_COMMAND(c))

static const struct xlat quotacmds[] = {
	{ OLD_CMD(0x1),	"Q_QUOTAON"	},
	{ OLD_CMD(0x2),	"Q_QUOTAOFF"	},
	{ OLD_CMD(0x3),	"Q_GETQUOTA"	},
	{ OLD_CMD(0x4),	"Q_SETQUOTA"	},
	{ OLD_CMD(0x5),	"Q_SETUSE"	},
	{ OLD_CMD(0x6),	"Q_SYNC"	},
	{ OLD_CMD(0x7),	"Q_SETQLIM"	},
	{ OLD_CMD(0x8),	"Q_GETSTATS"	},
	{ OLD_CMD(0x10),"Q_RSQUASH"	},
	{ NEW_CMD(0x1), "Q_SYNC"        },
	{ NEW_CMD(0x2), "Q_QUOTAON"     },
	{ NEW_CMD(0x3), "Q_QUOTAOFF"    },


		if (!tcp->u_arg[3])
			tprintf("NULL");
               else if (!verbose(tcp) ||
#ifdef HAVE_STRUCT_DQBLK_DQB_CURBLOCKS
			!
#endif
			OLD_COMMAND(cmd))
			tprintf("%#lx", tcp->u_arg[3]);
                else if (umoven(tcp, tcp->u_arg[3], sizeof(struct dqblk),
                    (char *) &dq) < 0)
                        tprintf("???");
		else {
                        tprintf("{");
			tprintf("%llu, ", (unsigned long long) dq.dqb_bhardlimit);
			tprintf("%llu, ", (unsigned long long) dq.dqb_bsoftlimit);
#ifdef HAVE_STRUCT_DQBLK_DQB_CURBLOCKS
			tprintf("%llu, ", (unsigned long long) dq.dqb_curblocks);
#else
			tprintf("%llu, ", (unsigned long long) dq.dqb_curspace);
#endif
			tprintf("%llu, ", (unsigned long long) dq.dqb_ihardlimit);
			tprintf("%llu, ", (unsigned long long) dq.dqb_isoftlimit);
			tprintf("%llu, ", (unsigned long long) dq.dqb_curinodes);
			tprintf("%llu, ", (unsigned long long) dq.dqb_btime);
			tprintf("%llu", (unsigned long long) dq.dqb_itime);
                        tprintf("}");
		}


Return to bug 102080

Lines 27-33 Link Here

(-)resource.c.orig (-19 / +28 lines)
27	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF	27	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
28	* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.	28	* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29	*	29	*
30	* $Id: resource.c,v 1.13 2004/10/06 22:14:53 roland Exp $	30	* $Id: resource.c,v 1.15 2005/08/03 12:18:09 roland Exp $
31	*/	31	*/
32		32
33	#include "defs.h"	33	#include "defs.h"
Lines 464-469 Link Here
464		464
465	#ifdef LINUX	465	#ifdef LINUX
466		466
		467	#define OLD_CMD(c) ((c)<<8)
467	#define NEW_CMD(c) ((0x80<<16)+(c))	468	#define NEW_CMD(c) ((0x80<<16)+(c))
468	#define XQM_CMD(c) (('X'<<8)+(c))	469	#define XQM_CMD(c) (('X'<<8)+(c))
469	#define NEW_COMMAND(c) (( ((c) >> SUBCMDSHIFT) & (0x80 << 16)))	470	#define NEW_COMMAND(c) (( ((c) >> SUBCMDSHIFT) & (0x80 << 16)))
Lines 471-485 Link Here
471	#define OLD_COMMAND(c) (!NEW_COMMAND(c) && !XQM_COMMAND(c))	472	#define OLD_COMMAND(c) (!NEW_COMMAND(c) && !XQM_COMMAND(c))
472		473
473	static const struct xlat quotacmds[] = {	474	static const struct xlat quotacmds[] = {
474	{ Q_QUOTAON, "Q_QUOTAON" },	475	{ OLD_CMD(0x1), "Q_QUOTAON" },
475	{ Q_QUOTAOFF, "Q_QUOTAOFF" },	476	{ OLD_CMD(0x2), "Q_QUOTAOFF" },
476	{ Q_GETQUOTA, "Q_GETQUOTA" },	477	{ OLD_CMD(0x3), "Q_GETQUOTA" },
477	{ Q_SETQUOTA, "Q_SETQUOTA" },	478	{ OLD_CMD(0x4), "Q_SETQUOTA" },
478	{ Q_SETUSE, "Q_SETUSE" },	479	{ OLD_CMD(0x5), "Q_SETUSE" },
479	{ Q_SYNC, "Q_SYNC" },	480	{ OLD_CMD(0x6), "Q_SYNC" },
480	{ Q_SETQLIM, "Q_SETQLIM" },	481	{ OLD_CMD(0x7), "Q_SETQLIM" },
481	{ Q_GETSTATS, "Q_GETSTATS" },	482	{ OLD_CMD(0x8), "Q_GETSTATS" },
482	{ Q_RSQUASH, "Q_RSQUASH" },	483	{ OLD_CMD(0x10),"Q_RSQUASH" },
483	{ NEW_CMD(0x1), "Q_SYNC" },	484	{ NEW_CMD(0x1), "Q_SYNC" },
484	{ NEW_CMD(0x2), "Q_QUOTAON" },	485	{ NEW_CMD(0x2), "Q_QUOTAON" },
485	{ NEW_CMD(0x3), "Q_QUOTAOFF" },	486	{ NEW_CMD(0x3), "Q_QUOTAOFF" },
Lines 528-548 Link Here
528		529
529	if (!tcp->u_arg[3])	530	if (!tcp->u_arg[3])
530	tprintf("NULL");	531	tprintf("NULL");
531	else if (!verbose(tcp) \|\| !OLD_COMMAND(cmd))	532	else if (!verbose(tcp) \|\|
		533	#ifdef HAVE_STRUCT_DQBLK_DQB_CURBLOCKS
		534	!
		535	#endif
		536	OLD_COMMAND(cmd))
532	tprintf("%#lx", tcp->u_arg[3]);	537	tprintf("%#lx", tcp->u_arg[3]);
533	else if (umoven(tcp, tcp->u_arg[3], sizeof(struct dqblk),	538	else if (umoven(tcp, tcp->u_arg[3], sizeof(struct dqblk),
534	(char *) &dq) < 0)	539	(char *) &dq) < 0)
535	tprintf("???");	540	tprintf("???");
536	else {	541	else {
537	tprintf("{");	542	tprintf("{");
538	tprintf("%u, ", dq.dqb_bhardlimit);	543	tprintf("%llu, ", (unsigned long long) dq.dqb_bhardlimit);
539	tprintf("%u, ", dq.dqb_bsoftlimit);	544	tprintf("%llu, ", (unsigned long long) dq.dqb_bsoftlimit);
540	tprintf("%u, ", dq.dqb_curblocks);	545	#ifdef HAVE_STRUCT_DQBLK_DQB_CURBLOCKS
541	tprintf("%u, ", dq.dqb_ihardlimit);	546	tprintf("%llu, ", (unsigned long long) dq.dqb_curblocks);
542	tprintf("%u, ", dq.dqb_isoftlimit);	547	#else
543	tprintf("%u, ", dq.dqb_curinodes);	548	tprintf("%llu, ", (unsigned long long) dq.dqb_curspace);
544	tprintf("%lu, ", dq.dqb_btime);	549	#endif
545	tprintf("%lu", dq.dqb_itime);	550	tprintf("%llu, ", (unsigned long long) dq.dqb_ihardlimit);
		551	tprintf("%llu, ", (unsigned long long) dq.dqb_isoftlimit);
		552	tprintf("%llu, ", (unsigned long long) dq.dqb_curinodes);
		553	tprintf("%llu, ", (unsigned long long) dq.dqb_btime);
		554	tprintf("%llu", (unsigned long long) dq.dqb_itime);
546	tprintf("}");	555	tprintf("}");
547	}	556	}
548		557