Mercurial > hg > octave-shane > gnulib-hg
changeset 76:7031c61568a0
merge with 3.4.7
| author | Jim Meyering <jim@meyering.net> |
|---|---|
| date | Thu, 15 Apr 1993 01:58:35 +0000 |
| parents | c2b3b494a819 |
| children | a08372bfb97e |
| files | lib/Makefile.in lib/fsusage.c |
| diffstat | 2 files changed, 15 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -78,12 +78,13 @@ # is the only way to reliably do a parallel make. getdate.c: getdate.y @echo expect 9 shift/reduce conflicts - -bison -o getdate.c $(srcdir)/getdate.y || yacc $(srcdir)/getdate.y + -bison -o getdate.c $(srcdir)/getdate.y || $(YACC) $(srcdir)/getdate.y test ! -f y.tab.c || mv y.tab.c getdate.c # Make the rename atomic, in case sed is interrupted and later rerun. posixtm.c: posixtm.y - -bison -o posixtm.tab.c $(srcdir)/posixtm.y || yacc $(srcdir)/posixtm.y + -bison -o posixtm.tab.c $(srcdir)/posixtm.y \ + || $(YACC) $(srcdir)/posixtm.y test ! -f y.tab.c || mv y.tab.c posixtm.tab.c sed -e 's/yy/zz/g' posixtm.tab.c > tposixtm.c mv tposixtm.c posixtm.c
--- a/lib/fsusage.c +++ b/lib/fsusage.c @@ -20,6 +20,10 @@ int statfs (); +#if defined (STATFS_OSF1) /* DEC Alpha running OSF/1 */ +# include <sys/mount.h> +#endif + #if defined(STAT_STATFS2_BSIZE) && !defined(_IBMR2) /* 4.3BSD, SunOS 4, HP-UX, AIX PS/2. */ #include <sys/vfs.h> #endif @@ -80,6 +84,14 @@ char *path, *disk; struct fs_usage *fsp; { +#if defined (STATFS_OSF1) + struct statfs fsd; + + if (statfs (path, &fsd, sizeof (struct statfs)) != 0) + return (-1); +#define convert_blocks(b) adjust_blocks ((b),fsd.f_fsize, 512) +#endif /* STATFS_OSF1 */ + #ifdef STAT_STATFS2_FS_DATA /* Ultrix. */ struct fs_data fsd;