Rename protected to prot

Also print size of grant table known in system

diff --git a/servers/is/Makefile b/servers/is/Makefile
index 25d90001d0150aebfc6e2c2bfe2500870d2232bd..8c7963014e059de7378337d0ccce830781b4bab0 100644 (file)
--- a/servers/is/Makefile
+++ b/servers/is/Makefile
@@ -15,7 +15,7 @@ f = $u/src/servers/fs
 CC =   exec cc
 CFLAGS = -I$i
 LDFLAGS = -i
-LIBS = -lsys -lsysutil 
+LIBS =  -lsysutil  -lsys
 
 OBJ = main.o dmp.o dmp_kernel.o dmp_pm.o dmp_fs.o dmp_rs.o dmp_ds.o 
 

diff --git a/servers/is/dmp.c b/servers/is/dmp.c
index 483a9c51c14397afdd63afc5313db16f8bf8e3a9..52c7b432d129b93eb1df6089f0b20e16519b29ce 100644 (file)
--- a/servers/is/dmp.c
+++ b/servers/is/dmp.c
@@ -12,7 +12,7 @@
 /* Define hooks for the debugging dumps. This table maps function keys
  * onto a specific dump and provides a description for it.
  */
-#define NHOOKS 18
+#define NHOOKS 19
 
 struct hook_entry {
        int key;

diff --git a/servers/is/dmp_kernel.c b/servers/is/dmp_kernel.c
index 0c0252c14ae31ab9f7ae5c91d5158b6845e7511c..ef7573c93f4cee0d9c9b403dd110f680f2b9c15b 100644 (file)
--- a/servers/is/dmp_kernel.c
+++ b/servers/is/dmp_kernel.c
@@ -292,7 +292,7 @@ PUBLIC void kenv_dmp()
     printf("- pc_at:      %3d\n", machine.pc_at); 
     printf("- ps_mca:     %3d\n", machine.ps_mca); 
     printf("- processor:  %3d\n", machine.processor); 
-    printf("- protected:  %3d\n", machine.protected); 
+    printf("- protected:  %3d\n", machine.prot); 
     printf("- vdu_ega:    %3d\n", machine.vdu_ega); 
     printf("- vdu_vga:    %3d\n\n", machine.vdu_vga); 
     printf("Kernel info structure:\n");
@@ -366,7 +366,7 @@ PUBLIC void privileges_dmp()
       return;
   }
 
-  printf("\n--nr-id-name---- -flags- -traps- -ipc_to mask------------------------ \n");
+  printf("\n--nr-id-name---- -flags- -traps- grants -ipc_to mask- ----------------- \n");
 
   for (rp = oldrp; rp < END_PROC_ADDR; rp++) {
        if (isemptyp(rp)) continue;
@@ -380,17 +380,17 @@ PUBLIC void privileges_dmp()
         if (r == -1 && ! (rp->p_rts_flags & SLOT_FREE)) {
            sp = &priv[USER_PRIV_ID];
         }
-       printf("(%02u) %-7.7s %s   %s  ",
+       printf("(%02u) %-7.7s %s   %s %7d ",
               sp->s_id, rp->p_name,
-              s_flags_str(sp->s_flags), s_traps_str(sp->s_trap_mask) 
-        );
+              s_flags_str(sp->s_flags), s_traps_str(sp->s_trap_mask),
+               sp->s_grant_entries);
         for (i=j=0; i < NR_SYS_PROCS; i++, j++) {
                    ipc_to[j] = get_sys_bit(sp->s_ipc_to, i) ? '1' : '0';
                    if (i % 8 == 7) ipc_to[++j] = ' ';
                }
         ipc_to[j] = '\0';
 
-       printf(" %s \n", ipc_to);
+       printf(" %s\n", ipc_to);
   }
   if (rp == END_PROC_ADDR) rp = BEG_PROC_ADDR; else printf("--more--\r");
   oldrp = rp;