From 19aa64a01847cce57a8c2a4ac6f68f9e125975f7 Mon Sep 17 00:00:00 2001
From: Eduardo Silva <edsiper@gmail.com>
Date: Sun, 6 Sep 2009 21:30:27 -0400
Subject: [PATCH] Cheetah: Print running username in 'status'

---
 src/cheetah.c | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/cheetah.c b/src/cheetah.c
index 7d579a6..fcb2ddf 100644
--- a/src/cheetah.c
+++ b/src/cheetah.c
@@ -24,6 +24,7 @@
 #include <string.h>
 #include <sys/types.h>
 #include <unistd.h>
+#include <pwd.h>
 #include <time.h>
 
 #include "monkey.h"
@@ -56,6 +57,27 @@
 #define MK_CHEETAH_ONEHOUR  3600
 #define MK_CHEETAH_ONEMINUTE  60
 
+void mk_cheetah_print_running_user()
+{
+        struct passwd pwd;
+        struct passwd *result;
+        char *buf;
+        size_t bufsize;
+        uid_t uid;
+
+        bufsize = sysconf(_SC_GETPW_R_SIZE_MAX);
+        if (bufsize == -1){
+                bufsize = 16384;
+        }
+        
+        buf = mk_mem_malloc(bufsize);
+        uid = getuid();
+        getpwuid_r(uid, &pwd, buf, bufsize, &result);
+
+        printf("%s\n", pwd.pw_name);
+        mk_mem_free(buf);
+}
+
 void mk_cheetah_cmd_uptime()
 {
         int days; int hours; int minutes; int seconds;
@@ -159,7 +181,10 @@ void mk_cheetah_cmd(char *cmd)
                 printf("\nMonkey Version     : %s\n", VERSION);
                 printf("Configutarion path : %s\n", config->serverconf);
                 printf("Process ID         : %i\n", getpid());
-                printf("Process User       : %i\n", getuid());
+
+                printf("Process User       : ");
+                mk_cheetah_print_running_user();
+
                 printf("Server Port        : %i\n", config->serverport);
                 printf("Worker Threads     : %i (per configuration: %i)\n", 
                        nthreads, 
-- 
2.11.4.GIT