Andreas Dilger fixes (CPP, ext2 features, const char etc).

[dump.git] / dump / optr.c

diff --git a/dump/optr.c b/dump/optr.c
index 0ac0acee6db937e42fc64d112acb68d9786a4727..b8e6ff5e28cdeaf756b95c41572ba9007a2cd7dd 100644 (file)
--- a/dump/optr.c
+++ b/dump/optr.c
@@ -41,9 +41,10 @@
 
 #ifndef lint
 static const char rcsid[] =
-       "$Id: optr.c,v 1.17 2000/12/05 16:31:36 stelian Exp $";
+       "$Id: optr.c,v 1.21 2001/03/19 13:22:48 stelian Exp $";
 #endif /* not lint */
 
+#include <config.h>
 #include <sys/param.h>
 #include <sys/wait.h>
 #include <sys/time.h>
@@ -64,6 +65,7 @@ static const char rcsid[] =
 #include <ext2fs/ext2fs.h>
 #include <bsdcompat.h>
 #include <signal.h>
+#include <time.h>
 #endif
 
 #include "dump.h"
@@ -503,7 +505,7 @@ fstabsearch(const char *key)
 {
        register struct pfstab *pf;
        register struct fstab *fs;
-       char *rn;
+       const char *rn;
 
        for (pf = table; pf != NULL; pf = pf->pf_next) {
                fs = pf->pf_fstab;
@@ -566,7 +568,7 @@ static void
 print_wmsg(char arg, int dumpme, const char *dev, int level,
           const char *mtpt, time_t ddate)
 {
-       char *date;
+       char *date = NULL;
        
        if (ddate) {
                char *d;