ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/i-scream/projects/libstatgrab/src/saidar/saidar.c
(Generate patch)

Comparing projects/libstatgrab/src/saidar/saidar.c (file contents):
Revision 1.3 by pajs, Thu Oct 9 16:08:16 2003 UTC vs.
Revision 1.10 by pajs, Mon Oct 20 15:25:48 2003 UTC

# Line 205 | Line 205 | void display_data(){
205          diskio_stat_t *diskio_stat_ptr;
206          network_stat_t *network_stat_ptr;
207          disk_stat_t *disk_stat_ptr;
208 +        /* Size before it will start overwriting "uptime" */
209 +        char hostname[15];
210 +        char *ptr;
211  
212          move(0,12);
213 <        printw("%s", stats.general_stats->hostname);
213 >        strncpy(hostname, stats.general_stats->hostname, (sizeof(hostname) - 1));
214 >        /* strncpy does not NULL terminate.. If only strlcpy was on all platforms :) */
215 >        hostname[14] = '\0';
216 >        ptr=strchr(hostname, '.');
217 >        /* Some hosts give back a FQDN for hostname. To avoid this, we'll
218 >         * just blank out everything after the first "."
219 >         */
220 >        if (ptr != NULL){
221 >                *ptr = '\0';
222 >        }      
223 >        printw("%s", hostname);
224          move(0,36);
225          printw("%s", hr_uptime(stats.general_stats->uptime));
226          epoc_time=time(NULL);
# Line 247 | Line 260 | void display_data(){
260          printw("%5d", stats.user_stats->num_entries);
261  
262          /* Mem */
250 –
263          move(6, 12);
264          printw("%7s", size_conv(stats.mem_stats->total));      
265          move(7, 12);
# Line 315 | Line 327 | void display_data(){
327                  network_stat_ptr++;
328          }
329  
330 +        /* Disk */
331          disk_stat_ptr = stats.disk_stats;
332          for(counter=0;counter<stats.disk_entries;counter++){
333                  move(13+stats.network_entries+counter, 42);
# Line 322 | Line 335 | void display_data(){
335                  move(13+stats.network_entries+counter, 62);
336                  printw("%7s", size_conv(disk_stat_ptr->avail));
337                  move(13+stats.network_entries+counter, 73);
338 <                printw("%5.2f%%", 100.00 * ((float)disk_stat_ptr->used / (float)disk_stat_ptr->size));
338 >                printw("%5.2f%%", 100.00 * ((float) disk_stat_ptr->used / (float) (disk_stat_ptr->used + disk_stat_ptr->avail)));
339                  disk_stat_ptr++;
340          }
341  
# Line 353 | Line 366 | int get_stats(){
366   }
367  
368   void version_num(char *progname){
369 <        fprintf(stderr, "%s version %s\n", PACKAGE_VERSION);
369 >        fprintf(stderr, "%s version %s\n", progname, PACKAGE_VERSION);
370          fprintf(stderr, "\nReport bugs to <%s>.\n", PACKAGE_BUGREPORT);
371          exit(1);
372   }
# Line 361 | Line 374 | void version_num(char *progname){
374   void usage(char *progname){
375          fprintf(stderr, "Usage: %s [-d delay] [-v] [-h]\n\n", progname);
376          fprintf(stderr, "  -d    Sets the update time in seconds\n");
377 <        fprintf(stderr, "  -v    Prints version number\n");
377 >        fprintf(stderr, "  -v    Prints version number\n");
378          fprintf(stderr, "  -h    Displays this help information.\n");
379          fprintf(stderr, "\nReport bugs to <%s>.\n", PACKAGE_BUGREPORT);
380          exit(1);
# Line 384 | Line 397 | int main(int argc, char **argv){
397          char ch;
398  
399          int delay=2;
400 <
401 <        while ((c = getopt(argc, argv, "d:")) != EOF){
400 > #ifdef ALLBSD
401 >        gid_t gid;
402 > #endif
403 >        if(statgrab_init() != 0){
404 >                fprintf(stderr, "statgrab_init failed. Please check the permissions\n");
405 >                return 1;
406 >        }
407 > #ifdef ALLBSD
408 >        if((setegid(getgid())) != 0){
409 >                fprintf(stderr, "Failed to lose setgid'ness\n");
410 >                return 1;
411 >        }
412 > #endif
413 >                
414 >        while ((c = getopt(argc, argv, "vhd:")) != EOF){
415                  switch (c){
416                          case 'd':
417                                  delay = atoi(optarg);

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines