home *** CD-ROM | disk | FTP | other *** search
/ Usenet 1994 January / usenetsourcesnewsgroupsinfomagicjanuary1994.iso / sources / misc / volume19 / df2 / patch01 / df2.p01
Encoding:
Text File  |  1991-04-29  |  2.7 KB  |  103 lines
  1. Index: df2.c
  2. ***************
  3. *** 13,16 ****
  4. --- 13,17 ----
  5.   #include <sys/stat.h>
  6.   #include <sys/statfs.h>
  7. + #include <sys/fstyp.h>
  8.   #include <mnttab.h>
  9.   
  10. ***************
  11. *** 21,25 ****
  12.   {
  13.   "                                   Size (kb)                  Inodes        ",
  14. ! "Filesystem|Mount Dir    | Total   Free    Used   Used| Total  Free  Used   Used",
  15.   (char *)0
  16.   };
  17. --- 22,26 ----
  18.   {
  19.   "                                   Size (kb)                  Inodes        ",
  20. ! "Filsys|Mount Dir      |  Total    Free    Used Used | Total   Free   Used Used",
  21.   (char *)0
  22.   };
  23. ***************
  24. *** 26,30 ****
  25.   
  26.   char *sep =
  27. ! "----------+-------------+----------------------------+-------------------------";
  28.   
  29.   /*+-------------------------------------------------------------------------
  30. --- 27,31 ----
  31.   
  32.   char *sep =
  33. ! "------+---------------+-----------------------------+-------------------------";
  34.   
  35.   /*+-------------------------------------------------------------------------
  36. ***************
  37. *** 42,45 ****
  38. --- 43,47 ----
  39.   struct statfs statf_buf;
  40.   struct statfs *fs = &statf_buf;
  41. + int fstyp_nfs = sysfs(GETFSIND, "NFS");
  42.   
  43.   long kb_size;
  44. ***************
  45. *** 71,74 ****
  46. --- 73,78 ----
  47.       while(fread((char *)mt,1,sizeof(*mt),fpmt) == sizeof(*mt))
  48.       {
  49. +         char *dev;
  50. + 
  51.           if(statfs(mt->mt_filsys,fs,sizeof(*fs),0))
  52.           {
  53. ***************
  54. *** 85,94 ****
  55.           ino_free = fs->f_ffree;
  56.           ino_used = ino_size - ino_free;
  57. !         ino_used_pct = (ino_used * 100) / ino_size;
  58.   
  59. !         printf("%-10.10s|%-13.13s|%7ld %7ld %7ld %3d%%|%6ld %6ld %6ld %3d%%\n",
  60. !             mt->mt_dev,mt->mt_filsys,
  61. !             kb_size,kb_free,kb_used,kb_used_pct,
  62. !             ino_size,ino_free,ino_used,ino_used_pct);
  63.   
  64.           kb_size_total  += kb_size;
  65. --- 89,111 ----
  66.           ino_free = fs->f_ffree;
  67.           ino_used = ino_size - ino_free;
  68. !         ino_used_pct = ino_size ? ((ino_used * 100) / ino_size) : 0;
  69.   
  70. !         dev = (fs->f_fstyp == fstyp_nfs) ? "NFS"
  71. !             : (strncmp(mt->mt_dev, "/dev/", 5) == 0) ? mt->mt_dev + 5
  72. !             : mt->mt_dev;
  73. ! 
  74. !         printf("%-6.6s|%-15.15s|%7ld %7ld %7ld %3d%% |",
  75. !                dev, mt->mt_filsys,
  76. !                kb_size,kb_free,kb_used,kb_used_pct);
  77. !         if (fs->f_fstyp == fstyp_nfs)
  78. !         {
  79. !             printf(" [%s]", mt->mt_dev);
  80. !         }
  81. !         else if (ino_size)
  82. !         {
  83. !             printf("%6ld %6ld %6ld %3d%%",
  84. !                    ino_size,ino_free,ino_used,ino_used_pct);
  85. !         }
  86. !         printf("\n");
  87.   
  88.           kb_size_total  += kb_size;
  89. ***************
  90. *** 105,109 ****
  91.   
  92.       printf("%s\n",sep);
  93. !     printf("%-10.10s|%-13.13s|%7ld %7ld %7ld %3d%%|%6ld %6ld %6ld %3d%%\n",
  94.           "","total",
  95.           kb_size_total,kb_free_total,kb_used_total,kb_used_pct,
  96. --- 122,126 ----
  97.   
  98.       printf("%s\n",sep);
  99. !     printf("%-6.6s|%-15.15s|%7ld %7ld %7ld %3d%% |%6ld %6ld %6ld %3d%%\n",
  100.           "","total",
  101.           kb_size_total,kb_free_total,kb_used_total,kb_used_pct,
  102.  
  103.