diff options
| author | Jim Meyering <jim@meyering.net> | 1993-10-09 20:43:31 +0000 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 1993-10-09 20:43:31 +0000 |
| commit | 4ab2d8f53aa7198e41d0e4e0e94055dc1f6e31ba (patch) | |
| tree | 9a9d6094ad686b9b8d12ccb61094fc29443e54d2 | |
| parent | ae89477b9b3dae36445ef1fda2cc6f3746be0140 (diff) | |
| download | coreutils-4ab2d8f53aa7198e41d0e4e0e94055dc1f6e31ba.tar.xz | |
merge with 3.8.3e
| -rw-r--r-- | lib/backupfile.c | 8 | ||||
| -rw-r--r-- | lib/fsusage.c | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/lib/backupfile.c b/lib/backupfile.c index ddf3fa789..cb9442903 100644 --- a/lib/backupfile.c +++ b/lib/backupfile.c @@ -156,11 +156,11 @@ max_backup_version (file, dir) int highest_version; int this_version; int file_name_length; - + dirp = opendir (dir); if (!dirp) return 0; - + highest_version = 0; file_name_length = strlen (file); @@ -168,7 +168,7 @@ max_backup_version (file, dir) { if (!REAL_DIR_ENTRY (dp) || NLENGTH (dp) <= file_name_length) continue; - + this_version = version_number (file, dp->d_name, file_name_length); if (this_version > highest_version) highest_version = this_version; @@ -207,7 +207,7 @@ version_number (base, backup, base_length) { int version; char *p; - + version = 0; if (!strncmp (base, backup, base_length) && ISDIGIT (backup[base_length])) { diff --git a/lib/fsusage.c b/lib/fsusage.c index 28c54ac17..7f7a4a7cd 100644 --- a/lib/fsusage.c +++ b/lib/fsusage.c @@ -31,7 +31,7 @@ int statfs (); -#if defined (STATFS_OSF1) /* DEC Alpha running OSF/1 */ +#if defined (STAT_STATFS3_OSF1) /* DEC Alpha running OSF/1 */ # include <sys/mount.h> #endif @@ -95,13 +95,13 @@ get_fs_usage (path, disk, fsp) char *path, *disk; struct fs_usage *fsp; { -#if defined (STATFS_OSF1) +#if defined (STAT_STATFS3_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 */ +#endif /* STAT_STATFS3_OSF1 */ #ifdef STAT_STATFS2_FS_DATA /* Ultrix. */ struct fs_data fsd; |