|
 |
868f7a8 |
diff -up mgetty-1.1.36/getdisk.c.lfs mgetty-1.1.36/getdisk.c
|
|
|
868f7a8 |
--- mgetty-1.1.36/getdisk.c.lfs 2008-10-09 22:57:02.000000000 +0200
|
|
|
868f7a8 |
+++ mgetty-1.1.36/getdisk.c 2008-10-09 22:57:02.000000000 +0200
|
|
|
868f7a8 |
@@ -198,11 +198,11 @@ long minfreespace = MINFREESPACE;
|
|
 |
2bc4ada |
*/
|
|
|
2bc4ada |
|
|
|
2bc4ada |
#ifndef TESTDISK
|
|
|
2bc4ada |
-int checkspace _P1 ((path), char *path)
|
|
|
2bc4ada |
+unsigned long long int checkspace _P1 ((path), char *path)
|
|
|
2bc4ada |
{
|
|
|
2bc4ada |
#ifdef HASDISKSTAT
|
|
|
2bc4ada |
struct mountinfo mi;
|
|
|
2bc4ada |
- unsigned int kbytes;
|
|
|
2bc4ada |
+ unsigned long long int kbytes;
|
|
|
2bc4ada |
|
|
|
2bc4ada |
if (getdiskstats(path, &mi))
|
|
|
2bc4ada |
return(1);
|
|
|
868f7a8 |
@@ -213,7 +213,7 @@ int checkspace _P1 ((path), char *path)
|
|
|
2bc4ada |
*/
|
|
|
2bc4ada |
kbytes = (mi.mi_bavail>>2) * (mi.mi_bsize>>8);
|
|
|
2bc4ada |
|
|
|
2bc4ada |
- lprintf( L_NOISE, "%d Mb free on %s", kbytes/1024, path );
|
|
|
2bc4ada |
+ lprintf( L_NOISE, "%llu Mb free on %s", kbytes/1024, path );
|
|
|
2bc4ada |
return( kbytes / minfreespace);
|
|
|
2bc4ada |
#else
|
|
|
2bc4ada |
return(1);
|
|
|
868f7a8 |
@@ -339,12 +339,12 @@ int main(argc, argv) int argc; char **ar
|
|
|
2bc4ada |
fprintf(stderr, "statfs on %s failed\n", *argv);
|
|
|
2bc4ada |
} else {
|
|
|
2bc4ada |
printf( "STATFS report on %s:\n", *argv );
|
|
|
2bc4ada |
- printf( "\tfundamental file system block size %ld\n", mi.mi_bsize);
|
|
|
2bc4ada |
- printf( "\ttotal data blocks in file system %ld\n", mi.mi_blocks);
|
|
|
2bc4ada |
- printf( "\tfree block in fs %ld\n", mi.mi_bfree);
|
|
|
2bc4ada |
- printf( "\tfree blocks avail to non-superuser %ld\n", mi.mi_bavail);
|
|
|
2bc4ada |
- printf( "\ttotal file nodes in file system %ld\n", mi.mi_files);
|
|
|
2bc4ada |
- printf( "\tfree file nodes in fs %ld\n", mi.mi_ffree);
|
|
|
2bc4ada |
+ printf( "\tfundamental file system block size %lu\n", (unsigned long int) mi.mi_bsize);
|
|
|
2bc4ada |
+ printf( "\ttotal data blocks in file system %llu\n", (unsigned long long int) mi.mi_blocks);
|
|
|
2bc4ada |
+ printf( "\tfree block in fs %llu\n", (unsigned long long int) mi.mi_bfree);
|
|
|
2bc4ada |
+ printf( "\tfree blocks avail to non-superuser %llu\n", (unsigned long long int) mi.mi_bavail);
|
|
|
2bc4ada |
+ printf( "\ttotal file nodes in file system %llu\n", (unsigned long long int) mi.mi_files);
|
|
|
2bc4ada |
+ printf( "\tfree file nodes in fs %llu\n", (unsigned long long int) mi.mi_ffree);
|
|
|
2bc4ada |
}
|
|
|
2bc4ada |
argv++;
|
|
|
2bc4ada |
}
|
|
|
868f7a8 |
diff -up mgetty-1.1.36/mgetty.h.lfs mgetty-1.1.36/mgetty.h
|
|
|
868f7a8 |
--- mgetty-1.1.36/mgetty.h.lfs 2008-10-09 22:57:02.000000000 +0200
|
|
|
868f7a8 |
+++ mgetty-1.1.36/mgetty.h 2008-10-09 22:57:02.000000000 +0200
|
|
|
868f7a8 |
@@ -307,19 +307,28 @@ int cnd_call _PROTO((char *name, char *t
|
|
|
2bc4ada |
/* disk statistics retrieval in getdisk.c */
|
|
|
2bc4ada |
|
|
|
2bc4ada |
struct mountinfo {
|
|
|
2bc4ada |
+#ifndef _SYS_STATVFS_H
|
|
|
2bc4ada |
long mi_bsize; /* fundamental block size */
|
|
|
2bc4ada |
long mi_blocks; /* number of blocks in file system */
|
|
|
2bc4ada |
long mi_bfree; /* number of free blocks in file system */
|
|
|
2bc4ada |
long mi_bavail; /* blocks available to non-super user */
|
|
|
2bc4ada |
long mi_files; /* number of file nodes in file system */
|
|
|
2bc4ada |
long mi_ffree; /* number of free nodes in fs */
|
|
|
2bc4ada |
+#else
|
|
|
2bc4ada |
+ unsigned long int mi_bsize;
|
|
|
2bc4ada |
+ fsblkcnt_t mi_blocks;
|
|
|
2bc4ada |
+ fsblkcnt_t mi_bfree;
|
|
|
2bc4ada |
+ fsblkcnt_t mi_bavail;
|
|
|
2bc4ada |
+ fsfilcnt_t mi_files;
|
|
|
2bc4ada |
+ fsfilcnt_t mi_ffree;
|
|
|
2bc4ada |
+#endif /* _SYS_STATVFS_H */
|
|
|
2bc4ada |
};
|
|
|
2bc4ada |
|
|
|
2bc4ada |
typedef struct mountinfo mntinf;
|
|
|
2bc4ada |
|
|
|
2bc4ada |
extern long minfreespace;
|
|
|
2bc4ada |
|
|
|
2bc4ada |
-int checkspace _PROTO((char *path));
|
|
|
2bc4ada |
+unsigned long long int checkspace _PROTO((char *path));
|
|
|
2bc4ada |
int getdiskstats _PROTO ((char *path, mntinf *mi));
|
|
|
2bc4ada |
|
|
|
2bc4ada |
/********* system prototypes **************/
|