X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=dump%2Foptr.c;h=c9c9239f6eaf74d38cba84e460e0b6ee8573847c;hb=43ef843b59f89bb96ebec8647aa23ad43ae6789c;hp=35ae3bd5b9d48df8960db25f5b8e18ff7af6db5c;hpb=58d8534847bc23e3b476372c11b368e4020676f7;p=dump.git

diff --git a/dump/optr.c b/dump/optr.c
index 35ae3bd..c9c9239 100644
--- a/dump/optr.c
+++ b/dump/optr.c
@@ -2,8 +2,8 @@
  *	Ported to Linux's Second Extended File System as part of the
  *	dump and restore backup suit
  *	Remy Card <card@Linux.EU.Org>, 1994-1997
- *	Stelian Pop <pop@cybercable.fr>, 1999-2000
- *	Stelian Pop <pop@cybercable.fr> - Alcôve <www.alcove.fr>, 2000
+ *	Stelian Pop <pop@noos.fr>, 1999-2000
+ *	Stelian Pop <pop@noos.fr> - Alcôve <www.alcove.fr>, 2000
  */
 
 /*-
@@ -41,9 +41,10 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: optr.c,v 1.15 2000/11/29 10:13:43 stelian Exp $";
+	"$Id: optr.c,v 1.22 2001/03/20 09:14:58 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"
@@ -99,11 +101,7 @@ query(const char *question)
 	FILE	*mytty;
 	time_t	firstprompt, when_answered;
 
-#ifdef __linux__
-	(void)time4(&(firstprompt));
-#else
-	(void)time((time_t *)&(firstprompt));
-#endif
+	firstprompt = time(NULL);
 
 	if ((mytty = fopen(_PATH_TTY, "r")) == NULL)
 		quit("fopen on %s fails: %s\n", _PATH_TTY, strerror(errno));
@@ -136,16 +134,12 @@ query(const char *question)
 	if (signal(SIGALRM, sig) == SIG_IGN)
 		signal(SIGALRM, SIG_IGN);
 	(void) fclose(mytty);
-#ifdef __linux__
-	(void)time4(&(when_answered));
-#else
-	(void)time((time_t *)&(when_answered));
-#endif
+	when_answered = time(NULL);
 	/*
 	 * Adjust the base for time estimates to ignore time we spent waiting
 	 * for operator input.
 	 */
-	if ((tstart_writing != 0) && (when_answered != (time_t)-1) && (firstprompt != (time_t)-1))
+	if (tstart_writing != 0)
 		tstart_writing += (when_answered - firstprompt);
 	return(back);
 }
@@ -245,7 +239,7 @@ broadcast(const char *message)
 		return;
 	}
 
-	clock = time((time_t *)0);
+	clock = time(NULL);
 	localclock = localtime(&clock);
 
 	if ((f_utmp = fopen(_PATH_UTMP, "r")) == NULL) {
@@ -322,25 +316,16 @@ time_t	tschedule = 0;
 void
 timeest(void)
 {
-	time_t	tnow, deltat;
+	time_t tnow = time(NULL);
 
-#ifdef __linux__
-	(void) time4(&tnow);
-#else
-	(void) time((time_t *) &tnow);
-#endif
 	if (tnow >= tschedule) {
+		char *buf = mktimeest(tnow);
 		tschedule = tnow + 300;
-		if (blockswritten < 500)
-			return;
-		if (blockswritten > tapesize)
-			tapesize = blockswritten;
-		deltat = tstart_writing - tnow +
-			(1.0 * (tnow - tstart_writing))
-			/ blockswritten * tapesize;
-		msg("%3.2f%% done, finished in %d:%02d\n",
-			(blockswritten * 100.0) / tapesize,
-			deltat / 3600, (deltat % 3600) / 60);
+		if (buf) {
+			fprintf(stderr, "  DUMP: ");
+			fwrite(buf, strlen(buf), 1, stderr);
+			fflush(stderr);
+		}
 	}
 }
 
@@ -507,7 +492,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;
@@ -570,7 +555,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;
@@ -603,7 +588,7 @@ lastdump(char arg) /* w ==> just what to do; W ==> most recent dumps */
 	struct pfstab *pf;
 	time_t tnow;
 
-	(void) time(&tnow);
+	tnow = time(NULL);
 	getfstab();		/* /etc/fstab input */
 	initdumptimes(0);	/* dumpdates input */
 	if (ddatev == NULL && table == NULL) {