From 60f3d7c5841cce706d85cad88e9f5a1bb57df652 Mon Sep 17 00:00:00 2001 From: Timur Bakeyev Date: Tue, 29 Dec 1998 19:33:28 +0000 Subject: [PATCH] add proper handling of xBSD types for BSDI and FreeBSD. --- src/ChangeLog | 9 ++++++++- src/mountlist.c | 15 ++------------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 739831b8c..f43b75fa4 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +Tue Dec 29 22:25:34 1998 Timur Bakeyev + + * mountlist.c: Compress all xBSD systems to one line and add check + for MOUNT_UFS - it seems, that 4.4BSD and 4.4BSD2 systems different- + ly handles FS names. (currently affects BSDI and FreeBSD) + Tue Dec 29 16:34:02 1998 Norbert Warmuth * file.c (progress_update_one): Ignore files in subdirectories @@ -12,7 +18,7 @@ Tue Dec 29 16:34:02 1998 Norbert Warmuth (various places): adpations for the above changes. -mon Dec 28 22:15:43 1998 Norbert Warmuth +Mon Dec 28 22:15:43 1998 Norbert Warmuth * slint.c (try_alloc_color_pair): Changed hardcoded values into defines. @@ -87,6 +93,7 @@ Thu Dec 24 18:42:52 1998 Norbert Warmuth * file.c: add a HAVE_GNOME only function Mon Dec 21 22:39:35 1998 Norbert Warmuth + * mountlist.c: Define xBSD on FreeBSD. * main.c (parse_an_arg): New function, popt callback. Option diff --git a/src/mountlist.c b/src/mountlist.c index ce38c760e..196d0b15f 100644 --- a/src/mountlist.c +++ b/src/mountlist.c @@ -84,24 +84,13 @@ void free (void *ptr); #include #endif -#ifdef __bsdi__ +/* 4.4BSD2 derived systems */ +#if defined(__bsdi__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) # ifndef MOUNT_UFS # define xBSD # endif #endif -#ifdef __NetBSD__ -# define xBSD -#endif - -#ifdef __OpenBSD__ -# define xBSD -#endif - -#ifdef __FreeBSD__ -# define xBSD -#endif - /* void error (void); FIXME -- needed? */ #ifdef DOLPHIN