system_cmds-336.6.tar.gz

[apple/system_cmds.git] / dmesg.tproj / dmesg.c

diff --git a/dmesg.tproj/dmesg.c b/dmesg.tproj/dmesg.c
index 10d5caeea1a180b6ea732c800d40bd1bd6357ccc..3b73c8860803028c78d238537adcbef10b68e571 100644 (file)
--- a/dmesg.tproj/dmesg.c
+++ b/dmesg.tproj/dmesg.c
@@ -58,26 +58,17 @@
 #include <sys/msgbuf.h>
 
 #include <fcntl.h>
-#include <kvm.h>
 #include <limits.h>
-#include <nlist.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
 #include <unistd.h>
 #include <vis.h>
+#include <libproc.h>
 
-struct nlist nl[] = {
-#define        X_MSGBUF        0
-       { "_msgbufp" },
-       { NULL },
-};
 
 void usage __P((void));
 
-#define        KREAD(addr, var) \
-       kvm_read(kd, addr, &var, sizeof(var)) != sizeof(var)
-
 int
 main(argc, argv)
        int argc;
@@ -85,46 +76,22 @@ main(argc, argv)
 {
        register int ch, newl, skip;
        register char *p, *ep;
-       struct msgbuf *bufp, cur;
-       char *memf, *nlistf;
-       kvm_t *kd;
+       struct msgbuf cur;
        char buf[5];
 
-       memf = nlistf = NULL;
-       while ((ch = getopt(argc, argv, "M:N:")) != EOF)
-               switch(ch) {
-               case 'M':
-                       memf = optarg;
-                       break;
-               case 'N':
-                       nlistf = optarg;
-                       break;
-               case '?':
-               default:
-                       usage();
-               }
-       argc -= optind;
-       argv += optind;
-
-       /*
-        * Discard setgid privileges if not the running kernel so that bad
-        * guys can't print interesting stuff from kernel memory.
-        */
-       if (memf != NULL || nlistf != NULL)
-               setgid(getgid());
+       if (argc > 1)
+               usage();
+       
+       if (proc_kmsgbuf(&cur, sizeof(struct msgbuf)) == 0){
+               perror("Unable to obtain kernel buffer");
+               usage();
+               exit(1);
+       }
 
-       /* Read in kernel message buffer, do sanity checks. */
-       if ((kd = kvm_open(nlistf, memf, NULL, O_RDONLY, "dmesg")) == NULL)
-               exit (1);
-       if (kvm_nlist(kd, nl) == -1)
-               errx(1, "kvm_nlist: %s", kvm_geterr(kd));
-       if (nl[X_MSGBUF].n_type == 0)
-               errx(1, "%s: msgbufp not found", nlistf ? nlistf : "namelist");
-       if (KREAD(nl[X_MSGBUF].n_value, bufp) || KREAD((long)bufp, cur))
-               errx(1, "kvm_read: %s", kvm_geterr(kd));
-       kvm_close(kd);
-       if (cur.msg_magic != MSG_MAGIC)
-               errx(1, "magic number incorrect");
+       if (cur.msg_magic != MSG_MAGIC) {
+               perror("magic number incorrect");
+               exit(1);
+       }
        if (cur.msg_bufx >= MSG_BSIZE)
                cur.msg_bufx = 0;
 
@@ -165,6 +132,6 @@ main(argc, argv)
 void
 usage()
 {
-       (void)fprintf(stderr, "usage: dmesg [-M core] [-N system]\n");
+       (void)fprintf(stderr, "usage: sudo dmesg\n");
        exit(1);
 }