only one shared memory

git-svn-id: http://opensvn.csie.org/pttbbs/pttbbs/trunk/pttbbs@296 63ad8ddf-47c3-0310-b6dd-a9e9d9715204

1 files changed, 9 insertions, 10 deletions

diff --git a/util/userlist.c b/util/userlist.c
index 9a142926..c8d53389 100644
--- a/util/userlist.c
+++ b/util/userlist.c
@@ -7,40 +7,39 @@
 #include "config.h"
 #include "pttstruct.h"
 
-struct utmpfile_t *u;
+SHM_t   *SHM;
 
 int main(int argc, char **argv) {
     int i, shm, counter;
     
-    shm = shmget(UTMPSHM_KEY, USHM_SIZE, SHM_R | SHM_W);
+    shm = shmget(SHM_KEY, USHM_SIZE, SHM_R | SHM_W);
     if(shm == -1) {
 	perror("shmget");
 	exit(0);
     }
     
-    u = shmat(shm, NULL, 0);
-    if(u == (struct utmpfile_t *)-1) {
+    if( (SHM = shmat(shm, NULL, 0)) < 0 ){
 	perror("shmat");
 	exit(0);
     }
     
     if(argc > 1) {
 	for(i = 1; i < argc; i++)
-	    u->uinfo[atoi(argv[i])].pid = 0;
+	    SHM->uinfo[atoi(argv[i])].pid = 0;
     } else {
 	for(i = counter = 0; i < USHM_SIZE; i++)
-	    if(u->uinfo[i].pid) {
+	    if(SHM->uinfo[i].pid) {
 		userinfo_t *f;
 		
-		f = &u->uinfo[i];
+		f = &SHM->uinfo[i];
 		printf(
 		    "%4d(%d) p[%d] i[%d] u[%s] n[%s] f[%s] m[%d] d[%d] t[%ld]\n",
 		    ++counter, i, f->pager, f->invisible, f->userid,
 		    f->username, f->from, f->mode, f->mind, f->lastact);
 	    }
-	printf("\nTotal: %d(%d)\n", counter, u->number);
-	if(counter != u->number) {
-	    u->number = counter;
+	printf("\nTotal: %d(%d)\n", counter, SHM->number);
+	if(counter != SHM->number) {
+	    SHM->number = counter;
 	    printf("adjust user number!\n");
 	}
     }