--- projects/libstatgrab/src/saidar/saidar.c	2003/10/22 13:07:22	1.13
+++ projects/libstatgrab/src/saidar/saidar.c	2004/01/05 14:25:03	1.20
@@ -428,14 +428,11 @@ int main(int argc, char **argv){
         extern int optind;
         int c;
 
+	time_t last_update = 0;
+
 	WINDOW *window;
 
-	int stdin_fileno;
-	fd_set infds;
-	struct timeval timeout;
-
 	extern int errno;
-	char ch;
 
 	int delay=2;
 #ifdef ALLBSD
@@ -448,8 +445,14 @@ int main(int argc, char **argv){
 		return 1;
 	}
 #endif
+#ifdef SOLARIS
+	if((seteuid(getuid())) != 0){
+		fprintf(stderr, "Failed to lose setuid'ness\n");
+		return 1;
+	}	
+#endif
 		
-        while ((c = getopt(argc, argv, "vhd:")) != EOF){
+        while ((c = getopt(argc, argv, "vhd:")) != -1){
                 switch (c){
                         case 'd':
                                 delay = atoi(optarg);
@@ -457,7 +460,6 @@ int main(int argc, char **argv){
 					fprintf(stderr, "Time must be 1 second or greater\n");
 					exit(1);
 				}
-				delay--;
                                 break;
 			case 'v':
 				version_num(argv[0]);	
@@ -467,7 +469,6 @@ int main(int argc, char **argv){
 				usage(argv[0]);
 				return 1;
 				break;
-				
                 }
         }
 
@@ -476,6 +477,7 @@ int main(int argc, char **argv){
         nonl();
         cbreak();
         noecho();
+	timeout(delay * 1000);
         window=newwin(0, 0, 0, 0);
 	clear();
 
@@ -486,38 +488,25 @@ int main(int argc, char **argv){
 	}
 
 	display_headings();
-	stdin_fileno=fileno(stdin);
 
 	for(;;){
+		time_t now;
+		int ch = getch();
 
-		FD_ZERO(&infds);
-		FD_SET(stdin_fileno, &infds);
-		timeout.tv_sec = delay;
-		timeout.tv_usec = 0;
-		
-		if((select((stdin_fileno+1), &infds, NULL, NULL, &timeout)) == -1){
-			if(errno!=EINTR){
-				perror("select failed");
-				exit(1);
-			}
+		if (ch == 'q'){
+			break;
 		}
 
-		if(FD_ISSET(stdin_fileno, &infds)){
-			ch=getch();
-			if (ch == 'q'){
-				endwin();
-				return 0;
-			}
+		/* To keep the numbers slightly accurate we do not want them
+		 * updating more frequently than once a second.
+		 */
+		now = time(NULL);
+		if ((now - last_update) >= 1) {
+			get_stats();
 		}
+		last_update = now;
 
-		get_stats();
-
 		display_data();
-
-		/* To keep the numbers slightly accurate we do not want them updating more 
-  		 * frequently than once a second.
-		 */
-		sleep(1);
 	}	
 
 	endwin();