===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ipcs/ipcs.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -c -r1.17 -r1.18
*** src/usr.bin/ipcs/ipcs.c	2002/06/12 06:07:15	1.17
--- src/usr.bin/ipcs/ipcs.c	2002/06/15 18:47:50	1.18
***************
*** 1,4 ****
! /*	$OpenBSD: ipcs.c,v 1.17 2002/06/12 06:07:15 mpech Exp $	*/
  /*	$NetBSD: ipcs.c,v 1.25 2000/06/16 03:58:20 simonb Exp $	*/
  
  /*-
--- 1,4 ----
! /*	$OpenBSD: ipcs.c,v 1.18 2002/06/15 18:47:50 matthieu Exp $	*/
  /*	$NetBSD: ipcs.c,v 1.25 2000/06/16 03:58:20 simonb Exp $	*/
  
  /*-
***************
*** 296,302 ****
  {
  
  	printf("Message Queues:\n");
! 	printf("T     ID     KEY        MODE       OWNER    GROUP");
  	if (option & CREATOR)
  		printf("  CREATOR   CGROUP");
  	if (option & OUTSTANDING)
--- 296,302 ----
  {
  
  	printf("Message Queues:\n");
! 	printf("T       ID     KEY        MODE       OWNER    GROUP");
  	if (option & CREATOR)
  		printf("  CREATOR   CGROUP");
  	if (option & OUTSTANDING)
***************
*** 324,330 ****
  		cvt_time(ctime, ctime_buf, sizeof(ctime_buf));
  	}
  
! 	printf("q %6d %10ld %s %8s %8s", ipcid, key, fmt_perm(mode),
  	    user_from_uid(uid, 0), group_from_gid(gid, 0));
  
  	if (option & CREATOR)
--- 324,330 ----
  		cvt_time(ctime, ctime_buf, sizeof(ctime_buf));
  	}
  
! 	printf("q %8d %10ld %s %8s %8s", ipcid, key, fmt_perm(mode),
  	    user_from_uid(uid, 0), group_from_gid(gid, 0));
  
  	if (option & CREATOR)
***************
*** 351,357 ****
  {
  
  	printf("Shared Memory:\n");
! 	printf("T     ID     KEY        MODE       OWNER    GROUP");
  	if (option & CREATOR)
  		printf("  CREATOR   CGROUP");
  	if (option & OUTSTANDING)
--- 351,357 ----
  {
  
  	printf("Shared Memory:\n");
! 	printf("T       ID     KEY        MODE       OWNER    GROUP");
  	if (option & CREATOR)
  		printf("  CREATOR   CGROUP");
  	if (option & OUTSTANDING)
***************
*** 378,384 ****
  		cvt_time(ctime, ctime_buf, sizeof(ctime_buf));
  	}
  
! 	printf("m %6d %10ld %s %8s %8s", ipcid, key, fmt_perm(mode),
  	    user_from_uid(uid, 0), group_from_gid(gid, 0));
  
  	if (option & CREATOR)
--- 378,384 ----
  		cvt_time(ctime, ctime_buf, sizeof(ctime_buf));
  	}
  
! 	printf("m %8d %10ld %s %8s %8s", ipcid, key, fmt_perm(mode),
  	    user_from_uid(uid, 0), group_from_gid(gid, 0));
  
  	if (option & CREATOR)
***************
*** 408,414 ****
  {
  
  	printf("Semaphores:\n");
! 	printf("T     ID     KEY        MODE       OWNER    GROUP");
  	if (option & CREATOR)
  		printf("  CREATOR   CGROUP");
  	if (option & BIGGEST)
--- 408,414 ----
  {
  
  	printf("Semaphores:\n");
! 	printf("T       ID     KEY        MODE       OWNER    GROUP");
  	if (option & CREATOR)
  		printf("  CREATOR   CGROUP");
  	if (option & BIGGEST)
***************
*** 429,435 ****
  		cvt_time(ctime, ctime_buf, sizeof(ctime_buf));
  	}
  
! 	printf("s %6d %10ld %s %8s %8s", ipcid, key, fmt_perm(mode),
  	    user_from_uid(uid, 0), group_from_gid(gid, 0));
  
  	if (option & CREATOR)
--- 429,435 ----
  		cvt_time(ctime, ctime_buf, sizeof(ctime_buf));
  	}
  
! 	printf("s %8d %10ld %s %8s %8s", ipcid, key, fmt_perm(mode),
  	    user_from_uid(uid, 0), group_from_gid(gid, 0));
  
  	if (option & CREATOR)