--- projects/libstatgrab/src/saidar/saidar.c	2003/10/16 17:54:44	1.6
+++ projects/libstatgrab/src/saidar/saidar.c	2003/10/18 15:05:17	1.9
@@ -205,9 +205,22 @@ void display_data(){
 	diskio_stat_t *diskio_stat_ptr;
 	network_stat_t *network_stat_ptr;
 	disk_stat_t *disk_stat_ptr;
+	/* Size before it will start overwriting "uptime" */
+	char hostname[15];
+	char *ptr;
 
 	move(0,12);
-	printw("%s", stats.general_stats->hostname);
+	strncpy(hostname, stats.general_stats->hostname, (sizeof(hostname) - 1));
+	/* strncpy does not NULL terminate.. If only strlcpy was on all platforms :) */
+	hostname[14] = '\0';
+	ptr=strchr(hostname, '.');
+	/* Some hosts give back a FQDN for hostname. To avoid this, we'll
+	 * just blank out everything after the first "."
+	 */
+	if (ptr != NULL){
+		*ptr = '\0';
+	}	
+	printw("%s", hostname);
 	move(0,36);
 	printw("%s", hr_uptime(stats.general_stats->uptime));
 	epoc_time=time(NULL);
@@ -322,7 +335,7 @@ void display_data(){
 		move(13+stats.network_entries+counter, 62);
 		printw("%7s", size_conv(disk_stat_ptr->avail));
 		move(13+stats.network_entries+counter, 73);
-		printw("%5.2f%%", 100.00 * ((float) (disk_stat_ptr->size - disk_stat_ptr->avail) / (float) disk_stat_ptr->size));
+		printw("%5.2f%%", 100.00 * ((float) disk_stat_ptr->used / (float) (disk_stat_ptr->used + disk_stat_ptr->avail)));
 		disk_stat_ptr++;
 	}